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

Conflicts:
	history.md
	lib/couchrest/model/property.rb
This commit is contained in:
Sam Lown 2011-06-08 18:37:00 +02:00
commit 7e054fd948
7 changed files with 79 additions and 8 deletions

View file

@ -50,6 +50,16 @@ module CouchRest::Model
super
end
def delete(obj)
couchrest_parent_will_change! if use_dirty? && self.length > 0
super(obj)
end
def delete_at(index)
couchrest_parent_will_change! if use_dirty? && self.length > 0
super(index)
end
def build(*args)
obj = casted_by_property.build(*args)
self.push(obj)

View file

@ -244,6 +244,7 @@ module CouchRest
else
options = { :limit => per_page, :skip => per_page * (page - 1) }
end
options[:include_docs] = true
view_options.merge(options)
end