lutaml-model 0.8.115 → 0.8.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b924b08953808c53f7f6db9f9832ffa870b11a5d2c7fe450b1340d8b2f289562
-  data.tar.gz: 3ba1f1afe7b2a95e83f137f8d3944e56e0ba516962b261665c4c3b91de74824f
+  metadata.gz: bd6d747592ab333f3edefaf4af21e7db87189a39c541bd7c70dda87b544615d8
+  data.tar.gz: 2380f18d9b82122602c3afc60695dd2077c2cc125375032673f90721d152fa53
 SHA512:
-  metadata.gz: 2d956aca0be2bdbae7e513391962490429057f04ca4371be1477d4bbc29e79f8ad942beffbb40debf27db64f7be7e7c301110832439a3ece8eb4ece5e6c673d9
-  data.tar.gz: 7a384e7b06e927f9b78a129914de369c2befa23b14e84c6a9c2ba24e769c145dd0b0814fa3f92483516132020ced34c885c71872c251d41a8bdc6dff995b41db
+  metadata.gz: d15bea65d1270d4eda9e07bbac48cee6232da11aab2df7bcbd51e74ab1ec8d9ecf2eb217b1b9d302cfdf128a2b51b610bd1062e7bfea1a81a65f68d16f952c43
+  data.tar.gz: 976d507e33e4a79de59b767215279bee14aaba443a05bfb8c84918190e236faa19d4383af9a0b3b20c3743dbd95e47404967b37a0611619738bd9fe4667af6bb

data/lib/lutaml/model/attribute.rb

@@ -977,6 +977,24 @@ instance_object = nil)
         end
 
         klass = resolve_polymorphic_class(resolved_type, value, options)
+        # A scalar handed to a mapped-model attribute crashed
+        # apply_mappings with an internal NoMethodError (key? on
+        # String, #978). A type declaring its own .cast owns scalar
+        # construction; base-cast identity types fall through to the
+        # legacy conversion chain, whose parse error names the token.
+        if serializable_type?(register) && !value.nil? &&
+            !value.is_a?(::Hash) && !value.is_a?(::Array) &&
+            !value.respond_to?(:key?) && klass.respond_to?(:cast) &&
+            klass.method(:cast).owner == klass.singleton_class
+          casted = klass.cast(value)
+          return casted if casted.is_a?(klass)
+
+          raise Lutaml::Model::IncorrectModelError,
+                "attribute '#{name}': the #{format} input for type " \
+                "#{klass} is a #{value.class}, and #{klass}.cast did " \
+                "not build one (received #{casted.class})"
+        end
+
         if can_serialize?(klass, value, format, options)
           propagated = Serialize::DeserializationContext.propagate(options)
           klass.apply_mappings(value, format,

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.8.115"
+    VERSION = "0.8.116"
   end
 end

data/spec/lutaml/model/from_json_scalar_cast_spec.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# #978: a JSON scalar handed to a mapped-model attribute crashed with
+# an internal NoMethodError (key? on String) wrapped as
+# InvalidFormatError. A type that declares its own .cast owns scalar
+# construction from that scalar; a cast-less type falls through to the
+# legacy conversion chain, whose parse error surfaces the offending
+# token — the remedy there is declaring .cast on the type.
+RSpec.describe "from_json scalar into a mapped-model attribute" do
+  let(:marked_class) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :content, :string
+
+      key_value do
+        map "content", to: :content
+      end
+
+      def self.cast(value)
+        return value if value.is_a?(self)
+
+        new(content: value.to_s)
+      end
+    end
+  end
+
+  let(:plain_class) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :content, :string
+
+      key_value do
+        map "content", to: :content
+      end
+    end
+  end
+
+  let(:holder_class) do
+    Class.new(Lutaml::Model::Serializable) do
+      attribute :description, "ScalarMarked"
+      attribute :plain_desc, "ScalarPlain"
+
+      key_value do
+        map "description", to: :description
+        map "plain_desc", to: :plain_desc
+      end
+    end
+  end
+
+  before do
+    stub_const("ScalarMarked", marked_class)
+    stub_const("ScalarPlain", plain_class)
+    stub_const("ScalarHolder", holder_class)
+  end
+
+  it "constructs the mapped value through the type's .cast" do
+    model = ScalarHolder.from_json('{"description": "text"}')
+
+    expect(model.description).to be_a(ScalarMarked)
+    expect(model.description.content).to eq("text")
+  end
+
+  it "falls through to the format parse error for a cast-less mapped type" do
+    expect { ScalarHolder.from_json('{"plain_desc": "text"}') }
+      .to raise_error(
+        Lutaml::Model::InvalidFormatError,
+        /unexpected token 'text'/,
+      )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.8.115
+  version: 0.8.116
 platform: ruby
 authors:
 - Ribose Inc.
@@ -1750,6 +1750,7 @@ files:
 - spec/lutaml/model/enum_spec.rb
 - spec/lutaml/model/except_spec.rb
 - spec/lutaml/model/finalization_cache_spec.rb
+- spec/lutaml/model/from_json_scalar_cast_spec.rb
 - spec/lutaml/model/generator_defaults_spec.rb
 - spec/lutaml/model/global_context_spec.rb
 - spec/lutaml/model/global_register_spec.rb