hqmf2js 1.2.1 → 1.3.0

data/test/unit/specifics_test.rb

@@ -231,8 +231,11 @@ class SpecificsTest < Test::Unit::TestCase
       var row1 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':20}});
       var row2 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':2},'OccurrenceBEncounter':{'id':20}});
       var row3 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':3},'OccurrenceBEncounter':{'id':30}});
+      var row4 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':'*'});
+      var row5 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':2},'OccurrenceBEncounter':'*'});
+      var row6 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':3},'OccurrenceBEncounter':'*'});
       
-      var specific = new hqmf.SpecificOccurrence([row1,row2,row3]);
+      var specific = new hqmf.SpecificOccurrence([row1,row2,row3,row4,row5,row6]);
       specific.addIdentityRow();
 
       var pop = new Boolean(true);
@@ -252,7 +255,9 @@ class SpecificsTest < Test::Unit::TestCase
     @context.eval('hqmf.SpecificsManager.validate(pop)').must_equal true
     @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceAEncounter"], pop)').must_equal 3
     @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceBEncounter"], pop)').must_equal 2
-    @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceAEncounter", "OccurrenceBEncounter"], pop)').must_equal 5
+    # this should be 3 and not 5 because we are doing a multiple encounter episode check.  The OccurrenceB rows should be dropped since
+    # we cannot have multiple values defined on a single row for a multi encounter episode check for unique.
+    @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceAEncounter", "OccurrenceBEncounter"], pop)').must_equal 3
     @context.eval('hqmf.SpecificsManager.countUnique(null, pop)').must_equal 1
   end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hqmf2js
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Marc Hadley
@@ -11,120 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: health-data-standards
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-- !ruby/object:Gem::Dependency
-  name: hquery-patient-api
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+date: 2014-03-25 00:00:00.000000000 Z
+dependencies: []
 description: A library for converting HQMF files to executable JavaScript suitable
   for use with the hQuery Gateway
 email: hquery-talk@googlegroups.com
@@ -149,12 +36,14 @@ files:
 - bin/hqmf2js.rb
 - config/warble.rb
 - hqmf2js.gemspec
+- lib/assets/javascripts/libraries/map_reduce_utils.js
 - lib/config/codes.xml
 - lib/generator/characteristic.js.erb
 - lib/generator/codes_to_json.rb
 - lib/generator/converter.rb
 - lib/generator/data_criteria.js.erb
 - lib/generator/derived_data.js.erb
+- lib/generator/execution.rb
 - lib/generator/js.rb
 - lib/generator/measure_period.js.erb
 - lib/generator/observation_criteria.js.erb
@@ -166,8 +55,8 @@ files:
 - lib/tasks/codes.rake
 - lib/tasks/coffee.rake
 - lib/tasks/convert.rake
-- lib/tasks/cover_me.rake
 - test/fixtures/NQF59New.xml
+- test/fixtures/codes/codes.json
 - test/fixtures/codes/codes.xls
 - test/fixtures/codes/codes.xml
 - test/fixtures/i2b2.xml
@@ -182,40 +71,46 @@ files:
 - test/fixtures/json/0043.json
 - test/fixtures/json/0043_hqmf1.json
 - test/fixtures/json/0043_hqmf2.json
+- test/fixtures/json/0495.json
 - test/fixtures/json/59New.json
+- test/fixtures/json/data_criteria/specific_occurrence.json
+- test/fixtures/json/data_criteria/temporals_with_anynonnull.json
 - test/fixtures/patients/francis_drake.json
 - test/fixtures/patients/larry_vanderman.json
+- test/simplecov.rb
 - test/test_helper.rb
+- test/unit/cmd_test.rb
 - test/unit/codes_to_json_test.rb
 - test/unit/custom_calculations_test.rb
 - test/unit/effective_date_test.rb
+- test/unit/erb_context_test.rb
 - test/unit/hqmf_from_json_javascript_test.rb
 - test/unit/hqmf_javascript_test.rb
+- test/unit/js_object_test.rb
 - test/unit/library_function_test.rb
 - test/unit/specifics_test.rb
 homepage: http://github.com/hquery/hqmf2js
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library for converting HQMF files to JavaScript
 test_files: []
 has_rdoc: 

data/lib/tasks/cover_me.rake

@@ -1,8 +0,0 @@
-namespace :cover_me do
-  
-  task :report do
-    require 'cover_me'
-    CoverMe.complete!
-  end
-  
-end