quality-measure-engine 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35e476899eb214e4601ce6d61c96bbb2e9dbbd7a
-  data.tar.gz: f4d5ac3ac53c4e6fcbd39d4237799443274368a0
+  metadata.gz: 2ac3f8a80c26556684d7f21bd6201e5265b256eb
+  data.tar.gz: b8379f12837783c518639ebadb3d21fe7e07546f
 SHA512:
-  metadata.gz: 9e0eac215433503529b1ad7eaf3c0adea2f212e5f5ceec48097064374edca2d34355ecc367e452688cbe56b98a68c88a6bd8e1a35560724ff59a9756bd9b6177
-  data.tar.gz: 866b367b2d0a978294854ffc125ef7e70628bfefc49038decabc88abd867c4bfe3c27e4e096c333364bb3f9fb684f8571ed6c00349fb0f5a77ebf8fd19ee7888
+  metadata.gz: fb88b3fecf9ce6d5cee8f489195ed8e02b5d2a91f8549dd97a417af732d4225aadad6c0d0f1a5fd331736140d19d23821aee251b1f47ae40ee3f56b18334f589
+  data.tar.gz: 5da3dd5bc12ee8383df188b97d1dfefadd23591daee55674bed0ae2da4ec6a29209c36e3eac2310d6a4e206146bdbec3162f4a35922dbd2881753bdb286bc44c

data/Gemfile

@@ -7,8 +7,3 @@ gem 'pry'
 gem 'pry-nav'
 gem 'pry-rescue'
 gem 'pry-stack_explorer'
-
-group :test do
-  gem "minitest", "~> 4.0"
-  gem 'turn', :require => false
-end

data/Gemfile.lock

@@ -1,142 +1,144 @@
 PATH
   remote: .
   specs:
-    quality-measure-engine (3.0.2)
-      delayed_job_mongoid (~> 2.0.0)
-      mongoid (~> 3.1.4)
-      moped (~> 1.5.1)
+    quality-measure-engine (3.0.3)
+      delayed_job_mongoid (~> 2.1.0)
+      mongoid (~> 4.0.0)
+      moped (~> 2.0.0)
       rubyzip (~> 0.9.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.14)
-      actionpack (= 3.2.14)
+    actionmailer (4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
       mail (~> 2.5.4)
-    actionpack (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
+    actionpack (4.1.5)
+      actionview (= 4.1.5)
+      activesupport (= 4.1.5)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.5)
+      activesupport (= 4.1.5)
+      builder (~> 3.1)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    ansi (1.4.3)
-    arel (3.0.2)
+    activemodel (4.1.5)
+      activesupport (= 4.1.5)
+      builder (~> 3.1)
+    activerecord (4.1.5)
+      activemodel (= 4.1.5)
+      activesupport (= 4.1.5)
+      arel (~> 5.0.0)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    builder (3.0.4)
-    coderay (1.0.9)
+    bson (2.3.0)
+    builder (3.2.2)
+    coderay (1.1.0)
+    connection_pool (2.0.0)
     debug_inspector (0.0.2)
-    delayed_job (3.0.5)
-      activesupport (~> 3.0)
-    delayed_job_mongoid (2.0.0)
-      delayed_job (~> 3.0)
-      mongoid (~> 3.0)
+    delayed_job (4.0.2)
+      activesupport (>= 3.0, < 4.2)
+    delayed_job_mongoid (2.1.0)
+      delayed_job (>= 3.0, < 5)
+      mongoid (>= 3.0, < 5)
+    docile (1.1.5)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.5)
-    interception (0.3)
-    journey (1.0.4)
-    json (1.8.0)
+    i18n (0.6.11)
+    interception (0.5)
+    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.2)
-    mime-types (1.24)
-    minitest (4.7.5)
-    mongoid (3.1.6)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.29)
-    moped (1.5.2)
-    multi_json (1.8.2)
-    origin (1.1.0)
-    polyglot (0.3.3)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    mime-types (1.25.1)
+    minitest (5.4.0)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.0)
+      bson (~> 2.2)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    multi_json (1.10.1)
+    optionable (0.2.0)
+    origin (2.1.1)
+    polyglot (0.3.5)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    pry-rescue (1.1.1)
-      interception (>= 0.3)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
+    pry-rescue (1.4.1)
+      interception (>= 0.5)
       pry
     pry-stack_explorer (0.4.9.1)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.14)
-      actionmailer (= 3.2.14)
-      actionpack (= 3.2.14)
-      activerecord (= 3.2.14)
-      activeresource (= 3.2.14)
-      activesupport (= 3.2.14)
-      bundler (~> 1.0)
-      railties (= 3.2.14)
-    railties (3.2.14)
-      actionpack (= 3.2.14)
-      activesupport (= 3.2.14)
-      rack-ssl (~> 1.3.2)
+    rails (4.1.5)
+      actionmailer (= 4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
+      activemodel (= 4.1.5)
+      activerecord (= 4.1.5)
+      activesupport (= 4.1.5)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.5)
+      sprockets-rails (~> 2.0)
+    railties (4.1.5)
+      actionpack (= 4.1.5)
+      activesupport (= 4.1.5)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
     rubyzip (0.9.9)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
-    sprockets (2.2.2)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.9.6)
-      ansi
-    tzinfo (0.3.38)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 4.0)
+  minitest (~> 5.4.0)
   pry
   pry-nav
   pry-rescue
   pry-stack_explorer
   quality-measure-engine!
-  rails (~> 3.2.8)
-  simplecov (~> 0.7.1)
-  turn
+  rails (~> 4.1.5)
+  simplecov (~> 0.9.0)

data/README.md

@@ -11,7 +11,7 @@ Results of quality measures are represented by QME::QualityReport. This class pr
 Environment
 ===========
 
-This project currently uses Ruby 1.9.3 and is built using [Bundler](http://gembundler.com/). To get all of the dependencies for the project, first install bundler:
+This project currently uses Ruby 2.1.X and is built using [Bundler](http://gembundler.com/). To get all of the dependencies for the project, first install bundler:
 
     gem install bundler
 
@@ -19,23 +19,10 @@ Then run bundler to grab all of the necessary gems:
 
     bundle install
 
-The Quality Measure engine relies on a MongoDB [MongoDB](http://www.mongodb.org/) running a minimum of version 2.2.* or higher.  To get and install Mongo refer to:
+The Quality Measure engine relies on a MongoDB [MongoDB](http://www.mongodb.org/) running a minimum of version 2.6.* or higher.  To get and install Mongo refer to:
 
     http://www.mongodb.org/display/DOCS/Quickstart
 
-It also relies on [Redis](http://redis.io/) for background jobs via [Resque](https://github.com/defunkt/resque). To install Redis, please refer to:
-
-    http://redis.io/download
-
-You can also find information on Redis at the [Resque homepage](https://github.com/defunkt/resque). Resque is used by this project to calculate quality measures in  background jobs. We also use [resque-status](https://github.com/quirkey/resque-status). Please consult the resque-status instructions for working with the resque-web application if you would like to use it to monitor status.
-
-Running Resque Workers
-----------------------
-
-QME::QualityReport will kick off background jobs with Resque. For these jobs to to actually get performed, you need to be running resque workers. This can be done with the following:
-
-    QUEUE=* bundle exec rake resque:work
-
 Testing
 =======
 
@@ -43,17 +30,17 @@ This project uses [minitest](https://github.com/seattlerb/minitest) for testing.
 
     bundle exec rake test
 
-The coverage of the test suite is monitored with [cover_me](https://github.com/markbates/cover_me). You can see the code coverage by looking in the coverage directory after running the test suite
+The coverage of the test suite is monitored with [simplecov](https://github.com/colszowka/simplecov). You can see the code coverage by looking in the coverage directory after running the test suite
 
 Project Practices
 =================
 
-Please try to follow our [Coding Style Guides](http://github.com/eedrummer/styleguide). Additionally, we will be using git in a pattern similar to [Vincent Driessen's workflow](http://nvie.com/posts/a-successful-git-branching-model/). While feature branches are encouraged, they are not required to work on the project.
+Please try to follow the [GitHub Coding Style Guides](https://github.com/styleguide). Additionally, we are switching to the git workflow described in [Juan Batiz-Benet's Gist](https://gist.github.com/jbenet/ee6c9ac48068889b0912). If you are new to the project and would like to make changes, please fork and do your work in a feature branch. Submit a pull request and we'll check to see if it is suitable to be merged in.
 
 License
 =======
 
-Copyright 2012 The MITRE Corporation
+Copyright 2014 The MITRE Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/qme/map/map_reduce_builder.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 
 module QME
   module MapReduce
-  
+
     # Builds Map and Reduce functions for a particular measure
     class Builder
       attr_reader :id, :params
@@ -11,19 +11,19 @@ module QME
       # Utility class used to supply a binding to Erb
       class Context < OpenStruct
         # Create a new context
-        # @param [Hash] vars a hash of parameter names (String) and values (Object). Each 
+        # @param [Hash] vars a hash of parameter names (String) and values (Object). Each
         # entry is added as an accessor of the new Context
         def initialize(db, vars)
           super(Context.add_defaults(vars))
           @db = db
         end
-      
+
         # Get a binding that contains all the instance variables
         # @return [Binding]
         def get_binding
           binding
         end
-        
+
         # Add default parameter values if not specified
         def self.add_defaults(vars)
           if !vars.has_key?('enable_logging')
@@ -34,7 +34,7 @@ module QME
           end
           vars
         end
-        
+
         # Inserts any library code into the measure JS. JS library code is loaded from
         # three locations: the js directory of the quality-measure-engine project, the
         # js sub-directory of the current directory (e.g. measures/js), and the bundles
@@ -60,7 +60,7 @@ module QME
         @id = measure_def['id']
         @params = {}
         @db = db
-        
+
         # normalize parameters hash to accept either symbol or string keys
         params.each do |name, value|
           @params[name.to_s] = value
@@ -93,11 +93,12 @@ module QME
       # map-reduce-utils.js
       # @return [String] the reduce function
       def finalize_function
-        reduce = 
-        "function (key, value) { 
+        reporting_period_start = Time.at(@params['effective_date']).prev_year.to_i
+        reduce =
+        "function (key, value) {
           var patient = value;
           patient.measure_id = \"#{@measure_def['id']}\";\n"
-        if @params['test_id'] && @params['test_id'].class==Moped::BSON::ObjectId
+        if @params['test_id'] && @params['test_id'].class==BSON::ObjectId
           reduce += "  patient.test_id = new ObjectId(\"#{@params['test_id']}\");\n"
         end
         if @measure_def.sub_id
@@ -106,20 +107,33 @@ module QME
         if @measure_def.nqf_id
           reduce += "  patient.nqf_id = \"#{@measure_def.nqf_id}\";\n"
         end
-          
+
         reduce += "patient.effective_date = #{@params['effective_date']};
                    if (patient.provider_performances) {
                      var tmp = [];
                      for(var i=0; i<patient.provider_performances.length; i++) {
                        var value = patient.provider_performances[i];
-                       if ((value['start_date'] <= #{@params['effective_date']} || value['start_date'] == null) && (value['end_date'] >= #{@params['effective_date']} || value['end_date'] == null))
+                       if (
+                        // Early Overlap
+                        ((value['start_date'] <= #{reporting_period_start} || value['start_date'] == null) && (value['end_date'] > #{reporting_period_start})) ||
+                        // Late Overlap
+                        ((value['start_date'] < #{@params['effective_date']}) && (value['end_date'] >= #{@params['effective_date']} || value['end_date'] == null)) ||
+                        // Full Overlap
+                        ((value['start_date'] <= #{reporting_period_start} || value['start_date'] == null) && (value['end_date'] >= #{@params['effective_date']} || value['end_date'] == null)) ||
+                        // Full Containment
+                        (value['start_date'] > #{reporting_period_start} && value['end_date'] < #{@params['effective_date']})
+                       )
                        tmp.push(value);
                      }
-                     if (tmp.length == 0) tmp = null;
-                     patient.provider_performances = tmp;
+                     if (tmp.length > 0) {
+                        patient.provider_performances = tmp;
+                     } else {
+                        sortedProviders = _.sortBy(patient.provider_performances, function(performance){return performance['end_date']});
+                        patient.provider_performances = [_.last(sortedProviders)];
+                     }
                    }
                    return patient;}"
-        
+
         reduce
       end
 

data/lib/qme/map/map_reduce_executor.rb

@@ -52,9 +52,9 @@ module QME
             match['value.gender'] = {'$in' => filters['genders']}
           end
           if (filters['providers'] && filters['providers'].size > 0)
-            providers = filters['providers'].map { |pv| {'providers' => Moped::BSON::ObjectId(pv) } }
-            pipeline.concat [{'$project' => {'value' => 1, 'providers' => "$value.provider_performances.provider_id"}},
-                             {'$unwind' => '$providers'},
+            providers = filters['providers'].map { |pv| {'providers' => BSON::ObjectId.from_string(pv) } }
+            pipeline.concat [{'$project' => {'value' => 1, 'providers' => "$value.provider_performances.provider_id"}}, 
+                             {'$unwind' => '$providers'}, 
                              {'$match' => {'$or' => providers}},
                              {'$group' => {"_id" => "$_id", "value" => {"$first" => "$value"}}}]
           end

data/lib/qme/quality_measure.rb

@@ -4,13 +4,12 @@ module QME
     include Mongoid::Document
     store_in collection: 'measures'
 
-    field :id, type: String
+    field :id, as: :id, type: String
     field :sub_id, type: String
     field :map_fn, type: String
     field :nqf_id, type: String
     field :continuous_variable, type: Boolean, default: false
     field :aggregator, type: String
-    field :map_fn, type: String
     field :population_ids, type: Hash
     field :parameters, type: Hash, default: {}
 

data/lib/qme/quality_report.rb

@@ -34,6 +34,7 @@ module QME
     field :test_id
     field :effective_date, type: Integer
     field :filters, type: Hash
+    field :prefilter, type: Hash
     embeds_one :result, class_name: "QME::QualityReportResult", inverse_of: :quality_report
     index "measure_id" => 1
     index "sub_id" => 1
@@ -197,7 +198,7 @@ module QME
           match['value.gender'] = {'$in' => filters['genders']}
         end
         if (filters['providers'] && filters['providers'].size > 0)
-          providers = filters['providers'].map { |pv| Moped::BSON::ObjectId(pv) }
+          providers = filters['providers'].map { |pv| BSON::ObjectId.from_string(pv) }
           match['value.provider_performances.provider_id'] = {'$in' => providers}
         end
         if (filters['languages'] && filters['languages'].size > 0)
@@ -209,15 +210,15 @@ module QME
 
     protected
 
-     #In the older version of QME QualityReport was not treated as apersisted object. As
+     # In the older version of QME QualityReport was not treated as a persisted object. As
      # a result anytime you wanted to get the cached results for a calculation you would create
      # a new QR object which would then go to the db and see if the calculation was performed or
-     # not yet and then return the results.  now that QR objects are persisted you need to go through
+     # not yet and then return the results.  Now that QR objects are persisted you need to go through
      # the find_or_create by method to ensure that duplicate entries are not being created.  Protecting
      # this method causes an exception to be thrown for anyone attempting to use this version of QME with the 
-     # sematics of the older version to highlight the issue
-    def initialize(attrs = nil, options = nil)
-      super(attrs, options)
+     # sematics of the older version to highlight the issue.
+    def initialize(attrs = nil)
+      super(attrs)
     end
 
     def self.enque_job(options,queue)

data/lib/qme/version.rb

@@ -1,3 +1,3 @@
 module QME
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/quality-measure-engine.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'moped', '~> 1.5.1'
-  gem.add_dependency 'mongoid', '~> 3.1.4'
+  gem.add_dependency 'moped', '~> 2.0.0'
+  gem.add_dependency 'mongoid', '~> 4.0.0'
   gem.add_dependency 'rubyzip', '~> 0.9.9'
-  gem.add_dependency 'delayed_job_mongoid', '~> 2.0.0'
+  gem.add_dependency 'delayed_job_mongoid', '~> 2.1.0'
 
-  gem.add_development_dependency "minitest", "~> 4.1.0"
-  gem.add_development_dependency "simplecov", "~> 0.7.1"
-  gem.add_development_dependency "rails", "~> 3.2.8"
+  gem.add_development_dependency "minitest", "~> 5.4.0"
+  gem.add_development_dependency "simplecov", "~> 0.9.0"
+  gem.add_development_dependency "rails", "~> 4.1.5"
 end

data/test/fixtures/records/barry_berry.json

@@ -446,7 +446,7 @@
       "codes": {
         "SNOMED-CT": [
           "273447005"
-        ]        
+        ]
       },
       "start_time": 1269762691,
       "end_time": 1269762693,
@@ -462,11 +462,18 @@
       "codes": {
         "SNOMED-CT": [
           "273447005"
-        ]        
+        ]
       },
       "start_time": 1269762691,
       "end_time": 1269762693,
       "anatomicalStructure" : {"code": "13648007", "codeSystem": "SNOMED-CT"}
     }
+  ],
+  "provider_performances" : [
+    {
+      "start_date" : 946684800,
+      "end_date" : 1291161600,
+      "provider_id" : "early_overlap"
+    }
   ]
 }

data/test/fixtures/records/billy_jones_ipp.json

@@ -75,5 +75,12 @@
                 ]
             }
         }
+    ],
+    "provider_performances" : [
+        {
+            "start_date" : 1291161600,
+            "end_date" : 1417392000,
+            "provider_id" : "late_overlap"
+        }
     ]
 }

data/test/fixtures/records/jane_jones_numerator.json

@@ -82,6 +82,18 @@
             }
         }
     ],
+    "provider_performances" : [
+        {
+            "start_date" : 2,
+            "end_date" : 7200,
+            "provider_id" : "waaay_too_early_provider"
+        },
+        {
+            "start_date" : 946684800,
+            "end_date" : 978307200,
+            "provider_id" : "too_early_provider"
+        }
+    ],
     "vital_signs": [
         {
             "codes": {

data/test/fixtures/records/jill_jones_denominator.json

@@ -81,5 +81,12 @@
                 ]
             }
         }
+    ],
+    "provider_performances" : [
+        {
+            "start_date" : 946684800,
+            "end_date" : 1417392000,
+            "provider_id" : "late_overlap"
+        }
     ]
 }

data/test/test_helper.rb

@@ -1,9 +1,8 @@
 require 'simplecov_setup'
 require 'minitest/autorun'
 require 'quality-measure-engine'
-require 'test/unit'
-require 'turn'
 require 'pry-nav'
+
 Mongoid.load!(File.join(File.dirname(__FILE__),"mongoid.yml"), :test)
 
 class MiniTest::Unit::TestCase
@@ -16,22 +15,22 @@ class MiniTest::Unit::TestCase
       Mongoid.default_session['system.js'].find('_id' => name).upsert(
         {
           "_id" => name,
-          "value" => Moped::BSON::Code.new(fn)
+          "value" => BSON::Code.new(fn)
         }
       )
     end
- 
+
   end
 
   # Add more helper methods to be used by all tests here...
-  
+
   def collection_fixtures(db, collection, *id_attributes)
     db[collection].drop
     Dir.glob(File.join(File.dirname(__FILE__), 'fixtures', collection, '*.json')).each do |json_fixture_file|
       #puts "Loading #{json_fixture_file}"
       fixture_json = JSON.parse(File.read(json_fixture_file))
       id_attributes.each do |attr|
-        fixture_json[attr] = Moped::BSON::ObjectId.from_string(fixture_json[attr])
+        fixture_json[attr] = BSON::ObjectId.from_string(fixture_json[attr])
       end
 
       db[collection].insert(fixture_json)

data/test/unit/qme/map/map_reduce_executor_test.rb

@@ -19,9 +19,9 @@ class MapReduceExecutorTest < MiniTest::Unit::TestCase
   def test_map_records_into_measure_groups
     executor = QME::MapReduce::Executor.new(@quality_report.measure_id,@quality_report.sub_id, {
                                             'effective_date' => Time.gm(2011, 1, 15).to_i})
-                                            
+
     executor.map_records_into_measure_groups
-    
+
 
     assert_equal 4, get_db['patient_cache'].find().count
     assert_equal 3, get_db['patient_cache'].find("value.#{QME::QualityReport::POPULATION}" => 1).count
@@ -31,13 +31,13 @@ class MapReduceExecutorTest < MiniTest::Unit::TestCase
   end
 
 
- def test_calculate_supplemental_data_elements
+  def test_calculate_supplemental_data_elements
     executor = QME::MapReduce::Executor.new(@quality_report.measure_id,@quality_report.sub_id, {
                                             'effective_date' => Time.gm(2011, 1, 15).to_i})
-                                            
+
     executor.map_records_into_measure_groups
     result = executor.count_records_in_measure_groups
-    
+
     suppl = result["supplemental_data"]
 
     assert !suppl.empty?, "should contain supplemental data entries"
@@ -59,13 +59,13 @@ class MapReduceExecutorTest < MiniTest::Unit::TestCase
      QME::QualityReport::SEX => {"F"=>1}
      }
 
-     
+
 
     assert_equal ipp, suppl[QME::QualityReport::POPULATION]
     assert_equal denom, suppl[QME::QualityReport::DENOMINATOR]
     assert_equal numer, suppl[QME::QualityReport::NUMERATOR]
 
-   
+
   end
 
   def test_count_records_in_measure_groups
@@ -79,7 +79,7 @@ class MapReduceExecutorTest < MiniTest::Unit::TestCase
 
     executor = QME::MapReduce::Executor.new(@quality_report.measure_id,@quality_report.sub_id, {
                                             'effective_date' => Time.gm(2011, 1, 14).to_i})
- 
+
     result = executor.count_records_in_measure_groups
     assert_equal 0, result[QME::QualityReport::POPULATION]
     assert_equal 0, result[QME::QualityReport::DENOMINATOR]
@@ -106,6 +106,14 @@ class MapReduceExecutorTest < MiniTest::Unit::TestCase
     assert result[QME::QualityReport::NUMERATOR]
   end
 
+  def test_provider_assignment
+    executor = QME::MapReduce::Executor.new(@quality_report.measure_id,@quality_report.sub_id, {
+                                            'effective_date' => Time.gm(2011, 1, 15).to_i})
+    executor.map_records_into_measure_groups
+    assert_equal 4, get_db['patient_cache'].find("value.provider_performances" => {'$size' => 1}).count
+    assert_equal 1, QME::PatientCache.where('value.medical_record_id' => '12345', 'value.provider_performances.provider_id' => 'too_early_provider').count
+  end
+
   def test_get_patient_result_with_bundle_id
     measure_id = "2E679CD2-3FEC-4A75-A75A-61403E5EFEE8"
     bundle_id = get_db()['bundles'].find.first

data/test/unit/qme/quality_report_test.rb

@@ -2,11 +2,12 @@ require 'test_helper'
 
 class QualityReportTest < MiniTest::Unit::TestCase
   include QME::DatabaseAccess
-  
+
   def setup
-   load_system_js
-   collection_fixtures(get_db(), 'bundles')
-   collection_fixtures(get_db(), 'measures')
+    load_system_js
+    collection_fixtures(get_db(), 'bundles')
+    collection_fixtures(get_db(), 'records')
+    collection_fixtures(get_db(), 'measures')
     get_db()['query_cache'].drop()
     get_db()['patient_cache'].drop()
     get_db()['query_cache'].insert(
@@ -44,7 +45,7 @@ class QualityReportTest < MiniTest::Unit::TestCase
         },
         "measure_id" => "test2",
         "sub_id" =>  "b",
-        "effective_date" => Time.gm(2010, 9, 19).to_i 
+        "effective_date" => Time.gm(2010, 9, 19).to_i
       }
     )
     collection_fixtures(get_db(), 'delayed_backend_mongoid_jobs', '_id')
@@ -53,25 +54,25 @@ class QualityReportTest < MiniTest::Unit::TestCase
   def test_calculated
     qr = QME::QualityReport.find_or_create('test2', 'b', "effective_date" => Time.gm(2010, 9, 19).to_i)
     assert qr.calculated?
-    
+
     qr = QME::QualityReport.find_or_create('test2', 'b', "effective_date" => Time.gm(2010, 9, 20).to_i)
     assert !qr.calculated?
   end
-  
+
   def test_result
     qr = QME::QualityReport.find_or_create('test2', 'b', "effective_date" => Time.gm(2010, 9, 19).to_i)
     result = qr.result
-    
+
     assert_equal 1, result[QME::QualityReport::NUMERATOR]
   end
-  
+
   def test_destroy_all
     QME::QualityReport.destroy_all
-    
+
     qr = QME::QualityReport.find_or_create('test2', 'b', "effective_date" => Time.gm(2010, 9, 19).to_i)
     assert !qr.calculated?
   end
-  
+
   def test_update_patient_results
     qr = QME::QualityReport.find_or_create('test2', 'b', "effective_date" => Time.gm(2010, 9, 19).to_i)
     assert qr.calculated?
@@ -83,7 +84,6 @@ class QualityReportTest < MiniTest::Unit::TestCase
   end
 
   def test_status
-
     status = QME::MapReduce::MeasureCalculationJob.status('not really a job id')
     assert_equal :complete, status
     status = QME::MapReduce::MeasureCalculationJob.status("508aeff07042f9f88900000d")
@@ -106,7 +106,7 @@ class QualityReportTest < MiniTest::Unit::TestCase
 
     assert !qr.calculation_queued_or_running?
     assert !qr2.calculation_queued_or_running?
- 
+
     qr.calculate({"oid_dictionary"=>{}},true)
 
     assert qr.calculation_queued_or_running?
@@ -129,6 +129,4 @@ class QualityReportTest < MiniTest::Unit::TestCase
 
     assert_equal 0, Mongoid.default_session["rollup_buffer"].find({}).count
   end
-
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quality-measure-engine
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Marc Hadley
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: moped
@@ -20,28 +20,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -62,56 +62,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 4.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 4.1.5
 description: A library for running clinical quality measures
 email:
 - talk@projectpophealth.org