json_model_rb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1b5efa89714c5e34d9ffc8c8f7f8a4da4cec9abd280d0ca50d9229e090f723
-  data.tar.gz: 0f13c5aaa27994bf1c05131cf81f8e43b18678ff80556cabe2c2ce43c3a63a06
+  metadata.gz: d8629addf96efee3c996feeeff0f3b1806ceb78bbc3ecffd6470ea1f96db1da5
+  data.tar.gz: 9821968d8a12620d7b4f53c5884cbe6214998e3af9b6785719f8390a3148725f
 SHA512:
-  metadata.gz: 97ce1787bb3d26ee9359211f73df8de3b99a58860cb45632b1c56990abdab2965310f3fdd6bce0b562ff6f5a48f5b988e5deb906285f90ec778b1f6342699bd0
-  data.tar.gz: d2a93f7a96fac2c66add234b5b2ee3bdf65404b82bdf591e348afcc4b27bafdebcf489109da25246be9db4e5db0b307aa06733ef871c990d358ca4735518b5ce
+  metadata.gz: ae72851a9d485cc0cbd7df518d48a40ff03a115025a4e3a04177fb6207783c2df3377c7778b1131cee053fc13711e60b9dafe220b831303f06d19eec56ef3eb6
+  data.tar.gz: e51539c6a3beb3319949bb0e052e5817304772c012d742f96b744289c2cb33afd8d9864b4593e3a0ea9013ee9039a5183e4ce1351fa670534dae1e1b45b10ab4

data/lib/json_model/properties.rb

@@ -7,14 +7,21 @@ module JsonModel
     included do
       extend(ActiveSupport::DescendantsTracker)
       include(ActiveModel::Validations)
+    end
 
-      class_attribute(:attributes, instance_writer: false, default: {})
-      class_attribute(:properties, instance_writer: false, default: {})
+    # @return [Hash]
+    def attributes
+      @attributes ||= {}
     end
 
     class_methods do
+      # @return [Hash]
+      def properties
+        @properties ||= {}
+      end
+
       # @param [Symbol] name
-      # @param [Object] type
+      # @param [Object, Class] type
       # @param [Hash] options
       def property(name, type:, **options)
         property_options = options.slice(:default, :optional, :ref_mode, :as)

data/lib/json_model/schema_meta.rb

@@ -13,20 +13,24 @@ module JsonModel
     }.freeze
 
     included do
-      class_attribute(:meta_attributes, instance_writer: false, default: {})
-      class_attribute(:ref_schema, instance_writer: false)
-
       # @param [Class] subclass
       def self.inherited(subclass)
         super
+        subclass.schema_id(JsonModel.config.schema_id_naming_strategy.call(self))
+        subclass.additional_properties(false)
         subclass.meta_attributes[:$ref] = schema_id
       end
 
-      schema_id(name)
+      schema_id(JsonModel.config.schema_id_naming_strategy.call(self))
       additional_properties(false)
     end
 
     class_methods do
+      # @return [Hash]
+      def meta_attributes
+        @meta_attributes ||= {}
+      end
+
       # @param [String, nil] description
       # @return [String, nil]
       def description(description = nil)

data/lib/json_model/type_spec.rb

@@ -30,7 +30,7 @@ module JsonModel
     end
 
     class << self
-      # @param [Object] type
+      # @param [Object, Class] type
       # @param [Hash] options
       # @return [TypeSpec]
       def resolve(type, **options)
@@ -48,7 +48,7 @@ module JsonModel
 
       private
 
-      # @param [Object] type
+      # @param [Object, Class] type
       # @param [Hash] options
       # @return [TypeSpec]
       def resolve_type_from_class(type, **options)

data/lib/json_model/version.rb

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

data/spec/schema_spec.rb

@@ -200,6 +200,14 @@ RSpec.describe(JsonModel::Schema) do
       let(:child) do
         Class.new(klass) do
           schema_id('https://example.com/schemas/child.json')
+          property(:baz, type: String)
+        end
+      end
+      let(:second_child) do
+        Class.new(klass) do
+          schema_id('https://example.com/schemas/second-child.json')
+          title('SecondChild')
+          property(:bar, type: String)
         end
       end
 
@@ -215,9 +223,34 @@ RSpec.describe(JsonModel::Schema) do
                 '$ref': 'https://example.com/schemas/example.json',
                 type: 'object',
                 additionalProperties: false,
+                properties: { baz: { type: 'string' } },
+                required: %i(baz),
               },
             ),
           )
+
+        expect(second_child.as_schema)
+          .to(
+            eq(
+              {
+                '$id': 'https://example.com/schemas/second-child.json',
+                '$ref': 'https://example.com/schemas/example.json',
+                title: 'SecondChild',
+                type: 'object',
+                additionalProperties: false,
+                properties: { bar: { type: 'string' } },
+                required: %i(bar),
+              },
+            ),
+          )
+
+        instance = child.new(foo: 'foo', baz: 'baz')
+        expect(instance.foo).to(eq('foo'))
+        expect(instance.baz).to(eq('baz'))
+
+        second_instance = second_child.new(foo: 'foo', bar: 'bar')
+        expect(second_instance.foo).to(eq('foo'))
+        expect(second_instance.bar).to(eq('bar'))
       end
     end
   end

metadata

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