json_model_rb 0.1.25 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 202713bac15f3fec6d5d7c2184c90dc3e172f799f5247abc74d779e2abeeb7be
-  data.tar.gz: 42637da8ac8cddb794c4b01d32dd637d4cc3bcf588de3c998eab2a0fb3b00bfb
+  metadata.gz: 11869cede7f9f8edc41ceb1d17d356dc1d9c795c081c6a0bb8dee482bbc87fce
+  data.tar.gz: 95ac80eceb616c34d6c6f6ed98e9a935c342f72f3cb984705f98cf524df58269
 SHA512:
-  metadata.gz: c49fb5f21ab077a5eb59ba6f39b513b2c0a7c268a93f67ab42d2f8678861d3b2004c42e7fb5188e964d03a9a4ae696e3ea5ce226d028f39388ed2dea27c25fbf
-  data.tar.gz: 27872f01fe8acf898883f07e1ee503af9e7d7614f40ebd9cba47b8d21a6f9603e29746d56d369f21a9d3efc6293348b48ca3065604f38eeb97753ced5a1b33f9
+  metadata.gz: 8d0cb3237a4164526778bc0bb6939c0bf5b041d90fb384a39c9e35059482f36ac63f64a42ff80231618cd2f1a8328d7cf88294d41dd25802eff1f427d0637698
+  data.tar.gz: 6b2e5112a96921d4764a95cf9b272fe5c6b97ab038d754e4a94949d814874010156986527e6d2e5325a218409cf65d473d8150763478f6bdda5045eae76a583d

data/lib/json_model/schema.rb

@@ -9,11 +9,16 @@ module JsonModel
     include(SchemaMeta)
 
     class_methods do
-      # @param [::Object] json
+      # @param [Hash] attributes
+      # @param [FalseClass, TrueClass] safe
+      # @param [Proc] block
       # @return [::Object, nil]
-      def from_json(json)
-        attributes = json.transform_keys { |key| invert_alias(key) }
-        new(attributes)
+      def new(attributes = default_attributes, safe = false, &block)
+        super(
+          attributes.transform_keys { |key| invert_alias(key) },
+          safe,
+          &block
+        )
       end
 
       # @param [Symbol] key

data/lib/json_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonModel
-  VERSION = '0.1.25'
+  VERSION = '0.1.27'
 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.25
+  version: 0.1.27
 platform: ruby
 authors:
 - Paul Gillesberger