Merge branch 'errors_fix' of https://github.com/gsterndale/couchrest_…

…model into errors_fix
couchrest · Feb 2, 2011 · 1ccb96b · 1ccb96b
2 parents d53c982 + 731338e
commit 1ccb96b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/couchrest/model/validations/casted_model.rb b/lib/couchrest/model/validations/casted_model.rb
@@ -6,7 +6,9 @@ class CastedModelValidator < ActiveModel::EachValidator
         def validate_each(document, attribute, value)
           values = value.is_a?(Array) ? value : [value]
           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

diff --git a/spec/couchrest/casted_model_spec.rb b/spec/couchrest/casted_model_spec.rb
@@ -286,6 +286,11 @@ class NotAHashButWithCastedModelMixin
         @toy2.errors.should be_empty
         @toy3.errors.should_not be_empty
       end
+
+      it "should not use dperecated ActiveModel options" do
+        ActiveSupport::Deprecation.should_not_receive(:warn)
+        @cat.should_not be_valid
+      end
     end
 
     describe "on a casted model property" do