json_schematize 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 332c8451a65d8d3ef3c738e6a06d54407e62d479f6d0f015aa348c01c8c70f03
-  data.tar.gz: 534ae0f9dd57ee349c99fa75305370241470afb99ca0273afe98d9b206a9eb57
+  metadata.gz: 41661866a0f6debaa7bacc0897f12f00fe0ee156deb2c18dbacd28ef205a1079
+  data.tar.gz: d053b83bc1b4a3fb39b80ad18e126fa535102beeb988e036ab0d76564934af22
 SHA512:
-  metadata.gz: ce9ed85a4db89c977231290127487fde0d703ac527009173d28d0d10a1ced80a43d1febcb8cc3e4dff3b64bd80dc20c2817dd14fe301c478d3169342799f1187
-  data.tar.gz: 6eca9b7c49801e97d1393157c8c49a42ffafcb26bcdc103974329c2222ce3f804a496038f1cf8041836170ac251b3e9f977727f99d4bd11edad6de47931b76de
+  metadata.gz: 7c8d4f0c708c44330f76d64b280b0dfdc2f8a3cf8aa8f99de36ad5ad4bdb0a9e41ba1329b128730942016195e456cd1842bae61d3782108462305a174244f7de
+  data.tar.gz: e64e2b257ea5c8cf8db6e1e01d88297a7f3a15724cb8efacb4bac4a2953aad4e2208e70f1f579e428181d5265170fbfa07f2a8bb736a08fe8193b66556627003

data/Gemfile.lock

@@ -1,59 +1,62 @@
 PATH
   remote: .
   specs:
-    json_schematize (0.7.0)
+    json_schematize (0.9.0)
+      class_composer (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.4)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     byebug (11.1.3)
+    class_composer (1.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    faker (2.20.0)
+    faker (3.1.1)
       i18n (>= 1.8.11, < 2)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.15.0)
-    pry (0.13.1)
+    minitest (5.18.0)
+    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.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       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.12.0)
+    rspec-support (3.12.0)
+    rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
@@ -68,4 +71,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.8
+   2.4.8

data/json_schematize.gemspec

@@ -29,6 +29,8 @@ 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_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/json_schematize/configuration.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
+require "class_composer"
+require "json_schematize/errors"
+
 module JsonSchematize
   class Configuration
+    include ClassComposer::Generator
+
     DEFAULT_ONE_MIN = 60 * 60
     DEFAULT_ONE_HOUR = DEFAULT_ONE_MIN * 60
     DEFAULT_ONE_DAY = DEFAULT_ONE_HOUR * 24
@@ -14,16 +19,11 @@ module JsonSchematize
       cache_update_on_change: true,
     }
 
-    attr_accessor *DEFAULT_CACHE_OPTIONS.keys
-
-    def initialize
-      @cache_client = DEFAULT_CACHE_OPTIONS[:cache_client]
-      @cache_key = DEFAULT_CACHE_OPTIONS[:cache_key]
-      @cache_namespace = DEFAULT_CACHE_OPTIONS[:cache_namespace]
-      @cache_stochastic_bust = DEFAULT_CACHE_OPTIONS[:cache_stochastic_bust]
-      @cache_ttl = DEFAULT_CACHE_OPTIONS[:cache_ttl]
-      @cache_update_on_change = DEFAULT_CACHE_OPTIONS[:cache_update_on_change]
-    end
+    add_composer :cache_key, allowed: Proc, default: DEFAULT_CACHE_OPTIONS[:cache_key], validation_error_klass: ::JsonSchematize::ConfigError, invalid_message: -> (val) { _assign_msg_("cache_key", "->(val, cusom_key) { val.hash }", "Default proc to assign cache key") }
+    add_composer :cache_namespace, allowed: [String, Symbol]
+    add_composer :cache_stochastic_bust, allowed: [Float, Integer], default: DEFAULT_CACHE_OPTIONS[:cache_stochastic_bust]
+    add_composer :cache_ttl, allowed: [Float, Integer], default: DEFAULT_CACHE_OPTIONS[:cache_ttl]
+    add_composer :cache_update_on_change, allowed: [TrueClass, FalseClass], default: DEFAULT_CACHE_OPTIONS[:cache_update_on_change]
 
     def cache_hash
       DEFAULT_CACHE_OPTIONS.map do |key, value|

data/lib/json_schematize/errors.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module JsonSchematize
+  class Error < StandardError; end
+  class ConfigError < Error; end
+  class FieldError < Error; end
+
+  class InvalidField < Error; end
+  class InvalidFieldByValidator < InvalidField; end
+  class InvalidFieldByType < InvalidField; end
+  class InvalidFieldByArrayOfTypes < InvalidField; end
+
+  ## Customized class errors
+  class UndefinedBoolean < Error; end
+end

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.7.0"
+  VERSION = "0.9.0"
 end

data/lib/json_schematize.rb

@@ -1,26 +1,14 @@
 # frozen_string_literal: true
 
-require "json_schematize/version"
-
 require "json_schematize/base"
 require "json_schematize/boolean"
 require "json_schematize/configuration"
 require "json_schematize/empty_value"
+require "json_schematize/errors"
 require "json_schematize/generator"
 require "json_schematize/version"
 
 module JsonSchematize
-  class Error < StandardError; end
-  class ConfigError < StandardError; end
-  class FieldError < Error; end
-  class InvalidField < Error; end
-  class InvalidFieldByValidator < InvalidField; end
-  class InvalidFieldByType < InvalidField; end
-  class InvalidFieldByArrayOfTypes < InvalidField; end
-
-  ## Customized class errors
-  class UndefinedBoolean < Error; end
-
   def self.configure
     yield configuration if block_given?
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: json_schematize
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2023-04-03 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
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +111,7 @@ files:
 - lib/json_schematize/cache/instance_methods.rb
 - lib/json_schematize/configuration.rb
 - lib/json_schematize/empty_value.rb
+- lib/json_schematize/errors.rb
 - lib/json_schematize/field.rb
 - lib/json_schematize/field_transformations.rb
 - lib/json_schematize/field_validators.rb
@@ -124,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: This gem gives you the ability to turn API results into a standardized schema's