cqm-validators 2.0.2 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c8067796e458fb6576378bcfedadb762e75cfc3222e7b71288a1ac24f706087
-  data.tar.gz: 5ee8cfad30be91371fee0b0ebcd454d5c7bd5993d6ff96b3e565fd148039e5b8
+  metadata.gz: 6abb9bf8064df8134c14cf879afb6e0166c187b72bf4d4111880bcabb3c06a2f
+  data.tar.gz: 9efa76762db8bb2168e14fafe8940e93a5321f5c10602498a4ab0357a765ff35
 SHA512:
-  metadata.gz: 0333e138838bda558b17d0612b5f270d9d549c908531e5e1792433941aaaa913c7d0d7754d09f60ca91df98cd355612418a68cb122a2d9440479d923fbff2989
-  data.tar.gz: 58deb72053f7e7e29e9c2174b21e7b603bbd5fffe954665add5899de6d0438b0b24d40c403b08735358bb10001585731230c4452d8a345295c19fab1bb49308c
+  metadata.gz: 2644f1657d905ec149c4bfcc8ce7ed9d8adfd2f67af49d7521c7a4060ae5d44f2bbfb1b97a32f1d5ce033b6d5a469e7772c6291252fca2eb71e037bfe0e68b62
+  data.tar.gz: 1388423a072a4db0cc3290b67328cac5598be670c5730a50b079f2de1af2265e705e71e28f004a295849d50d165bf08389c6b0cb8e5e281c2aeaa6d78ca38dc7

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: Continuous Integration
+on:
+  pull_request:
+    branches:
+      - master
+      - cqm_validators_2_x
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.6, 2.5]
+        mongodb-version: [4.0.18, 4.4]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Start MongoDB
+      uses: supercharge/mongodb-github-action@1.3.0
+      with:
+        mongodb-version: ${{ matrix.mongodb-version }}
+    - name: Run overcommit
+      run: |
+        bundle exec overcommit --sign
+        bundle exec overcommit --run
+    - name: Run tests
+      run: bundle exec rake test

data/.overcommit.yml

@@ -7,6 +7,8 @@ PreCommit:
     exclude: ['test/fixtures/**/*', 'lib/schema/**/*', 'lib/schematron/iso-schematron-xslt1/**/*', 'lib/schematron/iso-schematron-xslt2/**/*', 'lib/schematron/qrda/**/*']
   AuthorName:
     enabled: false
+  AuthorEmail:
+    enabled: false
 CommitMsg:
   RussianNovel:
     enabled: true

data/.rubocop.yml

@@ -1,21 +1,19 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.4
   Exclude:
     - bin/*
-Documentation:
+Style/Documentation:
   Enabled: false
 # TODO: remove this exception when java_processor.rb is fixed to rescue StandardError
+Style/HashEachMethods:
+  Enabled: false
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
 Lint/RescueException:
   Exclude:
     - 'lib/schematron/java_processor.rb'
-Layout/LineLength:
-  Max: 150
-  Exclude:
-    - 'test/**/*'
-    # TODO: remove exclusions below this line as line length is fixed
-    - 'lib/reported_result_extractor.rb'
-    - 'lib/data_validator.rb'
-    - 'lib/measure_validator.rb'
 Metrics/AbcSize:
   # The ABC size is a calculated magnitude, so this number can be a Fixnum or
   # a Float.
@@ -33,6 +31,14 @@ Metrics/ClassLength:
     - 'test/**/*'
     # TODO: remove exclusions below this line as Class length is fixed
     - 'lib/qrda_qdm_template_validator.rb'
+Layout/LineLength:
+  Max: 150
+  Exclude:
+    - 'test/**/*'
+    # TODO: remove exclusions below this line as line length is fixed
+    - 'lib/reported_result_extractor.rb'
+    - 'lib/data_validator.rb'
+    - 'lib/measure_validator.rb'
 Metrics/MethodLength:
   CountComments: false  # count full line comments?
   Max: 20

data/Gemfile

@@ -9,6 +9,6 @@ gemspec development_group: :test
 
 group :test do
   gem 'codecov', require: false
-  gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models.git', branch: 'master'
+  gem 'cqm-models', '~> 3.0'
   gem 'simplecov', require: false
 end

data/README.md

@@ -18,15 +18,18 @@ Then run bundler to grab all of the necessary gems:
 Versioning
 ==========
 
-Starting with version **1.0.1.0** released on 5/22/2019, cqm-validators versioning has the format **W.X.Y.Z**, where:
+Starting with version **2.0.0** released on 6/20/19, cqm-validators versioning has the format **X.Y.Z**, where:
 
-* **W** maps to a version of QRDA Category 1 and QRDA Category 3. See the table below to see the existing mapping to QRDA versions.
+* **X** maps to a version of QRDA. See the table below to see the existing mapping to QRDA versions.
 
-  | W | QRDA Cat 1 | QRDA Cat 3 |
+  | X | QRDA Cat 1 | QRDA Cat 3 |
   | --- | --- | --- |
-  | 1 | R1 STU5.1 | R1 STU2.1 |
+  | 2 | R1 STU5.1 | R1 STU2.1 |
+  | 3 | R1 STU5.2 | R1 STU2.1 |
 
-* **X.Y.Z** uses [SemVer](http://semver.org/) for versioning. **X.Y.Z** starts at 0.0.0 when **W** is incremented.
+* **Y** indicates major changes (incompatible API changes)
+
+* **Z** indicates minor changes (added functionality in a backwards-compatible manner) and patch changes (backwards-compatible bug fixes)
 
 For the versions available, see [tags on this repository](https://github.com/projecttacoma/cqm-validators/tags).
 

data/cqm_validators.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_dependency 'nokogiri', '~>1.10'
+  spec.add_dependency 'nokogiri', '>= 1.8.5', '< 1.13.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'byebug'

data/lib/cqm_validators/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CqmValidators
-  VERSION = '2.0.2'
+  VERSION = '3.1.2'
 end

data/lib/performance_rate_validator.rb

@@ -35,10 +35,13 @@ module CqmValidators
       denexcep = 0
       denom = 0
       numer = 0
+      numex = 0
       denex = reported_result['DENEX'] unless reported_result['DENEX'].nil?
       denexcep = reported_result['DENEXCEP'] unless reported_result['DENEXCEP'].nil?
       denom = reported_result['DENOM'] unless reported_result['DENOM'].nil?
       numer = reported_result['NUMER'] unless reported_result['NUMER'].nil?
+      numex = reported_result['NUMEX'] unless reported_result['NUMEX'].nil?
+      numer -= numex
       denom = denom - denex - denexcep
       pr = if denom.zero?
              'NA'

data/lib/reported_result_extractor.rb

@@ -8,7 +8,7 @@ module CqmValidators
     # returns nil if nothing matching is found
     # returns a hash with the values of the populations filled out along with the population_ids added to the result
 
-    ALL_POPULATION_CODES = %w[IPP DENOM NUMER NUMEX DENEX DENEXCEP MSRPOPL MSRPOPLEX OBSERV].freeze
+    ALL_POPULATION_CODES = %w[IPP DENOM NUMER NUMEX DENEX DENEXCEP MSRPOPL MSRPOPLEX].freeze
 
     def extract_results_by_ids(measure, poulation_set_id, doc, stratification_id = nil)
       results = nil
@@ -36,21 +36,14 @@ module CqmValidators
     end
 
     def get_measure_components(n, population_set, stratification_id)
-      results = { supplemental_data: {} }
+      # observations are a hash of population/value. For example {"DENOM"=>108.0, "NUMER"=>2}
+      results = { supplemental_data: {}, observations: {} }
       stratification = stratification_id ? population_set.stratifications.where(stratification_id: stratification_id).first.hqmf_id : nil
       ALL_POPULATION_CODES.each do |pop_code|
-        next unless population_set.populations[pop_code] || pop_code == 'OBSERV'
+        next unless population_set.populations[pop_code]
 
-        val = nil
-        sup = nil
-        if pop_code == 'OBSERV'
-          next unless population_set.populations['MSRPOPL']
-
-          msrpopl = population_set.populations['MSRPOPL']['hqmf_id']
-          val, sup = extract_cv_value(n, population_set.observations.first.hqmf_id, msrpopl, stratification)
-        else
-          val, sup, pr = extract_component_value(n, pop_code, population_set.populations[pop_code]['hqmf_id'], stratification)
-        end
+        get_observed_values(results, n, pop_code, population_set, stratification)
+        val, sup, pr = extract_component_value(n, pop_code, population_set.populations[pop_code]['hqmf_id'], stratification)
         unless val.nil?
           results[pop_code] = val
           results[:supplemental_data][pop_code] = sup
@@ -60,8 +53,19 @@ module CqmValidators
       results
     end
 
-    def extract_cv_value(node, id, msrpopl, strata = nil)
-      xpath_observation = %( cda:component/cda:observation[./cda:value[@code = "MSRPOPL"] and ./cda:reference/cda:externalObservation/cda:id[#{translate('@root')}='#{msrpopl.upcase}']])
+    def get_observed_values(results, n, pop_code, population_set, stratification)
+      statement_name = population_set.populations[pop_code]['statement_name']
+      # look to see if there is an observation that corresponds to the specific statement_name
+      statement_observation = population_set.observations.select { |obs| obs.observation_parameter.statement_name == statement_name }
+      # return unless an observation is found
+      unless statement_observation.empty?
+        hqmf_id = population_set.populations[pop_code]['hqmf_id']
+        results[:observations][pop_code] = extract_cv_value(n, statement_observation.first.hqmf_id, hqmf_id, pop_code, stratification)
+      end
+    end
+
+    def extract_cv_value(node, id, msrpopl, pop_code, strata = nil)
+      xpath_observation = %( cda:component/cda:observation[./cda:value[@code = "#{pop_code}"] and ./cda:reference/cda:externalObservation/cda:id[#{translate('@root')}='#{msrpopl.upcase}']])
       cv = node.at_xpath(xpath_observation)
       return nil unless cv
 
@@ -73,7 +77,7 @@ module CqmValidators
       else
         val = get_cv_value(cv, id)
       end
-      [val, (strata.nil? ? extract_supplemental_data(cv) : nil)]
+      val
     end
 
     def extract_component_value(node, code, id, strata = nil)