json_model_rb 0.1.24 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de086a259003cabd719e1d136f8849943f7ddbe03dc159e8b222a9fad906e16
-  data.tar.gz: f56d53d6c70c97545a12a7dab8426a0a19afb1a26c53508a1f029def5ff5bf94
+  metadata.gz: ccad36b0642e02de1ad6bc289113f5191c6e4182660a94c89b874d7717384cdd
+  data.tar.gz: 18a055eae6f73a38744cab3c5b1f925e032d9ef56e7f01139733dc3c29ddd967
 SHA512:
-  metadata.gz: d1eb31d9a5459f2fc18a9b066712c7eec233da44c34b4f7370fb801c5dd8995ff8387e312acd5d66e63b7b8a48c233760b8ad99d94a277a9d794cbdc10065170
-  data.tar.gz: 894d35b00daef15e54c823f0889d940746df5bff569042d25e9c070973c2b6d59804058b7515da2752db3d57ef364cb1ca0d2a15022b1ed6e2ed291b8607b45f
+  metadata.gz: 407a9b05cd4e25ca67a77a2fb74a0b0731e9487e690d47e2325afa9c1b42cb9abe5b73cc19a62c06152595ac9986f3607a827763b0f64e7221d5eac2f552d5d3
+  data.tar.gz: 5e61b492ece84552330e02d495b11447a6c804f42ba75938a30a3c3f83b5056c6c2011c809b05bba13d2627dec8ca889caa5a1df729ef3977dc67a1679ba040a

data/lib/json_model/schema.rb

@@ -9,11 +9,10 @@ module JsonModel
     include(SchemaMeta)
 
     class_methods do
-      # @param [::Object] json
+      # @param [Hash] attributes
       # @return [::Object, nil]
-      def from_json(json)
-        attributes = json.transform_keys { |key| invert_alias(key) }
-        new(attributes)
+      def new(attributes = {})
+        super(attributes.transform_keys { |key| invert_alias(key) })
       end
 
       # @param [Symbol] key
@@ -76,10 +75,10 @@ module JsonModel
 
       # @return [Array<Builder>]
       def builders
-        @builders ||= @local_builders + @schema
-                                          .type
-                                          .select { |type| parent_keys.include?(type) }
-                                          .map { |type| Builder.for(type) }
+        @builders ||= local_builders + @schema
+                                         .type
+                                         .select { |type| parent_keys.include?(type) }
+                                         .map { |type| Builder.for(type) }
       end
 
       # @return [Array<Class>]

data/lib/json_model/version.rb

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

data/spec/examples/file_system_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe('File system schema') do
         end
 
         attribute(:type, JsonModel::Types::String.constrained(eql: 'disk'))
-        attribute(:device, JsonModel::Types::String.constrained(format: %r{\A/dev/[^/]+(/[^/]+)*\z}))
+        attribute(:device, JsonModel::Types::String.constrained(format: %r{\A/dev/[^/]+(/[^/]+)*\z}).as(:Device))
       end,
     )
 
@@ -138,12 +138,12 @@ RSpec.describe('File system schema') do
                     const: 'disk',
                     type: 'string',
                   },
-                  device: {
+                  Device: {
                     type: 'string',
                     pattern: '\\A/dev/[^/]+(/[^/]+)*\\z',
                   },
                 },
-                required: %i(device type),
+                required: %i(Device type),
                 type: 'object',
               },
               DiskUuid: {
@@ -194,7 +194,7 @@ RSpec.describe('File system schema') do
 
   it('can instantiate a model') do
     instance = Fstab.new(
-      storage: { device: '/dev/sda1', type: 'disk' },
+      storage: { Device: '/dev/sda1', type: 'disk' },
       fstype: 'ext4',
       options: %w(rw noatime),
     )
@@ -205,4 +205,4 @@ RSpec.describe('File system schema') do
     expect(instance.options).to(eq(%w(rw noatime)))
     expect(instance.readonly).to(be_nil)
   end
-end
+end

data/spec/schema_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe(JsonModel::Schema) do
     end
   end
 
-  describe('.from_json') do
+  describe('.new') do
     before do
       stub_const(
         'Foo',
@@ -57,12 +57,12 @@ RSpec.describe(JsonModel::Schema) do
     end
 
     it('parent can be instantiated from json') do
-      instance = Foo.from_json({ fooBar: 'baz' })
+      instance = Foo.new({ fooBar: 'baz' })
       expect(instance.foo_bar).to(eq('baz'))
     end
 
     it('child can be instantiated from json') do
-      instance = Bar.from_json({ fooBar: 'baz' })
+      instance = Bar.new({ 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.24
+  version: 0.1.26
 platform: ruby
 authors:
 - Paul Gillesberger