Merge branch 'master' of github.com:couchrest/couchrest_model into adv_design

2011-02-27 20:19:09 +01:00 · 2011-02-27 20:19:09 +01:00 · f58482553c
commit f58482553c
parent 0a35be7167 53b052f631
10 changed files with 75 additions and 41 deletions
--- a/lib/couchrest/model/validations/uniqueness.rb
+++ b/lib/couchrest/model/validations/uniqueness.rb
@ -32,7 +32,7 @@ module CouchRest
          end
          
          if docs.length > 0
-            document.errors.add(attribute, :taken, :default => options[:message], :value => value)
+            document.errors.add(attribute, :taken, options.merge(:value => value))
          end
        end