json_schematize 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ba73765eb1eef7075be586554ca29eddc7ae7b81cc293aa526dc47715fbb77
-  data.tar.gz: f10b1d7668e6fecd3fc0b8c8a2dcc649df1ede93ce344e2a437209b1d94446c5
+  metadata.gz: 545006e10e9c73489b4a2db37d7b787a49c4427dd58d541ac938bad4c73954ce
+  data.tar.gz: 38f4d89c9cb2ffc8b9863531d8745eae5acd2b2bc1379ea6e9f459d66550525e
 SHA512:
-  metadata.gz: a8f5b17a8d1a4d0defb7898b4f8ed2721b960e8b3dbf5216db4ef2dc0d9c56ad9f3d9fe71c67f05735f6838aea729d79d9680614280e142de2f3f2ff17be51c0
-  data.tar.gz: 51624964387dcd0f1699827e497f170f31a7ac8d542398ac6fd14cb2d81719cc9c6d018b2dc2178718b6e008e320806b41c3bd77a50f208204a023fb63fae76c
+  metadata.gz: d640bd68de88a3e6e3b4a73fd8688e9c017bbb8948a73abb3a2f4bf36a87c3ba1bd31bb08f052b8fd36bca9a7758f825f32448ae39930610eaae7323ccd336fb
+  data.tar.gz: 344f9dd96df21d5b5f8f8b6daca078281403606c5b75dcc958d999186380e83a56ddb592f071b271656882ad9d4a117ce7211ca050cb901e4f57fbb90fe2355e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_schematize (0.3.0)
+    json_schematize (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/json_schematize/base.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class JsonSchematize::Base
+  def self.acceptable_types
+    raise NoMethodError, "Expected acceptable_values to be defined in parent class"
+  end
+end

data/lib/json_schematize/boolean.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class JsonSchematize::Boolean
+require "json_schematize/base"
+
+class JsonSchematize::Boolean < JsonSchematize::Base
   FALSE_VALUES = ["false", "f", "0", false]
   TRUE_VALUES = ["true", "t", "1", true]
 
@@ -10,4 +12,8 @@ class JsonSchematize::Boolean
 
     raise JsonSchematize::UndefinedBoolean, "#{val} is not a valid #{self.class}"
   end
+
+  def self.acceptable_types
+    [TrueClass, FalseClass]
+  end
 end

data/lib/json_schematize/field.rb

@@ -36,9 +36,9 @@ class JsonSchematize::Field
 
   def acceptable_value?(transformed_value:, raise_on_error:)
     if array_of_types
-      boolean = transformed_value.all? { |val| @acceptable_types.include?(val.class) }
+      boolean = transformed_value.all? { |val| validate_acceptable_types(val: val) }
     else
-      boolean = @acceptable_types.include?(transformed_value.class)
+      boolean = validate_acceptable_types(val: transformed_value)
     end
 
     if raise_on_error && (boolean==false)
@@ -77,6 +77,18 @@ class JsonSchematize::Field
 
   private
 
+  def validate_acceptable_types(val:)
+    (all_allowed_types + @acceptable_types).include?(val.class)
+  end
+
+  def all_allowed_types
+    @all_allowed_types ||= begin
+      @acceptable_types.map do |t|
+        t.acceptable_types if t.ancestors.include?(JsonSchematize::Base)
+      end.compact.flatten
+    end
+  end
+
   def iterate_array_of_types(value:)
     return raw_converter_call(value: value) unless array_of_types
 

data/lib/json_schematize/version.rb

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

data/lib/json_schematize.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require "json_schematize/version"
-require "json_schematize/generator"
+require "json_schematize/base"
 require "json_schematize/boolean"
+require "json_schematize/generator"
+require "json_schematize/version"
 
 module JsonSchematize
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schematize
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -88,6 +88,7 @@ files:
 - docker-compose.yml
 - json_schematize.gemspec
 - lib/json_schematize.rb
+- lib/json_schematize/base.rb
 - lib/json_schematize/boolean.rb
 - lib/json_schematize/field.rb
 - lib/json_schematize/field_transformations.rb