oscal 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 562c827a391c4d86af9edb5cdf98ee1a61fb3a7d57374aa29a3a70609df09bb3
-  data.tar.gz: 2031cf36b122b094cb3532bff51534de756907327d7f3bb09456a9120a510607
+  metadata.gz: 48c506201a2d0400f0757c293c18f52a421de5d9bc4650d74ae38c7250328e8b
+  data.tar.gz: 5918daf1884cd7a483748c058f32f3c0520572a68b9a29167272f9d514503ae9
 SHA512:
-  metadata.gz: cbd11774c99f75b1e8b365488fb3fdd4969a7917de692cbf7546118b2a3102767af8b9ed9a140c2998a0d4cff9f282061eeea03da47371b864d67067307433c3
-  data.tar.gz: d7510b9543be93b734be45f0d4140d32413af2d8a5462339bac65db9de3ff9a98c3b696537af73a9f23c1f491e85b269e898008df07da5180b2036e52fdff48a
+  metadata.gz: dfe64417748c6305b5ac8b44f092eedaf2d853defd9f39efd5ed13b1a82a1c510099fb948cc9b1d5558256f27e8fc19c4285c4f22e1eea76464f0489136dfa92
+  data.tar.gz: 6966ed7ea89daad3d90ca0423bf7053126bb4546ee4e1aa1ccafb0c1ccc7e11391d4b3513ddcfc24a9396c2d6e06522b036d15bdcbbff24b9a09c8718b6b7890

data/lib/oscal/assembly.rb

@@ -1,6 +1,7 @@
 require_relative "parsing_functions"
 require_relative "logger"
 require_relative "metadata_block"
+require "json"
 
 module Oscal
   class MetadataBlockWrapper < Oscal::MetadataBlock
@@ -32,8 +33,8 @@ module Oscal
       end
     end
 
-    def to_json
-      to_h.to_json
+    def to_json(*args)
+      to_h.to_json(*args)
     end
 
     def to_h

data/lib/oscal/attribute_type_hash.rb

@@ -41,6 +41,7 @@ module Oscal
     parts: AssessmentResult::PartArray,
     party_uuids: AssessmentResult::PartyUuidArray,
     props: AssessmentResult::PropArray,
+    reason: TokenDataType,
     related_controls: AssessmentResult::RelatedControls,
     related_observations: AssessmentResult::RelatedObservationArray,
     related_risks: AssessmentResult::RelatedRiskArray,

data/lib/oscal/logger.rb

@@ -1,8 +1,12 @@
 module Oscal
   module ParsingLogger
     require "logger"
+    def self.logger=(value)
+      @@logger = value
+    end
+
     def get_logger
-      Logger.new($stdout)
+      @@logger ||= Logger.new($stdout)
     end
   end
 end

data/lib/oscal/serializer.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require "json"
 
 module Oscal
   module Serializer

data/lib/oscal/version.rb

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

data/spec/oscal/assessment_plan_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "../spec_helper"
+
+RSpec.describe Oscal::AssessmentPlan::AssessmentPlan do
+  let(:fields) do
+    {
+      uuid: "4d56d1ab-d91e-4f7a-9055-1883c4e580b8",
+      metadata: {},
+      import_ssp: { href: "./ssp.json" },
+      reviewed_controls: { control_selections: [] },
+    }
+  end
+  subject { described_class.new(fields) }
+
+  describe "#to_json" do
+    it "generates a json representation of the assessment plan" do
+      expect(subject.to_json).to eq(JSON.generate(fields))
+    end
+  end
+end

data/spec/oscal/catalog_spec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../spec_helper"
+
 RSpec.describe Oscal::Catalog do
   let(:subject) do
     Oscal::Catalog.load_from_yaml(

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oscal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -120,6 +120,7 @@ files:
 - lib/oscal/with_id.rb
 - oscal.gemspec
 - sig/oscal.rbs
+- spec/oscal/assessment_plan_spec.rb
 - spec/oscal/catalog_spec.rb
 - spec/oscal_spec.rb
 - spec/sample_inputs/import-ap.json
@@ -132,7 +133,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
@@ -147,8 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.3.27
+signing_key: 
 specification_version: 4
 summary: Interact with OSCAL models
 test_files: []