hqmf2js 1.0.0 → 1.0.1

data/Gemfile

@@ -13,9 +13,9 @@ end
 gem 'hquery-patient-api', '~> 0.3.0'
 #gem 'hqmf-parser', :git => 'https://github.com/pophealth/hqmf-parser.git', :branch => 'develop'
 #gem 'hqmf-parser', :path => '../hqmf-parser'
-gem 'hqmf-parser', '~> 1.0.2'
+gem 'hqmf-parser', '~> 1.0.4'
 #gem "health-data-standards", :git => 'http://github.com/projectcypress/health-data-standards.git', :branch => 'develop'
-gem "health-data-standards", '~> 2.1.2'
+gem "health-data-standards", '~> 2.1.3'
 
 gem 'nokogiri'
 gem 'sprockets'

data/Gemfile.lock

@@ -56,7 +56,7 @@ GEM
       oauth (>= 0.3.6)
       oauth2 (>= 0.5.0)
     hashie (1.2.0)
-    health-data-standards (2.1.2)
+    health-data-standards (2.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       mongoid (~> 3.0.6)
@@ -64,7 +64,7 @@ GEM
       rest-client (~> 1.6.7)
       uuid (~> 2.3.5)
     hike (1.2.1)
-    hqmf-parser (1.0.2)
+    hqmf-parser (1.0.4)
       google-spreadsheet-ruby (= 0.1.8)
       roo (= 1.10.1)
       rubyzip
@@ -87,12 +87,12 @@ GEM
     method_source (0.7.1)
     mime-types (1.18)
     minitest (2.12.1)
-    mongoid (3.0.10)
+    mongoid (3.0.13)
       activemodel (~> 3.1)
       moped (~> 1.1)
       origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    moped (1.2.7)
+    moped (1.2.9)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
@@ -143,7 +143,7 @@ GEM
       rubyzip (>= 0.9.4)
       spreadsheet (> 0.6.4)
       todonotes (>= 0.1.0)
-    ruby-ole (1.2.11.4)
+    ruby-ole (1.2.11.5)
     rubyzip (0.9.9)
     sass (3.1.15)
     sass-rails (3.2.5)
@@ -185,8 +185,8 @@ DEPENDENCIES
   coffee-rails
   coffee-script
   cover_me (~> 1.2.0)
-  health-data-standards (~> 2.1.2)
-  hqmf-parser (~> 1.0.2)
+  health-data-standards (~> 2.1.3)
+  hqmf-parser (~> 1.0.4)
   hquery-patient-api (~> 0.3.0)
   minitest
   nokogiri

data/hqmf2js.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.email = "hquery-talk@googlegroups.com"
   s.homepage = "http://github.com/hquery/hqmf2js"
   s.authors = ["Marc Hadley"]
-  s.version = '1.0.0'
+  s.version = '1.0.1'
   
   s.add_dependency 'nokogiri', '~> 1.5.2'
   s.add_dependency 'tilt', '~> 1.3.3'

data/lib/generator/converter.rb

@@ -35,7 +35,7 @@ module HQMF2JS
         if (Specifics.validate(hqmfjs.NUMER(patient), denom, ipp)) {
           emit('denom', 1);
           emit('numer', 1);
-        } else if (Specifics.validate(hqmfjs.EXCEP(patient), denom, ipp)) {
+        } else if (Specifics.validate(hqmfjs.DENEXCEP(patient), denom, ipp)) {
           emit('excep', 1);
         } else {
           emit('denom', 1);

data/lib/generator/js.rb

@@ -186,7 +186,7 @@ module HQMF2JS
         // NUMERATOR
         #{js_for(population[HQMF::PopulationCriteria::NUMER], HQMF::PopulationCriteria::NUMER)}
         #{js_for(population[HQMF::PopulationCriteria::DENEX], HQMF::PopulationCriteria::DENEX)}
-        #{js_for(population[HQMF::PopulationCriteria::EXCEP], HQMF::PopulationCriteria::EXCEP)}
+        #{js_for(population[HQMF::PopulationCriteria::DENEXCEP], HQMF::PopulationCriteria::DENEXCEP)}
         "
       end
       

data/test/fixtures/NQF59New.xml

@@ -1009,8 +1009,8 @@
       <component typeCode="COMP">
         <denominatorExceptionCriteria moodCode="EVN" classCode="OBS">
           <id root="c75181d0-73eb-11de-8a39-0800200c9a66"
-            extension="EXCEP"/>
-          <code code="EXCEP" codeSystem="2.16.840.1.113883.5.1063"
+            extension="DENEXCEP"/>
+          <code code="DENEXCEP" codeSystem="2.16.840.1.113883.5.1063"
             codeSystemName="HL7 Observation Value">
             <displayName value="Denominator exception"/>
           </code>

data/test/unit/effective_date_test.rb

@@ -20,7 +20,7 @@ class EffectiveDateTest < Test::Unit::TestCase
       #{@converter.js_for('IPP')}
       #{@converter.js_for('DENOM')}
       #{@converter.js_for('NUMER')}
-      #{@converter.js_for('EXCEP')}
+      #{@converter.js_for('DENEXCEP')}
       #{@converter.js_for('DUMMY')}"
 
     # Now we can wrap and compile all of our code as one little JavaScript context for all of the tests below

data/test/unit/hqmf_from_json_javascript_test.rb

@@ -24,7 +24,7 @@ class HqmfFromJsonJavascriptTest < Test::Unit::TestCase
       #{@converter.js_for('IPP')}
       #{@converter.js_for('DENOM')}
       #{@converter.js_for('NUMER')}
-      #{@converter.js_for('EXCEP')}
+      #{@converter.js_for('DENEXCEP')}
       #{@converter.js_for('DUMMY')}"
 
     initialize_javascript_context(hqmf_utils, codes_json, converted_hqmf)
@@ -93,7 +93,7 @@ class HqmfFromJsonJavascriptTest < Test::Unit::TestCase
     assert @context.eval("hqmfjs.IPP(numeratorPatient).isTrue()")
     assert @context.eval("hqmfjs.DENOM(numeratorPatient).isTrue()")
     assert @context.eval("hqmfjs.NUMER(numeratorPatient).isTrue()")
-    assert !@context.eval("hqmfjs.EXCEP(numeratorPatient).isTrue()")
+    assert !@context.eval("hqmfjs.DENEXCEP(numeratorPatient).isTrue()")
     
     # COUNTing
     assert @context.eval("hqmfjs.moreThanTwoHbA1CTests(numeratorPatient).isTrue()")

data/test/unit/hqmf_javascript_test.rb

@@ -24,7 +24,7 @@ class HqmfJavascriptTest < Test::Unit::TestCase
       #{@converter.js_for('IPP')}
       #{@converter.js_for('DENOM')}
       #{@converter.js_for('NUMER')}
-      #{@converter.js_for('EXCEP')}
+      #{@converter.js_for('DENEXCEP')}
       #{@converter.js_for('DUMMY')}"
 
     initialize_javascript_context(hqmf_utils, codes_json, converted_hqmf)
@@ -120,7 +120,7 @@ class HqmfJavascriptTest < Test::Unit::TestCase
     assert @context.eval("hqmfjs.IPP(numeratorPatient).isTrue()")
     assert @context.eval("hqmfjs.DENOM(numeratorPatient).isTrue()")
     assert @context.eval("hqmfjs.NUMER(numeratorPatient).isTrue()")
-    assert !@context.eval("hqmfjs.EXCEP(numeratorPatient).isTrue()")
+    assert !@context.eval("hqmfjs.DENEXCEP(numeratorPatient).isTrue()")
     
     # COUNTing
     assert @context.eval("hqmfjs.moreThanTwoHbA1CTests(numeratorPatient).isTrue()")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hqmf2js
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri