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

Conflicts:
	lib/couchrest/model/callbacks.rb
This commit is contained in:
Sam Lown 2011-06-09 01:10:13 +02:00
commit 7875113d95
5 changed files with 39 additions and 4 deletions

View file

@ -21,6 +21,7 @@ module CouchRest
include CouchRest::Model::Designs
include CouchRest::Model::CastedBy
include CouchRest::Model::Dirty
include CouchRest::Model::Callbacks
def self.subclasses
@subclasses ||= []

View file

@ -12,6 +12,8 @@ module CouchRest::Model
include CouchRest::Model::Callbacks
include CouchRest::Model::CastedBy
include CouchRest::Model::Dirty
include CouchRest::Model::Callbacks
class_eval do
# Override CastedBy's base_doc?
def base_doc?