json_schematize 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f142af20c373eb4cc7c13c09311cb6c5ebfd3bd4d8de2f31bad7e162b1c7f38e
-  data.tar.gz: 208e364c6afbd566d55b81ebc7f57ea38c96e963afbecd9c2bac79da08710d45
+  metadata.gz: d0109f08060b1b724a2eac694e1cc96c54c3b7bf777b34c247cda4d4e23a4285
+  data.tar.gz: e97e0ac77e38320befb81841f3ef46162d89aba94563cc5b0c51c7cae8f72642
 SHA512:
-  metadata.gz: 8341c39c1d7bfd71e7bf42fc5ad85266084a401c464d3a73362d020e61aaeb2fb46563ecf366397c71e6e23a411763407f8dd45fede1164f0b0cccb0f302afa7
-  data.tar.gz: 37a700647afa8ad98de45e9563205293ec1a6b7f6c0eaa463fe58cdc98b88d031ed56b7c8f1862f4e3a5ac8bcf9c826803b9c38348bf7b89e30b044f4f031ec7
+  metadata.gz: 68d0341cf925a9571bd132e03fe75741dc1bd70de88bc706133c29be46b71b22da623c4963c810c33490dcc553d54c7711ac9390d776a52e4161b7a743e405a9
+  data.tar.gz: 8df6e7e5bd39c186cfa5d41649fda427ac86a470fabe766d886a02f7f9165c3b6bd68ce18cfd54809be3dbabd0805be6e62a2b392c691bbbd6516bc3e27fe42e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schematize (0.10.0)
+    json_schematize (0.11.0)
       class_composer (>= 1.0)
 
 GEM

data/lib/json_schematize/field.rb

@@ -5,7 +5,7 @@ require 'json_schematize/field_validators'
 
 class JsonSchematize::Field
 
-  attr_reader :name, :types, :dig, :dig_type, :symbol, :validator, :empty_value
+  attr_reader :name, :types, :type, :dig, :dig_type, :symbol, :validator, :empty_value
   attr_reader :acceptable_types, :required, :converter, :array_of_types
 
   EXPECTED_DIG_TYPE = [DIG_SYMBOL = :symbol, DEFAULT_DIG = DIG_NONE =:none, DIG_STRING = :string]
@@ -89,7 +89,11 @@ class JsonSchematize::Field
   private
 
   def validate_acceptable_types(val:)
-    (all_allowed_types + @acceptable_types).include?(val.class)
+    types = (all_allowed_types + @acceptable_types)
+    return true if types.include?(val.class)
+
+    # Allow inheritance here as well -- this only works when a custom converter is defined
+    Class === val ? types.any? { _1 > val } : false
   end
 
   def all_allowed_types
@@ -108,8 +112,14 @@ class JsonSchematize::Field
       raise JsonSchematize::InvalidFieldByArrayOfTypes, ":#{name} expected to be an array based on :array_of_types flag. Given #{value.class}"
     end
 
-    value.map do |val|
-      raw_converter_call(value: val)
+    if value.all? { JsonSchematize::Generator === _1 }
+      # We have already done the work to convert it into a Schematizable object
+      # Return the array and allow the remaining validations to take place
+      value
+    else
+      value.map do |val|
+        raw_converter_call(value: val)
+      end
     end
   end
 

data/lib/json_schematize/field_transformations.rb

@@ -20,7 +20,13 @@ module JsonSchematize::FieldTransformations
 
     @converter = DEFAULT_CONVERTERS[@acceptable_types[0]]
     if @converter.nil?
-      @converter = ->(val) { @acceptable_types[0].new(val) }
+      @converter = Proc.new do |val|
+        if @acceptable_types[0] < JsonSchematize::Generator && @acceptable_types[0] === val
+          val
+        else
+          @acceptable_types[0].new(val)
+        end
+      end
     end
   end
 

data/lib/json_schematize/generator.rb

@@ -2,13 +2,15 @@
 
 require "json_schematize/cache"
 require "json_schematize/field"
-require "json_schematize/introspect"
+require "json_schematize/introspect_instance_methods"
+require "json_schematize/introspect_class_methods"
 
 class JsonSchematize::Generator
   EMPTY_VALIDATOR = ->(_transformed_value, _raw_value) { true }
   PROTECTED_METHODS = [:assign_values!, :convenience_methods, :validate_required!, :validate_optional!, :validate_value]
 
-  include JsonSchematize::Introspect
+  include JsonSchematize::Introspect::InstanceMethods
+  extend JsonSchematize::Introspect::ClassMethods
 
   def self.add_field(name:, type: nil, types: nil, dig_type: nil, dig: nil, validator: nil, required: nil, converter: nil, array_of_types: nil, empty_value: nil, hash_of_types: nil, hash_of_types_key: "name")
     require "json_schematize/empty_value"

data/lib/json_schematize/introspect_class_methods.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module JsonSchematize::Introspect
+  module ClassMethods
+    def introspect(deep: false, prepend_dig: [], introspection: {})
+      fields.each do |field|
+        naming = (prepend_dig + field.dig).compact
+        type_metadata = __field_type__(field)
+        introspection[naming.join(".")] = {
+          required: field.required,
+          allowed: type_metadata[:humanize],
+        }
+
+        if deep && type_metadata[:deep_introspection]
+          prepended_naming = if field.array_of_types
+            naming.dup.tap { _1[-1] = "#{_1[-1]}[x]"}
+          else
+            naming.dup
+          end
+          type_metadata[:types][0].introspect(deep:, prepend_dig: prepended_naming, introspection: introspection)
+        end
+      end
+
+      introspection
+    end
+
+    def __field_type__(field)
+      types = Array(field.type || field.types)
+      deep_introspection = false
+      type_string = if types.length == 0
+        "Anything"
+      elsif types.length == 1
+        type = types.first
+        if JsonSchematize::Generator > type
+          deep_introspection = true
+          if field.array_of_types
+            "Array of #{type}"
+          else
+            type
+          end
+        else
+          type
+        end
+      else
+        "One of [#{types}]"
+      end
+
+      {
+        humanize: type_string,
+        types:,
+        deep_introspection:,
+      }
+    end
+  end
+end

data/lib/json_schematize/introspect_instance_methods.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module JsonSchematize::Introspect
+  module InstanceMethods
+    def to_h
+      self.class.fields.map do |field|
+        value = method(:"#{field.name}").()
+        if field.array_of_types
+          [field.name, value.map(&:to_h)]
+        elsif value.class == Class
+          [field.name, value.to_s]
+        elsif JsonSchematize::Generator > value.class
+          [field.name, value.to_h]
+        else
+          [field.name, value]
+        end
+      end.to_h
+    end
+    alias :to_hash :to_h
+
+    def deep_inspect(with_raw_params: false, with_field: false)
+      self.class.fields.map do |field|
+        value = {
+          required: field.required,
+          acceptable_types: field.acceptable_types,
+          value: instance_variable_get(:"@#{field.name}"),
+        }
+        value[:field] = field if with_field
+        value[:raw_params] = @__raw_params if with_raw_params
+        [field.name, value]
+      end.to_h
+    end
+
+    def inspect
+      stringify = to_h.map { |k, v| "#{k}:#{v}" }.join(", ")
+      "#<#{self.class} - required fields: #{self.class.required_fields.map(&:name)}; #{stringify}>"
+    end
+  end
+end

data/lib/json_schematize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonSchematize
-  VERSION = "0.10.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schematize
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-27 00:00:00.000000000 Z
+date: 2025-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_composer
@@ -90,7 +90,6 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
 - CODEOWNERS
 - Dockerfile
@@ -116,7 +115,8 @@ files:
 - lib/json_schematize/field_transformations.rb
 - lib/json_schematize/field_validators.rb
 - lib/json_schematize/generator.rb
-- lib/json_schematize/introspect.rb
+- lib/json_schematize/introspect_class_methods.rb
+- lib/json_schematize/introspect_instance_methods.rb
 - lib/json_schematize/version.rb
 homepage: https://github.com/matt-taylor/json_schematize
 licenses:

data/.ruby-version

@@ -1 +0,0 @@
-2.7.4

data/lib/json_schematize/introspect.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module JsonSchematize::Introspect
-  def to_h
-    self.class.fields.map do |field|
-      [field.name, instance_variable_get(:"@#{field.name}")]
-    end.to_h
-  end
-  alias :to_hash :to_h
-
-  def deep_inspect(with_raw_params: false, with_field: false)
-    self.class.fields.map do |field|
-      value = {
-        required: field.required,
-        acceptable_types: field.acceptable_types,
-        value: instance_variable_get(:"@#{field.name}"),
-      }
-      value[:field] = field if with_field
-      value[:raw_params] = @__raw_params if with_raw_params
-      [field.name, value]
-    end.to_h
-  end
-
-  def inspect
-    stringify = to_h.map { |k, v| "#{k}:#{v}" }.join(", ")
-    "#<#{self.class} - required fields: #{self.class.required_fields.map(&:name)}; #{stringify}>"
-  end
-end