json_model_rb 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8abfd3efdffc114b9968dc02c151d4f79cd49bb87aff04553641c284814f12
-  data.tar.gz: 34ccde981e5e99ff2df38e89bb25a240c4036782dc00b6af930121884894d813
+  metadata.gz: e4f530abe8264be24ec3b62c627bbab78fe3d25ace6bbd03a9360d7bbac688f2
+  data.tar.gz: e1997308062e1cd0b3af670b381bd461324f0c29e49457534cd1196048f57c47
 SHA512:
-  metadata.gz: 9918e40ee08f267dcef942ea23ef74c8f2006325b83c845f966212d946de25f41f7d8c5bdace36ced950ba624c24c9eaf94e16701b8b51b50858a3eed94ca705
-  data.tar.gz: b9624a3dc52e2a1b902629233b11953393052f9242a9da5182361932a4eda86665e337f433bb1ec2f804e32c58e6d5a83779a9193a8d6b8beed3ad034b5f8823
+  metadata.gz: aa7626727be77b8da34aa0775f2c8ba3f1f2e636dfca50b83224e51c92e7d78c70079a2732fb0ee17ded82f295d1d2f0654e274b94ceff224b55c36aa99bff88
+  data.tar.gz: 8bcd5c1fee253effded868ff5466f00969eebd6e50ae6c5ace3dce2bb5befc6ea6be3730bfd3ca9806bf5380267591df23dc679d97bb2751f227a9ef819669bc

data/lib/json_model/properties.rb

@@ -25,6 +25,13 @@ module JsonModel
         @aliased_properties ||= {}
       end
 
+      # @param [Symbol] name
+      # @return [Symbol, nil]
+      def invert_alias(name)
+        aliased_properties[name]&.name || superclass&.invert_alias(name)
+      rescue NoMethodError
+      end
+
       # @param [Symbol] name
       # @param [Object, Class] type
       # @param [Hash] options

data/lib/json_model/schema.rb

@@ -29,8 +29,8 @@ module JsonModel
     def assign_attribute(name, value)
       if respond_to?("#{name}=")
         send("#{name}=", value)
-      elsif !self.class.additional_properties && JsonModel.config.validate_after_instantiation
-        raise(Errors::UnknownAttributeError.new(self.class, name))
+      else
+        self.class.raise_unknown_attribute_error(name)
       end
     end
 
@@ -38,10 +38,17 @@ module JsonModel
       # @param [::Object] json
       # @return [::Object, nil]
       def from_json(json)
-        attributes = json.transform_keys { |key| aliased_properties[key]&.name || key }
+        attributes = json.transform_keys { |key| invert_alias(key) || raise_unknown_attribute_error(key) }
         new(attributes)
       end
 
+      # @param [Symbol] name
+      def raise_unknown_attribute_error(name)
+        if !additional_properties && JsonModel.config.validate_after_instantiation
+          raise(Errors::UnknownAttributeError.new(self, name))
+        end
+      end
+
       # @param [Symbol] ref_mode
       # @param [Hash] _options
       # @return [Hash]

data/lib/json_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonModel
-  VERSION = '0.1.11'
+  VERSION = '0.1.13'
 end

data/spec/schema_spec.rb

@@ -63,6 +63,34 @@ RSpec.describe(JsonModel::Schema) do
     end
   end
 
+  describe('.from_json') do
+    before do
+      stub_const(
+        'Foo',
+        Class.new do
+          include(JsonModel::Schema)
+
+          property(:foo_bar, type: String, as: :fooBar)
+        end,
+      )
+
+      stub_const(
+        'Bar',
+        Class.new(Foo) {},
+      )
+    end
+
+    it('parent can be instantiated from json') do
+      instance = Foo.from_json({ fooBar: 'baz' })
+      expect(instance.foo_bar).to(eq('baz'))
+    end
+
+    it('child can be instantiated from json') do
+      instance = Bar.from_json({ fooBar: 'baz' })
+      expect(instance.foo_bar).to(eq('baz'))
+    end
+  end
+
   describe('.as_schema') do
     let(:klass) do
       Class.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Paul Gillesberger