Fixed SDC loading to work with newer DRC measures. And cherry-pick wo…

…rk from master. (#39) * Fixed SDC loading to work with newer DRC measures. - Fixed issues with most data criteria getting thrown out. * Bring over dependabot nokogiri update and the simplexml_parser removal from #30. [Security] Update nokogiri requirement from ~> 1.8.5 to >= 1.8.5, < 1.11.0 Updates the requirements on [nokogiri](https://github.com/sparklemotion/nokogiri) to permit the latest version. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.5...v1.10.3) * Add the hqmf identifier to a statement reference (#25)
projecttacoma · Aug 26, 2019 · 419b1a7 · 419b1a7
1 parent 84dfc0b
commit 419b1a7
Show file tree

Hide file tree

Showing 3 changed files with 174 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,171 @@
+PATH
+  remote: .
+  specs:
+    cqm-parsers (2.0.0)
+      activesupport (~> 5.0)
+      builder (~> 3.1)
+      erubis (~> 2.7)
+      highline (~> 1.7.0)
+      log4r (~> 1.1)
+      memoist (~> 0.9)
+      mongoid (~> 6.4)
+      mongoid-tree (~> 2.1)
+      mustache
+      nokogiri (>= 1.8.5, < 1.11.0)
+      protected_attributes_continued (~> 1.4)
+      rubyzip (~> 1.2)
+      typhoeus (~> 1.3)
+      uuid (~> 2.3)
+      zip-zip (~> 0.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    ansi (1.5.0)
+    ast (2.4.0)
+    awesome_print (1.8.0)
+    bson (4.5.0)
+    builder (3.2.3)
+    bundler-audit (0.6.0)
+      bundler (~> 1.2)
+      thor (~> 0.18)
+    byebug (6.0.2)
+    cane (2.3.0)
+      parallel
+    codecov (0.1.14)
+      json
+      simplecov
+      url
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    cqm-models (2.0.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    docile (1.3.1)
+    erubis (2.7.0)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    factory_girl (4.1.0)
+      activesupport (>= 3.0.0)
+    ffi (1.11.1)
+    hashdiff (0.3.7)
+    highline (1.7.10)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    log4r (1.1.10)
+    log_switch (1.0.0)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
+    memoist (0.16.0)
+    method_source (0.8.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    minitest-reporters (1.3.5)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    mongo (2.10.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (6.4.4)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    mongoid-tree (2.1.1)
+      mongoid (>= 4.0, < 8)
+    mustache (1.1.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.17.0)
+    parser (2.6.2.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    protected_attributes_continued (1.5.0)
+      activemodel (>= 5.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    public_suffix (3.0.3)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rubocop (0.52.1)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.10.0)
+    rubyzip (1.2.3)
+    safe_yaml (1.0.4)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    slop (3.6.0)
+    systemu (2.6.5)
+    tailor (1.1.5)
+      log_switch (>= 0.3.0)
+      term-ansicolor (>= 1.0.5)
+      text-table (>= 1.2.2)
+    term-ansicolor (1.6.0)
+      tins (~> 1.0)
+    text-table (1.2.4)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tins (1.16.3)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.4.0)
+    url (0.3.2)
+    uuid (2.3.9)
+      macaddr (~> 1.0)
+    vcr (3.0.3)
+    webmock (3.4.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    zip-zip (0.3)
+      rubyzip (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  bundler-audit
+  byebug (~> 6.0.2)
+  cane (~> 2.3.0)
+  codecov
+  cqm-models (~> 2.0.0)
+  cqm-parsers!
+  factory_girl (~> 4.1.0)
+  minitest (~> 5.3)
+  minitest-reporters
+  mongoid (~> 6.4.2)
+  pry
+  pry-nav
+  rake
+  rubocop (~> 0.52.1)
+  simplecov
+  tailor (~> 1.1.2)
+  vcr
+  webmock
+
+BUNDLED WITH
+   1.17.3
diff --git a/cqm-parsers.gemspec b/cqm-parsers.gemspec
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'protected_attributes_continued', '~> 1.4'
   s.add_dependency 'uuid', '~> 2.3'
   s.add_dependency 'builder', '~> 3.1'
-  s.add_dependency 'nokogiri', '~> 1.10'
-  s.add_dependency 'highline', "~> 1.7"
+  s.add_dependency 'nokogiri', '>= 1.8.5', '< 1.11.0'
+  s.add_dependency 'highline', "~> 1.7.0"
 
   s.add_dependency 'rubyzip', '~> 1.2'
   s.add_dependency 'typhoeus', '~> 1.3'

diff --git a/lib/measure-loader/source_data_criteria_loader.rb b/lib/measure-loader/source_data_criteria_loader.rb
@@ -42,7 +42,7 @@ def extract_fields_from_standard_data_criteria(criteria, entry)
     end
 
     def extract_fields_from_single_code_reference_data_criteria(criteria)
-      single_code_reference = criteria.css('value[codeSystem][code]').last || criteria.css('code[codeSystem][code]').last
+      single_code_reference = criteria.at_css('value[codeSystem][code]') || criteria.at_css('code[codeSystem][code]')
       system_id = "#{single_code_reference['codeSystem']}_#{single_code_reference['codeSystemVersion']}".to_sym
       concept = @single_code_concepts[system_id][single_code_reference['code'].to_sym]
       value_set = concept._parent