json_model_rb 0.1.20 → 0.1.23

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: json_model_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.23
 platform: ruby
 authors:
 - Paul Gillesberger
 bindir: bin
 cert_chain: []
-date: 2026-01-19 00:00:00.000000000 Z
+date: 2026-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,20 +80,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
-description: Define JSON schemas as Ruby modules using a DSL
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.1
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+description: A gem that extends Dry::Struct with JSON Schema generation capabilities,supporting
+  standard types, constraints, and polymorphic models.
 email:
 - paulgillesberger@live.com
 executables: []
@@ -103,73 +150,52 @@ files:
 - LICENSE
 - README.md
 - lib/json_model.rb
-- lib/json_model/composeable.rb
+- lib/json_model/builder.rb
+- lib/json_model/builder/alias_builder.rb
+- lib/json_model/builder/array_builder.rb
+- lib/json_model/builder/base_builder.rb
+- lib/json_model/builder/composition.rb
+- lib/json_model/builder/composition/any_of_builder.rb
+- lib/json_model/builder/composition/builder.rb
+- lib/json_model/builder/composition/intersection_builder.rb
+- lib/json_model/builder/composition/one_of_builder.rb
+- lib/json_model/builder/composition/sum_builder.rb
+- lib/json_model/builder/constrained_builder.rb
+- lib/json_model/builder/default_builder.rb
+- lib/json_model/builder/enum_builder.rb
+- lib/json_model/builder/format_builder.rb
+- lib/json_model/builder/key_builder.rb
+- lib/json_model/builder/nested_builder.rb
+- lib/json_model/builder/primitive.rb
+- lib/json_model/builder/primitive/boolean_builder.rb
+- lib/json_model/builder/primitive/builder.rb
+- lib/json_model/builder/primitive/integer_builder.rb
+- lib/json_model/builder/primitive/null_builder.rb
+- lib/json_model/builder/primitive/number_builder.rb
+- lib/json_model/builder/primitive/string_builder.rb
+- lib/json_model/builder/ref_builder.rb
+- lib/json_model/builder/schema_builder.rb
 - lib/json_model/config.rb
 - lib/json_model/config/options.rb
 - lib/json_model/errors.rb
 - lib/json_model/errors/error.rb
-- lib/json_model/errors/invalid_ref_mode_error.rb
-- lib/json_model/errors/type_error.rb
-- lib/json_model/errors/unknown_attribute_error.rb
-- lib/json_model/properties.rb
-- lib/json_model/property.rb
-- lib/json_model/ref_mode.rb
+- lib/json_model/logic/predicates/methods.rb
+- lib/json_model/predicates.rb
 - lib/json_model/schema.rb
 - 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
-- lib/json_model/type_spec/composition/one_of.rb
-- lib/json_model/type_spec/const.rb
-- lib/json_model/type_spec/enum.rb
-- lib/json_model/type_spec/object.rb
-- lib/json_model/type_spec/primitive.rb
-- lib/json_model/type_spec/primitive/boolean.rb
-- lib/json_model/type_spec/primitive/integer.rb
-- lib/json_model/type_spec/primitive/null.rb
-- lib/json_model/type_spec/primitive/number.rb
-- lib/json_model/type_spec/primitive/numeric.rb
-- lib/json_model/type_spec/primitive/string.rb
 - lib/json_model/types.rb
-- lib/json_model/types/all_of.rb
+- lib/json_model/types/alias.rb
 - lib/json_model/types/any_of.rb
-- lib/json_model/types/array.rb
-- lib/json_model/types/boolean.rb
-- lib/json_model/types/const.rb
-- lib/json_model/types/enum.rb
-- lib/json_model/types/integer.rb
-- lib/json_model/types/null.rb
-- lib/json_model/types/number.rb
 - lib/json_model/types/one_of.rb
-- lib/json_model/types/string.rb
+- lib/json_model/types/ref.rb
 - lib/json_model/version.rb
 - spec/config_spec.rb
 - spec/examples/file_system_spec.rb
 - spec/examples/user_spec.rb
 - spec/json_model_spec.rb
-- spec/properties_spec.rb
-- spec/property_spec.rb
 - spec/schema_meta_spec.rb
 - 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
-- spec/type_spec/composition_spec.rb
-- spec/type_spec/const_spec.rb
-- spec/type_spec/enum_spec.rb
-- spec/type_spec/primitive/boolean_spec.rb
-- spec/type_spec/primitive/integer_spec.rb
-- spec/type_spec/primitive/null_spec.rb
-- spec/type_spec/primitive/number_spec.rb
-- spec/type_spec/primitive/numeric_spec.rb
-- spec/type_spec/primitive/string_spec.rb
-- spec/type_spec_spec.rb
 homepage: https://github.com/gillesbergerp/json_model
 licenses:
 - MIT
@@ -192,5 +218,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.3
 specification_version: 4
-summary: Declarative JSON Schema DSL with Sorbet and ActiveModel integration
+summary: Generate JSON Schema from Dry::Struct models
 test_files: []

data/lib/json_model/composeable.rb

@@ -1,35 +0,0 @@
-# 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/errors/invalid_ref_mode_error.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  module Errors
-    class InvalidRefModeError < Error
-      # @param [Symbol] ref_mode
-      def initialize(ref_mode)
-        super("Invalid ref_mode: #{ref_mode}.")
-      end
-    end
-  end
-end

data/lib/json_model/errors/type_error.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  module Errors
-    class TypeError < Error
-    end
-  end
-end

data/lib/json_model/errors/unknown_attribute_error.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  module Errors
-    class UnknownAttributeError < Error
-      # @param [Class] klass
-      # @param [Symbol] name
-      def initialize(klass, name)
-        super("Unknown attribute '#{name}' for '#{klass}'.")
-      end
-    end
-  end
-end

data/lib/json_model/properties.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  module Properties
-    extend(ActiveSupport::Concern)
-
-    included do
-      extend(ActiveSupport::DescendantsTracker)
-      include(ActiveModel::Validations)
-    end
-
-    # @return [Hash]
-    def attributes
-      @attributes ||= {}
-    end
-
-    class_methods do
-      # @return [Hash]
-      def properties
-        @properties ||= {}
-      end
-
-      # @return [Hash]
-      def aliased_properties
-        @aliased_properties ||= {}
-      end
-
-      # @param [Symbol] name
-      # @return [Symbol, nil]
-      def invert_alias(name)
-        aliased_properties[name]&.name || superclass&.invert_alias(name)
-      rescue NoMethodError
-        nil
-      end
-
-      # @param [Symbol] name
-      # @param [Object, Class] type
-      # @param [Hash] options
-      def property(name, type:, **options)
-        resolved_type = TypeSpec.resolve(type)
-        add_property(name, type: resolved_type, **options)
-        descendants.each { |subclass| subclass.add_property(name, type: resolved_type, **options) }
-      end
-
-      protected
-
-      # @param [Symbol] name
-      # @param [TypeSpec] type
-      # @param [Hash] options
-      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
-
-      # @param [Property] property
-      def define_accessors(property)
-        define_getter(property)
-        define_setter(property)
-      end
-
-      # @param [Property] property
-      def define_getter(property)
-        define_method(property.name) do
-          if attributes.key?(property.name)
-            attributes[property.name]
-          else
-            property.default
-          end
-        end
-      end
-
-      # @param [Property] property
-      def define_setter(property)
-        define_method("#{property.name}=") { |value| attributes[property.name] = property.type.cast(value) }
-      end
-
-      # @param [Property] property
-      def define_validations(property)
-        property.register_validations(self)
-      end
-    end
-  end
-end

data/lib/json_model/property.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  class Property
-    attr_reader(:name, :default, :type, :optional, :alias)
-
-    # @param [Symbol] name
-    # @param [TypeSpec] type
-    # @param [Object, nil] default
-    # @param [Boolean] optional
-    # @param [Symbol] ref_mode
-    # @param [Symbol, nil] as
-    def initialize(name, type:, default: nil, optional: false, ref_mode: RefMode::INLINE, as: nil)
-      @name = name
-      @type = type
-      @default = default
-      @optional = optional
-      @ref_mode = ref_mode
-      @alias = as || JsonModel.config.property_naming_strategy.call(name).to_sym
-    end
-
-    # @param [Hash] options
-    # @return [Hash]
-    def as_schema(**options)
-      {
-        self.alias => type
-                        .as_schema(**options, ref_mode: @ref_mode)
-                        .merge({ default: default }.compact),
-      }
-    end
-
-    # @param [ActiveModel::Validations]
-    def register_validations(klass)
-      if required?
-        klass.validates(name, presence: true)
-      end
-      type.register_validations(name, klass)
-    end
-
-    # @return [Boolean]
-    def required?
-      !optional
-    end
-
-    # @return [Array]
-    def referenced_schemas
-      if @ref_mode == RefMode::LOCAL
-        type.referenced_schemas
-      else
-        []
-      end
-    end
-  end
-end

data/lib/json_model/ref_mode.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  module RefMode
-    EXTERNAL = :external
-    INLINE = :inline
-    LOCAL = :local
-  end
-end

data/lib/json_model/type_spec/array.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  class TypeSpec
-    class Array < TypeSpec
-      # @param [TypeSpec] type
-      # @param [Integer, nil] min_items
-      # @param [Integer, nil] max_items
-      # @param [Boolean, nil] unique_items
-      def initialize(type, min_items: nil, max_items: nil, unique_items: nil)
-        super()
-        @type = type
-        @min_items = min_items
-        @max_items = max_items
-        @unique_items = unique_items
-      end
-
-      # @param [Hash] options
-      # @return [Hash]
-      def as_schema(**options)
-        {
-          type: 'array',
-          items: @type.as_schema(**options),
-          minItems: @min_items,
-          maxItems: @max_items,
-          uniqueItems: @unique_items,
-        }.compact
-      end
-
-      # @param [Symbol] name
-      # @param [ActiveModel::Validations] klass
-      def register_validations(name, klass)
-        super
-
-        if @min_items || @max_items
-          klass.validates(name, length: { minimum: @min_items, maximum: @max_items }.compact, allow_nil: true)
-        end
-        if @unique_items
-          register_uniqueness_validation(name, klass)
-        end
-      end
-
-      # @return [Array<TypeSpec>]
-      def referenced_schemas
-        @type.referenced_schemas
-      end
-
-      # @param [::Object] json
-      # @return [::Object, nil]
-      def cast(json)
-        if json.is_a?(Enumerable)
-          json.map { |item| @type.cast(item) }
-        else
-          raise(Errors::TypeError, "Expected an array, got #{json.class} (#{json.inspect})")
-        end
-      end
-
-      private
-
-      # @param [Symbol] name
-      # @param [ActiveModel::Validations] klass
-      def register_uniqueness_validation(name, klass)
-        klass.validate do |record|
-          duplicates = record.send(name)&.group_by(&:itself)&.select { |_k, v| v.size > 1 }&.keys
-          if !duplicates.nil? && duplicates.any?
-            record.errors.add(:tags, :uniqueness, message: "contains duplicates: #{duplicates.join(', ')}")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/json_model/type_spec/castable.rb

@@ -1,34 +0,0 @@
-# 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/composition/all_of.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  class TypeSpec
-    class Composition
-      class AllOf < Composition
-        # @param [TypeSpec] types
-        # @param [Hash] options
-        def initialize(*types, **options)
-          super(:allOf, *types, **options)
-        end
-
-        # @param [::Object] json
-        # @return [::Object, nil]
-        def cast(json)
-          if json.nil?
-            return nil
-          end
-
-          types_for(json).map do |type|
-            type.cast(json)
-          rescue StandardError
-            raise(Errors::TypeError, "Value #{json.inspect} cannot be cast to allOf type #{self}")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/json_model/type_spec/composition/any_of.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  class TypeSpec
-    class Composition
-      class AnyOf < Composition
-        # @param [TypeSpec] types
-        # @param [Hash] options
-        def initialize(*types, **options)
-          super(:anyOf, *types, **options)
-        end
-
-        # @param [::Object] json
-        # @return [::Object, nil]
-        def cast(json)
-          if json.nil?
-            return nil
-          end
-
-          type = types_for(json).detect do |type|
-            type.cast(json)
-          rescue StandardError
-            false
-          end
-          if type.nil?
-            raise(Errors::TypeError, "No matching type found in AnyOf for value: #{json.inspect}")
-          else
-            type.cast(json)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/json_model/type_spec/composition/one_of.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module JsonModel
-  class TypeSpec
-    class Composition
-      class OneOf < Composition
-        # @param [TypeSpec] types
-        # @param [Hash] options
-        def initialize(*types, **options)
-          super(:oneOf, *types, **options)
-        end
-
-        # @param [::Object] json
-        # @return [::Object, nil]
-        def cast(json)
-          if json.nil?
-            return nil
-          end
-
-          types = types_for(json).select do |type|
-            type.cast(json)
-          rescue StandardError
-            false
-          end
-
-          case types.size
-          when 0
-            raise(Errors::TypeError, "No matching type found in OneOf for value: #{json.inspect}")
-          when 1
-            types.first.cast(json)
-          else
-            raise(Errors::TypeError, "Multiple matching types found in OneOf for value: #{json.inspect}")
-          end
-        end
-      end
-    end
-  end
-end