loose_change 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/loose_change/attachments.rb

@@ -40,7 +40,7 @@ module LooseChange
     # Returns a hash composed of <tt>file</tt> and <tt>content_type</tt> as
     # returned from CouchDB identified by +name+.
     def retrieve_attachment(name)
-      { :file => RestClient.get("#{ uri }/#{ name }"),
+      { :file => RestClient.get("#{ uri }/#{ CGI.escape(name) }"),
         :content_type => JSON.parse(RestClient.get(uri))['_attachments']['name'] }
     end
     
@@ -52,7 +52,7 @@ module LooseChange
     #   recipe.put_attachment(:photo)
     def put_attachment(name)
       return unless attachments[name]
-      result = JSON.parse(RestClient.put("#{ uri }/#{ name }#{ '?rev=' + @_rev if @_rev  }", attachments[name][:file], {:content_type => attachments[name][:content_type], :accept => 'text/json'}))
+      result = JSON.parse(RestClient.put("#{ uri }/#{ CGI.escape(name) }#{ '?rev=' + @_rev if @_rev  }", attachments[name][:file], {:content_type => attachments[name][:content_type], :accept => 'text/json'}))
       @_rev = result['rev']
     end
        

data/lib/loose_change/persistence.rb

@@ -100,8 +100,11 @@ module LooseChange
       raise DatabaseNotSet.new("Cannot save without database set.") unless @database
       apply_defaults
       return false unless valid?
-      new_record? ? post_record : put_record
-      put_attachments
+      if new_record
+        post_record and put_attachments
+      else
+        put_record and put_attachments
+      end
       self
     end
     
@@ -133,7 +136,9 @@ module LooseChange
     end
 
     def put_attachments
-      (@attachments || {}).each { |name, attachment| put_attachment(name) if attachment[:dirty] }
+      (@attachments || {}).each { |name, attachment|
+        put_attachment(name) if attachment[:dirty]
+      }
     end
     
     def attachment_ivar(name)

data/loose_change.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{loose_change}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Miller"]
-  s.date = %q{2010-12-03}
+  s.date = %q{2010-12-15}
   s.email = %q{josh@joshinharrisburg.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/test/attachment_test.rb

@@ -12,7 +12,7 @@ class AttachmentTest < ActiveSupport::TestCase
   end
 
   should 'accept an attachment' do
-    @model.attach :photo, File.open(File.join(File.dirname(__FILE__), 'resources', 'couchdb.png')), :content_type => 'image/png'
+    @model.attach "photo", File.open(File.join(File.dirname(__FILE__), 'resources', 'couchdb.png')), :content_type => 'image/png'
     assert @model.save
     @retrieved = AttachmentModel.find(@model.id)
     assert_equal({"photo" => {:content_type => 'image/png'}}, @retrieved.attachments)
@@ -20,6 +20,15 @@ class AttachmentTest < ActiveSupport::TestCase
     assert_equal @retrieved.attachment(:photo).size, @model.attachment(:photo).size
   end
   
+  should 'accept an attachment with spaces in its name' do
+    @model.attach "first photo", File.open(File.join(File.dirname(__FILE__), 'resources', 'couchdb.png')), :content_type => 'image/png'
+    assert @model.save
+    @retrieved = AttachmentModel.find(@model.id)
+    assert_equal({"first photo" => {:content_type => 'image/png'}}, @retrieved.attachments)
+    assert_not_nil @retrieved.attachment("first photo")
+    assert_equal @retrieved.attachment("first photo").size, @model.attachment("first photo").size
+  end
+  
   should "persist attachment between saves" do
     @model.attach "Photo", File.open(File.join(File.dirname(__FILE__), 'resources', 'couchdb.png')), :content_type => 'image/png'
     assert @model.save

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Joshua Miller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -05:00
+date: 2010-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1881381695233606524
+      hash: -727594084289976830
       segments: 
       - 0
       version: "0"