openscap_parser 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e421ccf596a13137a881d3e122bf990e01daeb8c22318bb4c09283264b0a5c11
-  data.tar.gz: 5fedddd4b213a41902e7db014ea168090ab421ad507370bc3450277cabfe9356
+  metadata.gz: 6f10f20d16fca6f3b16000545209fcaac88b09f90543bc7e2d820aad743e74d3
+  data.tar.gz: 731820564df8192f546ab0b08b106a90288603c97801bbfbecd043b410223825
 SHA512:
-  metadata.gz: 7a3ea53ee21055986e306269fe3793b574c5cf01e4f2ebd4e46b5c446b274fc791eecb16117962be2a9d0d86ddfdf35ebc9908abc1befee10381fc396d136f04
-  data.tar.gz: 4d5ddbc06cc09a596a19157cc03cb13bbe1848f8d2725a11cf65f3d54ce0517e3c137944fb9dd2cef962aab5a76c731a29a59e075ee223a32f6a2c52dac1fb9b
+  metadata.gz: b9b787207f533bc039f38df9d6235e49aa22661c9f395f4f4802f8ae44e4cd9a461d3af76cf60af95b0163b268c835e163748ced0ade199619d29f718e6a78f3
+  data.tar.gz: b9806ee3729be9b7a8bcdaa06e7db80bb39a63e92922cc312fac3814f98a60e1c9599fe29e9590d45a55a0d5d0836e20d62009d3945c1727457e6b87c57a4bd3

data/lib/openscap_parser/benchmark.rb

@@ -6,7 +6,7 @@ require 'openscap_parser/rules'
 require 'openscap_parser/profiles'
 require 'openscap_parser/rule_references'
 require 'openscap_parser/groups'
-require 'openscap_parser/value_definitions'
+require 'openscap_parser/values'
 
 # Mimics openscap-ruby Benchmark interface
 module OpenscapParser
@@ -16,7 +16,7 @@ module OpenscapParser
     include OpenscapParser::RuleReferences
     include OpenscapParser::Profiles
     include OpenscapParser::Groups
-    include OpenscapParser::ValueDefinitions
+    include OpenscapParser::Values
 
     def id
       @id ||= @parsed_xml['id']

data/lib/openscap_parser/profile.rb

@@ -46,8 +46,19 @@ module OpenscapParser
         @parsed_xml.xpath("select[@selected='true']/@idref").map(&:text)
     end
 
+    def refined_values
+      @refined_values ||= @parsed_xml.xpath("refine-value").each_with_object({}) do |element, rv|
+        rv[element.at_xpath('@idref').text] = element.at_xpath('@selector').text
+      end
+    end
+
     def to_h
-      { :id => id, :title => title, :description => description }
+      {
+        :id => id,
+        :title => title,
+        :description => description,
+        :refined_values => refined_values
+      }
     end
   end
 end

data/lib/openscap_parser/rule.rb

@@ -63,7 +63,7 @@ module OpenscapParser
     end
 
     def rule_identifier
-      @identifier ||= RuleIdentifier.new(parsed_xml: identifier_node)
+      @identifier ||= identifier_node && RuleIdentifier.new(parsed_xml: identifier_node)
     end
     alias :identifier :rule_identifier
 

data/lib/openscap_parser/value.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+module OpenscapParser
+  class Value < XmlNode
+    include OpenscapParser::Util
+
+    def id
+      @id ||= parsed_xml['id']
+    end
+
+    def description
+      @description ||= newline_to_whitespace(parsed_xml.at_css('description')&.text)
+    end
+
+    def title
+      @title ||= parsed_xml.at_css('title')&.text
+    end
+
+    def type
+      @type ||= parsed_xml['type'] || 'string'
+    end
+
+    def generic_selector(type, selector = nil)
+      cache = instance_variable_get("@#{type}")
+
+      unless cache
+        element_name = type.to_s.sub('_', '-')
+        cache = parsed_xml.xpath(element_name).each_with_object({}) do |element, elements|
+          elements[element.at_xpath('@selector')&.text.presence] = element&.text
+        end
+        instance_variable_set("@#{type}", cache)
+      end
+
+      return cache[selector] if selector
+
+      cache[nil] || cache.values.first
+    end
+
+    def upper_bound(selector = nil)
+      generic_selector(:upper_bound, selector)
+    end
+
+    def lower_bound(selector = nil)
+      generic_selector(:lower_bound, selector)
+    end
+
+    def value(selector = nil)
+      generic_selector(:value, selector)
+    end
+
+    def to_h
+      {
+        :id => id,
+        :title => title,
+        :description => description,
+        :type => type,
+        :lower_bound => lower_bound,
+        :upper_bound => upper_bound
+      }
+    end
+  end
+end

data/lib/openscap_parser/values.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'openscap_parser/value'
+
+module OpenscapParser
+  # Methods related to parsing values
+  module Values
+    def self.included(base)
+      base.class_eval do
+        def values
+          @values ||= value_nodes.map do |vdn|
+            Value.new(parsed_xml: vdn)
+          end
+        end
+
+        def value_nodes(xpath = ".//Value")
+          xpath_nodes(xpath)
+        end
+      end
+    end
+  end
+end

data/lib/openscap_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenscapParser
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

data/lib/openscap_parser.rb

@@ -7,7 +7,7 @@ require 'openscap_parser/test_results'
 require 'openscap_parser/profiles'
 require 'openscap_parser/rules'
 require 'openscap_parser/groups'
-require 'openscap_parser/value_definitions'
+require 'openscap_parser/values'
 require 'openscap_parser/rule_results'
 require 'openscap_parser/tailorings'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openscap_parser
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -176,8 +176,8 @@ files:
 - lib/openscap_parser/test_result_file.rb
 - lib/openscap_parser/test_results.rb
 - lib/openscap_parser/util.rb
-- lib/openscap_parser/value_definition.rb
-- lib/openscap_parser/value_definitions.rb
+- lib/openscap_parser/value.rb
+- lib/openscap_parser/values.rb
 - lib/openscap_parser/version.rb
 - lib/openscap_parser/xml_file.rb
 - lib/openscap_parser/xml_node.rb

data/lib/openscap_parser/value_definition.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-module OpenscapParser
-  class ValueDefinition < XmlNode
-    include OpenscapParser::Util
-
-    def id
-      @id ||= parsed_xml['id']
-    end
-
-    def description
-      @description ||= newline_to_whitespace(parsed_xml.at_css('description')&.text)
-    end
-
-    def title
-      @title ||= parsed_xml.at_css('title')&.text
-    end
-
-    def type
-      @type ||= parsed_xml['type'] || 'string'
-    end
-
-    def lower_bound
-      @lower_bound ||= begin
-        lower_bound_element = parsed_xml.at_xpath("lower-bound[@selector='']") || parsed_xml.at_xpath('lower-bound[not(@selector)]')
-        lower_bound_element&.text
-      end
-    end
-
-    def upper_bound
-      @upper_bound ||= begin
-        upper_bound_element = parsed_xml.at_xpath("upper-bound[@selector='']") || parsed_xml.at_xpath('upper-bound[not(@selector)]')
-        upper_bound_element&.text
-      end
-    end
-
-    def default_value
-      # The default value is the value element with a empty or absent @selector
-      # If there is no value element with an empty or absent @selector, the first value in
-      # the top down processing shall be the default element
-      @default_value ||= begin
-        value_element = parsed_xml.at_xpath("value[@selector='']") || parsed_xml.at_xpath('value[not(@selector)]') || parsed_xml.xpath("value")[0]
-        value_element&.text
-      end
-    end
-
-    def to_h
-      {
-        :id => id,
-        :title => title,
-        :description => description,
-        :type => type,
-        :lower_bound => lower_bound,
-        :upper_bound => upper_bound,
-        :default_value => default_value
-      }
-    end
-  end
-end

data/lib/openscap_parser/value_definitions.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'openscap_parser/value_definition'
-
-module OpenscapParser
-  # Methods related to parsing values
-  module ValueDefinitions
-    def self.included(base)
-      base.class_eval do
-        def value_definitions
-          @value_definitions ||= value_definition_nodes.map do |vdn|
-            ValueDefinition.new(parsed_xml: vdn)
-          end
-        end
-
-        def value_definition_nodes(xpath = ".//Value")
-          xpath_nodes(xpath)
-        end
-      end
-    end
-  end
-end