json_model_rb 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c30126ff23f7ec073ef981be5682bb6db7976e4d3f7fde6e5ad5c26b3fc7d8
-  data.tar.gz: 88e4abe3490277fc63c1f3b4d612dc398cb68e982c1038d00cf75fce7bff2759
+  metadata.gz: 5c8abfd3efdffc114b9968dc02c151d4f79cd49bb87aff04553641c284814f12
+  data.tar.gz: 34ccde981e5e99ff2df38e89bb25a240c4036782dc00b6af930121884894d813
 SHA512:
-  metadata.gz: 782eebf325932cd06bccf71c410e5a820868bf07989372da9b6329b8e3e2eaab68fea6c16e4d2234279d57cee3c831871c786507618914683b30ce57aec0bf37
-  data.tar.gz: 235dce29d095bab73e393c39b6912ffb1de547a52de845a4a3c309a14b7584baa816d5f71584a4ead8a1c2b64f5210956541e747ef059774a5c721c34647bcc1
+  metadata.gz: 9918e40ee08f267dcef942ea23ef74c8f2006325b83c845f966212d946de25f41f7d8c5bdace36ced950ba624c24c9eaf94e16701b8b51b50858a3eed94ca705
+  data.tar.gz: b9624a3dc52e2a1b902629233b11953393052f9242a9da5182361932a4eda86665e337f433bb1ec2f804e32c58e6d5a83779a9193a8d6b8beed3ad034b5f8823

data/README.md

@@ -1,6 +1,6 @@
 # JSON Model
 
-[![Gem Version](https://badge.fury.io/rb/json_model.svg)](https://badge.fury.io/rb/json_model)
+[![Gem Version](https://badge.fury.io/rb/json_model_rb.svg)](https://badge.fury.io/rb/json_model_rb)
 [![Ruby](https://github.com/gillesbergerp/json_model_rb/actions/workflows/ci.yml/badge.svg)](https://github.com/gillesbergerp/json_model_rb/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 

data/lib/json_model/properties.rb

@@ -20,6 +20,11 @@ module JsonModel
         @properties ||= {}
       end
 
+      # @return [Hash]
+      def aliased_properties
+        @aliased_properties ||= {}
+      end
+
       # @param [Symbol] name
       # @param [Object, Class] type
       # @param [Hash] options
@@ -38,6 +43,7 @@ module JsonModel
       def add_property(name, type:, **options)
         property = Property.new(name, type: type, **options)
         properties[name] = property
+        aliased_properties[property.alias] = property
         define_accessors(property)
         define_validations(property)
       end

data/lib/json_model/schema.rb

@@ -35,6 +35,13 @@ module JsonModel
     end
 
     class_methods do
+      # @param [::Object] json
+      # @return [::Object, nil]
+      def from_json(json)
+        attributes = json.transform_keys { |key| aliased_properties[key]&.name || key }
+        new(attributes)
+      end
+
       # @param [Symbol] ref_mode
       # @param [Hash] _options
       # @return [Hash]

data/lib/json_model/type_spec/const.rb

@@ -26,7 +26,7 @@ module JsonModel
       def register_validations(name, klass)
         super
 
-        klass.validates(name, inclusion: { in: @value })
+        klass.validates(name, inclusion: { in: @value }, allow_nil: true)
       end
     end
   end

data/lib/json_model/type_spec/enum.rb

@@ -26,7 +26,7 @@ module JsonModel
       def register_validations(name, klass)
         super
 
-        klass.validates(name, inclusion: { in: @values })
+        klass.validates(name, inclusion: { in: @values }, allow_nil: true)
       end
     end
   end

data/lib/json_model/type_spec/object.rb

@@ -23,7 +23,7 @@ module JsonModel
       # @param [::Object] json
       # @return [::Object, nil]
       def cast(json)
-        @type.new(**json)
+        @type.from_json(**json)
       end
     end
   end

data/lib/json_model/version.rb

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

data/spec/examples/component_spec.rb

@@ -4,41 +4,45 @@ require('spec_helper')
 
 RSpec.describe('User schema') do
   it('todo') do
-    base_component = stub_const(
+    stub_const(
       'BaseComponent',
       Class.new do
         include(JsonModel::Schema)
+
         property(:type, type: String)
         property(:styles, type: T::Array[String], optional: true)
-      end
+      end,
     )
-    text_component = stub_const(
+    stub_const(
       'TextComponent',
       Class.new(BaseComponent) do
         include(JsonModel::Schema)
+
         property(:type, type: T::Enum['text'])
         property(:value, type: String)
-      end
+      end,
     )
-    number_component = stub_const(
+    stub_const(
       'NumberComponent',
       Class.new(BaseComponent) do
         include(JsonModel::Schema)
+
         property(:type, type: T::Const['number'])
         property(:value, type: Integer)
-      end
+      end,
     )
 
     all_component_types = ObjectSpace
-      .each_object(Class)
-      .select { |klass| klass.ancestors.include?(BaseComponent) && klass != BaseComponent }
-    grid_component = stub_const(
+                            .each_object(Class)
+                            .select { |klass| klass.ancestors.include?(BaseComponent) && klass != BaseComponent }
+    stub_const(
       'GridComponent',
       Class.new(BaseComponent) do
         include(JsonModel::Schema)
+
         property(:type, type: T::Const['grid'])
         property(:components, type: T::Array[T::OneOf[*all_component_types]], optional: true, ref_mode: JsonModel::RefMode::EXTERNAL)
-      end
+      end,
     )
 
 
@@ -50,4 +54,4 @@ RSpec.describe('User schema') do
     expect(instance.components.first).to(be_instance_of(TextComponent))
     expect(instance.components.last).to(be_instance_of(NumberComponent))
   end
-end
+end

data/spec/type_spec/const_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe(JsonModel::TypeSpec::Const) do
         .to(
           eq(
             {
-              const: 'a'
+              const: 'a',
             },
           ),
         )

data/spec/type_spec/enum_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe(JsonModel::TypeSpec::Enum) do
         described_class
           .new(1)
           .register_validations(:foo, klass)
-        instance = klass.new(foo: nil)
+        instance = klass.new(foo: 2)
 
         expect(instance.valid?)
           .to(be(false))
@@ -62,15 +62,6 @@ RSpec.describe(JsonModel::TypeSpec::Enum) do
           .register_validations(:foo, klass)
       end
 
-      it('fails the validation if nil') do
-        instance = klass.new(foo: nil)
-
-        expect(instance.valid?)
-          .to(be(false))
-        expect(instance.errors.map(&:type))
-          .to(eq(%i(inclusion)))
-      end
-
       it('fails the validation if not allowed') do
         instance = klass.new(foo: 0)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Paul Gillesberger
 bindir: bin
 cert_chain: []
-date: 2025-12-29 00:00:00.000000000 Z
+date: 2025-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake