diff --git a/README.md b/README.md index 01eb72e1..0d64dcf2 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Or with authentication CouchPotato::Config.database_name = "http://username:password@example.com:5984/name_of_the_db" -Optionally you can configure which framework you want to use for validations (either validatable or ActiveModel) +Optionally you can configure which framework you want to use for validations (either validatable or ActiveModel (default)) CouchPotato::Config.validation_framework = :validatable | :active_model @@ -193,7 +193,7 @@ You can also force a dirty state: #### Object validations -Couch Potato uses the validatable library for validation (http://validatable.rubyforge.org/)\ +Couch Potato by default uses ActiveModel for validation class User property :name @@ -202,7 +202,9 @@ Couch Potato uses the validatable library for validation (http://validatable.rub user = User.new user.valid? # => false - user.errors.on(:name) # => [:name, 'can't be blank'] + user.errors[:name] # => ['can't be blank'] + +If you want you can use [Validatable](http://validatable.rubyforge.org/) by setting `CouchPotato::Config.validation(http://validatable.rubyforge.org/)\_framework = :validatable` #### Finding stuff / views / lists diff --git a/lib/couch_potato.rb b/lib/couch_potato.rb index 25dc83dc..6285b84c 100644 --- a/lib/couch_potato.rb +++ b/lib/couch_potato.rb @@ -10,7 +10,7 @@ unless defined?(CouchPotato) module CouchPotato Config = Struct.new(:database_name, :validation_framework).new - Config.validation_framework = :validatable # default to the validatable gem for validations + Config.validation_framework = :active_model # Returns a database instance which you can then use to create objects and query views. You have to set the CouchPotato::Config.database_name before this works. def self.database