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

Merge pull request #90 from kostia/validates_on

Browse source 
Should be able to set contextual validations
This commit is contained in:
Sam Lown 2011-06-08 16:06:04 -07:00
commit ca932df5ba
5 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/couchrest/model/base.rb
View file

@ -7,7 +7,6 @@ module CouchRest
include CouchRest::Model::Configuration
include CouchRest::Model::Connection
include CouchRest::Model::Persistence
include CouchRest::Model::Callbacks
include CouchRest::Model::DocumentQueries
include CouchRest::Model::Views
include CouchRest::Model::DesignDoc
@ -21,6 +20,7 @@ module CouchRest
include CouchRest::Model::Designs
include CouchRest::Model::CastedBy
include CouchRest::Model::Dirty
include CouchRest::Model::Callbacks
def self.subclasses
@subclasses ||= []

6
lib/couchrest/model/callbacks.rb
View file

@ -16,8 +16,10 @@ module CouchRest #:nodoc:
end
def valid?(*) #nodoc
_run_validation_callbacks { super }
def valid?(context = nil)
context ||= (new_record? ? :create : :update)
output = super(context)
errors.empty? && output
end
end

3
lib/couchrest/model/casted_model.rb
View file

@ -5,13 +5,14 @@ module CouchRest::Model
included do
include CouchRest::Model::Configuration
include CouchRest::Model::Callbacks
include CouchRest::Model::Properties
include CouchRest::Model::PropertyProtection
include CouchRest::Model::Associations
include CouchRest::Model::Validations
include CouchRest::Model::CastedBy
include CouchRest::Model::Dirty
include CouchRest::Model::Callbacks
class_eval do
# Override CastedBy's base_doc?
def base_doc?