Merge branch 'master' of git://github.com/tapajos/couchrest_model

Conflicts:
	Rakefile
	couchrest_model.gemspec
	history.txt
	lib/couchrest_model.rb
	spec/couchrest/attribute_protection_spec.rb
This commit is contained in:
Sam Lown 2010-08-24 11:45:37 +02:00
commit c32992c21b
12 changed files with 84 additions and 10 deletions

View file

@ -54,7 +54,7 @@ module CouchRest
attributes.reject! do |property_name, property_value|
protected_names.include?(property_name.to_s)
end
end if attributes
attributes || {}
end