cqm-parsers 4.0.0.0 → 4.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42976fc653ecb9c5a69de2d4ff1cb23a56880bbfc45f53cc7f159f45e7929a4
-  data.tar.gz: 4d66c6e37db1a5a4ad9ea4134eda9388817092031ebe0aa7cec9e1c1b69057ac
+  metadata.gz: 941e271032c6b25868959e769dd4980df733a28134c0f1c4902c754fb1dd25f4
+  data.tar.gz: c733db1084a81605ee74005ac528b2d8b3f2fbb9cb7cb92d0e215a8d7693ce7f
 SHA512:
-  metadata.gz: 33eca35212fcfc098812f2959c1390771bc2fb8453161b1b243cca5c59fdb30398a74ca01e285d4799d5978704012cedf581a3e22e62c226f8881804fac66d75
-  data.tar.gz: efcfb1116851ac81d5ec7659821f5f4547e8c93ab9e41e28bf8f9895e99bfd3be2e3a00f93cea238776bd3192b94cca6cbe5d759cbed74e52fbe23adfa81b062
+  metadata.gz: 929661a624be50d82bbf71720d141e33d25068a4d3683a79cd318148b656e1bf51b04924b97b3a3d7943c9d065d4eae9d7bd762b207d2be99ddeacb8fd2f9d10
+  data.tar.gz: '090372bf2550215301c871b0e042597797ff62cc2d8cbe7abe49bda2b13bd06c7517250bff3889a739c869843d638522a50507db1b3171c98713a1bd9201d806'

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec :development_group => :test
 
-gem 'mongoid', '~> 6.4.2'
+gem 'mongoid', '~> 7.0.5'
 
 # gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models.git', branch: 'master'
 # gem 'cqm-models', :path => '../cqm-models'

data/lib/measure-loader/elm_parser.rb

@@ -12,14 +12,17 @@ module Measures
       # extract library identifier data
       ret[:identifier][:id] = doc.css("identifier").attr("id").value
       ret[:identifier][:version] = doc.css("identifier").attr("version").value
-
-      # extracts the fields of type "annotation" and their children.
-      annotations = doc.css("annotation")
-      annotations.each do |node|
-        node, define_name = parse_node(node, localid_to_type_map)
-        unless define_name.nil?
-          node[:define_name] = define_name
-          ret[:statements] << node
+      # all the define statements including functions
+      definitions = doc.css("statements def")
+      definitions&.each do |definition|
+        annotation = definition.at("annotation")
+        if annotation
+          node = parse_node(annotation, localid_to_type_map)
+          define_name = definition.attr("name")
+          unless define_name.nil?
+            node[:define_name] = define_name
+            ret[:statements] << node
+          end
         end
       end
       ret
@@ -31,7 +34,6 @@ module Measures
       ret = {
         children: []
       }
-      define_name = nil
       node.children.each do |child|
         if child.is_a?(Nokogiri::XML::Text) # leaf node
           clause_text = child.content.gsub(/\t/, "  ")
@@ -40,19 +42,17 @@ module Measures
           }
           clause[:ref_id] = child['r'] unless child['r'].nil?
           ret[:children] << clause
-          define_name = clause_text.split("\"")[1] if clause_text.strip.starts_with?("define")
         else
           node_type = localid_to_type_map[child['r']] unless child['r'].nil?
           # Parses the current child recursively. child_define_name will bubble up to indicate which
           # statement is currently being traversed.
-          node, child_define_name = parse_node(child, localid_to_type_map)
+          node = parse_node(child, localid_to_type_map)
           node[:node_type] = node_type  unless node_type.nil?
           node[:ref_id] = child['r'] unless child['r'].nil?
           ret[:children] << node
-          define_name = child_define_name unless child_define_name.nil?
         end
       end
-      return ret, define_name
+      return ret
     end
 
     def self.generate_localid_to_type_map(doc)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cqm-parsers
 version: !ruby/object:Gem::Version
-  version: 4.0.0.0
+  version: 4.1.0.0
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cqm-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 7.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 7.0.5
 - !ruby/object:Gem::Dependency
   name: mongoid-tree
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
         version: 1.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
         version: 1.8.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A library for parsing HQMF documents.