json_schematize 0.8.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc1b50176fdee42d41912116919c05fdd1c34e17c7932b4e588cb380abfd8f5
-  data.tar.gz: ee85dc09adc5d4505e75d04aa524d43f2aa6859ee82eddf474fbdd471613f885
+  metadata.gz: f142af20c373eb4cc7c13c09311cb6c5ebfd3bd4d8de2f31bad7e162b1c7f38e
+  data.tar.gz: 208e364c6afbd566d55b81ebc7f57ea38c96e963afbecd9c2bac79da08710d45
 SHA512:
-  metadata.gz: 21a5a7c6d3e194c1ba1149b3b6e37dfe6da7724ee317f8e2d3856b1b917dbcaedad510a8cce42f3c6340b3a66d5b662dc0cac11ce598916b73ef1c59a6aed739
-  data.tar.gz: '09d5cb8dd10a426f98b8fbbc89ab14cb76800f3c3bdb7acb0bb7d640a9a135453732d533b75703a6b639e19b937b8b32ad77c502f804840fbf3ae49b6ec06f7a'
+  metadata.gz: 8341c39c1d7bfd71e7bf42fc5ad85266084a401c464d3a73362d020e61aaeb2fb46563ecf366397c71e6e23a411763407f8dd45fede1164f0b0cccb0f302afa7
+  data.tar.gz: 37a700647afa8ad98de45e9563205293ec1a6b7f6c0eaa463fe58cdc98b88d031ed56b7c8f1862f4e3a5ac8bcf9c826803b9c38348bf7b89e30b044f4f031ec7

data/.circleci/config.yml

@@ -12,10 +12,10 @@ workflows:
       - cst/enforce-gem-version-bump
       - cst/rspec-ruby:
           rspec-system-args: "SIMPLE_COV_RUN=true"
-          cc-report-collect-ruby: "2.7.5"
+          cc-report-collect-ruby: "3.3.6"
           matrix:
             parameters:
-              ruby-version: ["2.7.5" , "3.0.0", "3.0.3"]
+              ruby-version: ["3.2.4", "3.3.6"]
             alias: required-matrix-tests
           name: test-ruby<< matrix.ruby-version >>
       - cst/publish-gem:

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.1
+FROM ruby:3.3.6
 RUN cd /tmp && curl -L --output ghr.tar.gz https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz && \
     tar -xzvf ghr.tar.gz && chmod +x ghr_v0.12.0_linux_amd64/ghr && mv ghr_v0.12.0_linux_amd64/ghr /usr/local/bin/ghr && rm -rf /tmp/*
 

data/Gemfile.lock

@@ -1,59 +1,79 @@
 PATH
   remote: .
   specs:
-    json_schematize (0.7.0)
+    json_schematize (0.10.0)
+      class_composer (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     byebug (11.1.3)
+    class_composer (2.1.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    faker (2.20.0)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    drb (2.2.1)
+    faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    i18n (1.10.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    minitest (5.15.0)
-    pry (0.13.1)
+    logger (1.6.4)
+    method_source (1.1.0)
+    minitest (5.25.4)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (>= 0.13, < 0.15)
     rake (12.3.3)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rspec_junit_formatter (0.5.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    simplecov (0.21.2)
+    securerandom (0.4.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.0.2)
 
 PLATFORMS
+  aarch64-linux
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
@@ -68,4 +88,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.8
+   2.4.8

data/json_schematize.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage    = "https://github.com/matt-taylor/json_schematize"
   spec.license     = "MIT"
 
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2")
 
   spec.metadata = {
     "homepage_uri" => spec.homepage,
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "class_composer", "~> 1.0"
+  spec.add_dependency "class_composer", ">= 1.0"
 
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 12.0"

data/lib/json_schematize/cache/class_methods/client.rb

@@ -2,12 +2,11 @@
 
 module JsonSchematize::Cache::ClassMethods
   module Client
-
     def __deserialize_keys__(key_hash_bytes)
       return [{}, 0] if key_hash_bytes.nil?
 
       min_expire = Time.now.to_i
-      key_hash =  Marshal.load(key_hash_bytes)
+      key_hash =  __marshalize__(key_hash_bytes)
       keys_removed = 0
       key_hash.each do |key, expire|
         next if expire.to_i > min_expire
@@ -22,6 +21,10 @@ module JsonSchematize::Cache::ClassMethods
       [{}, 0]
     end
 
+    def __marshalize__(key_hash_bytes)
+      Marshal.load(key_hash_bytes)
+    end
+
     def __update_record_keeper__!(expire:, cache_key:, delete_key: false)
       record_of_truth = cached_keys(with_expire: true)
       if delete_key

data/lib/json_schematize/field.rb

@@ -39,7 +39,11 @@ class JsonSchematize::Field
 
   def acceptable_value?(transformed_value:, raise_on_error:)
     if array_of_types
-      boolean = transformed_value.all? { |val| validate_acceptable_types(val: val) }
+      if transformed_value.is_a?(empty_value) && required == false
+        boolean = true
+      else
+        boolean = transformed_value.all? { |val| validate_acceptable_types(val: val) }
+      end
     else
       boolean = validate_acceptable_types(val: transformed_value)
     end
@@ -53,7 +57,11 @@ class JsonSchematize::Field
 
   def acceptable_value_by_validator?(transformed_value:, raw_value:, raise_on_error:)
     if array_of_types
-      boolean = transformed_value.all? { |val| validator.call(transformed_value, raw_value) }
+      if transformed_value.is_a?(empty_value) && required == false
+        boolean = true
+      else
+        boolean = transformed_value.all? { |val| validator.call(transformed_value, raw_value) }
+      end
     else
       boolean = validator.call(transformed_value, raw_value)
     end
@@ -94,6 +102,7 @@ class JsonSchematize::Field
 
   def iterate_array_of_types(value:)
     return raw_converter_call(value: value) unless array_of_types
+    return empty_value.new if value.nil? && required == false
 
     unless value.is_a?(Array)
       raise JsonSchematize::InvalidFieldByArrayOfTypes, ":#{name} expected to be an array based on :array_of_types flag. Given #{value.class}"

data/lib/json_schematize/generator.rb

@@ -10,7 +10,9 @@ class JsonSchematize::Generator
 
   include JsonSchematize::Introspect
 
-  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)
+  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"
+
     field_params = {
       converter: converter || schema_defaults[:converter],
       dig: dig || schema_defaults[:dig],

data/lib/json_schematize/version.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: json_schematize
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2024-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: class_composer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -132,14 +132,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: This gem gives you the ability to turn API results into a standardized schema's