json_model_rb 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18911c5ebb83b6699be34560af2a7c8d964ff54c497a135603c3e5e1ae2c8a18
-  data.tar.gz: 3b2c5736aea3dac28d2a54ba783c0f933284cddf587c76aab20327323cfc876f
+  metadata.gz: 98b0c57c0738f93582f7783f5de240050d0129e7015ee2e208101ee2fbf62228
+  data.tar.gz: 847d1567156289c42144329ca370250772bdd9fdfa1c4776482d354a51560ab5
 SHA512:
-  metadata.gz: 9061ca8854c66c5f9d17f2d5381484b898c395b86d826ef0b2b7a1724d45cf1d297a3427d3fa7ca5e3000aeb262e5336d60f5436e4020064a3de01ea01ee40e2
-  data.tar.gz: 946fc6b81294a7eda74add39544f079691b032158f5de0a58e0b241a35ab66629a0398145273e7645bdc5614046d574e28879765cd04f4b104e69dc285e80e09
+  metadata.gz: a8eb301c456c28814b8b7eca3fbbe30a0d7c6e8e789bbc6bbfca73052e0f18934e277913a1cc7632a45fe56245781389bc96ed8d59b01781d63ec08f3c2f0f61
+  data.tar.gz: 9ae72f4ab9291f822ed7dcb632744c4b87c8689344fcb3bb68ea469ea605fa57945735af341c1671edcfe2d4b91a8a73ece88fa72c092b9027860f8d1da73d74

data/lib/json_model/composeable.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module JsonModel
+  module Composeable
+    extend(ActiveSupport::Concern)
+
+    class_methods do
+      # @return [Array]
+      def composed_types
+        @composed_types ||= []
+      end
+
+      # @param [Object] type
+      # @param [Symbol] ref_mode
+      def compose(type, ref_mode: RefMode::LOCAL)
+        composed_types << {
+          type: TypeSpec.resolve(type),
+          ref_mode: ref_mode,
+        }
+      end
+
+      # @return [Array<JsonModel::TypeSpec::Composition>]
+      def composed_type_defs
+        composed_types.select { |type| type[:ref_mode] == RefMode::LOCAL }.flat_map { |it| it[:type].referenced_schemas }
+      end
+
+      # @return [Array<Hash>]
+      def composed_types_as_schema
+        composed_types.each_with_object({}) do |it, agg|
+          agg.deep_merge!(it[:type].as_schema(ref_mode: it[:ref_mode]))
+        end
+      end
+    end
+  end
+end

data/lib/json_model/schema.rb

@@ -3,6 +3,7 @@
 module JsonModel
   module Schema
     extend(ActiveSupport::Concern)
+    include(Composeable)
     include(Properties)
     include(SchemaMeta)
 
@@ -61,6 +62,7 @@ module JsonModel
               required: required_properties_as_schema,
               '$defs': defs_as_schema,
             )
+            .merge(**composed_types_as_schema)
             .merge(type: 'object')
             .compact
         when RefMode::LOCAL
@@ -94,11 +96,7 @@ module JsonModel
       end
 
       def defs_as_schema
-        referenced_schemas = local_properties
-                               .values
-                               .flat_map(&:referenced_schemas)
-                               .uniq
-
+        referenced_schemas = (composed_type_defs + local_properties.values.flat_map(&:referenced_schemas)).uniq
         if referenced_schemas.any?
           referenced_schemas.to_h { |type| [type.name.to_sym, type.as_schema] }
         end

data/lib/json_model/type_spec.rb

@@ -49,17 +49,18 @@ module JsonModel
       # @param [Object, Class] type
       # @return [TypeSpec]
       def resolve(type)
-        case type
-        when TypeSpec
-          type
-        when Class
-          resolve_type_from_class(type)
+        if type.is_a?(TypeSpec)
+          return type
+        end
+
+        if TYPE_MAP.key?(type)
+          TYPE_MAP[type]
+        elsif type.respond_to?(:to_type_spec)
+          type.to_type_spec
+        elsif type.is_a?(Class) && type < Schema
+          TypeSpec::Object.new(type)
         else
-          if type.respond_to?(:to_type_spec)
-            type.to_type_spec
-          else
-            raise(ArgumentError, "Unsupported type: #{type}")
-          end
+          raise(ArgumentError, "Unsupported type: #{type}")
         end
       end
 

data/lib/json_model/version.rb

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

data/lib/json_model.rb

@@ -5,6 +5,7 @@ require('active_support/concern')
 require('active_support/core_ext/class/attribute')
 require('active_support/descendants_tracker')
 require('uri')
+require('json_model/composeable')
 require('json_model/config')
 require('json_model/errors')
 require('json_model/properties')

data/spec/examples/user_spec.rb

@@ -20,20 +20,35 @@ RSpec.describe('User schema') do
 
     stub_const('Address', address_class)
 
-    user_class = Class.new do
+    person_class = Class.new do
       include(JsonModel::Schema)
 
       def self.name
-        'User'
+        'Person'
       end
 
+      schema_id('person.schema.json')
       property(:name, type: String)
       property(:email, type: T::String[format: :email])
+    end
+
+    stub_const('Person', person_class)
+
+    user_class = Class.new do
+      include(JsonModel::Schema)
+
+      def self.name
+        'User'
+      end
+
+      compose(T::AllOf[Person], ref_mode: JsonModel::RefMode::EXTERNAL)
       property(:age, type: T::Integer[minimum: 0, maximum: 120], optional: true)
       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)
+      property(:websites, type: T::Array[URI], optional: true)
+      property(:height, type: Float, optional: true)
     end
 
     stub_const('User', user_class)
@@ -45,9 +60,8 @@ RSpec.describe('User schema') do
         eq(
           {
             type: 'object',
+            allOf: [{ '$ref': 'person.schema.json' }],
             properties: {
-              name: { type: 'string' },
-              email: { type: 'string', format: 'email' },
               age: { type: 'integer', minimum: 0, maximum: 120 },
               active: { type: 'boolean', default: true },
               addresses: {
@@ -56,8 +70,10 @@ RSpec.describe('User schema') do
               },
               tags: { type: 'array', items: { type: 'string' } },
               birthday: { type: 'string', format: 'date' },
+              websites: { type: 'array', items: { type: 'string', format: 'uri' } },
+              height: { type: 'number' },
             },
-            required: %i(addresses email name),
+            required: %i(addresses),
             '$defs': {
               Address: {
                 type: 'object',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.20
 platform: ruby
 authors:
 - Paul Gillesberger
 bindir: bin
 cert_chain: []
-date: 2026-01-05 00:00:00.000000000 Z
+date: 2026-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,6 +103,7 @@ files:
 - LICENSE
 - README.md
 - lib/json_model.rb
+- lib/json_model/composeable.rb
 - lib/json_model/config.rb
 - lib/json_model/config/options.rb
 - lib/json_model/errors.rb