cqm-validators 3.0.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2392d581780f96f7b1b57b2e39bb007d8d450f69f0f903b8c0b18bac2fad9d
-  data.tar.gz: ad2ef24b759d799e4c6fe49cb6438a4aec9c4af8f002ec67d136b97357e1eabf
+  metadata.gz: 8d1b58c405d0b4f5749dd5a97f3e8bf6d9d751276b322f7f616ec143273c546a
+  data.tar.gz: 6c569d85fa41bdf80c2ebb2844035a0d3eca2e58d8c065f28dab833370049e34
 SHA512:
-  metadata.gz: 2f57e881a5825ce58d928f46559c42279faec7b41ba7f1dade50ece69ee72a50443be5b59aef15683aee670809712dc832afe66c6b81c7988fba59783239f84f
-  data.tar.gz: ad889cec773305338b0d4d268f1b4fd5fc33abe3edb81636c3013eac715eab7fbc88ddc899bac42dd3fae08eecf4b5e4742e2921e43640f39ff37215be923e4a
+  metadata.gz: 1fac7b2669ce06bcf10402fe2e966740eb6f82e5dadd1245e251e49a7d1fcc3f3d0dc6966d235f073279ad844864b30c965101bf630fe1a88560f8b11edcf1bb
+  data.tar.gz: c641e6e185bc0cf57efc448b280441193ce0a3c0143e5d041271a1484a6b1cf6a84d19862cce4e5ec7b1767960bd41bb19b8e2d86d5a4b508bbbfad07e7c5fb4

data/.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: Continuous Integration
+on:
+  pull_request:
+    branches:
+      - master
+      - cqm_validators_2_x
+      - cqm_validators_3_x
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.6, 2.7.2]
+        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,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.4
   Exclude:
     - bin/*
 Style/Documentation:

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/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.14.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 = '3.0.1'
+  VERSION = '3.1.3'
 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)

data/lib/validators.rb

@@ -8,6 +8,7 @@ require_relative 'measure_validator'
 require_relative 'data_validator'
 require_relative 'performance_rate_validator'
 require_relative 'qrda_qdm_template_validator'
+require 'singleton'
 
 module CqmValidators
   CDA_SDTC_SCHEMA = 'lib/schema/infrastructure/cda/CDA_SDTC.xsd'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cqm-validators
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Laura
@@ -9,22 +9,28 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -146,11 +152,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rubocop.yml"
 - ".simplecov"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - QRDA_Schematron_License.txt
@@ -226,14 +232,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: new cqm validator library

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-  - 2.5
-cache:
-  - bundler
-sudo: required
-services:
-  - mongodb
-branches:
-  only:
-  - master
-  - cqm_validators_2_x
-before_script:
-  - git config --global user.email "travis@travis.ci"
-  - git config --global user.name "Travis CI"
-script:
-  - bundle exec overcommit --sign
-  - bundle exec overcommit --run
-  - travis_retry bundle exec rake test