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

Merge remote branch 'tapajos/master'

Browse source 
Conflicts:
	README.md
	lib/couchrest/mixins/properties.rb
	spec/couchrest/core/database_spec.rb
	spec/couchrest/more/extended_doc_spec.rb
This commit is contained in:
Tapajós 2009-09-20 22:52:39 -03:00
commit 2f2c507582
11 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/couchrest/mixins/extended_attachments.rb
View file

@ -64,7 +64,7 @@ module CouchRest
def set_attachment_attr(args)
content_type = args[:content_type] ? args[:content_type] : get_mime_type(args[:file])
self['_attachments'][args[:name]] = {
'content-type' => content_type,
'content_type' => content_type,
'data' => encode_attachment(args[:file].read)
}
end