hqmf2js 1.0.1 → 1.1.0

data/hqmf2js.gemspec

@@ -6,14 +6,14 @@ Gem::Specification.new do |s|
   s.description = "A library for converting HQMF files to executable JavaScript suitable for use with the hQuery Gateway"
   s.email = "hquery-talk@googlegroups.com"
   s.homepage = "http://github.com/hquery/hqmf2js"
-  s.authors = ["Marc Hadley"]
-  s.version = '1.0.1'
+  s.authors = ["Marc Hadley", "Andre Quina", "Andy Gregorowicz"]
+  s.version = '1.1.0'
   
-  s.add_dependency 'nokogiri', '~> 1.5.2'
+  s.add_dependency 'nokogiri', '~> 1.5.5'
   s.add_dependency 'tilt', '~> 1.3.3'
   s.add_dependency 'coffee-script', '~> 2.2.0'
-  s.add_dependency 'sprockets', '~> 2.1.2'
-  s.add_development_dependency "awesome_print", "~> 0.3"
+  s.add_dependency 'sprockets', '~> 2.2.2'
+  s.add_development_dependency "awesome_print", "~> 1.1.0"
 
   s.files = s.files = `git ls-files`.split("\n")
 end

data/lib/generator/characteristic.js.erb

@@ -6,14 +6,14 @@ var events = [value];
 events = <%= temporal_reference.type %>(events, hqmfjs.<%= temporal_reference.reference.id %>(patient)<%= ", #{js_for_bounds(temporal_reference.range)}" if temporal_reference.range %>);
       <%- end -%>
     <%- end -%>
-events.specificContext=Specifics.identity();
+events.specificContext=hqmf.SpecificsManager.identity();
 return events;
   <%- elsif criteria.property == :expired or criteria.property == :clinicalTrialParticipant -%>
 matching = matchingValue(value, 'true');
-matching.specificContext=Specifics.identity();
+matching.specificContext=hqmf.SpecificsManager.identity();
 return matching
   <%- else -%>
 matching = matchingValue(value, <%= js_for_bounds(criteria.value) %>);
-matching.specificContext=Specifics.identity();
+matching.specificContext=hqmf.SpecificsManager.identity();
 return matching;
   <%- end -%>

data/lib/generator/converter.rb

@@ -25,17 +25,17 @@ module HQMF2JS
       # Pretty stock map/reduce functions that call out to our converted HQMF code stored in the functions variable
       map = "function map(patient) {
   var ipp = hqmfjs.IPP(patient);
-  if (Specifics.validate(ipp)) {
+  if (hqmf.SpecificsManager.validate(ipp)) {
     emit('ipp', 1);
-    if (Specifics.validate(hqmfjs.DENEX(patient), ipp)) {
+    if (hqmf.SpecificsManager.validate(hqmfjs.DENEX(patient), ipp)) {
       emit('denex', 1);    
     } else {
       var denom = hqmfjs.DENOM(patient);
-      if (Specifics.validate(denom, ipp)) {
-        if (Specifics.validate(hqmfjs.NUMER(patient), denom, ipp)) {
+      if (hqmf.SpecificsManager.validate(denom, ipp)) {
+        if (hqmf.SpecificsManager.validate(hqmfjs.NUMER(patient), denom, ipp)) {
           emit('denom', 1);
           emit('numer', 1);
-        } else if (Specifics.validate(hqmfjs.DENEXCEP(patient), denom, ipp)) {
+        } else if (hqmf.SpecificsManager.validate(hqmfjs.DENEXCEP(patient), denom, ipp)) {
           emit('excep', 1);
         } else {
           emit('denom', 1);

data/lib/generator/data_criteria.js.erb

@@ -19,20 +19,20 @@ hqmfjs.<%= js_name(criteria) %> = function(patient) {
   events = filterEventsByValue(events, <%= js_for_bounds(criteria.value) %>);
     <%- end -%>
     <%- if criteria.field_values.present?
-          criteria.field_values.keys.each do |field|
-      -%>
-  events = filterEventsByField(events, "<%= field_method(field) %>", <%= js_for_bounds(criteria.field_values[field]) %>);
-    <%-   end
-        end -%>
+          criteria.field_values.keys.each do |field| -%>
+  events = <%= field_library_method(field) %>(events, "<%= field_method(field) %>", <%= js_for_bounds(criteria.field_values[field]) %>);
+      <%- end -%>
+    <%- end -%>
     <%- if criteria.temporal_references and criteria.temporal_references.length > 0 -%>
       <%- criteria.temporal_references.each do |temporal_reference| -%>
-  events = <%= temporal_reference.type %>(events, hqmfjs.<%= temporal_reference.reference.id %>(patient)<%= ", #{js_for_bounds(temporal_reference.range)}" if temporal_reference.range %>);
+  if (events.length > 0) events = <%= temporal_reference.type %>(events, hqmfjs.<%= temporal_reference.reference.id %>(patient)<%= ", #{js_for_bounds(temporal_reference.range)}" if temporal_reference.range %>);
+  else events.specificContext=hqmf.SpecificsManager.empty();
       <%- end -%>
     <%- else -%>
         <%- if criteria.specific_occurrence -%>
-  events.specificContext=new Specifics(Row.buildForDataCriteria(events.specific_occurrence, events))
+  events.specificContext=new hqmf.SpecificOccurrence(Row.buildForDataCriteria(events.specific_occurrence, events))
         <%- else -%>
-  events.specificContext=Specifics.identity()
+  events.specificContext=hqmf.SpecificsManager.identity()
         <%- end -%>
     <%- end -%>
     <%- if criteria.subset_operators -%>

data/lib/generator/js.rb

@@ -46,6 +46,17 @@ module HQMF2JS
         HQMF::DataCriteria::FIELDS[field_name][:coded_entry_method].to_s.camelize(:lower)
       end
       
+      def field_library_method(field_name)
+        field_type = HQMF::DataCriteria::FIELDS[field_name][:field_type]
+        if field_type == :value
+          'filterEventsByField'
+        elsif field_type == :timestamp
+          'adjustBoundsForField'
+        elsif field_type == :nested_timestamp
+          'denormalizeEventsByLocation'
+        end
+      end
+      
       def js_for_value(value)
         if value
           if value.respond_to?(:derived?) && value.derived?
@@ -119,6 +130,8 @@ module HQMF2JS
       def js_for_code_list(criteria)
         if criteria.inline_code_list
           criteria.inline_code_list.to_json
+        elsif criteria.code_list_id.nil?
+          "null"
         else
           "getCodes(\"#{criteria.code_list_id}\")"
         end
@@ -187,6 +200,8 @@ module HQMF2JS
         #{js_for(population[HQMF::PopulationCriteria::NUMER], HQMF::PopulationCriteria::NUMER)}
         #{js_for(population[HQMF::PopulationCriteria::DENEX], HQMF::PopulationCriteria::DENEX)}
         #{js_for(population[HQMF::PopulationCriteria::DENEXCEP], HQMF::PopulationCriteria::DENEXCEP)}
+        // CV
+        #{js_for(population[HQMF::PopulationCriteria::MSRPOPL], HQMF::PopulationCriteria::MSRPOPL)}
         "
       end
       
@@ -200,7 +215,7 @@ module HQMF2JS
         json_list = specific_occurrences.map {|occurrence| occurrence.to_json}
         specifics_list = json_list.join(',')
         specifics_list = ",#{specifics_list}" unless specifics_list.empty?
-        "hqmfjs.initializeSpecifics = function(patient_api, hqmfjs) { Specifics.initialize(patient_api,hqmfjs#{specifics_list}) }"
+        "hqmfjs.initializeSpecifics = function(patient_api, hqmfjs) { hqmf.SpecificsManager.initialize(patient_api,hqmfjs#{specifics_list}) }"
       end
       
       # Generate JS for a HQMF2::PopulationCriteria
@@ -225,16 +240,21 @@ module HQMF2JS
         Tilt::CoffeeScriptTemplate.default_bare = true 
         ctx.append_path "app/assets/javascripts"
         
-        ["// #########################\n// ###### PATIENT API #######\n// #########################\n",
+        ["// #########################\n// ###### Underscore.js #######\n// #######################\n",
+         ctx.find_asset('underscore').to_s,
+         "// #########################\n// ###### PATIENT API #######\n// #########################\n",
          HqueryPatientApi::Generator.patient_api_javascript.to_s,
+         "// #########################\n// ## SPECIFIC OCCURRENCES ##\n// #########################\n",
+         ctx.find_asset('specifics').to_s,
          "// #########################\n// ### LIBRARY FUNCTIONS ####\n// #########################\n",
          ctx.find_asset('hqmf_util').to_s, 
          "// #########################\n// ### PATIENT EXTENSION ####\n// #########################\n",
          ctx.find_asset('patient_api_extension').to_s,
+         "// #########################\n// ## CUSTOM CALCULATIONS ###\n// #########################\n",
+         ctx.find_asset('custom_calculations').to_s,
          "// #########################\n// ##### LOGGING UTILS ######\n// #########################\n",
-         ctx.find_asset('logging_utils').to_s,
-         "// #########################\n// ## SPECIFIC OCCURRENCES ##\n// #########################\n",
-         ctx.find_asset('specifics').to_s].join("\n")
+         ctx.find_asset('logging_utils').to_s].join("\n")
+
       end
   
     end

data/test/fixtures/codes/codes.xml

@@ -6,6 +6,12 @@
             codeSystemVersion="3"/>
       </ConceptList>
    </ValueSet>
+   <ValueSet id="2.16.840.1.113883.3.464.1.1142" displayName="diabetes">
+      <ConceptList xml:lang="en-US">
+         <Concept code="E10.36" codeSystemName="ICD-10-CM" displayName="Type 1 diabetes mellitus with diabetic cataract" codeSystemVersion="06/2009"/>
+      </ConceptList>
+   </ValueSet>
+
    <ValueSet id="2.16.840.1.113883.3.464.1.37" displayName="diabetes">
       <ConceptList xml:lang="en-US">
          <Concept code="E10.36" codeSystemName="ICD-10-CM"

data/test/fixtures/patients/larry_vanderman.json

@@ -100,7 +100,16 @@
           "V70.0"
         ]
       }, 
-      "description": "Encounter Outpatient", 
+      "description": "Encounter Outpatient",
+      "facility": {
+        "name": "Outpatient Clinic",
+        "start_time": 1290166000,
+        "end_time": 1291166000,
+        "code": {
+          "code": "bar",
+          "codeSystem": "SNOMED-CT"
+        }
+      }, 
       "end_time": 1291266000
     }, 
     {
@@ -201,6 +210,7 @@
       }, 
       "description": "Foot Exam", 
       "time": 1291266000, 
+      "incisionTime": 1112587200,
       "values": [
         {
           "scalar": "Normal", 

data/test/test_helper.rb

@@ -32,7 +32,6 @@ def get_js_context(javascript)
 end
 
 def initialize_javascript_context(hqmf_utils, codes_json, converted_hqmf)
-  patient_api = File.open('test/fixtures/patient_api.js').read
   fixture_json = File.read('test/fixtures/patients/larry_vanderman.json')
   initialize_patient = 'var numeratorPatient = new hQuery.Patient(larry);'
 
@@ -41,13 +40,13 @@ def initialize_javascript_context(hqmf_utils, codes_json, converted_hqmf)
   else
     @context = V8::Context.new
   end
-  @context.eval("#{patient_api}
+  @context.eval("
     #{hqmf_utils}
     var OidDictionary = #{codes_json};
     #{converted_hqmf}
     var larry = #{fixture_json};
     #{initialize_patient}")
-  @context.eval("Specifics.initialize()")
+  @context.eval("hqmf.SpecificsManager.initialize()")
 end
 
 def compile_coffee_script

data/test/unit/codes_to_json_test.rb

@@ -14,7 +14,7 @@ class CodesToJsonTest < Test::Unit::TestCase
     
     @context = get_js_context("var dictionary = #{codes_json}")
     
-    @context.eval("dictionary").entries.length.must_equal 18
+    @context.eval("dictionary").entries.length.must_equal 19
     @context.eval("dictionary['2.16.840.1.113883.3.464.1.42']").entries.first[0].must_equal "CPT"
     @context.eval("dictionary['2.16.840.1.113883.3.464.1.42']").entries.first[1].length.must_equal 19
     

data/test/unit/custom_calculations_test.rb

@@ -0,0 +1,74 @@
+require_relative '../test_helper'
+require 'hquery-patient-api'
+
+class CustomCalculationsTest < Test::Unit::TestCase
+  
+  def setup
+    @context = get_js_context(HQMF2JS::Generator::JS.library_functions)
+    test_initialize_js = 
+    "
+      inr1 = new hQuery.CodedEntry({time:#{Time.gm(2010,1,5).to_i}, values:[{scalar:'2.8'}]})
+      inr2 = new hQuery.CodedEntry({time:#{Time.gm(2010,1,18).to_i}, values:[{scalar:'3.5'}]})
+      inr3 = new hQuery.CodedEntry({time:#{Time.gm(2010,2,2).to_i}, values:[{scalar:'3.4'}]})
+      inr4 = new hQuery.CodedEntry({time:#{Time.gm(2010,2,15).to_i}, values:[{scalar:'3.9'}]})
+      inr5 = new hQuery.CodedEntry({time:#{Time.gm(2010,3,10).to_i}, values:[{scalar:'1.7'}]})
+      inr6 = new hQuery.CodedEntry({time:#{Time.gm(2010,3,24).to_i}, values:[{scalar:'2.3'}]})
+      inr7 = new hQuery.CodedEntry({time:#{Time.gm(2010,4,12).to_i}, values:[{scalar:'2.4'}]})
+      inr8 = new hQuery.CodedEntry({time:#{Time.gm(2010,5,13).to_i}, values:[{scalar:'3.2'}]})
+      inr9 = new hQuery.CodedEntry({time:#{Time.gm(2010,5,27).to_i}, values:[{scalar:'3.5'}]})
+      inr10 = new hQuery.CodedEntry({time:#{Time.gm(2010,6,10).to_i}, values:[{scalar:'3.5'}]})
+      inr11 = new hQuery.CodedEntry({time:#{Time.gm(2010,6,24).to_i}, values:[{scalar:'3.4'}]})
+      inr12 = new hQuery.CodedEntry({time:#{Time.gm(2010,7,8).to_i}, values:[{scalar:'2.1'}]})
+      inr13 = new hQuery.CodedEntry({time:#{Time.gm(2010,7,22).to_i}, values:[{scalar:'2.6'}]})
+      
+      list = new hqmf.CustomCalc.PercentTTREntries([inr1,inr2,inr3,inr4,inr5,inr6,inr7,inr8,inr9,inr10,inr11,inr12,inr13])
+      
+      inr_b1 = new hQuery.CodedEntry({time:#{Time.gm(2010,4,1).to_i}, values:[{scalar:'2.2'}]})
+      inr_b2 = new hQuery.CodedEntry({time:#{Time.gm(2010,5,7).to_i}, values:[{scalar:'2.0'}]})
+      inr_b3 = new hQuery.CodedEntry({time:#{Time.gm(2010,6,4).to_i}, values:[{scalar:'2.7'}]})
+      inr_b4 = new hQuery.CodedEntry({time:#{Time.gm(2010,7,10).to_i}, values:[{scalar:'2.2'}]})
+      inr_b5 = new hQuery.CodedEntry({time:#{Time.gm(2010,8,12).to_i}, values:[{scalar:'2.3'}]})
+      inr_b6 = new hQuery.CodedEntry({time:#{Time.gm(2010,9,11).to_i}, values:[{scalar:'2.8'}]})
+      inr_b7 = new hQuery.CodedEntry({time:#{Time.gm(2010,10,9).to_i}, values:[{scalar:'2.8'}]})
+      inr_b8 = new hQuery.CodedEntry({time:#{Time.gm(2010,10,17).to_i}, values:[{scalar:'2.1'}]})
+      inr_b9 = new hQuery.CodedEntry({time:#{Time.gm(2010,10,31).to_i}, values:[{scalar:'1.8'}]})
+      
+      list2 = new hqmf.CustomCalc.PercentTTREntries([inr_b1,inr_b2,inr_b3,inr_b4,inr_b5,inr_b6,inr_b7,inr_b8,inr_b9])
+    "
+    @context.eval(test_initialize_js)
+    
+    
+  end
+
+
+  def test_inr_results
+    @context.eval("typeof(hqmf.CustomCalc.PercentTTREntries) === 'function'").must_equal true
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr1,inr2) - 3.714285714285717) < .001")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr2,inr3)) == 0 ")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr3,inr4))  == 0")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr4,inr5) - 10.45454545) < .001")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr5,inr6) - 7) < .001")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr6,inr7) - 19) < .001")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr7,inr8) - 23.25) < .001")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr8,inr9)) == 0")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr9,inr10)) == 0")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr10,inr11)) == 0")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr11,inr12) - 9.692307692) < .001")
+    assert @context.eval("Math.abs(list.calculateDaysInRange(inr12,inr13) - 14) < .001")
+    
+  end
+  
+  def test_total_number_of_days
+    @context.eval("list.totalNumberOfDays()").must_equal 198
+  end
+
+  def test_calculate_ttr
+    assert @context.eval("Math.abs(list.calculateTTR() - 87.11113886) < .001")
+  end
+
+  def test_calculate_percent_ttr
+    assert @context.eval("Math.abs(list.calculatePercentTTR() - 43.99552468) < .001")
+  end
+  
+  
+end

data/test/unit/hqmf_from_json_javascript_test.rb

@@ -33,17 +33,17 @@ class HqmfFromJsonJavascriptTest < Test::Unit::TestCase
   def test_converted_hqmf
     # Unspecified time bounds should be nil
     assert_equal nil, @context.eval("numeratorPatient.encounters()[0].asIVL_TS().low.asDate()")
-    assert_equal 2010, @context.eval("numeratorPatient.encounters()[0].asIVL_TS().high.asDate().getFullYear()")
+    assert_equal 2010, @context.eval("numeratorPatient.encounters()[0].asIVL_TS().high.asDate().getUTCFullYear()")
 
     # Measure variables
-    assert_equal 2011, @context.eval("MeasurePeriod.low.asDate().getFullYear()")
-    assert_equal 0, @context.eval("MeasurePeriod.low.asDate().getMonth()")
-    assert_equal 2011, @context.eval("MeasurePeriod.high.asDate().getFullYear()")
-    assert_equal 11, @context.eval("MeasurePeriod.high.asDate().getMonth()")
-    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getFullYear()")
-    assert_equal 0, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getMonth()")
-    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getFullYear()")
-    assert_equal 11, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getMonth()")
+    assert_equal 2011, @context.eval("MeasurePeriod.low.asDate().getUTCFullYear()")
+    assert_equal 0, @context.eval("MeasurePeriod.low.asDate().getUTCMonth()")
+    assert_equal 2011, @context.eval("MeasurePeriod.high.asDate().getUTCFullYear()")
+    assert_equal 11, @context.eval("MeasurePeriod.high.asDate().getUTCMonth()")
+    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getUTCFullYear()")
+    assert_equal 0, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getUTCMonth()")
+    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getUTCFullYear()")
+    assert_equal 11, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getUTCMonth()")
   
     # Age functions - Fixture is 37.1
     assert @context.eval("hqmfjs.ageBetween17and64(numeratorPatient).isTrue()")

data/test/unit/hqmf_javascript_test.rb

@@ -8,8 +8,6 @@ class HqmfJavascriptTest < Test::Unit::TestCase
     doc = HQMF::Parser.parse(hqmf_contents, HQMF::Parser::HQMF_VERSION_2)
     
     codes_file_path = File.expand_path("../../fixtures/codes/codes.xml", __FILE__)
-    # This patient is identified from Cypress as in the denominator and numerator for NQF59
-    numerator_patient_json = File.read('test/fixtures/patients/larry_vanderman.json')
     
     # First compile the CoffeeScript that enables our converted HQMF JavaScript
     hqmf_utils = compile_coffee_script
@@ -46,10 +44,8 @@ class HqmfJavascriptTest < Test::Unit::TestCase
   def test_to_js_method
     value = @converter.to_js(0,@codes_hash)
     local_context = V8::Context.new
-    patient_api = File.open('test/fixtures/patient_api.js').read
     hqmf_utils = HQMF2JS::Generator::JS.library_functions
-    local_context.eval("#{patient_api}
-                        #{hqmf_utils}
+    local_context.eval("#{hqmf_utils}
                         #{value}")
                         
     local_context.eval('typeof hqmfjs != undefined').must_equal true
@@ -62,17 +58,17 @@ class HqmfJavascriptTest < Test::Unit::TestCase
   def test_converted_hqmf
     # Unspecified time bounds should be nil
     assert_equal nil, @context.eval("numeratorPatient.encounters()[0].asIVL_TS().low.asDate()")
-    assert_equal 2010, @context.eval("numeratorPatient.encounters()[0].asIVL_TS().high.asDate().getFullYear()")
+    assert_equal 2010, @context.eval("numeratorPatient.encounters()[0].asIVL_TS().high.asDate().getUTCFullYear()")
 
     # Measure variables
-    assert_equal 2011, @context.eval("MeasurePeriod.low.asDate().getFullYear()")
-    assert_equal 0, @context.eval("MeasurePeriod.low.asDate().getMonth()")
-    assert_equal 2011, @context.eval("MeasurePeriod.high.asDate().getFullYear()")
-    assert_equal 11, @context.eval("MeasurePeriod.high.asDate().getMonth()")
-    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getFullYear()")
-    assert_equal 0, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getMonth()")
-    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getFullYear()")
-    assert_equal 11, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getMonth()")
+    assert_equal 2011, @context.eval("MeasurePeriod.low.asDate().getUTCFullYear()")
+    assert_equal 0, @context.eval("MeasurePeriod.low.asDate().getUTCMonth()")
+    assert_equal 2011, @context.eval("MeasurePeriod.high.asDate().getUTCFullYear()")
+    assert_equal 11, @context.eval("MeasurePeriod.high.asDate().getUTCMonth()")
+    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getUTCFullYear()")
+    assert_equal 0, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().low.asDate().getUTCMonth()")
+    assert_equal 2011, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getUTCFullYear()")
+    assert_equal 11, @context.eval("hqmfjs.MeasurePeriod()[0].asIVL_TS().high.asDate().getUTCMonth()")
   
     # Age functions - Fixture is 37.1
     assert @context.eval("hqmfjs.ageBetween17and64(numeratorPatient).isTrue()")
@@ -142,6 +138,32 @@ class HqmfJavascriptTest < Test::Unit::TestCase
     # getCode
     assert_equal 1, @context.eval('getCodes("2.16.840.1.113883.3.464.1.14")').count
     assert_equal "00110", @context.eval('getCodes("2.16.840.1.113883.3.464.1.14")["HL7"][0]')
+    
+    # adjustBoundsForField 
+    @context.eval('var procedures = numeratorPatient.procedures()')
+    assert_equal 7, @context.eval('procedures.length')
+    assert_equal 2010, @context.eval('procedures[0].timeStamp().getFullYear()')
+    assert_equal true, @context.eval('procedures[0].includesCodeFrom({"SNOMED-CT": ["401191002"]})')
+    @context.eval('var updatedProcedures = adjustBoundsForField(procedures, "incisionTime")')
+    assert_equal 1, @context.eval('updatedProcedures.length')
+    assert_equal 2005, @context.eval('updatedProcedures[0].timeStamp().getFullYear()')
+    assert_equal true, @context.eval('updatedProcedures[0].includesCodeFrom({"SNOMED-CT": ["401191002"]})')
+    
+    # denormalizeEventsByLocation
+    @context.eval('var normalizedEncounters = denormalizeEventsByLocation(numeratorPatient.encounters(), "facilityArrival")')
+    assert_equal 1, @context.eval('normalizedEncounters.length')
+    assert_equal 10, @context.eval('normalizedEncounters[0].startDate().getUTCMonth()')
+    assert_equal 19, @context.eval('normalizedEncounters[0].startDate().getUTCDate()')
+    assert_equal 10, @context.eval('normalizedEncounters[0].endDate().getUTCMonth()')
+    assert_equal 19, @context.eval('normalizedEncounters[0].endDate().getUTCDate()')
+    assert_equal 'bar', @context.eval('normalizedEncounters[0].facility().code()')
+    assert_equal 'SNOMED-CT', @context.eval('normalizedEncounters[0].facility().codeSystemName()')
+    @context.eval('normalizedEncounters = denormalizeEventsByLocation(numeratorPatient.encounters(), "facilityDeparture")')
+    assert_equal 1, @context.eval('normalizedEncounters.length')
+    assert_equal 11, @context.eval('normalizedEncounters[0].startDate().getUTCMonth()')
+    assert_equal 1, @context.eval('normalizedEncounters[0].startDate().getUTCDate()')
+    assert_equal 11, @context.eval('normalizedEncounters[0].endDate().getUTCMonth()')
+    assert_equal 1, @context.eval('normalizedEncounters[0].endDate().getUTCDate()')
   end
   
   def test_map_reduce_generation

data/test/unit/library_function_test.rb

@@ -5,7 +5,7 @@ class LibraryFunctionTest < Test::Unit::TestCase
   
   def setup
     @context = get_js_context(HQMF2JS::Generator::JS.library_functions)
-    @context.eval("Specifics.initialize()")
+    @context.eval("hqmf.SpecificsManager.initialize()")
   end
 
 
@@ -85,15 +85,15 @@ class LibraryFunctionTest < Test::Unit::TestCase
     ts = 'new TS("20110101")'
     ts2 = 'new TS("20100101")'
     ts3 = 'new TS("20120101")'
-    assert_equal 2011, @context.eval("#{ts}.asDate().getFullYear()")
-    assert_equal 0, @context.eval("#{ts}.asDate().getMonth()")
-    assert_equal 1, @context.eval("#{ts}.asDate().getDate()")
-    assert_equal 2012, @context.eval("#{ts}.add(new PQ(1, 'a')).asDate().getFullYear()")
-    assert_equal 2, @context.eval("#{ts}.add(new PQ(1, 'd')).asDate().getDate()")
-    assert_equal 8, @context.eval("#{ts}.add(new PQ(1, 'wk')).asDate().getDate()")
-    assert_equal 1, @context.eval("#{ts}.add(new PQ(1, 'h')).asDate().getHours()")
-    assert_equal 5, @context.eval("#{ts}.add(new PQ(5, 'min')).asDate().getMinutes()")
-    assert_equal 11, @context.eval("#{ts}.add(new PQ(-1, 'mo')).asDate().getMonth()")
+    assert_equal 2011, @context.eval("#{ts}.asDate().getUTCFullYear()")
+    assert_equal 0, @context.eval("#{ts}.asDate().getUTCMonth()")
+    assert_equal 1, @context.eval("#{ts}.asDate().getUTCDate()")
+    assert_equal 2012, @context.eval("#{ts}.add(new PQ(1, 'a')).asDate().getUTCFullYear()")
+    assert_equal 2, @context.eval("#{ts}.add(new PQ(1, 'd')).asDate().getUTCDate()")
+    assert_equal 8, @context.eval("#{ts}.add(new PQ(1, 'wk')).asDate().getUTCDate()")
+    assert_equal 1, @context.eval("#{ts}.add(new PQ(1, 'h')).asDate().getUTCHours()")
+    assert_equal 5, @context.eval("#{ts}.add(new PQ(5, 'min')).asDate().getUTCMinutes()")
+    assert_equal 11, @context.eval("#{ts}.add(new PQ(-1, 'mo')).asDate().getUTCMonth()")
     assert @context.eval("#{ts2}.before(#{ts})")
     assert @context.eval("#{ts3}.after(#{ts})")
     assert !@context.eval("#{ts}.before(#{ts2})")
@@ -260,7 +260,7 @@ class LibraryFunctionTest < Test::Unit::TestCase
     ivl1 = 'new IVL_TS(new TS("20120310"), new TS("20120320"))'
     ivl2 = 'new IVL_TS(new TS("20120312"), new TS("20120320"))'
     assert @context.eval("#{ivl2}.DURING(#{ivl1})")
-    assert_equal 2010, @context.eval('getIVL(new Date(2010,1,1)).low.asDate().getFullYear()')
+    assert_equal 2010, @context.eval('getIVL(new Date(Date.UTC(2010,1,1))).low.asDate().getUTCFullYear()')
   end
   
   def test_any_non_null
@@ -336,6 +336,7 @@ class LibraryFunctionTest < Test::Unit::TestCase
     # Events and bounds for temporal operators
     @context.eval('var events1 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105"), new TS("20120105"));}}]')
     @context.eval('var events2 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120102"), new TS("20120105"));}}]')
+    @context.eval('var events3 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105203030"), new TS("20120105203030"));}}]')
     @context.eval('var bound1 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105"), new TS("20120105"));}}]')
     @context.eval('var bound2 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120107"), new TS("20120107"));}}]')
     @context.eval('var bound3 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120103"), new TS("20120107"));}}]')
@@ -344,8 +345,11 @@ class LibraryFunctionTest < Test::Unit::TestCase
     @context.eval('var nullStartBound = new IVL_TS(new TS("20120105"), new TS("20120105"));')
     @context.eval('nullStartBound.low.date = null;')
     @context.eval('var bound6 = {"asIVL_TS": function() {return nullStartBound;}}')
+    @context.eval('var bound7 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105193030"), new TS("20120105193030"));}}]')
     @context.eval('var range1 = new IVL_PQ(null, new PQ(1, "d"))')
     @context.eval('var range2 = new IVL_PQ(new PQ(1, "d"), null)')
+    @context.eval('var range3 = new IVL_PQ(new PQ(0, "d"), null)')
+    @context.eval('var range4 = new IVL_PQ(null, new PQ(3, "d"))')
     
     # DURING
     assert_equal 1, @context.eval('DURING(events1, bound1)').count
@@ -408,6 +412,7 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert_equal 0, @context.eval('SBS(events2, bound1, range1)').count
     assert_equal 1, @context.eval('SBS(events2, bound1)').count
     assert_equal 1, @context.eval('SBS(events2, bound1, range2)').count
+    assert_equal 0, @context.eval('SBS(events3, bound7, range3)').count
     
     # SAS
     assert_equal 0, @context.eval('SAS(events1, bound1)').count
@@ -470,6 +475,19 @@ class LibraryFunctionTest < Test::Unit::TestCase
     # CONCURRENT
     assert_equal 1, @context.eval('CONCURRENT(events1, bound1)').count
     assert_equal 0, @context.eval('CONCURRENT(events1, bound2)').count
+
+    #DATEDIFF
+    @context.eval('var diffEvent1 = {"asIVL_TS": function() {return new IVL_TS(new TS("20120105"), new TS("20120105"));}, "timeStamp": function() {return new Date(Date.UTC(2012, 1, 5, 0, 0));}}')
+    @context.eval('var diffEvent2 = {"asIVL_TS": function() {return new IVL_TS(new TS("20120107"), new TS("20120107"));}, "timeStamp": function() {return new Date(Date.UTC(2012, 1, 7, 0, 0));}}')
+    @context.eval('var diffEvent3 = {"asIVL_TS": function() {return new IVL_TS(new TS("20120111"), new TS("20120111"));}, "timeStamp": function() {return new Date(Date.UTC(2012, 1, 11, 0, 0));}}')
+    
+    assert_equal true, @context.eval('DATEDIFF([diffEvent1,diffEvent2],range4).isTrue()')
+    assert_equal true, @context.eval('DATEDIFF([diffEvent2,diffEvent1],range4).isTrue()')
+    assert_equal true, @context.eval('DATEDIFF([diffEvent1,diffEvent1],range4).isTrue()')
+    
+    # false test
+    
+    
   end
   
   def test_ordinal_operators