json_model_rb 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae63a0cef5ca421b32a3a103aeaaa8c61cfe9a1edd7871567e8c8f5905678f5d
-  data.tar.gz: b51047217b904c7194deb9c21bcd66a175ae18779360d68a78db5efa3190d12a
+  metadata.gz: 601bb6f47fc30b627b972036213a1388f0e844a42476988cbeb19156edf59ea0
+  data.tar.gz: 4550f13f61deaf8b455bf7b8437e05e13401aae8d33932460e722574e0bc6ee7
 SHA512:
-  metadata.gz: 05f4f40b76349054936c5df92514615c3a86ebb9eaa54d5e9105c59dc33d836fc4718f98d1590a34d7569ed86e14a292ee70a2f7e17b241fea337f81074e4d82
-  data.tar.gz: b9b97ae062116a998eb894e8a98d486dc8ffa141d2a49c5b4755afe41358b0ff4b8aed7a8283bbe744107980a3206a858b2de6d16deacdbe01102bf5a4aed300
+  metadata.gz: 45305cffcc227dd58959f1b5ae64662d378f6d703e85b53da9319e9b6366d075c0c20a70465fc8f1fbb319b83d58d5637682f4a29faf3e8513bf78aa632f2b20
+  data.tar.gz: 21de5df72ff9f5b1244e530133d0c6d2e6cddf6123a25146a07cd79db73f1e8083488f7dc37fe32fab72c169f05baba296ba96fa6292f52f188889adb5a48cf4

data/lib/json_model/config.rb

@@ -39,5 +39,7 @@ module JsonModel
     end
 
     option(:validate_after_instantiation, default: true)
+
+    option(:schema_version)
   end
 end

data/lib/json_model/schema_meta.rb

@@ -17,12 +17,12 @@ module JsonModel
       def self.inherited(subclass)
         super
         subclass.schema_id(JsonModel.config.schema_id_naming_strategy.call(subclass))
-        subclass.additional_properties(false)
+        subclass.schema_version(JsonModel.config.schema_version)
         subclass.meta_attributes[:$ref] = schema_id
       end
 
       schema_id(JsonModel.config.schema_id_naming_strategy.call(self))
-      additional_properties(false)
+      schema_version(JsonModel.config.schema_version)
     end
 
     class_methods do
@@ -71,6 +71,16 @@ module JsonModel
         end
       end
 
+      # @param [Boolean, nil] value
+      # @return [Boolean]
+      def unevaluated_properties(value = nil)
+        if value.nil?
+          meta_attributes[:unevaluatedProperties] || false
+        else
+          meta_attributes[:unevaluatedProperties] = value
+        end
+      end
+
       # @param [Symbol, nil] version
       # @return [Boolean]
       def schema_version(version = nil)

data/lib/json_model/type_spec/castable.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module JsonModel
+  class TypeSpec
+    class Castable < TypeSpec
+      # @param [String] format
+      # @param [Proc] cast_block
+      def initialize(format:, &cast_block)
+        super()
+        @format = format
+        @cast_block = cast_block
+      end
+
+      # @param [Hash] _options
+      # @return [Hash]
+      def as_schema(**_options)
+        {
+          type: 'string',
+          format: @format,
+        }
+      end
+
+      # @param [::Object] json
+      # @return [::Object, nil]
+      def cast(json)
+        if json.nil?
+          nil
+        else
+          @cast_block.call(json)
+        end
+      end
+    end
+  end
+end

data/lib/json_model/type_spec/primitive/string.rb

@@ -62,7 +62,7 @@ module JsonModel
             end
           },
           uuid: lambda { |v|
-            SecureRandom(v.match?(/\A[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\z/i))
+            v.match?(/\A[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\z/i)
           },
           regex: lambda { |v|
             begin
@@ -79,7 +79,7 @@ module JsonModel
         # @param [Integer, nil] min_length
         # @param [Integer, nil] max_length
         # @param [Regexp, nil] pattern
-        # @param [String, nil] format
+        # @param [Symbol, nil] format
         def initialize(min_length: nil, max_length: nil, pattern: nil, format: nil)
           super(types: [::String], schema_type: 'string')
 
@@ -115,7 +115,6 @@ module JsonModel
           end
           if @format
             if JSON_SCHEMA_FORMATS.key?(@format)
-
               register_format_validation(klass, name)
             else
               raise(ArgumentError, "Invalid format: #{@format}")

data/lib/json_model/type_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative('type_spec/array')
+require_relative('type_spec/castable')
 require_relative('type_spec/composition')
 require_relative('type_spec/const')
 require_relative('type_spec/enum')
@@ -9,6 +10,20 @@ require_relative('type_spec/primitive')
 
 module JsonModel
   class TypeSpec
+    TYPE_MAP = {
+      Date => Castable.new(format: 'date') { |v| ::DateTime.iso8601(v) },
+      DateTime => Castable.new(format: 'date-time') { |v| ::DateTime.iso8601(v) },
+      FalseClass => Primitive::Boolean.new,
+      Float => Primitive::Number.new,
+      Integer => Primitive::Integer.new,
+      NilClass => Primitive::Null.new,
+      Regexp => Castable.new(format: 'regex') { |v| Regexp.new(v) },
+      String => Primitive::String.new,
+      Time => Castable.new(format: 'time') { |v| ::Time.iso8601(v) },
+      TrueClass => Primitive::Boolean.new,
+      URI => Castable.new(format: 'uri') { |v| URI.parse(v) },
+    }.freeze
+
     # @param [Hash] options
     # @return [Hash]
     def as_schema(**options)
@@ -53,16 +68,8 @@ module JsonModel
       # @param [Object, Class] type
       # @return [TypeSpec]
       def resolve_type_from_class(type)
-        if type == String
-          Primitive::String.new
-        elsif type == Integer
-          Primitive::Integer.new
-        elsif type == Float
-          Primitive::Number.new
-        elsif [TrueClass, FalseClass].include?(type)
-          Primitive::Boolean.new
-        elsif type == NilClass
-          Primitive::Null.new
+        if TYPE_MAP.key?(type)
+          TYPE_MAP[type]
         elsif type < Schema
           TypeSpec::Object.new(type)
         else

data/lib/json_model/version.rb

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

data/spec/examples/file_system_spec.rb

@@ -98,7 +98,6 @@ RSpec.describe('File system schema') do
                 type: 'boolean',
               },
             },
-            additionalProperties: false,
             '$defs': {
               DiskDevice: {
                 properties: {
@@ -111,7 +110,6 @@ RSpec.describe('File system schema') do
                   },
                 },
                 required: %i(device type),
-                additionalProperties: false,
                 type: 'object',
               },
               DiskUuid: {
@@ -123,7 +121,6 @@ RSpec.describe('File system schema') do
                   },
                 },
                 required: %i(label type),
-                additionalProperties: false,
                 type: 'object',
               },
               Nfs: {
@@ -139,7 +136,6 @@ RSpec.describe('File system schema') do
                   },
                 },
                 required: %i(remotePath server type),
-                additionalProperties: false,
                 type: 'object',
               },
               Tmpfs: {
@@ -148,7 +144,6 @@ RSpec.describe('File system schema') do
                   sizeInMB: { type: 'integer', minimum: 16, maximum: 512 },
                 },
                 required: %i(sizeInMB type),
-                additionalProperties: false,
                 type: 'object',
               },
             },

data/spec/examples/user_spec.rb

@@ -33,6 +33,7 @@ RSpec.describe('User schema') do
       property(:active, type: T::Boolean, default: true, optional: true)
       property(:addresses, type: T::Array[Address], ref_mode: JsonModel::RefMode::LOCAL)
       property(:tags, type: T::Array[String], optional: true)
+      property(:birthday, type: Date, optional: true)
     end
 
     stub_const('User', user_class)
@@ -54,8 +55,8 @@ RSpec.describe('User schema') do
                 items: { '$ref': '#/$defs/Address' },
               },
               tags: { type: 'array', items: { type: 'string' } },
+              birthday: { type: 'string', format: 'date' },
             },
-            additionalProperties: false,
             required: %i(addresses email name),
             '$defs': {
               Address: {
@@ -68,7 +69,6 @@ RSpec.describe('User schema') do
                   street: { type: 'string' },
                 },
                 required: %i(city country street),
-                additionalProperties: false,
               },
             },
           },
@@ -77,7 +77,12 @@ RSpec.describe('User schema') do
   end
 
   it('can instantiate a model') do
-    user = User.new(name: 'Foo', email: 'foo@example.com', addresses: [{ street: '123 Main St', city: 'Anytown' }])
+    user = User.new(
+      name: 'Foo',
+      email: 'foo@example.com',
+      addresses: [{ street: '123 Main St', city: 'Anytown' }],
+      birthday: '2000-01-01',
+    )
 
     expect(user.name).to(eq('Foo'))
     expect(user.email).to(eq('foo@example.com'))
@@ -88,5 +93,6 @@ RSpec.describe('User schema') do
     expect(user.addresses.first.postal_code).to(be_nil)
     expect(user.addresses.first.state).to(be_nil)
     expect(user.addresses.first.city).to(eq('Anytown'))
+    expect(user.birthday).to(eq(Date.new(2000, 1, 1)))
   end
 end

data/spec/schema_meta_spec.rb

@@ -103,9 +103,9 @@ RSpec.describe(JsonModel::SchemaMeta) do
       end
     end
 
-    it('is false by default') do
+    it('is missing by default') do
       expect(klass.meta_attributes)
-        .to(eq({ additionalProperties: false }))
+        .to(eq({}))
     end
 
     it('can be changed') do
@@ -115,4 +115,24 @@ RSpec.describe(JsonModel::SchemaMeta) do
         .to(eq({ additionalProperties: true }))
     end
   end
+
+  describe('.additional_properties') do
+    let(:klass) do
+      Class.new do
+        include(JsonModel::SchemaMeta)
+      end
+    end
+
+    it('is missing by default') do
+      expect(klass.meta_attributes)
+        .to(eq({}))
+    end
+
+    it('can be changed') do
+      klass.unevaluated_properties(true)
+
+      expect(klass.meta_attributes)
+        .to(eq({ unevaluatedProperties: true }))
+    end
+  end
 end

data/spec/schema_spec.rb

@@ -100,7 +100,7 @@ RSpec.describe(JsonModel::Schema) do
 
     it('returns an empty schema') do
       expect(klass.as_schema)
-        .to(eq({ type: 'object', additionalProperties: false }))
+        .to(eq({ type: 'object' }))
     end
 
     it('includes the schema id') do
@@ -112,7 +112,6 @@ RSpec.describe(JsonModel::Schema) do
             {
               '$id': 'https://example.com/schemas/example.json',
               type: 'object',
-              additionalProperties: false,
             },
           ),
         )
@@ -145,7 +144,6 @@ RSpec.describe(JsonModel::Schema) do
                 foo: { type: 'string' },
               },
               required: %i(bam baz foo),
-              additionalProperties: false,
             },
           ),
         )
@@ -206,16 +204,13 @@ RSpec.describe(JsonModel::Schema) do
                   type: 'object',
                   properties: { foo: { type: 'string' } },
                   required: %i(foo),
-                  additionalProperties: false,
                 },
               },
-              additionalProperties: false,
               '$defs': {
                 Bar: {
                   type: 'object',
                   properties: { bar: { type: 'string' } },
                   required: %i(bar),
-                  additionalProperties: false,
                 },
               },
               required: %i(bam bar foo),
@@ -250,7 +245,6 @@ RSpec.describe(JsonModel::Schema) do
                 '$id': 'https://example.com/schemas/child.json',
                 '$ref': 'https://example.com/schemas/example.json',
                 type: 'object',
-                additionalProperties: false,
                 properties: { baz: { type: 'string' } },
                 required: %i(baz),
               },
@@ -265,7 +259,6 @@ RSpec.describe(JsonModel::Schema) do
                 '$ref': 'https://example.com/schemas/example.json',
                 title: 'SecondChild',
                 type: 'object',
-                additionalProperties: false,
                 properties: { bar: { type: 'string' } },
                 required: %i(bar),
               },

data/spec/type_spec/castable_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require('spec_helper')
+
+RSpec.describe(JsonModel::TypeSpec::Castable) do
+  describe('#as_schema') do
+    it('returns a string schema') do
+      expect(described_class.new(format: 'date') { |v| v }.as_schema)
+        .to(eq({ type: 'string', format: 'date' }))
+    end
+  end
+
+  describe('#cast') do
+    it('casts a string') do
+      expect(described_class.new(format: 'date') { |v| Date.parse(v) }.cast('2020-01-01'))
+        .to(eq(Date.new(2020, 1, 1)))
+    end
+  end
+end

data/spec/type_spec/composition_spec.rb

@@ -27,7 +27,6 @@ RSpec.describe(JsonModel::TypeSpec::Composition) do
                   type: 'object',
                   properties: { foo: { type: 'string' } },
                   required: %i(foo),
-                  additionalProperties: false,
                 },
               ],
             },

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.17
 platform: ruby
 authors:
 - Paul Gillesberger
 bindir: bin
 cert_chain: []
-date: 2025-12-30 00:00:00.000000000 Z
+date: 2026-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -117,6 +117,7 @@ files:
 - lib/json_model/schema_meta.rb
 - lib/json_model/type_spec.rb
 - lib/json_model/type_spec/array.rb
+- lib/json_model/type_spec/castable.rb
 - lib/json_model/type_spec/composition.rb
 - lib/json_model/type_spec/composition/all_of.rb
 - lib/json_model/type_spec/composition/any_of.rb
@@ -145,7 +146,6 @@ files:
 - lib/json_model/types/string.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
@@ -155,6 +155,7 @@ files:
 - spec/schema_spec.rb
 - spec/spec_helper.rb
 - spec/type_spec/array_spec.rb
+- spec/type_spec/castable_spec.rb
 - spec/type_spec/composition/all_of_spec.rb
 - spec/type_spec/composition/any_of_spec.rb
 - spec/type_spec/composition/one_of_spec.rb

data/spec/examples/component_spec.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require('spec_helper')
-
-RSpec.describe('User schema') do
-  it('todo') do
-    stub_const(
-      'BaseComponent',
-      Class.new do
-        include(JsonModel::Schema)
-
-        property(:type, type: String)
-        property(:styles, type: T::Array[String], optional: true)
-      end,
-    )
-    stub_const(
-      'TextComponent',
-      Class.new(BaseComponent) do
-        include(JsonModel::Schema)
-
-        property(:type, type: T::Enum['text'])
-        property(:value, type: String)
-      end,
-    )
-    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 }
-    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