bonnie_bundler 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba2b327df38138686e837f9156bb3b0c63398d9
-  data.tar.gz: '08581626e3b497890a99ef1c170b1450ea928121'
+  metadata.gz: 973eb1a1c06145e1a7d06a4f1101bf2e35e179e9
+  data.tar.gz: 445d5d2057bfb716ce5cbc1e30baa45e58439ab3
 SHA512:
-  metadata.gz: 3dbd38b0b9e248e20c68c5ae68eab09e9f1f94b98647d5a87ea53cd6cb2d6b9190382ed544b3a08ca1df6132e76881fb63ceed851c255066dc6c30bfc453b344
-  data.tar.gz: fe7ff9b1b9c1c156bbbeb9f8fe402e59fb96181c818ea17a16485434d4535c5962941e7ee760cf64026942192fcd9709f4fae50a9c3ef6e36a61d49ac255ba00
+  metadata.gz: 3f26b65b570b975bcb4e804e6083f32ef8b0702fcf52c8da48e2b6083dd8de896605d4b5b0f4dd7cd6861b8612d1e9eca10949e8076927390883173884e49cd6
+  data.tar.gz: 70c68df147debef6e370d1e8366d338a0e030e1056775111e8224601f06b171b33e1eeceeb2568b8e3740dfda26fecac2c6187e077523e14fdc2a2332969ca34

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - "2.3.5"
+  - "2.3.7"
 services: mongodb
 script:
   - bundle exec bundle-audit check --update

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    bonnie_bundler (2.2.3)
+    bonnie_bundler (2.2.4)
       diffy (~> 3.0.0)
-      health-data-standards (~> 4.3.1)
+      health-data-standards (~> 4.3.2)
       hqmf2js (~> 1.4)
       hquery-patient-api (~> 1.1)
       mongoid (~> 5.0)
       quality-measure-engine (~> 3.2)
-      rails (~> 4.2)
+      rails (>= 4.2, < 6.0)
       roo (~> 1.13)
       rubyzip (~> 1.2, >= 1.2.1)
       simplexml_parser (~> 1.0)
@@ -17,36 +17,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actionmailer (4.2.11)
+      actionpack (= 4.2.11)
+      actionview (= 4.2.11)
+      activejob (= 4.2.11)
       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)
+    actionpack (4.2.11)
+      actionview (= 4.2.11)
+      activesupport (= 4.2.11)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionview (4.2.11)
+      activesupport (= 4.2.11)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
+    activejob (4.2.11)
+      activesupport (= 4.2.11)
       globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
+    activemodel (4.2.11)
+      activesupport (= 4.2.11)
       builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
+    activerecord (4.2.11)
+      activemodel (= 4.2.11)
+      activesupport (= 4.2.11)
       arel (~> 6.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -65,7 +65,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -84,7 +84,7 @@ GEM
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hashdiff (0.3.6)
-    health-data-standards (4.3.1)
+    health-data-standards (4.3.2)
       activesupport (~> 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
@@ -120,7 +120,7 @@ GEM
     json (2.1.0)
     libv8 (3.16.14.19)
     log4r (1.1.10)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     macaddr (1.7.1)
@@ -145,7 +145,7 @@ GEM
       mongoid (>= 2.0)
     mongoid-tree (2.0.1)
       mongoid (>= 4.0, < 6.0)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     netrc (0.11.0)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
@@ -164,19 +164,19 @@ GEM
       mongoid (~> 5.0)
       rubyzip (~> 1.0)
       zip-zip (~> 0.3)
-    rack (1.6.10)
+    rack (1.6.11)
     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)
+    rails (4.2.11)
+      actionmailer (= 4.2.11)
+      actionpack (= 4.2.11)
+      actionview (= 4.2.11)
+      activejob (= 4.2.11)
+      activemodel (= 4.2.11)
+      activerecord (= 4.2.11)
+      activesupport (= 4.2.11)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
+      railties (= 4.2.11)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -186,9 +186,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     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 (4.2.11)
+      actionpack (= 4.2.11)
+      activesupport (= 4.2.11)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
@@ -228,7 +228,7 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tilt (1.4.1)
     tzinfo (1.2.5)
@@ -265,4 +265,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.16.2
+   1.16.6

data/bonnie-bundler.gemspec

@@ -7,16 +7,16 @@ 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.2.3'
+  s.version = '2.2.4'
   s.license = 'Apache-2.0'
 
-  s.add_dependency 'health-data-standards', '~> 4.3.1'
+  s.add_dependency 'health-data-standards', '~> 4.3.2'
   s.add_dependency 'quality-measure-engine', '~> 3.2'
   s.add_dependency 'hquery-patient-api', '~> 1.1'
   s.add_dependency 'simplexml_parser', '~> 1.0'
   s.add_dependency 'hqmf2js', '~> 1.4'
 
-  s.add_dependency 'rails', '~> 4.2'
+  s.add_dependency 'rails', '>= 4.2', '< 6.0'
   s.add_dependency 'mongoid', '~> 5.0'
   s.add_dependency 'rubyzip', '~> 1.2', '>= 1.2.1'
   s.add_dependency 'zip-zip', '~> 0.3'

data/lib/bonnie_bundler.rb

@@ -14,7 +14,6 @@ require_relative 'models/measure.rb'
 require_relative 'models/cql_measure.rb'
 require_relative 'measures/loading/exceptions.rb'
 require_relative 'measures/loading/loader.rb'
-require_relative 'measures/loading/base_loader_definition.rb'
 require_relative 'measures/loading/cql_loader.rb'
 require_relative 'measures/loading/value_set_loader.rb'
 require_relative 'measures/logic_extractor.rb'

data/lib/measures/loading/cql_loader.rb

@@ -1,62 +1,93 @@
 module Measures
   # Utility class for loading CQL measure definitions into the database from the MAT export zip
-  class CqlLoader < BaseLoaderDefinition
+  class CqlLoader
+    # Returns true if ths uploaded measure zip file is a composite measure
+    def self.composite_measure?(measure_dir)
+      # Look through all xml files at current directory level and find QDM 
+      files = Dir.glob("#{measure_dir}/**.xml").select 
+      begin
+        # Iterate over all files passed in, extract file to temporary directory.
+        files.each do |xml_file|
+          if xml_file && xml_file.size > 0
+            # Open up xml file and read contents.
+            doc = Nokogiri::XML.parse(File.read(xml_file))
+            # Check if root node in xml file matches either the HQMF file or ELM file.
+            if doc.root.name == 'QualityMeasureDocument' # Root node for HQMF XML
+              # Xpath to determine if it is a composite or not
+              doc.root.add_namespace_definition('cda', 'urn:hl7-org:v3')
+              return !doc.at_xpath('//cda:measureAttribute[cda:code[@code="MSRTYPE"]][cda:value[@code="COMPOSITE"]]').nil?
+            end
+          end
+        end     
+      rescue Exception => e
+        raise MeasureLoadingException.new "Error Checking MAT Export: #{e.message}"
+      end
+      false
+    end
 
+    # Verifies that the zip file contains a valid measure
+    # Works for both regular & composite measures
     def self.mat_cql_export?(zip_file)
-      # Open the zip file and iterate over each of the files.
-      Zip::ZipFile.open(zip_file.path) do |zip_file|
-        # Check for CQL, HQMF, ELM and Human Readable
-        cql_entry = zip_file.glob(File.join('**','**.cql')).select {|x| !x.name.starts_with?('__MACOSX') }.first
-        elm_json = zip_file.glob(File.join('**','**.json')).select {|x| !x.name.starts_with?('__MACOSX') }.first
-        human_readable_entry = zip_file.glob(File.join('**','**.html')).select { |x| !x.name.starts_with?('__MACOSX') }.first
-
-        # Grab all xml files in the zip.
-        zip_xml_files = zip_file.glob(File.join('**','**.xml')).select {|x| !x.name.starts_with?('__MACOSX') }
+      # Extract contents of zip file while retaining the directory structure
+      original = Dir.pwd
+      Dir.mktmpdir do |tmp_dir|
+        current_directory = unzip_measure_contents(zip_file, tmp_dir)
+        # Check if measure contents are valid
+        return valid_measure_contents?(current_directory, true)
+      end
+    end
 
-        if zip_xml_files.count > 0
-          xml_files_hash = extract_xml_files(zip_file, zip_xml_files)
-          !cql_entry.nil? && !elm_json.nil? && !human_readable_entry.nil? && !xml_files_hash[:HQMF_XML].nil? && !xml_files_hash[:ELM_XML].nil?
-        else
-          false
+    # Returns the base directory of the measure
+    def self.unzip_measure_contents(zip_file, tmp_dir)
+      Zip::ZipFile.open(zip_file.path) do |zip_file|
+        zip_file.each do |f|
+          f_path = File.join(tmp_dir, f.name)
+          FileUtils.mkdir_p(File.dirname(f_path))
+          f.extract(f_path)
+        end
+      end
+      current_directory = tmp_dir
+      # Detect if the zip file contents were stored into a single directory
+      if Dir.glob("#{current_directory}/*").count < 3
+        # If there is a single folder containing the zip file contents, step into it (ignore __MACOSX file if it exists)
+        Dir.glob("#{current_directory}/*").select.each do |file|
+          if !file.end_with?('__MACOSX') && File.directory?(file)
+            current_directory = file
+            break
+          end
         end
       end
+      return current_directory
     end
 
-    def self.load_mat_cql_exports(user, zip_file, out_dir, measure_details, vsac_options, vsac_ticket_granting_ticket)
-      measure = nil
-      cql = nil
-      hqmf_path = nil
-      # Grabs the cql file contents, the elm_xml contents, elm_json contents and the hqmf file path
-      files = get_files_from_zip(zip_file, out_dir)
-
-      # Load hqmf into HQMF Parser
-      hqmf_model = Measures::Loader.parse_hqmf_model(files[:HQMF_XML_PATH])
-
-      # Get main measure from hqmf parser
-      main_cql_library = hqmf_model.cql_measure_library
-
-      cql_artifacts = process_cql(files, main_cql_library, user, vsac_options, vsac_ticket_granting_ticket, hqmf_model.hqmf_set_id)
-
-      # Create CQL Measure
-      hqmf_model.backfill_patient_characteristics_with_codes(cql_artifacts[:all_codes_and_code_names])
-      json = hqmf_model.to_json
-      json.convert_keys_to_strings
-
-      # Set the code list ids of data criteria and source data criteria that use direct reference codes to GUIDS.
-      json['source_data_criteria'], json['data_criteria'] = set_data_criteria_code_list_ids(json, cql_artifacts)
+    # Verifies contents of the given measure are valid (works for regular, composite and component measures)
+    def self.valid_measure_contents?(measure_dir, check_components = false)
+      # If composite measure given, check components
+      if check_components
+        Dir.glob("#{measure_dir}/*").each do |file|
+          if File.directory?(file)
+            if !valid_measure_contents?(file)
+              return false
+            end
+          end
+        end
+      end
 
-      # Create CQL Measure
-      measure = Measures::Loader.load_hqmf_cql_model_json(json, user, cql_artifacts[:all_value_set_oids], main_cql_library, cql_artifacts[:cql_definition_dependency_structure],
-                                                          cql_artifacts[:elms], cql_artifacts[:elm_annotations], files[:CQL], nil, cql_artifacts[:value_set_oid_version_objects])
-      measure['episode_of_care'] = measure_details['episode_of_care']
-      measure['type'] = measure_details['type']
-      measure['calculate_sdes'] = measure_details['calculate_sdes']
+      # Grab all cql, elm & human readable docs from measure
+      cql_entry = Dir.glob(File.join(measure_dir,'**.cql')).select {|x| !File.basename(x).starts_with?('__MACOSX') }.first
+      elm_json = Dir.glob(File.join(measure_dir,'**.json')).select {|x| !File.basename(x).starts_with?('__MACOSX') }.first
+      human_readable_entry = Dir.glob(File.join(measure_dir,'**.html')).select {|x| !File.basename(x).starts_with?('__MACOSX') }.first
 
-      # Create, associate and save the measure package.
-      measure.package = CqlMeasurePackage.new(file: BSON::Binary.new(zip_file.read()))
-      measure.package.save
+      # Grab all xml files in the measure.
+      xml_files = Dir.glob(File.join(measure_dir,'**.xml')).select {|x| !File.basename(x).starts_with?('__MACOSX') }
 
-      measure
+      # Find key value pair for HQMF and ELM xml files.
+      if xml_files.count > 0
+        xml_files_hash = retrieve_elm_and_hqmf(xml_files)
+        !cql_entry.nil? && !elm_json.nil? && !human_readable_entry.nil? && !xml_files_hash[:HQMF_XML].nil? && !xml_files_hash[:ELM_XML].nil?
+      else
+        false
+      end
     end
 
     def self.set_data_criteria_code_list_ids(json, cql_artifacts)
@@ -84,28 +115,175 @@ module Measures
       return json['source_data_criteria'], json['data_criteria']
     end
 
-    def self.load(file, user, measure_details, vsac_options, vsac_ticket_granting_ticket)
+    # Returns an array of measures
+    # Single measure returned into the array if it is a non-composite measure
+    def self.extract_measures(measure_zip, current_user, measure_details, vsac_options, vsac_ticket_granting_ticket)
       measure = nil
-      Dir.mktmpdir do |dir|
-        measure = load_mat_cql_exports(user, file, dir, measure_details, vsac_options, vsac_ticket_granting_ticket)
+      component_measures = []
+      # Unzip measure contents while retaining the directory structure
+      Dir.mktmpdir do |tmp_dir|
+        current_directory = unzip_measure_contents(measure_zip, tmp_dir)
+        if !valid_measure_contents?(current_directory, true)
+          raise MeasureLoadingException.new("Zip file was not a MAT package.")
+        end
+        component_elms = {}
+        component_elms[:ELM_JSON] = []
+
+        # If it is a composite measure, load in each of the components
+        # Components must be loaded first so their elms can be passed onto the composite
+        if composite_measure?(current_directory)
+          component_measures = create_component_measures(current_directory, current_user, measure_details, vsac_options, vsac_ticket_granting_ticket)
+          component_measures.each do |component_measure|
+            component_elms[:ELM_JSON].push(*component_measure.elm)
+          end
+        end
+
+        # Load in regular/composite measure measure
+        begin
+          measure = create_measure(current_directory, current_user, measure_details, vsac_options, vsac_ticket_granting_ticket, component_elms)
+        rescue => e
+          component_measures.each { |component| component.delete }
+          raise e
+        end
+
+        # Create, associate and save the measure package.
+        measure_package = CqlMeasurePackage.new(file: BSON::Binary.new(measure_zip.read()))
+        measure.package = measure_package
+        measure.package.save 
+
+        component_measures.each do |component_measure|
+          # Update the components' hqmf_set_id, formatted as follows:
+          #   <composite_hqmf_set_id>&<component_hqmf_set_id>
+          component_measure.hqmf_set_id = measure.hqmf_set_id + '&' + component_measure.hqmf_set_id
+          component_measure.component = true;
+          # Associate the component with the composite
+          measure.component_hqmf_set_ids.push(component_measure.hqmf_set_id)
+        end
+      end # End of temporary directory usage 
+
+      # Put measure (and component measures) into an array to return
+      measures = component_measures << measure
+      return measures
+    end
+
+    # Creates a composite's component measures 
+    def self.create_component_measures(current_directory, current_user, measure_details, vsac_options, vsac_ticket_granting_ticket)
+      component_measures = []
+      Dir.glob("#{current_directory}/*").sort.each do |file|
+        if File.directory?(file)
+          component_measures << create_measure(file, current_user, measure_details, vsac_options, vsac_ticket_granting_ticket)
+        end
       end
+      component_measures
+    end
+
+    # Creates and returns a measure 
+    def self.create_measure(measure_dir, user, measure_details, vsac_options, vsac_ticket_granting_ticket, component_elms=nil)
+      measure = nil
+
+      # Grabs the cql file contents, the elm_xml contents, elm_json contents and the hqmf file path
+      files = get_files_from_directory(measure_dir)
+
+      # Load hqmf into HQMF Parser
+      hqmf_model = Measures::Loader.parse_hqmf_model(files[:HQMF_XML_PATH])
+
+      # Get main measure from hqmf parser
+      main_cql_library = hqmf_model.cql_measure_library
+
+      cql_artifacts = process_cql(files, main_cql_library, user, vsac_options, vsac_ticket_granting_ticket, hqmf_model.hqmf_set_id, component_elms)
+
+      # Create CQL Measure
+      hqmf_model.backfill_patient_characteristics_with_codes(cql_artifacts[:all_codes_and_code_names])
+      json = hqmf_model.to_json
+      json.convert_keys_to_strings
+
+      # Set the code list ids of data criteria and source data criteria that use direct reference codes to GUIDS.
+      json['source_data_criteria'], json['data_criteria'] = set_data_criteria_code_list_ids(json, cql_artifacts)
+
+      # Create CQL Measure
+      measure_details["composite"] = composite_measure?(measure_dir)
+      measure = Measures::Loader.load_hqmf_cql_model_json(json, user, cql_artifacts[:all_value_set_oids], main_cql_library, cql_artifacts[:cql_definition_dependency_structure],
+                                                          cql_artifacts[:elms], cql_artifacts[:elm_annotations], files[:CQL], measure_details, cql_artifacts[:value_set_oid_version_objects])
       measure
     end
 
+    def self.get_files_from_directory(dir)
+      cql_paths = Dir.glob(File.join("#{dir}/**.cql")).sort
+      xml_paths = Dir.glob(File.join("#{dir}/**.xml")).sort
+      elm_json_paths = Dir.glob(File.join("#{dir}/**.json")).sort
+      
+      begin
+        cql_contents = []
+        cql_paths.each do |cql_path|
+          cql_contents << open(cql_path).read
+        end
+
+        elm_json = []
+        elm_json_paths.each do |elm_json_path|
+          elm_json << open(elm_json_path).read
+        end
+        
+        xml_file_hash = retrieve_elm_and_hqmf(xml_paths)
+        elm_xml_paths = xml_file_hash[:ELM_XML]
+        elm_xml = []
+        elm_xml_paths.each do |elm_xml_path|
+          elm_xml << open(elm_xml_path).read
+        end
+
+        files = { :HQMF_XML_PATH => xml_file_hash[:HQMF_XML],
+                  :ELM_JSON => elm_json,
+                  :CQL => cql_contents,
+                  :ELM_XML => elm_xml }
+        return files
+      rescue Exception => e
+        raise MeasureLoadingException.new "Error Parsing Measure Logic: #{e.message}"
+      end
+    end
+
+    # Takes in array of xml files and returns hash with keys HQMF_XML and ELM_XML
+    def self.retrieve_elm_and_hqmf(files)
+      file_paths_hash = {}
+      file_paths_hash[:ELM_XML] = []
+      begin
+        files.each do |xml_file_path|
+          if xml_file_path && xml_file_path.size > 0
+            # Open up xml file and read contents.
+            doc = Nokogiri::XML.parse(File.read(xml_file_path))
+            # Check if root node in xml file matches either the HQMF file or ELM file.
+            if doc.root.name == 'QualityMeasureDocument' # Root node for HQMF XML
+              file_paths_hash[:HQMF_XML] = xml_file_path
+            elsif doc.root.name == 'library' # Root node for ELM XML
+              file_paths_hash[:ELM_XML] << xml_file_path
+            end
+          end
+        end     
+      rescue Exception => e
+        raise MeasureLoadingException.new "Error Checking MAT Export: #{e.message}"
+      end
+      file_paths_hash
+    end
+
     # Manages all of the CQL processing that is not related to the HQMF.
-    def self.process_cql(files, main_cql_library, user, vsac_options, vsac_ticket_granting_ticket, measure_id=nil)
+    def self.process_cql(files, main_cql_library, user, vsac_options, vsac_ticket_granting_ticket, measure_id=nil, component_elms=nil)
       elm_strings = files[:ELM_JSON]
       # Removes 'urn:oid:' from ELM for Bonnie and Parse the JSON
       elm_strings.each { |elm_string| elm_string.gsub! 'urn:oid:', '' }
       elms = elm_strings.map{ |elm| JSON.parse(elm, :max_nesting=>1000)}
       elm_annotations = parse_elm_annotations(files[:ELM_XML])
 
+      if (!component_elms.nil?)
+        elms.push(*component_elms[:ELM_JSON]) 
+      end
       # Hash of define statements to which define statements they use.
       cql_definition_dependency_structure = populate_cql_definition_dependency_structure(main_cql_library, elms)
-      # Go back for the library statements
-      cql_definition_dependency_structure = populate_used_library_dependencies(cql_definition_dependency_structure, main_cql_library, elms)
-      # Add unused libraries to structure and set the value to empty hash
-      cql_definition_dependency_structure = populate_unused_included_libraries(cql_definition_dependency_structure, elms)
+      begin
+        # Go back for the library statements
+        cql_definition_dependency_structure = populate_used_library_dependencies(cql_definition_dependency_structure, main_cql_library, elms)
+        # Add unused libraries to structure and set the value to empty hash
+        cql_definition_dependency_structure = populate_unused_included_libraries(cql_definition_dependency_structure, elms)
+      rescue => e
+        raise MeasureLoadingException.new("Measure package missing a library or component.")
+      end
 
       # fix up statement names in cql_statement_dependencies to not use periods <<WRAP 1>>
       # this is matched with an UNWRAP in MeasuresController in the bonnie project
@@ -177,7 +355,7 @@ module Measures
                        :all_codes_and_code_names => all_codes_and_code_names}
     end
 
-    # returns a list of objects that include the valueset oids and their versions
+    # Returns a list of objects that include the valueset oids and their versions
     def self.get_value_set_oid_version_objects(value_sets, single_code_references)
       # [LDC] need to make this an array of objects instead of a hash because Mongo is
       # dumb and *let's you* have dots in keys on object creation but *doesn't let you*
@@ -268,50 +446,6 @@ module Measures
       return single_code_references, all_codes_and_code_names
     end
 
-    # Opens the zip and grabs the cql file contents, the ELM contents (XML and JSON) and hqmf_path.
-    def self.get_files_from_zip(zip_file, out_dir)
-      Zip::ZipFile.open(zip_file.path) do |file|
-        cql_entries = file.glob(File.join('**','**.cql')).select {|x| !x.name.starts_with?('__MACOSX') }
-        zip_xml_files = file.glob(File.join('**','**.xml')).select {|x| !x.name.starts_with?('__MACOSX') }
-        elm_json_entries = file.glob(File.join('**','**.json')).select {|x| !x.name.starts_with?('__MACOSX') }
-        
-        begin
-          cql_paths = []
-          cql_entries.each do |cql_file|
-            cql_paths << extract(file, cql_file, out_dir) if cql_file.size > 0
-          end
-          cql_contents = []
-          cql_paths.each do |cql_path|
-            cql_contents << open(cql_path).read
-          end
-
-          elm_json_paths = []
-          elm_json_entries.each do |json_file|
-            elm_json_paths << extract(file, json_file, out_dir) if json_file.size > 0
-          end
-          elm_json = []
-          elm_json_paths.each do |elm_json_path|
-            elm_json << open(elm_json_path).read
-          end
-          
-          xml_file_paths = extract_xml_files(file, zip_xml_files, out_dir)
-          elm_xml_paths = xml_file_paths[:ELM_XML]
-          elm_xml = []
-          elm_xml_paths.each do |elm_xml_path|
-            elm_xml << open(elm_xml_path).read
-          end
-
-          files = { :HQMF_XML_PATH => xml_file_paths[:HQMF_XML],
-                    :ELM_JSON => elm_json,
-                    :CQL => cql_contents,
-                    :ELM_XML => elm_xml }
-          return files
-        rescue Exception => e
-          raise MeasureLoadingException.new "Error Parsing Measure Logic: #{e.message}"
-        end
-      end
-    end
-
     private
     def self.parse_elm_annotations(xmls)
       elm_annotations = {}