oscal 0.1.1 → 0.2.2

data/lib/oscal/set_parameter.rb

@@ -3,24 +3,25 @@ require_relative "base_class"
 module Oscal
   class SetParameter < Oscal::BaseClass
     KEY = %i(param_id klass depneds_on props links label usage
-      constraints guidelines values select)
+             constraints guidelines values select)
 
     attr_accessor *KEY
+
     attr_serializable *KEY
 
     def set_value(key_name, val)
       case key_name
-      when 'props'
+      when "props"
         Property.wrap(val)
-      when 'links'
+      when "links"
         Link.wrap(val)
-      when 'constraints'
+      when "constraints"
         Constraint.wrap(val)
-      when 'guidelines'
+      when "guidelines"
         Guideline.wrap(val)
-      when 'values'
+      when "values"
         Value.wrap(val)
-      when 'select'
+      when "select"
         Select.wrap(val)
       else
         val

data/lib/oscal/telephone_number.rb

@@ -5,6 +5,7 @@ module Oscal
     KEY = %i(type number)
 
     attr_accessor *KEY
+
     attr_serializable *KEY
   end
 end

data/lib/oscal/test.rb

@@ -5,6 +5,7 @@ module Oscal
     KEY = %i(expression remarks)
 
     attr_accessor *KEY
+
     attr_serializable *KEY
   end
 end

data/lib/oscal/url.rb

@@ -5,6 +5,7 @@ module Oscal
     KEY = %i(val)
 
     attr_accessor *KEY
+
     attr_serializable *KEY
   end
 end

data/lib/oscal/value.rb

@@ -6,6 +6,7 @@ module Oscal
 
     KEY = %i(val)
     attr_accessor *KEY
+
     attr_serializable *KEY
 
     def self.wrap(obj)
@@ -17,13 +18,13 @@ module Oscal
       end
     end
 
-    def initialize(options={})
+    def initialize(options = {})
       unless options.is_a? Hash
-        options = {'val' => options}
+        options = { "val" => options }
       end
 
-      options.each_pair.each do |key,val|
-        key_name = key.gsub('-','_')
+      options.each_pair.each do |key, val|
+        key_name = key.gsub("-", "_")
 
         unless KEY.include?(key_name.to_sym)
           raise UnknownAttributeError.new("Unknown key `#{key}` in Value")

data/lib/oscal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Oscal
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

data/lib/oscal/with_id.rb

@@ -7,6 +7,7 @@ module Oscal
     KEY = %i(val)
 
     attr_accessor *KEY
+
     attr_serializable *KEY
 
     def self.wrap(obj)
@@ -22,7 +23,7 @@ module Oscal
       klass = self.class
 
       unless options.is_a? Hash
-        options = {KEY.first.to_s => options}
+        options = { KEY.first.to_s => options }
       end
 
       options.each_pair.each do |key, val|

data/lib/oscal.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-Dir[File.join(__dir__, 'oscal', '*.rb')].each { |file| require file }
+Dir[File.join(__dir__, "oscal", "*.rb")].each { |file| require file }
 
 module Oscal
   class Error < StandardError; end

data/spec/oscal/catalog_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Oscal::Catalog do
 
   it "parses oscal-content YAML" do
     expect(subject.class).to be Oscal::Catalog
-    expect(subject.groups.first.groups.first.parts.first.prose).to eq(
+    expect(subject.groups.first.groups.first.controls.first.parts.first.prose).to eq(
       "To establish a management framework to initiate and " \
       "control the implementation and operation of information security " \
       "within the organization.",
@@ -22,14 +22,15 @@ RSpec.describe Oscal::Catalog do
   end
 
   it "find object by id" do
-    obj = subject.find_object_by_id('s2.1_smt')
+    obj = subject.find_object_by_id("s2.1_smt")
     expect(obj.to_s).to match(/Oscal::Part/)
     expect(obj.prose).to eq(
-      "To limit access to information and information processing facilities.")
+      "To limit access to information and information processing facilities.",
+    )
   end
 
   it "find object by uuid" do
-    uuid = '74c8ba1e-5cd4-4ad1-bbfd-d888e2f6c724'
+    uuid = "74c8ba1e-5cd4-4ad1-bbfd-d888e2f6c724"
     obj = subject.find_object_by_id(
       uuid, subject, :uuid
     )

data/spec/oscal_spec.rb

@@ -4,4 +4,15 @@ RSpec.describe Oscal do
   it "has a version number" do
     expect(Oscal::VERSION).not_to be nil
   end
+
+  it "allows setting a new logger" do
+    logger = double(Logger)
+    Oscal::ParsingLogger.logger = logger
+
+    class LoggerTest
+      include Oscal::ParsingLogger
+    end
+
+    expect(LoggerTest.new.get_logger).to eq logger
+  end
 end

data/spec/sample_inputs/import-ap.json

@@ -0,0 +1,4 @@
+{
+    "href": "../3-implementation/ssp.oscal.xml",
+    "remarks": "These are valid remarks."
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oscal
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-14 00:00:00.000000000 Z
+date: 2024-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -32,6 +32,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".docker/Dockerfile"
+- ".docker/Makefile"
+- ".docker/docker-compose.yml"
+- ".docker/readme.md"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
@@ -39,18 +43,27 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- LICENSE
+- Makefile
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
+- docker-compose.yml
 - exe/convert2oscalyaml.rb
 - lib/oscal.rb
 - lib/oscal/add.rb
 - lib/oscal/address.rb
 - lib/oscal/address_line.rb
 - lib/oscal/alter.rb
+- lib/oscal/assembly.rb
+- lib/oscal/assessment_plan.rb
+- lib/oscal/assessment_result.rb
+- lib/oscal/attribute_type_hash.rb
 - lib/oscal/back_matter.rb
 - lib/oscal/base64_object.rb
 - lib/oscal/base_class.rb
@@ -62,6 +75,7 @@ files:
 - lib/oscal/constraint.rb
 - lib/oscal/control.rb
 - lib/oscal/custom.rb
+- lib/oscal/datatypes.rb
 - lib/oscal/document_id.rb
 - lib/oscal/email_address.rb
 - lib/oscal/exclude_control.rb
@@ -73,14 +87,17 @@ files:
 - lib/oscal/include_control.rb
 - lib/oscal/insert_control.rb
 - lib/oscal/link.rb
+- lib/oscal/list.rb
 - lib/oscal/location.rb
 - lib/oscal/location_uuid.rb
+- lib/oscal/logger.rb
 - lib/oscal/matching.rb
 - lib/oscal/member_of_organization.rb
 - lib/oscal/merge.rb
 - lib/oscal/metadata_block.rb
 - lib/oscal/modify.rb
 - lib/oscal/parameter.rb
+- lib/oscal/parsing_functions.rb
 - lib/oscal/part.rb
 - lib/oscal/party.rb
 - lib/oscal/party_uuid.rb
@@ -105,6 +122,7 @@ files:
 - sig/oscal.rbs
 - spec/oscal/catalog_spec.rb
 - spec/oscal_spec.rb
+- spec/sample_inputs/import-ap.json
 - spec/spec_helper.rb
 homepage: https://github.com/metanorma/oscal-ruby/
 licenses:
@@ -114,7 +132,7 @@ metadata:
   source_code_uri: https://github.com/metanorma/oscal-ruby/
   changelog_uri: https://github.com/metanorma/oscal-ruby/CHANGELOG
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -129,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Interact with OSCAL models
 test_files: []