json_model_rb 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452a7c1ae9d8d3c1df881d768520e439d92dce607b3e4fa609b8cafdce702b70
-  data.tar.gz: eba5d91dfd64620a0d64fd82e610837644d8e019fb3d7e4978eed050ea009487
+  metadata.gz: e4f530abe8264be24ec3b62c627bbab78fe3d25ace6bbd03a9360d7bbac688f2
+  data.tar.gz: e1997308062e1cd0b3af670b381bd461324f0c29e49457534cd1196048f57c47
 SHA512:
-  metadata.gz: e9f23593b4a6d8647d0854be6c50e2e62ea5929571273bbe5229cf1f67f069d38638bd8cd2acc066fb69c513e48da929eed72782ba195bfd3d39f592391e9471
-  data.tar.gz: 777dd3fe984c380aabddd1d199e69bbaeafc94a5ebca9e6bf6a889138095133c8bb0ae002efcc944b733123a103b6adf06ab9e82b06d1654c86c9b23d137f2e6
+  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

@@ -38,7 +38,7 @@ module JsonModel
       # @param [::Object] json
       # @return [::Object, nil]
       def from_json(json)
-        attributes = json.transform_keys { |key| aliased_properties[key]&.name || raise_unknown_attribute_error(key) }
+        attributes = json.transform_keys { |key| invert_alias(key) || raise_unknown_attribute_error(key) }
         new(attributes)
       end
 

data/lib/json_model/version.rb

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

data/spec/schema_spec.rb

@@ -64,16 +64,29 @@ RSpec.describe(JsonModel::Schema) do
   end
 
   describe('.from_json') do
-    let(:klass) do
-      Class.new do
-        include(JsonModel::Schema)
+    before do
+      stub_const(
+        'Foo',
+        Class.new do
+          include(JsonModel::Schema)
 
-        property(:foo_bar, type: String, as: :fooBar)
-      end
+          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('can be instantiated from json') do
-      instance = klass.from_json({ fooBar: 'baz' })
+    it('child can be instantiated from json') do
+      instance = Bar.from_json({ fooBar: 'baz' })
       expect(instance.foo_bar).to(eq('baz'))
     end
   end

metadata

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