lutaml-model 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94d3957e15a5f50e2fc02c922f739acf71e99a592b97c4461c64b20cbc203bc5
-  data.tar.gz: 0daf15d9e99b94ecce154a95b86d8b24a11bc4ae89f7e21f44cd7d251ec11ab9
+  metadata.gz: 99e9857c1f8a86d0fb3566c6d9e5e11723e203e7f58bd7fcfd3c5a0cb1702b6c
+  data.tar.gz: 270002530a82256d2682a060a9616320b76f9592aeb74d17451d26d311a45508
 SHA512:
-  metadata.gz: a05e07d0948529796da6833032c9edae933a022734f9018fc459a4caf7e8ee6d475e325b002a58c4b5de764fecde077380ab528bc0a60f87eecef8919dfa16f4
-  data.tar.gz: f6116e02319e52a64e6ed0817655b456ca0be1933f66fea70dab1999fbd4a1c2a70b52cfc60f153d1b18d6778b23882598c76ca7a4af0b7e7eb5eca0e563040c
+  metadata.gz: f1d98496343787aad60a34ee00c7df537b9fcd4160209cdd920d8265afdc048e7a26dbc3567b30ed1a5f5eb8120684b81dc9bb04a8964fd4495be67ae339bf5e
+  data.tar.gz: d51b92c1bda980ac8f30890236329880db515eb11e20e73a647dc78cdba2de58fc869d58a5905a20681f4b946dff205968f9f1cf619bac10aa677157497f05ff

data/lib/lutaml/model/validation.rb

@@ -6,13 +6,14 @@ module Lutaml
         self.class.attributes.each do |name, attr|
           value = public_send(:"#{name}")
           begin
-            if value.respond_to?(:validate!)
-              value.validate!
+            if value.respond_to?(:validate)
+              errors.concat(value.validate)
             else
               attr.validate_value!(value)
             end
           rescue Lutaml::Model::InvalidValueError,
                  Lutaml::Model::CollectionCountOutOfRangeError,
+                 Lutaml::Model::CollectionTrueMissingError,
                  PatternNotMatchedError => e
             errors << e
           end

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

data/spec/lutaml/model/validation_spec.rb

@@ -12,6 +12,18 @@ RSpec.describe Lutaml::Model::Validation do
       attribute :tags, :string, collection: true
       attribute :role, :string, collection: 1..3
     end)
+
+    stub_const("ValidationTestMainClass", Class.new(Lutaml::Model::Serializable) do
+      attribute :test_class, ValidationTestClass
+
+      xml do
+        map_element "test_class", to: :test_class
+      end
+
+      key_value do
+        map "test_class", to: :test_class
+      end
+    end)
   end
 
   let(:valid_instance) do
@@ -24,15 +36,29 @@ RSpec.describe Lutaml::Model::Validation do
     )
   end
 
+  let(:valid_nested_instance) do
+    ValidationTestMainClass.new(
+      test_class: valid_instance,
+    )
+  end
+
   describe "#validate" do
     it "returns an empty array for a valid instance" do
       expect(valid_instance.validate).to be_empty
     end
 
-    xit "returns errors for invalid integer value" do
+    it "returns errors for invalid integer value" do
       instance = ValidationTestClass.new(age: "thirty", role: ["admin"])
       errors = instance.validate
-      expect(errors).to include("Invalid value for attribute age: thirty")
+      expect(errors).to eq([])
+      expect(instance.age).to be_nil
+    end
+
+    it "raises error if Array is set but collection is not set" do
+      instance = ValidationTestClass.new(name: ["admin"])
+      expect do
+        instance.validate
+      end.not_to raise_error(Lutaml::Model::CollectionTrueMissingError)
     end
 
     it "returns errors for value not in allowed set" do
@@ -55,17 +81,20 @@ RSpec.describe Lutaml::Model::Validation do
       end
     end
 
-    xit "returns multiple errors for multiple invalid attributes" do
+    it "returns multiple errors for multiple invalid attributes" do
       instance = ValidationTestClass.new(name: "123", age: "thirty",
                                          email: "invalid@example.com", role: [])
       expect do
         instance.validate!
       end.to raise_error(Lutaml::Model::ValidationError) do |error|
-        expect(error.error_messages.join("\n")).to include("Invalid value for attribute age: thirty")
         expect(error.error_messages.join("\n")).to include("email is `invalid@example.com`, must be one of the following [test@example.com, user@example.com]")
         expect(error.error_messages.join("\n")).to include("role count is 0, must be between 1 and 3")
       end
     end
+
+    it "returns an empty array for a valid nested instance" do
+      expect(valid_nested_instance.validate).to be_empty
+    end
   end
 
   describe "#validate!" do
@@ -73,13 +102,31 @@ RSpec.describe Lutaml::Model::Validation do
       expect { valid_instance.validate! }.not_to raise_error
     end
 
-    xit "raises a ValidationError with all error messages for an invalid instance" do
+    it "raises a ValidationError with all error messages for an invalid instance" do
       instance = ValidationTestClass.new(name: "test", age: "thirty")
       expect do
         instance.validate!
       end.to raise_error(Lutaml::Model::ValidationError) do |error|
         expect(error.error_messages.join("\n")).to include("role count is 0, must be between 1 and 3")
-        expect(error.error_messages.join("\n")).to include("Invalid value for attribute age: thirty")
+      end
+    end
+
+    it "validates nested ValidationTestClass instance" do
+      invalid_nested = ValidationTestMainClass.new(
+        test_class: ValidationTestClass.new(
+          name: "John Doe",
+          age: 30,
+          email: "invalid@example.com",
+          role: ["admin"],
+        ),
+      )
+
+      expect do
+        invalid_nested.validate!
+      end.to raise_error(Lutaml::Model::ValidationError) do |error|
+        expect(error.error_messages.join("\n")).to include(
+          "email is `invalid@example.com`, must be one of the following [test@example.com, user@example.com]",
+        )
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64