attributor 5.3 → 5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a11bd68a97257cb5818f1bcebf57f02bde25bf22904c878117f7e729e5bd0b94
-  data.tar.gz: 3e5e895e7f60be40aad375c37cac20f031b9687cd08f0496fa5457954e29df3d
+  metadata.gz: bb9d8a77a4e71c5f44cc2eaa6559c7d40882c88ec675b0400170d961386d66c1
+  data.tar.gz: 0b4d4bec370cbca4fa15d61dd08b0bc9b2cdcb8f1f0d39d21287e7471f60075e
 SHA512:
-  metadata.gz: 72386a9b285c56eed7c6a5d5a06b35fe2e892d3f2e8e689412b02e07eaabbbefe768d6b9739f63523276b2ffd89b47cb24c9cdaf43d7fca65da16e0741cc184a
-  data.tar.gz: 6261ac3f99788710e20e3fb7acbe4c4808da4eb77e3c346b329148c791d59ea490fe256552420b0373e2ef82c9cc6e7a7b86e57b0b0a72469ac46dd455a1fdc4
+  metadata.gz: 78a4367ada6bebcb2a164da33b08e05bd0c20207d11df7631b700346bb3e4ec74df47bef3373178cbd619a2f0252609c59586a1fb46c0913830a57b547361b67
+  data.tar.gz: e2a0fa2ecb088ff61c184624fcadfcc992d1fd60c5694727e8ffd594be1188ee6d60e2b14d7cc1daab4a9e8fbd67b584612d3be6e7574fbda4cfca004a182e00

data/attributor.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'rspec-collection_matchers'
   spec.add_development_dependency('yard')
-  spec.add_development_dependency('backports', ['~> 3'])
   spec.add_development_dependency('yardstick', ['~> 0'])
   spec.add_development_dependency('bundler', ['>= 0'])
   spec.add_development_dependency('rake-notes', ['~> 0'])

data/lib/attributor.rb

@@ -73,6 +73,20 @@ module Attributor
     inspection
   end
 
+  def self.recursive_to_h(val)
+    if val.is_a? Array
+      val.map { |v| recursive_to_h(v) }
+    elsif val.nil?
+      nil
+    elsif val.respond_to?(:to_h)
+      val.to_h.each_with_object({}) do |(name, inner_val), hash|
+        hash[name] = recursive_to_h(inner_val)
+      end
+    else
+      val
+    end
+  end  
+
   MODULE_PREFIX       = 'Attributor::'.freeze
   MODULE_PREFIX_REGEX = ::Regexp.new(MODULE_PREFIX)
 

data/lib/attributor/attribute.rb

@@ -158,7 +158,8 @@ module Attributor
 
       if options.key? :example
         loaded = example_from_options(parent, context)
-        errors = validate(loaded, context)
+        # Only validate the type, if the proc-generated example is "complex" (has attributes)
+        errors = loaded.class.respond_to?(:attributes) ? validate_type(loaded, context) : validate(loaded, context)
         raise AttributorException, "Error generating example for #{Attributor.humanize_context(context)}. Errors: #{errors.inspect}" if errors.any?
         return loaded
       end

data/lib/attributor/types/class.rb

@@ -1,4 +1,4 @@
-require 'active_support'
+require 'active_support/core_ext/string/inflections'
 
 require_relative '../exceptions'
 

data/lib/attributor/types/hash.rb

@@ -262,11 +262,11 @@ module Attributor
     end
 
     def self.load(value, context = Attributor::DEFAULT_ROOT_CONTEXT, recurse: false, **_options)
-      context = Array(context)
 
       return value if value.is_a?(self)
       return nil if value.nil? && !recurse
 
+      context = Array(context)
       loaded_value = self.parse(value, context)
 
       return from_hash(loaded_value, context, recurse: recurse) if keys.any?
@@ -282,7 +282,9 @@ module Attributor
         value
       elsif value.is_a?(::String)
         decode_json(value, context)
-      elsif value.respond_to?(:to_hash)
+      elsif value.respond_to?(:to_h)
+        value.to_h
+      elsif value.respond_to?(:to_hash) # Deprecate this in lieu of to_h only?
         value.to_hash
       else
         raise Attributor::IncompatibleTypeError.new(context: context, value_type: value.class, type: self)
@@ -301,6 +303,10 @@ module Attributor
       context + ["key(#{key_name.inspect})"]
     end
 
+    def to_h
+      Attributor.recursive_to_h(@contents)
+    end
+
     def generate_subcontext(context, key_name)
       self.class.generate_subcontext(context, key_name)
     end
@@ -548,6 +554,7 @@ module Attributor
     end
 
     def validate(context = Attributor::DEFAULT_ROOT_CONTEXT)
+      @validating = true
       context = [context] if context.is_a? ::String
 
       if self.class.keys.any?
@@ -555,6 +562,8 @@ module Attributor
       else
         self.validate_generic(context)
       end
+    ensure
+      @validating = false      
     end
 
     def validate_keys(context)

data/lib/attributor/types/polymorphic.rb

@@ -95,7 +95,9 @@ module Attributor
         value
       elsif value.is_a?(::String)
         decode_json(value, context)
-      elsif value.respond_to?(:to_hash)
+      elsif value.respond_to?(:to_h)
+        value.to_h
+      elsif value.respond_to?(:to_hash) # Deprecate this in lieu of to_h only?
         value.to_hash
       else
         raise Attributor::IncompatibleTypeError, context: context, value_type: value.class, type: self

data/lib/attributor/version.rb

@@ -1,3 +1,3 @@
 module Attributor
-  VERSION = '5.3'.freeze
+  VERSION = '5.4'.freeze
 end

data/spec/types/class_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
-require 'backports'
 
 describe Attributor::Class do
   subject(:type) { Attributor::Class }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: '5.3'
+  version: '5.4'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -109,20 +109,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: yardstick
   requirement: !ruby/object:Gem::Requirement