deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'errors_fix' of https://github.com/gsterndale/couchrest_model into errors_fix

Browse source
This commit is contained in:
Sam Lown 2011-02-02 20:17:51 +01:00
parent d53c98252e 731338ed6c
commit 1ccb96bf56
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/couchrest/model/validations/casted_model.rb
View file

@ -6,7 +6,9 @@ module CouchRest
def validate_each(document, attribute, value) def validate_each(document, attribute, value)
values = value.is_a?(Array) ? value : [value] values = value.is_a?(Array) ? value : [value]
return if values.collect {|doc| doc.nil? || doc.valid? }.all? return if values.collect {|doc| doc.nil? || doc.valid? }.all?
document.errors.add(attribute, :invalid, :default => options[:message], :value => value) error_options = { :value => value }
error_options[:message] = options[:message] if options[:message]
document.errors.add(attribute, :invalid, error_options)
end end
end end
end end

5
spec/couchrest/casted_model_spec.rb
View file

@ -286,6 +286,11 @@ describe CouchRest::Model::CastedModel do
@toy2.errors.should be_empty @toy2.errors.should be_empty
@toy3.errors.should_not be_empty @toy3.errors.should_not be_empty
end end
it "should not use dperecated ActiveModel options" do
ActiveSupport::Deprecation.should_not_receive(:warn)
@cat.should_not be_valid
end
end end
describe "on a casted model property" do describe "on a casted model property" do