bonnie_bundler 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8e32e9abd0ae8bddf964402942f9e173b8f9e67
-  data.tar.gz: defe86ae5cbfe20bf191c4b9872a1601e9f9bedd
+  metadata.gz: 61e2a56d536dfc98d6737d50c746798b94640bb6
+  data.tar.gz: 4b545b3b00f5daa2670da24798d9cfca0e35eaf3
 SHA512:
-  metadata.gz: ebd879310aa8f2d93499729729f76fa612c81fd6aa0bafdb31c79c1effc832cd01b6b2df28245c3d44c7cee0327096aedd9104be67823017f0b256c0afc7dcd3
-  data.tar.gz: bc97bb15843fa6792d819b9724e796730477b826b691cf03d1b1e598a46a53008ef0e14068d999332bdd850f525042add1c298401cfb6e5168654a22c37cbce6
+  metadata.gz: 31322b05a378e3f5897f8ff193f78aef1565d5113d64238ea6ac13e5c28a510ebc0bcf47d4a109c48896c9563698d65cfb816e9ea0bc051d8bf4d1ea3f30c7a8
+  data.tar.gz: '00292a81e87be77bf7c05270ff902eb970a3f8a13253739d907fa8d503d804f88e1cc731a8dff3fdacc7a9d91f343a0a72dab09fbbd35caae0fd226028945797'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bonnie_bundler (2.0.0)
+    bonnie_bundler (2.0.1)
       diffy (~> 3.0.0)
       health-data-standards (~> 4.0)
       hqmf2js (~> 1.4)
@@ -84,7 +84,7 @@ GEM
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hashdiff (0.3.6)
-    health-data-standards (4.0.0)
+    health-data-standards (4.0.1)
       activesupport (~> 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)

data/bonnie-bundler.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.email = "pophealth-talk@googlegroups.com"
   s.homepage = "http://github.com/projecttacoma/bonnie_bundler"
   s.authors = ["The MITRE Corporation"]
-  s.version = '2.0.0'
+  s.version = '2.0.1'
   s.license = 'Apache-2.0'
 
   s.add_dependency 'health-data-standards', '~> 4.0'

data/lib/measures/loading/cql_loader.rb

@@ -324,44 +324,69 @@ module Measures
 
       cql_statement_depencency_map[main_cql_library] = {}
       main_library_elm['library']['statements']['def'].each { |statement|
-        cql_statement_depencency_map[main_cql_library][statement['name']] = retrieve_all_statements_in_population(statement, elms)
+        cql_statement_depencency_map[main_cql_library][statement['name']] = retrieve_all_statements_in_population(statement, main_library_elm, elms)
       }
       cql_statement_depencency_map
     end
 
     # Given a starting define statement, a starting library and all of the libraries,
     # this will return an array of all nested define statements.
-    def self.retrieve_all_statements_in_population(statement, elms)
+    def self.retrieve_all_statements_in_population(statement, statement_library, elms, statement_library_name=nil)
       all_results = []
       if statement.is_a? String
-        statement = retrieve_sub_statement_for_expression_name(statement, elms)
+        statement = retrieve_sub_statement_for_expression_name(statement, elms, statement_library_name)
       end
       sub_statement_names = retrieve_expressions_from_statement(statement)
       # Currently if sub_statement_name is another Population we do not remove it.
       if sub_statement_names.length > 0
         sub_statement_names.each do |sub_statement_name|
           # Check if the statement is not a built in expression
-          sub_library_name, sub_statement = retrieve_sub_statement_for_expression_name(sub_statement_name, elms)
-          if sub_statement
-            all_results << { library_name: sub_library_name, statement_name: sub_statement_name }
+          if sub_statement_name[:name]
+            sub_statement_name[:library] = alias_to_library_name(sub_statement_name[:library], statement_library)
+            all_results << { library_name: sub_statement_name[:library], statement_name: sub_statement_name[:name] }
           end
         end
       end
       all_results
     end
 
+    # Converts a Library alias to the actual Library name
+    # If no library_alias is provided, return the name of the library that is passed in
+    def self.alias_to_library_name(library_alias, statement_library)
+      if library_alias == nil
+        return statement_library['library']['identifier']['id']
+      end
+
+      if statement_library['library']['includes']
+        statement_library['library']['includes']['def'].each do |library_hash|
+          if library_alias == library_hash['localIdentifier']
+            return library_hash['path']
+          end
+        end
+      end
+      raise MeasureLoadingException.new 'Unexpected statement library structure encountered.'
+    end
+
     # Finds which library the given define statement exists in.
     # Returns the JSON statement that contains the given name.
     # If given statement name is a built in expression, return nil.
-    def self.retrieve_sub_statement_for_expression_name(name, elms)
-      elms.each do | parsed_elm |
-        parsed_elm['library']['statements']['def'].each do |statement|
-          return [parsed_elm['library']['identifier']['id'], statement] if statement['name'] == name
-        end
+    def self.retrieve_sub_statement_for_expression_name(name, elms, library_name)
+      # Search for elm with that name to look for definitions in.
+      if library_name
+        library_elm = elms.find { |elm| elm['library']['identifier']['id'] == library_name }
+        statement_definition = find_definition_in_elm(library_elm, name)
+        return statement_definition if statement_definition
       end
       nil
     end
 
+    # Given an elm structure and a statment_name return the statement JSON structure.
+    def self.find_definition_in_elm(elm, statement_name)
+      elm['library']['statements']['def'].each do |statement|
+        return [elm['library']['identifier']['id'], statement] if statement['name'] == statement_name
+      end
+    end
+
     # Traverses the given statement and returns all of the potential additional statements.
     def self.retrieve_expressions_from_statement(statement)
       expressions = []
@@ -374,7 +399,7 @@ module Measures
         else
           if k == 'type' && (v == 'ExpressionRef' || v == 'FunctionRef')
             # We ignore the Patient expression because it isn't an actual define statment in the cql
-            expressions << statement['name'] unless statement['name'] == 'Patient'
+            expressions.push({name: statement['name'], library: statement['libraryName']}) unless statement['name'] == 'Patient'
           end
         end
       end
@@ -406,7 +431,8 @@ module Measures
         if !starting_hash.has_key?(key_statement[:library_name])
           starting_hash[key_statement[:library_name]] = {}
         end
-        starting_hash[key_statement[:library_name]][key_statement[:statement_name]] = retrieve_all_statements_in_population(key_statement[:statement_name], elms).uniq
+        library_elm = elms.find { |elm| elm['library']['identifier']['id'] == key_statement[:library_name] }
+        starting_hash[key_statement[:library_name]][key_statement[:statement_name]] = retrieve_all_statements_in_population(key_statement[:statement_name], library_elm, elms, key_statement[:library_name]).uniq
         # If there are no statements return hash
         return starting_hash if starting_hash[key_statement[:library_name]][key_statement[:statement_name]].empty?
         # Loop over array of sub statements and build out hash keys for each.