cql_qdm_patientapi 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a223682b6169cd2d77aee7a38ca3641dfe08b59454fbbf070e6253c0ebe8e252
-  data.tar.gz: 90844909701048290940079d8ef66189a2debbbf4e3db933e03a599bf4f2314c
+SHA1:
+  metadata.gz: 33a7aa24e0f645f52b49e64975b73379aa01bb57
+  data.tar.gz: b9bf894f8de2a0ec6fd91f525dbc71c599ca7034
 SHA512:
-  metadata.gz: cde1743be206ee2d84dcfd6e5f60edb2751652656679cecaa0c79e609e9fb43d0816844bd709c8e246d0289d1134fd3f6ade97f0df763c6def298ec6b8c93b5c
-  data.tar.gz: 23d09bee95558466d483c11fb79bda2f2d1e2a5ea2a4d4025b0a316561850042f4ee969a075ba16e886315a1e59ec983160223cbb11647cf51946aa104d55294
+  metadata.gz: e713fa97645076726e6e4e42cc8e760fe8d2601239c3c7c3071d535f898b35d1b78dd5bb5d7fe32421ffcc328482fbb4cee2c2e24b01298fe95e583cacf9cf45
+  data.tar.gz: c3ed8e6b125f80e01240adb029dce4fbd54f04c2a62a490215ba1a1a6c2269f36ddf22761b507e9e8853c02980bfb87ae7aad7d7dbf0b9fc9f8b2ed40e1daaba

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.3.8
 before_install:
   - "sh -e /etc/init.d/xvfb start"
 before_install: gem install bundler -v 1.15.3

data/Gemfile.lock

@@ -1,49 +1,56 @@
 PATH
   remote: .
   specs:
-    cql_qdm_patientapi (1.3.0)
+    cql_qdm_patientapi (1.3.1)
       coffee-rails (~> 4.1)
-      rails (~> 4.2)
+      rails (>= 4.2, < 6.0)
       sprockets-rails (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actioncable (5.2.1.1)
+      actionpack (= 5.2.1.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.1.1)
+      actionpack (= 5.2.1.1)
+      actionview (= 5.2.1.1)
+      activejob (= 5.2.1.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.1.1)
+      actionview (= 5.2.1.1)
+      activesupport (= 5.2.1.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionview (5.2.1.1)
+      activesupport (= 5.2.1.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
-      globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
-      arel (~> 6.0)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    activejob (5.2.1.1)
+      activesupport (= 5.2.1.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.1.1)
+      activesupport (= 5.2.1.1)
+    activerecord (5.2.1.1)
+      activemodel (= 5.2.1.1)
+      activesupport (= 5.2.1.1)
+      arel (>= 9.0)
+    activestorage (5.2.1.1)
+      actionpack (= 5.2.1.1)
+      activerecord (= 5.2.1.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.4)
+    arel (9.0.0)
     builder (3.2.3)
     bundler-audit (0.6.0)
       bundler (~> 1.2)
@@ -55,53 +62,58 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.5)
-    crass (1.0.2)
-    erubis (2.7.0)
+    concurrent-ruby (1.1.3)
+    crass (1.0.4)
+    erubi (1.7.1)
     execjs (2.7.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.9.1)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.2)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.3)
+    nio4r (2.3.1)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     phantomjs (2.1.1.0)
-    rack (1.6.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.10)
-      actionmailer (= 4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      activemodel (= 4.2.10)
-      activerecord (= 4.2.10)
-      activesupport (= 4.2.10)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.1.1)
+      actioncable (= 5.2.1.1)
+      actionmailer (= 5.2.1.1)
+      actionpack (= 5.2.1.1)
+      actionview (= 5.2.1.1)
+      activejob (= 5.2.1.1)
+      activemodel (= 5.2.1.1)
+      activerecord (= 5.2.1.1)
+      activestorage (= 5.2.1.1)
+      activesupport (= 5.2.1.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.1.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
+    railties (5.2.1.1)
+      actionpack (= 5.2.1.1)
+      activesupport (= 5.2.1.1)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.2.1)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -113,10 +125,13 @@ GEM
       railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.3.4)
       teaspoon (>= 1.0.0)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -128,4 +143,4 @@ DEPENDENCIES
   teaspoon-jasmine (= 2.3.4)
 
 BUNDLED WITH
-   1.16.2
+   1.16.6

data/cql_qdm_patientapi.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.license       = "Apache-2.0"
 
-  spec.add_dependency 'rails', '~> 4.2'
+  spec.add_dependency 'rails', '>= 4.2', '< 6.0'
   spec.add_dependency 'coffee-rails', '~> 4.1'
   spec.add_dependency 'sprockets-rails', '~> 2.3'
 end

data/lib/cql_qdm_patientapi/version.rb

@@ -1,3 +1,3 @@
 module CqlQdmPatientapi
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/vendor/assets/javascripts/cql4browsers.js

@@ -584,7 +584,8 @@
 },{"./clinical":5,"./datetime":7,"./interval":9,"./logic":10,"./uncertainty":11}],7:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Date, DateTime, Uncertainty, cqlFormatStringToMomentFormatString, daysInMonth, getTimezoneSeparatorFromString, isValidDateStringFormat, isValidDateTimeStringFormat, jsDate, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString, ref;
+  var Date, DateTime, Uncertainty, cqlFormatStringToMomentFormatString, daysInMonth, getTimezoneSeparatorFromString, isValidDateStringFormat, isValidDateTimeStringFormat, jsDate, moment, normalizeMillisecondsField, normalizeMillisecondsFieldInString, ref,
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   Uncertainty = require('./uncertainty').Uncertainty;
 
@@ -937,6 +938,32 @@
     };
 
     DateTime.prototype.toString = function() {
+      if (this.isTime()) {
+        return this.toStringTime();
+      } else {
+        return this.toStringDateTime();
+      }
+    };
+
+    DateTime.prototype.toStringTime = function() {
+      var str;
+      str = 'T';
+      if (this.hour != null) {
+        str += +this._pad(this.hour);
+        if (this.minute != null) {
+          str += ':' + this._pad(this.minute);
+          if (this.second != null) {
+            str += ':' + this._pad(this.second);
+            if (this.millisecond != null) {
+              str += '.' + String("00" + this.millisecond).slice(-3);
+            }
+          }
+        }
+      }
+      return str;
+    };
+
+    DateTime.prototype.toStringDateTime = function() {
       var offsetHours, offsetMin, str;
       str = '';
       if (this.year != null) {
@@ -970,6 +997,10 @@
       return str;
     };
 
+    DateTime.prototype.getDateTime = function() {
+      return this;
+    };
+
     DateTime.prototype.getDate = function() {
       return new Date(this.year, this.month, this.day);
     };
@@ -1280,12 +1311,18 @@
 
   DateTime.prototype.isMorePrecise = Date.prototype.isMorePrecise = function(other) {
     var field, i, len, ref1;
-    ref1 = this.constructor.FIELDS;
-    for (i = 0, len = ref1.length; i < len; i++) {
-      field = ref1[i];
-      if ((other[field] != null) && (this[field] == null)) {
+    if (typeof other === 'string' && indexOf.call(this.constructor.FIELDS, other) >= 0) {
+      if (this[other] == null) {
         return false;
       }
+    } else {
+      ref1 = this.constructor.FIELDS;
+      for (i = 0, len = ref1.length; i < len; i++) {
+        field = ref1[i];
+        if ((other[field] != null) && (this[field] == null)) {
+          return false;
+        }
+      }
     }
     return !this.isSamePrecision(other);
   };
@@ -1296,6 +1333,9 @@
 
   DateTime.prototype.isSamePrecision = Date.prototype.isSamePrecision = function(other) {
     var field, i, len, ref1;
+    if (typeof other === 'string' && indexOf.call(this.constructor.FIELDS, other) >= 0) {
+      return other === this.getPrecision();
+    }
     ref1 = this.constructor.FIELDS;
     for (i = 0, len = ref1.length; i < len; i++) {
       field = ref1[i];
@@ -2100,6 +2140,13 @@
       }
     };
 
+    Interval.prototype.toString = function() {
+      var end, start;
+      start = this.lowClosed ? '[' : '(';
+      end = this.highClosed ? ']' : ')';
+      return start + this.low.toString() + ', ' + this.high.toString() + end;
+    };
+
     return Interval;
 
   })();
@@ -3594,6 +3641,9 @@
       var date1, date2, ref, result;
       ref = this.execArgs(ctx), date1 = ref[0], date2 = ref[1];
       if ((date1 != null) && (date2 != null)) {
+        if (date2.isDate && date1.isDateTime) {
+          date1 = date1.getDate();
+        }
         result = date1.durationBetween(date2, this.precision.toLowerCase());
         if ((result != null) && result.isPoint()) {
           return result.low;
@@ -4603,9 +4653,10 @@
 },{"../datatypes/datatypes":6,"./builder":14,"./expression":20,"./quantity":32}],24:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Collapse, End, Ends, Expression, Interval, Meets, MeetsAfter, MeetsBefore, Overlaps, OverlapsAfter, OverlapsBefore, Quantity, Start, Starts, ThreeValuedLogic, UnimplementedExpression, Width, build, cmp, doAddition, doIncludes, doSubtraction, dtivl, predecessor, ref, ref1, ref2, successor,
+  var Collapse, End, Ends, Expand, Expression, Interval, MIN_FLOAT_PRECISION_VALUE, Meets, MeetsAfter, MeetsBefore, Overlaps, OverlapsAfter, OverlapsBefore, Quantity, Start, Starts, ThreeValuedLogic, UnimplementedExpression, Width, build, cmp, collapseIntervals, compare_units, convert_value, doAddition, doIncludes, doSubtraction, dtivl, intervalListType, predecessor, ref, ref1, ref2, successor,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    hasProp = {}.hasOwnProperty;
+    hasProp = {}.hasOwnProperty,
+    indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   ref = require('./expression'), Expression = ref.Expression, UnimplementedExpression = ref.UnimplementedExpression;
 
@@ -4613,9 +4664,9 @@
 
   build = require('./builder').build;
 
-  ref1 = require('./quantity'), Quantity = ref1.Quantity, doAddition = ref1.doAddition, doSubtraction = ref1.doSubtraction;
+  ref1 = require('./quantity'), Quantity = ref1.Quantity, doAddition = ref1.doAddition, doSubtraction = ref1.doSubtraction, compare_units = ref1.compare_units, convert_value = ref1.convert_value;
 
-  ref2 = require('../util/math'), successor = ref2.successor, predecessor = ref2.predecessor;
+  ref2 = require('../util/math'), successor = ref2.successor, predecessor = ref2.predecessor, MIN_FLOAT_PRECISION_VALUE = ref2.MIN_FLOAT_PRECISION_VALUE;
 
   dtivl = require('../datatypes/interval');
 
@@ -4920,6 +4971,252 @@
 
   })(Expression);
 
+  intervalListType = function(intervals) {
+    var high, itvl, j, len, low, ref3, ref4, type;
+    type = null;
+    for (j = 0, len = intervals.length; j < len; j++) {
+      itvl = intervals[j];
+      if (itvl == null) {
+        continue;
+      }
+      if ((itvl.low == null) && (itvl.high == null)) {
+        continue;
+      }
+      low = (ref3 = itvl.low) != null ? ref3 : itvl.high;
+      high = (ref4 = itvl.high) != null ? ref4 : itvl.low;
+      if ((typeof low.isTime === "function" ? low.isTime() : void 0) && (typeof high.isTime === "function" ? high.isTime() : void 0)) {
+        if (type == null) {
+          type = 'time';
+        } else if (type === 'time') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if ((low.isDateTime || high.isDateTime) && (low.isDateTime || low.isDate) && (high.isDateTime || high.isDate)) {
+        if ((type == null) || type === 'date') {
+          type = 'datetime';
+        } else if (type === 'datetime') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (low.isDate && high.isDate) {
+        if (type == null) {
+          type = 'date';
+        } else if (type === 'date' || 'datetime') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (low.isQuantity && high.isQuantity) {
+        if (type == null) {
+          type = 'quantity';
+        } else if (type === 'quantity') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (Number.isInteger(low) && Number.isInteger(high)) {
+        if (type == null) {
+          type = 'integer';
+        } else if (type === 'integer' || 'decimal') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else if (typeof low === 'number' && typeof high === 'number') {
+        if ((type == null) || type === 'integer') {
+          type = 'decimal';
+        } else if (type === 'decimal') {
+          continue;
+        } else {
+          return 'mismatch';
+        }
+      } else {
+        return 'mismatch';
+      }
+    }
+    return type;
+  };
+
+  module.exports.Expand = Expand = (function(superClass) {
+    extend(Expand, superClass);
+
+    function Expand(json) {
+      Expand.__super__.constructor.apply(this, arguments);
+    }
+
+    Expand.prototype.exec = function(ctx) {
+      var defaultPer, expandFunction, interval, intervals, items, j, len, per, ref3, results, type;
+      ref3 = this.execArgs(ctx), intervals = ref3[0], per = ref3[1];
+      type = intervalListType(intervals);
+      if (type === 'mismatch') {
+        throw new Error("List of intervals contains mismatched types.");
+      }
+      if (type == null) {
+        return null;
+      }
+      intervals = collapseIntervals(intervals, per);
+      if (intervals.length === 0) {
+        return [];
+      }
+      if (type === "time" || type === "date" || type === "datetime") {
+        expandFunction = this.expandDTishInterval;
+        defaultPer = function(interval) {
+          return new Quantity({
+            value: 1,
+            unit: interval.low.getPrecision()
+          });
+        };
+      } else if (type === "quantity") {
+        expandFunction = this.expandQuantityInterval;
+        defaultPer = function(interval) {
+          return new Quantity({
+            value: 1,
+            unit: interval.low.unit
+          });
+        };
+      } else if (type === "integer" || type === "decimal") {
+        expandFunction = this.expandNumericInterval;
+        defaultPer = function(interval) {
+          return new Quantity({
+            value: 1,
+            unit: '1'
+          });
+        };
+      } else {
+        throw new Error("Interval list type not yet supported.");
+      }
+      results = [];
+      for (j = 0, len = intervals.length; j < len; j++) {
+        interval = intervals[j];
+        if (interval == null) {
+          continue;
+        }
+        if ((interval.low == null) || (interval.high == null)) {
+          return null;
+        }
+        if (type === 'datetime') {
+          interval.low = interval.low.getDateTime();
+          interval.high = interval.high.getDateTime();
+        }
+        per = per != null ? per : defaultPer(interval);
+        items = expandFunction.call(this, interval, per);
+        if (items === null) {
+          return null;
+        }
+        results.push.apply(results, items);
+      }
+      return results;
+    };
+
+    Expand.prototype.expandDTishInterval = function(interval, per) {
+      var count, current_high, current_low, high, i, j, k, low, point_intervals, ref3, ref4, ref5, ref6, results;
+      if ((ref3 = per.unit) === 'week' || ref3 === 'weeks') {
+        per.value *= 7;
+        per.unit = 'day';
+      }
+      if (ref4 = per.unit, indexOf.call(interval.low.constructor.FIELDS, ref4) < 0) {
+        return null;
+      }
+      if (interval.low.isLessPrecise(per.unit)) {
+        return null;
+      }
+      low = interval.lowClosed ? interval.low : interval.low.successor();
+      high = interval.highClosed ? interval.high : interval.high.predecessor();
+      if (low.after(high)) {
+        return [];
+      }
+      current_low = low;
+      results = [];
+      point_intervals = current_low.add(per.value, per.unit).predecessor().equals(current_low);
+      if (per.unit === low.getPrecision()) {
+        count = Math.floor((low.durationBetween(high, per.unit).high + 1) / per.value);
+      } else {
+        count = Math.floor((low.durationBetween(high, per.unit).low + 1) / per.value);
+      }
+      if (point_intervals) {
+        for (i = j = 1, ref5 = count + 1; 1 <= ref5 ? j <= ref5 : j >= ref5; i = 1 <= ref5 ? ++j : --j) {
+          results.push(new dtivl.Interval(current_low, current_low.copy(), true, true));
+          current_low = current_low.add(per.value, per.unit);
+        }
+      } else {
+        for (i = k = 1, ref6 = count; 1 <= ref6 ? k <= ref6 : k >= ref6; i = 1 <= ref6 ? ++k : --k) {
+          current_high = current_low.add(per.value, per.unit).predecessor();
+          results.push(new dtivl.Interval(current_low, current_high, true, true));
+          current_low = current_low.add(per.value, per.unit);
+        }
+      }
+      if (results.length > 0 && !results[results.length - 1].high.sameOrBefore(high)) {
+        results.pop();
+      }
+      return results;
+    };
+
+    Expand.prototype.expandQuantityInterval = function(interval, per) {
+      var high_value, itvl, j, len, low_value, per_value, result_units, results;
+      if (compare_units(interval.low.unit, per.unit) > 0) {
+        result_units = per.unit;
+      } else {
+        result_units = interval.low.unit;
+      }
+      low_value = convert_value(interval.low.value, interval.low.unit, result_units);
+      high_value = convert_value(interval.high.value, interval.high.unit, result_units);
+      per_value = convert_value(per.value, per.unit, result_units);
+      if (!((low_value != null) && (high_value != null) && (per_value != null))) {
+        return null;
+      }
+      results = this.makeNumericIntervalList(low_value, high_value, interval.lowClosed, interval.highClosed, per_value);
+      for (j = 0, len = results.length; j < len; j++) {
+        itvl = results[j];
+        itvl.low = new Quantity({
+          value: itvl.low,
+          unit: result_units
+        });
+        itvl.high = new Quantity({
+          value: itvl.high,
+          unit: result_units
+        });
+      }
+      return results;
+    };
+
+    Expand.prototype.expandNumericInterval = function(interval, per) {
+      if (per.unit !== '1') {
+        return null;
+      }
+      return this.makeNumericIntervalList(interval.low, interval.high, interval.lowClosed, interval.highClosed, per.value);
+    };
+
+    Expand.prototype.makeNumericIntervalList = function(low, high, lowClosed, highClosed, per) {
+      var gap, point_intervals, results, width, x;
+      point_intervals = Number.isInteger(low) && Number.isInteger(high) && Number.isInteger(per);
+      gap = point_intervals ? 1 : MIN_FLOAT_PRECISION_VALUE;
+      if (!lowClosed) {
+        low = low + gap;
+      }
+      if (!highClosed) {
+        high = high - gap;
+      }
+      width = per - gap;
+      if (low > high) {
+        return [];
+      }
+      results = (function() {
+        var j, ref3, ref4, ref5, results1;
+        results1 = [];
+        for (x = j = ref3 = low, ref4 = high - width, ref5 = per; ref5 > 0 ? j <= ref4 : j >= ref4; x = j += ref5) {
+          results1.push(new dtivl.Interval(x, x + width, true, true));
+        }
+        return results1;
+      })();
+      return results;
+    };
+
+    return Expand;
+
+  })(Expression);
+
   module.exports.Collapse = Collapse = (function(superClass) {
     extend(Collapse, superClass);
 
@@ -4928,141 +5225,146 @@
     }
 
     Collapse.prototype.exec = function(ctx) {
-      var a, b, collapsedIntervals, i, interval, intervals, intervalsClone, len, perWidth, precisionUnits, ref3, ref4, ref5, ref6, ref7;
+      var intervals, perWidth, ref3;
       ref3 = this.execArgs(ctx), intervals = ref3[0], perWidth = ref3[1];
-      intervalsClone = [];
-      for (i = 0, len = intervals.length; i < len; i++) {
-        interval = intervals[i];
-        if (interval != null) {
-          intervalsClone.push(interval.copy());
-        }
+      return collapseIntervals(intervals, perWidth);
+    };
+
+    return Collapse;
+
+  })(Expression);
+
+  collapseIntervals = function(intervals, perWidth) {
+    var a, b, collapsedIntervals, interval, intervalsClone, j, len, precisionUnits, ref3, ref4, ref5, ref6;
+    intervalsClone = [];
+    for (j = 0, len = intervals.length; j < len; j++) {
+      interval = intervals[j];
+      if (interval != null) {
+        intervalsClone.push(interval.copy());
       }
-      if (intervals == null) {
-        return null;
-      } else if ((intervalsClone != null ? intervalsClone.length : void 0) <= 1) {
-        return intervalsClone;
-      } else {
-        if (perWidth == null) {
-          if (intervalsClone[0].low != null) {
-            if (intervalsClone[0].low.isDateTime) {
-              precisionUnits = intervalsClone[0].low.getPrecision();
-              perWidth = new Quantity({
-                value: 1,
-                unit: precisionUnits
-              });
-            } else if (intervalsClone[0].low.isQuantity) {
-              perWidth = doSubtraction(successor(intervalsClone[0].low), intervalsClone[0].low);
-            } else {
-              perWidth = successor(intervalsClone[0].low) - intervalsClone[0].low;
-            }
-          } else if (intervalsClone[0].high != null) {
-            if (intervalsClone[0].high.isDateTime) {
-              precisionUnits = intervalsClone[0].high.getPrecision();
-              perWidth = new Quantity({
-                value: 1,
-                unit: precisionUnits
-              });
-            } else if (intervalsClone[0].high.isQuantity) {
-              perWidth = doSubtraction(successor(intervalsClone[0].high), intervalsClone[0].high);
-            } else {
-              perWidth = successor(intervalsClone[0].high) - intervalsClone[0].high;
-            }
+    }
+    if (intervals == null) {
+      return null;
+    } else if ((intervalsClone != null ? intervalsClone.length : void 0) <= 1) {
+      return intervalsClone;
+    } else {
+      if (perWidth == null) {
+        if (intervalsClone[0].low != null) {
+          if (intervalsClone[0].low.isDateTime) {
+            precisionUnits = intervalsClone[0].low.getPrecision();
+            perWidth = new Quantity({
+              value: 1,
+              unit: precisionUnits
+            });
+          } else if (intervalsClone[0].low.isQuantity) {
+            perWidth = doSubtraction(successor(intervalsClone[0].low), intervalsClone[0].low);
           } else {
-            throw new Error("Point type of intervals provided to collapse cannot be determined.");
+            perWidth = successor(intervalsClone[0].low) - intervalsClone[0].low;
           }
-          if (typeof perWidth === 'number') {
+        } else if (intervalsClone[0].high != null) {
+          if (intervalsClone[0].high.isDateTime) {
+            precisionUnits = intervalsClone[0].high.getPrecision();
             perWidth = new Quantity({
-              value: perWidth,
-              unit: '1'
+              value: 1,
+              unit: precisionUnits
             });
+          } else if (intervalsClone[0].high.isQuantity) {
+            perWidth = doSubtraction(successor(intervalsClone[0].high), intervalsClone[0].high);
+          } else {
+            perWidth = successor(intervalsClone[0].high) - intervalsClone[0].high;
           }
+        } else {
+          throw new Error("Point type of intervals provided to collapse cannot be determined.");
         }
-        intervalsClone.sort(function(a, b) {
-          var ref4, ref5;
-          if (typeof ((ref4 = a.low) != null ? ref4.before : void 0) === 'function') {
-            if ((b.low != null) && a.low.before(b.low)) {
-              return -1;
-            }
-            if ((b.low == null) || a.low.after(b.low)) {
-              return 1;
-            }
-          } else if ((a.low != null) && (b.low != null)) {
-            if (a.low < b.low) {
-              return -1;
-            }
-            if (a.low > b.low) {
-              return 1;
-            }
-          } else if ((a.low != null) && (b.low == null)) {
+        if (typeof perWidth === 'number') {
+          perWidth = new Quantity({
+            value: perWidth,
+            unit: '1'
+          });
+        }
+      }
+      intervalsClone.sort(function(a, b) {
+        var ref3, ref4;
+        if (typeof ((ref3 = a.low) != null ? ref3.before : void 0) === 'function') {
+          if ((b.low != null) && a.low.before(b.low)) {
+            return -1;
+          }
+          if ((b.low == null) || a.low.after(b.low)) {
             return 1;
-          } else if ((a.low == null) && (b.low != null)) {
+          }
+        } else if ((a.low != null) && (b.low != null)) {
+          if (a.low < b.low) {
             return -1;
           }
-          if (typeof ((ref5 = a.high) != null ? ref5.before : void 0) === 'function') {
-            if ((b.high == null) || a.high.before(b.high)) {
-              return -1;
-            }
-            if (a.high.after(b.high)) {
-              return 1;
-            }
-          } else if ((a.high != null) && (b.high != null)) {
-            if (a.high < b.high) {
-              return -1;
-            }
-            if (a.high > b.high) {
-              return 1;
-            }
-          } else if ((a.high != null) && (b.high == null)) {
+          if (a.low > b.low) {
+            return 1;
+          }
+        } else if ((a.low != null) && (b.low == null)) {
+          return 1;
+        } else if ((a.low == null) && (b.low != null)) {
+          return -1;
+        }
+        if (typeof ((ref4 = a.high) != null ? ref4.before : void 0) === 'function') {
+          if ((b.high == null) || a.high.before(b.high)) {
             return -1;
-          } else if ((a.high == null) && (b.high != null)) {
+          }
+          if (a.high.after(b.high)) {
             return 1;
           }
-          return 0;
-        });
-        collapsedIntervals = [];
-        a = intervalsClone.shift();
-        b = intervalsClone.shift();
-        while (b) {
-          if (typeof ((ref4 = b.low) != null ? ref4.durationBetween : void 0) === 'function') {
-            if ((ref5 = a.high) != null ? ref5.sameOrAfter(b.low) : void 0) {
-              if ((b.high == null) || b.high.after(a.high)) {
-                a.high = b.high;
-              }
-            } else if (((ref6 = a.high) != null ? ref6.durationBetween(b.low, perWidth.unit).high : void 0) <= perWidth.value) {
+        } else if ((a.high != null) && (b.high != null)) {
+          if (a.high < b.high) {
+            return -1;
+          }
+          if (a.high > b.high) {
+            return 1;
+          }
+        } else if ((a.high != null) && (b.high == null)) {
+          return -1;
+        } else if ((a.high == null) && (b.high != null)) {
+          return 1;
+        }
+        return 0;
+      });
+      collapsedIntervals = [];
+      a = intervalsClone.shift();
+      b = intervalsClone.shift();
+      while (b) {
+        if (typeof ((ref3 = b.low) != null ? ref3.durationBetween : void 0) === 'function') {
+          if ((ref4 = a.high) != null ? ref4.sameOrAfter(b.low) : void 0) {
+            if ((b.high == null) || b.high.after(a.high)) {
               a.high = b.high;
-            } else {
-              collapsedIntervals.push(a);
-              a = b;
             }
-          } else if (typeof ((ref7 = b.low) != null ? ref7.sameOrBefore : void 0) === 'function') {
-            if ((a.high != null) && b.low.sameOrBefore(doAddition(a.high, perWidth))) {
-              if ((b.high == null) || b.high.after(a.high)) {
-                a.high = b.high;
-              }
-            } else {
-              collapsedIntervals.push(a);
-              a = b;
+          } else if (((ref5 = a.high) != null ? ref5.durationBetween(b.low, perWidth.unit).high : void 0) <= perWidth.value) {
+            a.high = b.high;
+          } else {
+            collapsedIntervals.push(a);
+            a = b;
+          }
+        } else if (typeof ((ref6 = b.low) != null ? ref6.sameOrBefore : void 0) === 'function') {
+          if ((a.high != null) && b.low.sameOrBefore(doAddition(a.high, perWidth))) {
+            if ((b.high == null) || b.high.after(a.high)) {
+              a.high = b.high;
             }
           } else {
-            if ((b.low - a.high) <= perWidth.value) {
-              if (b.high > a.high || (b.high == null)) {
-                a.high = b.high;
-              }
-            } else {
-              collapsedIntervals.push(a);
-              a = b;
+            collapsedIntervals.push(a);
+            a = b;
+          }
+        } else {
+          if ((b.low - a.high) <= perWidth.value) {
+            if (b.high > a.high || (b.high == null)) {
+              a.high = b.high;
             }
+          } else {
+            collapsedIntervals.push(a);
+            a = b;
           }
-          b = intervalsClone.shift();
         }
-        collapsedIntervals.push(a);
-        return collapsedIntervals;
+        b = intervalsClone.shift();
       }
-    };
-
-    return Collapse;
-
-  })(Expression);
+      collapsedIntervals.push(a);
+      return collapsedIntervals;
+    }
+  };
 
 }).call(this);
 
@@ -6801,6 +7103,23 @@
     }
   };
 
+  module.exports.compare_units = function(unit_a, unit_b) {
+    var c, e;
+    try {
+      c = ucum.convert(1, ucum_unit(unit_a), ucum_unit(unit_b));
+      if (c > 1) {
+        return 1;
+      }
+      if (c < 1) {
+        return -1;
+      }
+      return 0;
+    } catch (error) {
+      e = error;
+      return null;
+    }
+  };
+
 }).call(this);
 
 
@@ -7448,11 +7767,11 @@
 },{"./builder":14,"./expression":20}],36:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Combine, Concatenate, EndsWith, Expression, Lower, PositionOf, Split, StartsWith, Substring, Upper, build,
+  var Combine, Concatenate, EndsWith, Expression, Lower, PositionOf, Split, SplitOnMatches, StartsWith, Substring, UnimplementedExpression, Upper, build, ref,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
-  Expression = require('./expression').Expression;
+  ref = require('./expression'), Expression = ref.Expression, UnimplementedExpression = ref.UnimplementedExpression;
 
   build = require('./builder').build;
 
@@ -7531,6 +7850,17 @@
 
   })(Expression);
 
+  module.exports.SplitOnMatches = SplitOnMatches = (function(superClass) {
+    extend(SplitOnMatches, superClass);
+
+    function SplitOnMatches() {
+      return SplitOnMatches.__super__.constructor.apply(this, arguments);
+    }
+
+    return SplitOnMatches;
+
+  })(UnimplementedExpression);
+
   module.exports.Upper = Upper = (function(superClass) {
     extend(Upper, superClass);
 
@@ -7798,7 +8128,7 @@
 },{"./builder":14,"./expression":20}],38:[function(require,module,exports){
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var As, Concept, Convert, Date, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDate, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, normalizeMillisecondsField, parseQuantity, ref, ref1, ref2,
+  var As, Concept, Convert, ConvertsToBoolean, ConvertsToDate, ConvertsToDateTime, ConvertsToDecimal, ConvertsToInteger, ConvertsToQuantity, ConvertsToString, ConvertsToTime, Date, DateTime, Expression, FunctionRef, IntervalTypeSpecifier, Is, ListTypeSpecifier, NamedTypeSpecifier, ToBoolean, ToConcept, ToDate, ToDateTime, ToDecimal, ToInteger, ToQuantity, ToString, ToTime, TupleTypeSpecifier, UnimplementedExpression, isValidDecimal, isValidInteger, limitDecimalPrecision, normalizeMillisecondsField, parseQuantity, ref, ref1, ref2,
     extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     hasProp = {}.hasOwnProperty;
 
@@ -8153,6 +8483,94 @@
 
   })(UnimplementedExpression);
 
+  module.exports.ConvertsToBoolean = ConvertsToBoolean = (function(superClass) {
+    extend(ConvertsToBoolean, superClass);
+
+    function ConvertsToBoolean() {
+      return ConvertsToBoolean.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToBoolean;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToDate = ConvertsToDate = (function(superClass) {
+    extend(ConvertsToDate, superClass);
+
+    function ConvertsToDate() {
+      return ConvertsToDate.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToDate;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToDateTime = ConvertsToDateTime = (function(superClass) {
+    extend(ConvertsToDateTime, superClass);
+
+    function ConvertsToDateTime() {
+      return ConvertsToDateTime.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToDateTime;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToDecimal = ConvertsToDecimal = (function(superClass) {
+    extend(ConvertsToDecimal, superClass);
+
+    function ConvertsToDecimal() {
+      return ConvertsToDecimal.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToDecimal;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToInteger = ConvertsToInteger = (function(superClass) {
+    extend(ConvertsToInteger, superClass);
+
+    function ConvertsToInteger() {
+      return ConvertsToInteger.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToInteger;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToQuantity = ConvertsToQuantity = (function(superClass) {
+    extend(ConvertsToQuantity, superClass);
+
+    function ConvertsToQuantity() {
+      return ConvertsToQuantity.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToQuantity;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToString = ConvertsToString = (function(superClass) {
+    extend(ConvertsToString, superClass);
+
+    function ConvertsToString() {
+      return ConvertsToString.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToString;
+
+  })(UnimplementedExpression);
+
+  module.exports.ConvertsToTime = ConvertsToTime = (function(superClass) {
+    extend(ConvertsToTime, superClass);
+
+    function ConvertsToTime() {
+      return ConvertsToTime.__super__.constructor.apply(this, arguments);
+    }
+
+    return ConvertsToTime;
+
+  })(UnimplementedExpression);
+
   module.exports.IntervalTypeSpecifier = IntervalTypeSpecifier = (function(superClass) {
     extend(IntervalTypeSpecifier, superClass);
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: cql_qdm_patientapi
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: QDM CQL execution engine and HDS patient model interface