attributor 5.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de74a91670c3d4d2ab545ed984f7a8e04ad258bc
-  data.tar.gz: 6d1764a9765d136fe1439ec0cd46e54519aaf07f
+  metadata.gz: e92945289cab58f688cbad5df9d032fa684537b3
+  data.tar.gz: 53c15208c223f49ae8c05fdeebb962e31cc9c63e
 SHA512:
-  metadata.gz: c2899ff383f44c4266725b69e35a60707885dd648ca6f00e75fb5f515b0946fbe0a8192c9f822891a0222aeaa572b24f50d05bfeff9b7adac74e275147f7748b
-  data.tar.gz: 9d6823ce40583045dc223d5f5e348d5f276840cf7ff211880d8d491521de16484ccd338e3677a4be665defb55fdccf5bdc09893c1b667b6489892ae3715696cf
+  metadata.gz: 957400d332d6091f4f288c338ca9564004a9ca07b7d50355a8870c004f4419c3879e35c997aa4cdcdd4e92fd1301935c860de9c92318ae94d1d7af9f7208cf72
+  data.tar.gz: 7a189aa4fac7c5c7263e130a25b52515fb3de6717e652cbc7f5fd00d1c95acf48caaad70771b151b96365e616a9c6e384b873de2abfe68604a2b4b804cc4c0b0

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## next
 
+## 5.0.1
+
+* Fix bug that made Struct/Models skip validation of requirements using the `requires` DSL
 
 ## 5.0
 

data/lib/attributor/hash_dsl_compiler.rb

@@ -30,7 +30,7 @@ module Attributor
         self
       end
 
-      def validate( object,context=Attributor::DEFAULT_ROOT_CONTEXT,_attribute)
+      def validate( object,context=Attributor::DEFAULT_ROOT_CONTEXT,_attribute=nil)
         result = []
         case type
         when :all

data/lib/attributor/types/hash.rb

@@ -590,11 +590,9 @@ module Attributor
           end
         end
       end
-      unless self.class.requirements.empty?
-        self.class.requirements.each_with_object(ret) do |req, errors|
-          validation_errors = req.validate( @contents , context)
-          errors.push *validation_errors unless validation_errors.empty?
-        end
+      self.class.requirements.each_with_object(ret) do |req, errors|
+        validation_errors = req.validate( @contents , context)
+        errors.push *validation_errors unless validation_errors.empty?
       end
       ret
     end

data/lib/attributor/types/model.rb

@@ -131,7 +131,7 @@ module Attributor
 
       context = [context] if context.is_a? ::String
 
-      self.class.attributes.each_with_object(Array.new) do |(sub_attribute_name, sub_attribute), errors|
+      ret = self.class.attributes.each_with_object(Array.new) do |(sub_attribute_name, sub_attribute), errors|
         sub_context = self.class.generate_subcontext(context,sub_attribute_name)
 
         value = self.__send__(sub_attribute_name)
@@ -141,6 +141,11 @@ module Attributor
 
         errors.push *sub_attribute.validate(value, sub_context)
       end
+      self.class.requirements.each_with_object(ret) do |req, errors|
+        validation_errors = req.validate( @contents , context)
+        errors.push *validation_errors unless validation_errors.empty?
+      end
+      ret
     ensure
       @validating = false
     end

data/lib/attributor/version.rb

@@ -1,3 +1,3 @@
 module Attributor
-  VERSION = '5.0'
+  VERSION = '5.0.1'
 end

data/spec/support/models.rb

@@ -83,6 +83,7 @@ class Address < Attributor::Model
     attribute :name, String, example: /\w+/
     attribute :state, String, values: %w{OR CA}
     attribute :person, Person, example: proc { |address, context| Person.example(context, address: address) }
+    requires :name
   end
 end
 

data/spec/types/model_spec.rb

@@ -246,7 +246,7 @@ describe Attributor::Model do
         context 'loading with default values' do
           let(:reference) { Post }
           let(:options) { {reference: reference} }
-          
+
           let(:attribute_definition) do
             proc do
               attribute :title
@@ -255,10 +255,10 @@ describe Attributor::Model do
           end
 
           let(:struct) { Attributor::Struct.construct(attribute_definition, options)}
-          
+
           let(:data) { {title: 'my post'} }
-          
-          subject(:loaded)  { struct.load(data) }    
+
+          subject(:loaded)  { struct.load(data) }
 
 
           it 'validates' do
@@ -372,6 +372,11 @@ describe Attributor::Model do
       end
     end
 
+    context 'for models using the "requires" DSL' do
+      subject(:address) { Address.load(state: 'CA') }
+      its(:validate) { should_not be_empty }
+      its(:validate) { should include "Key name is required for $." }
+    end
     context 'for models with circular sub-attributes' do
       context 'that are valid' do
         subject(:person) { Person.example }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributor
 version: !ruby/object:Gem::Version
-  version: '5.0'
+  version: 5.0.1
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A powerful attribute and type management library for Ruby