hqmf2js 1.2.0 → 1.2.1

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 1.9.2
+  - 1.9.3
 
 script: bundle exec rake
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    hqmf2js (1.2.0)
+    hqmf2js (1.2.1)
       coffee-script (~> 2.2.0)
-      health-data-standards (~> 3.0.1)
-      hquery-patient-api (~> 1.0.1)
+      health-data-standards (~> 3.1.1)
+      hquery-patient-api (~> 1.0.2)
       nokogiri (~> 1.5.5)
       sprockets (~> 2.2.2)
       tilt (~> 1.3.3)
@@ -43,7 +43,6 @@ GEM
     arel (3.0.2)
     awesome_print (1.1.0)
     builder (3.0.4)
-    choice (0.1.6)
     coderay (1.0.8)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -60,34 +59,23 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    faraday (0.8.6)
-      multipart-post (~> 1.1)
-    google-spreadsheet-ruby (0.1.8)
-      nokogiri (>= 1.4.3.1)
-      oauth (>= 0.3.6)
-      oauth2 (>= 0.5.0)
     hashie (1.2.0)
-    health-data-standards (3.0.1)
+    health-data-standards (3.1.1)
       activesupport (~> 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      google-spreadsheet-ruby (= 0.1.8)
       log4r (~> 1.1.10)
+      memoist (~> 0.9.0)
       mongoid (~> 3.1.0)
       nokogiri (~> 1.5.5)
       rest-client (~> 1.6.7)
-      roo (= 1.10.1)
       rubyzip
-      spreadsheet (= 0.6.8)
       uuid (~> 2.3.5)
     hike (1.2.1)
-    hquery-patient-api (1.0.1)
-    httpauth (0.2.0)
+    hquery-patient-api (1.0.2)
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
     libv8 (3.3.10.4)
     log4r (1.1.10)
     macaddr (1.6.1)
@@ -96,27 +84,18 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    memoist (0.9.0)
     method_source (0.8.1)
     mime-types (1.20.1)
     minitest (4.3.2)
-    mongoid (3.1.2)
+    mongoid (3.1.3)
       activemodel (~> 3.2)
       moped (~> 1.4.2)
       origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    moped (1.4.2)
+    moped (1.4.5)
     multi_json (1.5.0)
-    multi_xml (0.5.3)
-    multipart-post (1.2.0)
     nokogiri (1.5.6)
-    oauth (0.4.7)
-    oauth2 (0.9.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
     origin (1.0.11)
     polyglot (0.3.3)
     pry (0.9.10)
@@ -150,14 +129,6 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    roo (1.10.1)
-      choice (>= 0.1.4)
-      google-spreadsheet-ruby (>= 0.1.5)
-      nokogiri (>= 1.5.0)
-      rubyzip (>= 0.9.4)
-      spreadsheet (> 0.6.4)
-      todonotes (>= 0.1.0)
-    ruby-ole (1.2.11.6)
     rubyzip (0.9.9)
     sass (3.2.3)
     sass-rails (3.2.5)
@@ -165,8 +136,6 @@ GEM
       sass (>= 3.1.10)
       tilt (~> 1.3)
     slop (3.3.3)
-    spreadsheet (0.6.8)
-      ruby-ole (>= 1.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -177,8 +146,6 @@ GEM
       libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
-    todonotes (0.1.1)
-      log4r
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)

data/app/assets/javascripts/crosswalk.js.coffee

@@ -0,0 +1,72 @@
+class @CrosswalkManager
+  @matchedSystems: {}
+  @trueMatchedSystems: {}
+  @tmpTrueMatchedSystems: {}
+  @clearValidateCodeSystemData: () ->
+    CrosswalkManager.matchedSystems = {}
+    CrosswalkManager.trueMatchedSystems = {}
+    CrosswalkManager.tmpTrueMatchedSystems = {}
+
+hQuery.Patient::validateCodeSystems = () ->
+  sections = ['encounters','medications','conditions','procedures','results','vitalSigns','immunizations','allergies','pregnancies','socialHistories','careGoals','medicalEquipment','functionalStatuses']
+  fullMatch = true
+  for section in sections
+    for entry in this[section]()
+      matchedSystems = CrosswalkManager.matchedSystems[entry.id]
+      if (matchedSystems? && _.keys(matchedSystems).length > 0)
+        matches = _.keys(entry.json.codes).length == _.keys(matchedSystems).length
+        fullMatch = fullMatch && matches
+        Logger.info("#{entry.json['description']} -> #{_.keys(entry.json.codes)} != #{_.keys(matchedSystems)}") if !matches
+      # trueMatchedSystems = CrosswalkManager.trueMatchedSystems[entry.id]
+      # if (trueMatchedSystems? && _.keys(trueMatchedSystems).length > 0)
+      #   matches = _.keys(entry.json.codes).length == _.keys(trueMatchedSystems).length
+      #   fullMatch = fullMatch && matches
+      #   Logger.info("TRUE MATCH: #{entry.json['description']} -> #{_.keys(entry.json.codes)} != #{_.keys(trueMatchedSystems)}") if !matches
+  CrosswalkManager.clearValidateCodeSystemData()
+  fullMatch
+
+hQuery.CodedEntry::includesCodeFrom = (codeSet) ->
+  allTrue = true
+  oneTrue = false
+  # tmpTrueMatchedSystems = {}
+  matchedSystems = CrosswalkManager.matchedSystems[@id]
+  for codedValue in @_type
+    thisResult = codedValue.includedIn(codeSet)
+    oneTrue = oneTrue || thisResult
+    allTrue = allTrue && thisResult
+    matchedSystems = {} unless matchedSystems?
+    matchedSystems[codedValue.codeSystemName()] = true if (thisResult)
+    # tmpTrueMatchedSystems[codedValue.codeSystemName()] = true if (thisResult)
+  if (oneTrue && !allTrue)
+    Logger.info("*** #{@json['description']}")
+    for codedValue in @_type
+      thisResult = codedValue.includedIn(codeSet)
+      Logger.info("*** Logger is #{thisResult} for: #{Logger.toJson(codedValue)}")
+  CrosswalkManager.matchedSystems[@id] = matchedSystems
+  # CrosswalkManager.tmpTrueMatchedSystems[@id] = tmpTrueMatchedSystems
+  oneTrue
+
+instrumentTrueCrosswalk = (hqmfjs) ->
+  # CrosswalkManager.clearValidateCodeSystemData()
+  # _.each(_.functions(hqmfjs), (method) ->
+  #   hqmfjs[method] = _.wrap(hqmfjs[method], (func) ->
+
+  #     args = Array.prototype.slice.call(arguments,1)
+
+  #     results = func.apply(this, args)
+  #     tmp_results = results
+  #     tmp_results = [results] unless _.isArray(tmp_results)
+
+  #     _.each(tmp_results, (result) ->
+  #       if result.json? && CrosswalkManager.tmpTrueMatchedSystems[result.id]?
+  #         tmpTrueMatchedSystems = CrosswalkManager.tmpTrueMatchedSystems[result.id]
+  #         CrosswalkManager.trueMatchedSystems[result.id] = {} unless CrosswalkManager.trueMatchedSystems[result.id]
+  #         Logger.info("TRUE_MATCHED: #{result.json['description']} - #{_.keys(tmpTrueMatchedSystems)}!!!")
+  #         _.each(_.keys(tmpTrueMatchedSystems), (key) ->
+  #           CrosswalkManager.trueMatchedSystems[result.id][key] = CrosswalkManager.trueMatchedSystems[result.id][key] || tmpTrueMatchedSystems[key]
+  #         )
+  #     )
+  #     results
+  #   )
+  # )
+@instrumentTrueCrosswalk = instrumentTrueCrosswalk

data/app/assets/javascripts/hqmf_util.js.coffee

@@ -131,7 +131,8 @@ class TS
       
   # Number of whole minutes between the two time stamps (as Date objects)
   @minutesDifference: (earlier, later) ->
-    Math.floor(((later.getTime()-earlier.getTime())/1000)/60)
+    [e,l] = TS.dropSeconds(earlier,later)
+    Math.floor(((l.getTime()-e.getTime())/1000)/60)
     
   # Number of whole hours between the two time stamps (as Date objects)
   @hoursDifference: (earlier, later) ->
@@ -452,7 +453,8 @@ filterEventsByValue = (events, value) ->
 # Return only those events with a field that matches the supplied value
 filterEventsByField = (events, field, value) ->
   respondingEvents = (event for event in events when event.respondTo(field))
-  result = (event for event in respondingEvents when value.match(event[field]()))
+  unit = value.unit() if value.unit?
+  result = (event for event in respondingEvents when value.match(event[field](unit)))
   hqmf.SpecificsManager.maintainSpecifics(result, events)
 @filterEventsByField = filterEventsByField
 
@@ -510,10 +512,13 @@ class CrossProduct extends Array
   constructor: (allEventLists) ->
     super()
     @eventLists = []
+    # keep track of the specific occurrences by encounter ID.  This is used in eventsMatchBounds (specifically in buildRowsForMatching down the _.isObject path)
+    @specific_occurrence = {}
     for eventList in allEventLists
       @eventLists.push eventList
       for event in eventList
         this.push(event)
+        @specific_occurrence[event.id] = eventList.specific_occurrence if eventList.specific_occurrence
   listCount: -> @eventLists.length
   childList: (index) -> @eventLists[index]
 
@@ -525,9 +530,13 @@ XPRODUCT = (eventLists...) ->
 # Create a new list containing all the events from the supplied event lists
 UNION = (eventLists...) ->
   union = []
+  # keep track of the specific occurrences by encounter ID.  This is used in eventsMatchBounds (specifically in buildRowsForMatching down the _.isObject path)
+  specific_occurrence = {}
   for eventList in eventLists
     for event in eventList
+      specific_occurrence[event.id] = eventList.specific_occurrence if eventList.specific_occurrence
       union.push(event)
+  union.specific_occurrence = specific_occurrence unless _.isEmpty(specific_occurrence)
   hqmf.SpecificsManager.unionAll(union, eventLists)
 @UNION = UNION
 
@@ -639,7 +648,7 @@ eventsMatchBounds = (events, bounds, methodName, range) ->
 
     if hasSpecificOccurrence
       matchingEvents.specific_occurrence = events.specific_occurrence
-      # TODO: well need a temporary variable for non specific occurrences on the left so that we can do rejections based on restrictions in the data criteria
+      # we use a temporary variable for non specific occurrences on the left so that we can do rejections based on restrictions in the data criteria
       specificContext.addRows(Row.buildRowsForMatching(events.specific_occurrence, event, bounds.specific_occurrence, matchingBounds))
     else
       # add all stars

data/app/assets/javascripts/logging_utils.js.coffee

@@ -2,11 +2,13 @@ class @Logger
   @logger: []
   @rationale: {}
   @info: (string) ->
-    @logger.push("#{Logger.indent()}#{string}")
+    if @enable_logging
+      @logger.push("#{Logger.indent()}#{string}")
   @record: (id, result) ->
-    if result? and typeof(result.isTrue) == 'function'
+    if @enable_rationale and result? and typeof(result.isTrue) == 'function'
       @rationale[id] = result.isTrue()
-  @enabled: true
+  @enable_logging: true
+  @enable_rationale: true
   @initialized: false
   @indentCount = 0
   @indent: ->
@@ -24,10 +26,10 @@ class @Logger
     else
       object
   @toJson: (value) ->
-    if (typeof(tojson) == 'function')
-      tojson(value)
-    else
+    if (typeof(JSON) == 'object')
       JSON.stringify(value)
+    else
+      tojson(value)
   @classNameFor: (object) ->
     funcNameRegex = ///function (.+)\(///;
     results = funcNameRegex.exec(object.constructor.toString());
@@ -40,29 +42,61 @@ class @Logger
       memo.push("#{entry.codeSystemName()}:#{entry.code()}");
       memo
     , []).join(',')+"]"
+  @formatSpecificEntry: (object, index) ->
+    if object == hqmf.SpecificsManager.any
+      object
+    else
+      "#{object.id}"
+  @formatSpecificContext: (object) ->
+    displayRows = []
+    if object?.specificContext?.rows?.length
+      displayRows.push(Logger.toJson(item.id for item in hqmf.SpecificsManager.occurrences))
+      for row in object.specificContext.rows
+        do (row) ->
+          displayRow = []
+          for entry, index in row.values
+            do (entry) ->
+              displayRow.push(Logger.formatSpecificEntry(entry, index))
+          displayRows.push(Logger.toJson(displayRow))
+    displayRows
+  @logSpecificContext: (object) ->
+    Logger.indentCount++
+    for row in Logger.formatSpecificContext(object)
+      do (row) ->
+        Logger.info(row)
+    Logger.indentCount--
     
+    
+@injectLogger = (hqmfjs, enable_logging, enable_rationale) ->
+  Logger.enable_logging = enable_logging
+  Logger.enable_rationale = enable_rationale
 
-@enableMeasureLogging = (hqmfjs) ->
+  # Wrap all of the data criteria functions generated from HQMF
   _.each(_.functions(hqmfjs), (method) ->
-    hqmfjs[method] = _.wrap(hqmfjs[method], (func) ->
+    if method != 'initializeSpecifics'
+      hqmfjs[method] = _.wrap(hqmfjs[method], (func) ->
 
-      args = Array.prototype.slice.call(arguments,1)
+        args = Array.prototype.slice.call(arguments,1)
 
-      Logger.info("#{method}:")
-      Logger.indentCount++
-      result = func.apply(this, args)
+        Logger.info("#{method}:")
+        Logger.indentCount++
+        result = func.apply(this, args)
 
-      Logger.indentCount--
-      Logger.info("#{method} -> #{Logger.asBoolean(result)}")
-      Logger.record(method,result)
-      return result;
-    );
+        Logger.indentCount--
+        Logger.info("#{method} -> #{Logger.asBoolean(result)}")
+        if result.specificContext?.rows?.length
+          Logger.info("Specific context")
+          Logger.logSpecificContext(result)
+          Logger.info("------")
+        Logger.record(method,result)
+        return result;
+      );
   );
 
-@enableLogging =->
   if (!Logger.initialized)
     Logger.initialized=true
     
+    # Wrap selected hQuery Patient API functions
     _.each(_.functions(hQuery.Patient.prototype), (method) ->
       if (hQuery.Patient.prototype[method].length == 0)
         hQuery.Patient.prototype[method] = _.wrap(hQuery.Patient.prototype[method], (func) ->
@@ -88,6 +122,18 @@ class @Logger
       return result;
     );
     
+    # Wrap selected HQMF Util functions
+    hqmf.SpecificsManagerSingleton.prototype.intersectAll = _.wrap(hqmf.SpecificsManagerSingleton.prototype.intersectAll, (func, boolVal, values, negate=false, episodeIndices) ->
+      func = _.bind(func, this, boolVal, values, negate, episodeIndices)
+      result = func(boolVal, values, negate, episodeIndices)
+      Logger.info("Intersecting (#{values.length}):")
+      for value in values
+        Logger.logSpecificContext(value)
+      Logger.info("Intersected result:")
+      Logger.logSpecificContext(result)
+      return result;
+    );
+    
     @getCodes = _.wrap(@getCodes, (func, oid) -> 
       codes = func(oid)
       Logger.info("accessed codes: #{oid}")
@@ -127,6 +173,13 @@ class @Logger
       result
     )
 
+    @eventsMatchBounds = _.wrap(@eventsMatchBounds, (func, events, bounds, methodName, range) -> 
+      args = Array.prototype.slice.call(arguments,1)
+      result = func(events, bounds, methodName, range)
+      Logger.info("#{methodName}(Events: #{Logger.stringify(events)}, Bounds: #{Logger.stringify(bounds)}, Range: #{Logger.toJson(range)}) -> #{Logger.stringify(result)}")
+      result
+    )
+
     @atLeastOneFalse = _.wrap(@atLeastOneFalse, (func) -> 
       args = Array.prototype.slice.call(arguments,1)
       Logger.info("called atLeastOneFalse(#{args}):")
@@ -138,9 +191,3 @@ class @Logger
       result
     )
     
-    @eventsMatchBounds = _.wrap(@eventsMatchBounds, (func, events, bounds, methodName, range) -> 
-      args = Array.prototype.slice.call(arguments,1)
-      result = func(events, bounds, methodName, range)
-      Logger.info("#{methodName}(Events: #{Logger.stringify(events)}, Bounds: #{Logger.stringify(bounds)}, Range: #{Logger.toJson(range)}) -> #{Logger.stringify(result)}")
-      result
-    )

data/app/assets/javascripts/patient_api_extension.js.coffee

@@ -18,6 +18,10 @@ hQuery.CodedEntry::asTS = ->
   ts.date = this.timeStamp()
   ts
 
+hQuery.Encounter::lengthOfStay = (unit) ->
+  ivl_ts = this.asIVL_TS()
+  ivl_ts.low.difference(ivl_ts.high, unit)
+
 hQuery.CodedEntry::respondTo = (functionName) ->
   typeof(@[functionName]) == "function"
 

data/app/assets/javascripts/specifics.js.coffee

@@ -73,8 +73,13 @@ class hqmf.SpecificsManagerSingleton
     entry.specificRow = row
     entry
     
-  intersectSpecifics: (populations...) ->
-    value = @intersectAll(new Boolean(populations[0].isTrue()), populations)
+  intersectSpecifics: (nextPopulation, previousPopulation, occurrenceIDs) ->
+    # we need to pass the episode indicies all the way down through the interesection to the match function
+    # this must be done because we need to ensure that on intersection of populations the * does not allow an episode through
+    # that was not part of a previous population
+    episodeIndices = null
+    episodeIndices = (@getColumnIndex(occurrenceID) for occurrenceID in occurrenceIDs) if occurrenceIDs?
+    value = @intersectAll(new Boolean(nextPopulation.isTrue()), [nextPopulation, previousPopulation], false, episodeIndices)
     value
     
   # Returns a count of the unique events that match the criteria for the supplied
@@ -104,19 +109,19 @@ class hqmf.SpecificsManagerSingleton
       return @maintainSpecifics(new Boolean(false), initial)
     else
       return initial
-  
+
   # Returns a boolean indication of whether all of the supplied population criteria are
   # met
   validate: (intersectedPopulation) ->
     intersectedPopulation.isTrue() and intersectedPopulation.specificContext.hasRows()
   
-  intersectAll: (boolVal, values, negate=false) ->
+  intersectAll: (boolVal, values, negate=false, episodeIndices) ->
     result = new hqmf.SpecificOccurrence
     # add identity row
     result.addIdentityRow()
     for value in values
       if value.specificContext?
-        result = result.intersect(value.specificContext)
+        result = result.intersect(value.specificContext, episodeIndices)
     if negate and (!result.hasRows() or result.hasSpecifics())
       result = result.negate()
       result = result.compactReusedEvents()
@@ -202,11 +207,11 @@ class hqmf.SpecificOccurrence
     value.rows = @rows.concat(other.rows)
     value.removeDuplicateRows()
   
-  intersect: (other) ->
+  intersect: (other, episodeIndices) ->
     value = new hqmf.SpecificOccurrence()
     for leftRow in @rows
       for rightRow in other.rows
-        result = leftRow.intersect(rightRow)
+        result = leftRow.intersect(rightRow, episodeIndices)
         value.rows.push(result) if result?
     value.removeDuplicateRows()
   
@@ -333,8 +338,6 @@ class hqmf.SpecificOccurrence
   addIdentityRow: ->
     @addRows(hqmf.SpecificsManager.identity().rows)
 
-
-
 class Row
   # {'OccurrenceAEncounter':1, 'OccurrenceBEncounter'2}
   constructor: (leftMost, occurrences={}) ->
@@ -370,18 +373,30 @@ class Row
       equal &&= Row.valuesEqual(value, other.values[i])
     equal
 
-  intersect: (other) ->
+  intersect: (other, episodeIndices) ->
     intersectedRow = new Row(@leftMost, {})
     intersectedRow.tempValue = @tempValue
-    allMatch = true
+
+    # if all the episodes are any, then they were not referenced by the parent population.  This occurs when an intersection is done 
+    # against the identity row.  In this case we want to allow the specific occurrences through.  This happens when we intersect against a measure
+    # without a denomninator, and on regular intersections since we start with the identity row in the context.
+    allEpisodesAny = (episodeIndices? && (@allValuesAny(episodeIndices) || other.allValuesAny(episodeIndices)))
+
     for value,i in @values
-      result = Row.match(value, other.values[i])
+      # check if the value is an episode of care.  If so it will be treated differently in the match function
+      isEpisodeOfCare = (episodeIndices? && !allEpisodesAny && episodeIndices.indexOf(i) >= 0)
+      result = Row.match(value, other.values[i], isEpisodeOfCare)
       if result?
         intersectedRow.values[i] = result 
       else
         return undefined
     intersectedRow
   
+  allValuesAny: (indicies) ->
+    for i in indicies
+      return false if @values[i] != hqmf.SpecificsManager.any
+    return true
+
   groupKeyForLeftMost: ->
     @groupKey(@leftMost)
     
@@ -397,12 +412,20 @@ class Row
     keyForGroup
     
   
-  @match: (left, right) ->
-    return right if left == hqmf.SpecificsManager.any
-    return left if right == hqmf.SpecificsManager.any
+  @match: (left, right, isEpisodeOfCare) ->
+    return @checkEpisodeOfCare(right, isEpisodeOfCare) if left == hqmf.SpecificsManager.any
+    return @checkEpisodeOfCare(left, isEpisodeOfCare) if right == hqmf.SpecificsManager.any
     return left if left.id == right.id
     return undefined
 
+  # if we are dealing with an episode of care we don't want to match against the any (*) indicator.  This is because
+  # the any indicator from a previous population indicates that we did not evaluate against that occurrence in a positive path.
+  # this is typically OK with specific occurrences, but not if they represent episodes of care.
+  @checkEpisodeOfCare: (value, isEpisodeOfCare) ->
+    # return the any indicator to signify that the episode of care was unobserved.  This will eliminate it from the counts.
+    return hqmf.SpecificsManager.any if (isEpisodeOfCare)
+    return value
+
   @valuesEqual: (left, right) ->
     return true if !left? and !right?
     return false if !left?
@@ -417,7 +440,12 @@ class Row
     for match in matches
       occurrences={}
       occurrences[entryKey] = entry
-      occurrences[matchesKey] = match
+      # from unions and crossproducts we may have a matches key that is a hash of object ids mapped to the specific occurrence key.
+      # this is because we may have multiple different specific occurrences on the right hand side if it came from a group
+      if (_.isObject(matchesKey))
+        occurrences[matchesKey[match.id]] = match
+      else
+        occurrences[matchesKey] = match
       rows.push(new Row(entryKey, occurrences))
     rows
     

data/hqmf2js.gemspec

@@ -7,15 +7,15 @@ Gem::Specification.new do |s|
   s.email = "hquery-talk@googlegroups.com"
   s.homepage = "http://github.com/hquery/hqmf2js"
   s.authors = ["Marc Hadley", "Andre Quina", "Andy Gregorowicz"]
-  s.version = '1.2.0'
+  s.version = '1.2.1'
   
   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.2.2'
   s.add_development_dependency "awesome_print", "~> 1.1.0"
-  s.add_dependency 'health-data-standards', '~> 3.0.1'
-  s.add_dependency 'hquery-patient-api', '~> 1.0.1'
+  s.add_dependency 'health-data-standards', '~> 3.1.1'
+  s.add_dependency 'hquery-patient-api', '~> 1.0.2'
 
   s.files = s.files = `git ls-files`.split("\n")
 end

data/lib/generator/characteristic.js.erb

@@ -1,4 +1,4 @@
-var value = patient.<%= criteria.property %>(<%= js_for_date_bound(criteria) if criteria.property == :age %>);
+var value = patient.<%= criteria.property %>(<%= js_for_date_bound(criteria) if criteria.property == :age %>) || null;
   <%- if criteria.property == :birthtime -%>
 var events = [value];
     <%- if criteria.temporal_references -%>

data/lib/generator/codes_to_json.rb

@@ -1,10 +1,6 @@
 module HQMF2JS
   module Generator
     class CodesToJson      
-      def self.from_xls(code_systems_file)
-        value_sets = HQMF::ValueSet::Parser.new().parse(code_systems_file)
-        from_value_sets(value_sets)
-      end
       
       def self.hash_to_js(hash)
         hash.to_json.gsub(/\"/, "'")

data/lib/generator/js.rb

@@ -240,25 +240,33 @@ module HQMF2JS
         HQMF2JS::Generator.render_template('data_criteria', {'all_criteria' => @doc.specific_occurrence_source_data_criteria.concat(@doc.all_data_criteria), 'measure_period' => @doc.measure_period})
       end
       
-      def self.library_functions
+      def self.library_functions(check_crosswalk=false)
         ctx = Sprockets::Environment.new(File.expand_path("../../..", __FILE__))
         Tilt::CoffeeScriptTemplate.default_bare = true 
         ctx.append_path "app/assets/javascripts"
         
-        ["// #########################\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].join("\n")
+        libraries = ["// #########################\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]
+
+        # check for code set crosswalks
+        if (check_crosswalk)
+          libraries += ["// #########################\n// ##### CROSSWALK EXTENSION ######\n// #########################\n",
+                        ctx.find_asset('crosswalk').to_s]
+        end
+
+        libraries.join("\n")
 
       end
   

data/test/unit/codes_to_json_test.rb

@@ -20,19 +20,5 @@ class CodesToJsonTest < Test::Unit::TestCase
     
   end
 
-  def test_parsing_from_xls
-    
-    codes_file_path = File.expand_path("../../fixtures/codes/codes.xls", __FILE__)
-    # Parse the code systems that are mapped to the OIDs we support
-    codes_json = HQMF2JS::Generator::CodesToJson.hash_to_js(HQMF2JS::Generator::CodesToJson.from_xls(codes_file_path))
-
-    @context = get_js_context("var dictionary = #{codes_json}")
-    @context.eval("dictionary").entries.length.must_equal 12
-    @context.eval("dictionary['2.16.840.1.113883.3.464.0001.430']").entries.first[0].must_equal "RxNorm"
-    @context.eval("dictionary['2.16.840.1.113883.3.464.0001.430']").entries.first[1].length.must_equal 25
-    
-  end
-  
-
 
 end

data/test/unit/library_function_test.rb

@@ -178,6 +178,14 @@ class LibraryFunctionTest < Test::Unit::TestCase
     ts2 = 'new TS("201203010020")'
     assert_equal 70, @context.eval("#{ts1}.difference(#{ts2},'min')")
     
+    ts1 = 'new TS("20120101101010")'
+    ts2 = 'new TS("20120101101030")'
+    assert_equal 0, @context.eval("#{ts1}.difference(#{ts2},'min')")
+    
+    ts1 = 'new TS("20120101100950")'
+    ts2 = 'new TS("20120101101010")'
+    assert_equal 1, @context.eval("#{ts1}.difference(#{ts2},'min')")
+
     # Additional tests from previous version of TJC guidance
     ts4 = 'new TS("20000310")'
     ts5 = 'new TS("20110405")'

data/test/unit/specifics_test.rb

@@ -19,7 +19,7 @@ class SpecificsTest < Test::Unit::TestCase
   end
 
 
-  def test_specifics_initialized_proper
+  def test_specifics_initialized_properly
     
     @context.eval('hqmf.SpecificsManager.keyLookup[0]').must_equal 'OccurrenceAEncounter'
     @context.eval('hqmf.SpecificsManager.keyLookup[1]').must_equal 'OccurrenceBEncounter'
@@ -593,12 +593,100 @@ class SpecificsTest < Test::Unit::TestCase
     "
     @context.eval(rows)
     
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,pop3))').must_equal true
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,pop4))').must_equal false
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,pop5))').must_equal false
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop3f,pop1,pop2))').must_equal false
+    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop3)))').must_equal true
+    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop4)))').must_equal false
+    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop5)))').must_equal false
+    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop3f,hqmf.SpecificsManager.intersectSpecifics(pop1,pop2)))').must_equal false
     
   end
+
+  def test_episode_of_care_restrictions
+
+    rows = "
+      hqmf.SpecificsManager.initialize({},hqmfjs, {'id':'OccurrenceAEncounter1', 'type':'Encounter', 'function':'SourceOccurrenceAEncounter1'},
+                                                  {'id':'OccurrenceAEncounter2', 'type':'Encounter', 'function':'SourceOccurrenceAEncounter2'},
+                                                  {'id':'OccurrenceAEncounter3', 'type':'Encounter', 'function':'SourceOccurrenceAEncounter3'})
+
+
+      var row1 = new Row('OccurrenceAEncounter1',{'OccurrenceAEncounter1':{'id':1}});
+      var row2 = new Row('OccurrenceAEncounter2',{'OccurrenceAEncounter2':{'id':3}});
+      var row3 = new Row('OccurrenceAEncounter1',{'OccurrenceAEncounter1':{'id':1},'OccurrenceAEncounter2':{'id':3}});
+      var identityRow = hqmf.SpecificsManager.identity().rows[0];
+      
+      var pop1 = new Boolean(true);
+      var pop2 = new Boolean(true);
+      var pop3 = new Boolean(true);
+      var pop4 = new Boolean(true);
+
+      pop1.specificContext = new hqmf.SpecificOccurrence([row1]);
+      pop2.specificContext = new hqmf.SpecificOccurrence([row2]);
+      pop3.specificContext = new hqmf.SpecificOccurrence([row3]);
+      pop4.specificContext = new hqmf.SpecificOccurrence([identityRow]);
+
+      var result = null;
+
+    "
+    @context.eval(rows)
+
+    # test allValuesAny
+    @context.eval('row1.allValuesAny([0,1,2])').must_equal false
+    @context.eval('row1.allValuesAny([1,2])').must_equal true
+    @context.eval('row1.allValuesAny([2])').must_equal true
+    @context.eval('row1.allValuesAny([1])').must_equal true
+    @context.eval('row1.allValuesAny([])').must_equal true
+    @context.eval('identityRow.allValuesAny([0,1,2])').must_equal true
+
+    # test checkEpisodeOfCare
+    @context.eval('Row.checkEpisodeOfCare({id: 1}, true) == hqmf.SpecificsManager.any').must_equal true
+    @context.eval('Row.checkEpisodeOfCare({id: 1}, false) == hqmf.SpecificsManager.any').must_equal false
+    @context.eval('Row.checkEpisodeOfCare({id: 1}, false).id == 1').must_equal true
+
+    # test intersect
+    @context.eval('row1.intersect(row2,[0,1]).allValuesAny([0,1,2])').must_equal true # this is the critical check.  Make sure we drop bad episode of care intersections
+    @context.eval('row1.intersect(row2,[0]).allValuesAny([2])').must_equal true
+    @context.eval('row1.intersect(row2,[0]).values[0].id == 1').must_equal true
+    @context.eval('row1.intersect(row2,[0]).values[1].id == 3').must_equal true
+    @context.eval('row1.intersect(row2,[1]).allValuesAny([2])').must_equal true
+    @context.eval('row1.intersect(row2,[1]).values[0].id == 1').must_equal true
+    @context.eval('row1.intersect(row2,[1]).values[1].id == 3').must_equal true
+
+    @context.eval('identityRow.intersect(row1,[0]).values[0].id == 1').must_equal true
+    @context.eval('identityRow.intersect(row1,[0]).allValuesAny([1,2])').must_equal true
+    @context.eval('row1.intersect(identityRow,[0]).values[0].id == 1').must_equal true
+    @context.eval('row1.intersect(identityRow,[0]).allValuesAny([1,2])').must_equal true
+
+    # make sure we drop a bad strggler for encounter 2
+    @context.eval('row1.intersect(row3,[0,1]).allValuesAny([1,2])').must_equal true
+    @context.eval('row1.intersect(row3,[0,1]).values[0].id == 1').must_equal true
+    
+    # test intersectSpecifics
+
+    @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[0].id == 1').must_equal true
+    @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[1].id == 3').must_equal true
+    @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[2] == hqmf.SpecificsManager.any').must_equal true
+    @context.eval("hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,['OccurrenceAEncounter1','OccurrenceAEncounter2','OccurrenceAEncounter3']).specificContext.rows[0].allValuesAny([0,1,2])").must_equal true
+    @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,['OccurrenceAEncounter1']).specificContext.rows[0]")
+    @context.eval('result.allValuesAny([2])').must_equal true
+    @context.eval('result.values[0].id == 1').must_equal true
+    @context.eval('result.values[1].id == 3').must_equal true
+    @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,['OccurrenceAEncounter2']).specificContext.rows[0]")
+    @context.eval('result.allValuesAny([2])').must_equal true
+    @context.eval('result.values[0].id == 1').must_equal true
+    @context.eval('result.values[1].id == 3').must_equal true
+
+    @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop4,['OccurrenceAEncounter1']).specificContext.rows[0]")
+    @context.eval('result.values[0].id == 1').must_equal true
+    @context.eval('result.allValuesAny([1,2])').must_equal true
+
+    @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop4,pop1,['OccurrenceAEncounter1']).specificContext.rows[0]")
+    @context.eval('result.values[0].id == 1').must_equal true
+    @context.eval('result.allValuesAny([1,2])').must_equal true
+
+    @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop3,['OccurrenceAEncounter1','OccurrenceAEncounter2']).specificContext.rows[0]")
+    @context.eval('result.allValuesAny([1,2])').must_equal true
+    @context.eval('result.values[0].id == 1').must_equal true
+
+  end
   
   def test_intersect_all
   
@@ -774,20 +862,20 @@ class SpecificsTest < Test::Unit::TestCase
     "
     @context.eval(rows)
     @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows).length').must_equal 6
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[0].id').must_equal 10
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[1].id').must_equal 11
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[2].id').must_equal 12
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[3].id').must_equal 13
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[4].id').must_equal 14
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[5].id').must_equal 15
+    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[0].id').must_equal '10'
+    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[1].id').must_equal '11'
+    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[2].id').must_equal '12'
+    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[3].id').must_equal '13'
+    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[4].id').must_equal '14'
+    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[5].id').must_equal '15'
     
     @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows).length").must_equal 6
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[0].id").must_equal 10
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[1].id").must_equal 11
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[2].id").must_equal 12
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[3].id").must_equal 13
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[4].id").must_equal 14
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[5].id").must_equal 15
+    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[0].id").must_equal '10'
+    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[1].id").must_equal '11'
+    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[2].id").must_equal '12'
+    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[3].id").must_equal '13'
+    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[4].id").must_equal '14'
+    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[5].id").must_equal '15'
     
   end
 
@@ -830,30 +918,30 @@ class SpecificsTest < Test::Unit::TestCase
     exactly1 = 'new IVL_PQ(new PQ(1), new PQ(1))'
     
     @context.eval("specific1.COUNT(#{moreThanOne}).rows.length").must_equal 5
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[0].tempValue.id").must_equal 10
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[1].tempValue.id").must_equal 11
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[2].tempValue.id").must_equal 12
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[3].tempValue.id").must_equal 13
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[4].tempValue.id").must_equal 14
+    @context.eval("specific1.COUNT(#{moreThanOne}).rows[0].tempValue.id").must_equal '10'
+    @context.eval("specific1.COUNT(#{moreThanOne}).rows[1].tempValue.id").must_equal '11'
+    @context.eval("specific1.COUNT(#{moreThanOne}).rows[2].tempValue.id").must_equal '12'
+    @context.eval("specific1.COUNT(#{moreThanOne}).rows[3].tempValue.id").must_equal '13'
+    @context.eval("specific1.COUNT(#{moreThanOne}).rows[4].tempValue.id").must_equal '14'
     @context.eval("specific1.COUNT(#{lessThanThree}).rows.length").must_equal 3
-    @context.eval("specific1.COUNT(#{lessThanThree}).rows[0].tempValue.id").must_equal 10
-    @context.eval("specific1.COUNT(#{lessThanThree}).rows[1].tempValue.id").must_equal 11
-    @context.eval("specific1.COUNT(#{lessThanThree}).rows[2].tempValue.id").must_equal 15
+    @context.eval("specific1.COUNT(#{lessThanThree}).rows[0].tempValue.id").must_equal '10'
+    @context.eval("specific1.COUNT(#{lessThanThree}).rows[1].tempValue.id").must_equal '11'
+    @context.eval("specific1.COUNT(#{lessThanThree}).rows[2].tempValue.id").must_equal '15'
     @context.eval("specific1.COUNT(#{exactly1}).rows.length").must_equal 1
-    @context.eval("specific1.COUNT(#{exactly1}).rows[0].tempValue.id").must_equal 15
+    @context.eval("specific1.COUNT(#{exactly1}).rows[0].tempValue.id").must_equal '15'
     
     @context.eval("specific2.COUNT(#{moreThanOne}).rows.length").must_equal 5
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[0].values[0].id").must_equal 10
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[1].values[0].id").must_equal 11
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[2].values[0].id").must_equal 12
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[3].values[0].id").must_equal 13
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[4].values[0].id").must_equal 14
+    @context.eval("specific2.COUNT(#{moreThanOne}).rows[0].values[0].id").must_equal '10'
+    @context.eval("specific2.COUNT(#{moreThanOne}).rows[1].values[0].id").must_equal '11'
+    @context.eval("specific2.COUNT(#{moreThanOne}).rows[2].values[0].id").must_equal '12'
+    @context.eval("specific2.COUNT(#{moreThanOne}).rows[3].values[0].id").must_equal '13'
+    @context.eval("specific2.COUNT(#{moreThanOne}).rows[4].values[0].id").must_equal '14'
     @context.eval("specific2.COUNT(#{lessThanThree}).rows.length").must_equal 3
-    @context.eval("specific2.COUNT(#{lessThanThree}).rows[0].values[0].id").must_equal 10
-    @context.eval("specific2.COUNT(#{lessThanThree}).rows[1].values[0].id").must_equal 11
-    @context.eval("specific2.COUNT(#{lessThanThree}).rows[2].values[0].id").must_equal 15
+    @context.eval("specific2.COUNT(#{lessThanThree}).rows[0].values[0].id").must_equal '10'
+    @context.eval("specific2.COUNT(#{lessThanThree}).rows[1].values[0].id").must_equal '11'
+    @context.eval("specific2.COUNT(#{lessThanThree}).rows[2].values[0].id").must_equal '15'
     @context.eval("specific2.COUNT(#{exactly1}).rows.length").must_equal 1
-    @context.eval("specific2.COUNT(#{exactly1}).rows[0].values[0].id").must_equal 15
+    @context.eval("specific2.COUNT(#{exactly1}).rows[0].values[0].id").must_equal '15'
 
     @context.eval("specific3.COUNT(#{exactly1}).rows.length").must_equal 1
     @context.eval("specific4.COUNT(#{moreThanOne}).rows.length").must_equal 0
@@ -863,14 +951,14 @@ class SpecificsTest < Test::Unit::TestCase
     ##### FIRST
     ###
     @context.eval("specific1.FIRST().rows.length").must_equal 3
-    @context.eval("specific1.FIRST().rows[0].tempValue.id").must_equal 11
-    @context.eval("specific1.FIRST().rows[1].tempValue.id").must_equal 12
-    @context.eval("specific1.FIRST().rows[2].tempValue.id").must_equal 15
+    @context.eval("specific1.FIRST().rows[0].tempValue.id").must_equal '11'
+    @context.eval("specific1.FIRST().rows[1].tempValue.id").must_equal '12'
+    @context.eval("specific1.FIRST().rows[2].tempValue.id").must_equal '15'
     
     @context.eval("specific2.FIRST().rows.length").must_equal 3
-    @context.eval("specific2.FIRST().rows[0].values[0].id").must_equal 11
-    @context.eval("specific2.FIRST().rows[1].values[0].id").must_equal 12
-    @context.eval("specific2.FIRST().rows[2].values[0].id").must_equal 15
+    @context.eval("specific2.FIRST().rows[0].values[0].id").must_equal '11'
+    @context.eval("specific2.FIRST().rows[1].values[0].id").must_equal '12'
+    @context.eval("specific2.FIRST().rows[2].values[0].id").must_equal '15'
 
     @context.eval("specific3.FIRST().rows.length").must_equal 1
     @context.eval("specific4.FIRST().rows.length").must_equal 0
@@ -880,14 +968,14 @@ class SpecificsTest < Test::Unit::TestCase
     ###
 
     @context.eval("specific1.RECENT().rows.length").must_equal 3
-    @context.eval("specific1.RECENT().rows[0].tempValue.id").must_equal 10
-    @context.eval("specific1.RECENT().rows[1].tempValue.id").must_equal 13
-    @context.eval("specific1.RECENT().rows[2].tempValue.id").must_equal 15
+    @context.eval("specific1.RECENT().rows[0].tempValue.id").must_equal '10'
+    @context.eval("specific1.RECENT().rows[1].tempValue.id").must_equal '13'
+    @context.eval("specific1.RECENT().rows[2].tempValue.id").must_equal '15'
     
     @context.eval("specific2.RECENT().rows.length").must_equal 3
-    @context.eval("specific2.RECENT().rows[0].values[0].id").must_equal 10
-    @context.eval("specific2.RECENT().rows[1].values[0].id").must_equal 13
-    @context.eval("specific2.RECENT().rows[2].values[0].id").must_equal 15
+    @context.eval("specific2.RECENT().rows[0].values[0].id").must_equal '10'
+    @context.eval("specific2.RECENT().rows[1].values[0].id").must_equal '13'
+    @context.eval("specific2.RECENT().rows[2].values[0].id").must_equal '15'
 
     @context.eval("specific3.RECENT().rows.length").must_equal 1
     @context.eval("specific4.RECENT().rows.length").must_equal 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hqmf2js
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: hquery-patient-api
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 description: A library for converting HQMF files to executable JavaScript suitable
   for use with the hQuery Gateway
 email: hquery-talk@googlegroups.com
@@ -139,6 +139,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/javascripts/crosswalk.js.coffee
 - app/assets/javascripts/custom_calculations.js.coffee
 - app/assets/javascripts/hqmf_util.js.coffee
 - app/assets/javascripts/logging_utils.js.coffee