hashie-model 1.1.0 → 1.2.0

data/hashie-model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hashie-model}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ZenCash.com}]
-  s.date = %q{2011-11-01}
+  s.date = %q{2011-11-04}
   s.description = %q{Hashie + ActiveModel 3, offering declared properties, validations, JSON serialization/deserialization}
   s.email = %q{istvan@zencash.com}
   s.extra_rdoc_files = [

data/lib/hashie_model/associated_validator.rb

@@ -2,7 +2,8 @@ module HashieModel
   class AssociatedValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       return if (value.is_a?(Array) ? value : [value]).collect{ |r| r.nil? || r.valid? }.all?
-      record.errors.add(attribute, :invalid, options.merge(:value => value))
+      errors = value.is_a?(Array) ? value.map(&:errors).first : value.errors
+      record.errors.add(attribute, errors, options.merge(:value => value))
     end
   end
 end

data/lib/hashie_model/spec/matchers.rb

@@ -75,7 +75,8 @@ end
 
 RSpec::Matchers.define :validate_associated do |attribute|
   match do |component|
-    component.stub(attribute => mock("#{component.class}.#{attribute}", :valid? => false))
+    errors = mock("#{component} errors", :empty? => false)
+    component.stub(attribute => mock("#{component.class}.#{attribute}", :errors => errors, :valid? => false))
     is_invalid = !component.valid?
     right_error_count = component.errors[attribute].size == 1
     

data/lib/hashie_model/version.rb

@@ -1,7 +1,7 @@
 module HashieModel
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     BUILD = nil
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashie-model
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2162761960 !ruby/object:Gem::Requirement
+  requirement: &2162527160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2162761960
+  version_requirements: *2162527160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2162761380 !ruby/object:Gem::Requirement
+  requirement: &2162526460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2162761380
+  version_requirements: *2162526460
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2162760880 !ruby/object:Gem::Requirement
+  requirement: &2162525600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2162760880
+  version_requirements: *2162525600
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &2162760400 !ruby/object:Gem::Requirement
+  requirement: &2162524700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *2162760400
+  version_requirements: *2162524700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162759800 !ruby/object:Gem::Requirement
+  requirement: &2162523560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2162759800
+  version_requirements: *2162523560
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &2162759260 !ruby/object:Gem::Requirement
+  requirement: &2162518000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0.beta3
   type: :development
   prerelease: false
-  version_requirements: *2162759260
+  version_requirements: *2162518000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2162758720 !ruby/object:Gem::Requirement
+  requirement: &2162516920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2162758720
+  version_requirements: *2162516920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2162758220 !ruby/object:Gem::Requirement
+  requirement: &2162515640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2162758220
+  version_requirements: *2162515640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2162757720 !ruby/object:Gem::Requirement
+  requirement: &2162514140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2162757720
+  version_requirements: *2162514140
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2162757080 !ruby/object:Gem::Requirement
+  requirement: &2162513280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162757080
+  version_requirements: *2162513280
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2162756520 !ruby/object:Gem::Requirement
+  requirement: &2162512360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162756520
+  version_requirements: *2162512360
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2162756000 !ruby/object:Gem::Requirement
+  requirement: &2162511500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162756000
+  version_requirements: *2162511500
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2162755520 !ruby/object:Gem::Requirement
+  requirement: &2162504820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162755520
+  version_requirements: *2162504820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2162754980 !ruby/object:Gem::Requirement
+  requirement: &2162504120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162754980
+  version_requirements: *2162504120
 - !ruby/object:Gem::Dependency
   name: guard-yard
-  requirement: &2162754440 !ruby/object:Gem::Requirement
+  requirement: &2162503160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162754440
+  version_requirements: *2162503160
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2162753820 !ruby/object:Gem::Requirement
+  requirement: &2162502340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162753820
+  version_requirements: *2162502340
 description: Hashie + ActiveModel 3, offering declared properties, validations, JSON
   serialization/deserialization
 email: istvan@zencash.com
@@ -236,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -928634340732323977
+      hash: 2357576476638275921
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: