json_model_rb 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae375731299ec26a890c6325c485b794599871c645e9345bb92492908f9bf3ae
-  data.tar.gz: bfad9ced0dd6ecc9720b85bdd029b7e3078b84581aad4c2273866137459e1442
+  metadata.gz: 98bb614ecc704ac48a1a6d72b079f26eae33b6e6e392c64309ef3dead031cef3
+  data.tar.gz: cae571a4e4f58b34a1c5add1135ebbe8382dcf588a40fcdca719343addaf66b5
 SHA512:
-  metadata.gz: 78c339093d60f4bb6d9d13f48ed21fc6d3f303f7821ac3b66c0ff90593c70fe962582db2fb5481b7399c66c607cd7af7072d9acbcc92dd706f9b4ec768b4b064
-  data.tar.gz: 686ff812df589d267d6318b183c47c815184eb17cbd32d0d79b278216af4fdee70d8d04f39734d9545cf0fa89d8e5cf04b985f0874814d2dc9a3d18cdb2cf5cc
+  metadata.gz: 0c7d8e9859704abbdc88e0659de62c34c586e448288e58063f80a7448a5c0c32ccf374146ed14488a1ee67f6a358e80f162fb4b9cd79a531b479c89bc5d814e0
+  data.tar.gz: 9a2ca8d4b13ee9ac3ff8fb6e68adca65bdad4a320f2216fe5a277842a1feacf5f5aa0b9f3049ab39658c3f6fa5f833339bfcca967e7782ce9068e9039dde8dfb

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/primitive.rb

@@ -25,7 +25,7 @@ module JsonModel
         elsif @types.any? { |type| json.is_a?(type) }
           json
         else
-          raise(Errors::TypeError, "Expected one of #{@type.join('/')}, got #{json.class} (#{json.inspect})")
+          raise(Errors::TypeError, "Expected one of #{@types.join('/')}, got #{json.class} (#{json.inspect})")
         end
       end
     end

data/lib/json_model/version.rb

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

data/spec/examples/component_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require('spec_helper')
+
+RSpec.describe('User schema') do
+  it('todo') do
+    base_component = stub_const(
+      'BaseComponent',
+      Class.new do
+        include(JsonModel::Schema)
+        property(:type, type: String)
+        property(:styles, type: T::Array[String], optional: true)
+      end
+    )
+    text_component = stub_const(
+      'TextComponent',
+      Class.new(BaseComponent) do
+        include(JsonModel::Schema)
+        property(:type, type: T::Enum['text'])
+        property(:value, type: String)
+      end
+    )
+    number_component = stub_const(
+      'NumberComponent',
+      Class.new(BaseComponent) do
+        include(JsonModel::Schema)
+        property(:type, type: T::Const['number'])
+        property(:value, type: Integer)
+      end
+    )
+
+    all_component_types = ObjectSpace
+      .each_object(Class)
+      .select { |klass| klass.ancestors.include?(BaseComponent) && klass != BaseComponent }
+    grid_component = 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
+    )
+
+
+    instance = GridComponent.new(
+      type: 'grid',
+      components: [{ type: 'text', value: 'foo' }, { type: 'number', value: 1 }],
+    )
+
+    expect(instance.components.first).to(be_instance_of(TextComponent))
+    expect(instance.components.last).to(be_instance_of(NumberComponent))
+  end
+end

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Paul Gillesberger
@@ -141,6 +141,7 @@ files:
 - lib/json_model/types/one_of.rb
 - lib/json_model/version.rb
 - spec/config_spec.rb
+- spec/examples/component_spec.rb
 - spec/examples/file_system_spec.rb
 - spec/examples/user_spec.rb
 - spec/json_model_spec.rb