openscap_parser 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9728a34c5047c3762befe37699a1413d1bc2329ba158b311a2a1342bafe210
-  data.tar.gz: e2725fba41bbeed647628b092dfe689979f824eece673c3fb87e65c50bbeaed4
+  metadata.gz: 7726cf3e8cf53af20cb73fbddef5c95e92ca2a748e0da3a229a015918b382d34
+  data.tar.gz: f9ebf783cce54e930970ea94da5819dc50e638ec3cc91ae3c38d5e2deb705f24
 SHA512:
-  metadata.gz: 1112c1537e58816bc6a25f7a89830fc24dec94bd4bca3897fb342ef13f4f5ee8a34a664065ad7608d2a79459dbf518f912200ad1ffcae6760c0f77b1822c6f9f
-  data.tar.gz: e29e00ced02ba2a339461f75496c41d2395e5259b73adc7072ee9c99d6e2177b9709a858f3b57690a29239df60296e23a022a9dbdae58a354dda0df5d482c655
+  metadata.gz: 05e6983a1a1ce75fc9fa216a078df30be423ab56e81e863eba5ce0cab837f8e0a4de23550981dc61162d0bba9113e6b065c83103cff76714b418d3d2941083b2
+  data.tar.gz: 6a0340c5bd19e82b3aee053d19ebccf3a0fdb0bc0287d32145ce5380417adabbaf03b85d2702a9b7830d286a3ca6af21f32d353a4265e7a807f4209428c5c184

data/lib/openscap_parser/benchmark.rb

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

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
 
@@ -83,6 +83,10 @@ module OpenscapParser
       end
     end
 
+    def values
+      parsed_xml.xpath("check/check-export").map { |r| r.at_xpath('@value-id')&.text }
+    end
+
     def to_h
       {
         :id => id,
@@ -95,7 +99,8 @@ module OpenscapParser
         :rationale => rationale,
         :identifier => rule_identifier.to_h,
         :parent_id => parent_id,
-        :parent_type => parent_type
+        :parent_type => parent_type,
+        :values => values
       }
     end
   end

data/lib/openscap_parser/value_definition.rb

@@ -0,0 +1,58 @@
+# 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

@@ -0,0 +1,22 @@
+# 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

data/lib/openscap_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenscapParser
-  VERSION = "1.4.0"
+  VERSION = "1.5.1"
 end

data/lib/openscap_parser.rb

@@ -7,6 +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/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.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -176,6 +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/version.rb
 - lib/openscap_parser/xml_file.rb
 - lib/openscap_parser/xml_node.rb