s4 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.0.5 - 2011-10-18
+
+* Allow spaces in filenames when uploading files.
+* Fix various issues when running tests.
+
 0.0.4 - 2011-09-20
 
 * S4#put now returns the URL to the uploaded file.

data/lib/s4.rb

@@ -6,7 +6,7 @@ require "json"
 
 # Simpler AWS S3 library
 class S4
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   # sub-resource names which may appear in the query string and also must be
   # signed against.
@@ -175,7 +175,7 @@ class S4
     uri = uri(name)
     req = Net::HTTP::Put.new(uri.request_uri)
 
-    content_type = `file -ib #{io.path}`.chomp if !content_type && io.respond_to?(:path)
+    content_type = `file -ib '#{io.path}'`.chomp if !content_type && io.respond_to?(:path)
 
     req.add_field "Content-Type", content_type
     req.add_field "Content-Length", io.size

data/test/s4_test.rb

@@ -1,5 +1,6 @@
 raise "You need to have ENV[\"S3_URL\"] set for the tests to connect to your testing bucket on S3. Format is: 's3://<access key id>:<secret access key>@s3.amazonaws.com/<s4 test bucket>'." unless ENV["S3_URL"]
-raise "You need to have ENV[\"S4_NEW_BUCKET\"], which will be dynamically created and destroyed for testing bucket creation. i.e.: 's4-test-bucketthatdoesntexist'." unless ENV["S3_NEW_BUCKET"]
+raise "You need to have ENV[\"S4_NEW_BUCKET\"], which will be dynamically created and destroyed for testing bucket creation, e.g. 's4-test-bucketthatdoesntexist'." unless ENV["S4_NEW_BUCKET"]
+raise "You need to install the command line client for S3 (s3cmd) in order to run the tests" unless system("which s3cmd")
 
 require "contest"
 require "timecop"
@@ -174,6 +175,15 @@ class S4Test < Test::Unit::TestCase
       assert_equal "text/plain", foo.content_type
     end
 
+    should "upload foo bar.txt" do
+      @s4.upload(fixture("foo bar.txt"))
+
+      foo = open("http://s3.amazonaws.com/#{TestBucket}/foo%20bar.txt")
+
+      assert_equal "abc123", foo.read
+      assert_equal "text/plain", foo.content_type
+    end
+
     should "use given content_type" do
       @s4.put StringIO.new("abcdef", "r"), "bar.txt", "text/foobar"
       assert_equal "text/foobar", open("http://s3.amazonaws.com/#{TestBucket}/bar.txt").content_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s4
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000 -03:00
+date: 2011-10-18 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &2153639160 !ruby/object:Gem::Requirement
+  requirement: &2156443380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2153639160
+  version_requirements: *2156443380
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2153638740 !ruby/object:Gem::Requirement
+  requirement: &2156442320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153638740
+  version_requirements: *2156442320
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2153638200 !ruby/object:Gem::Requirement
+  requirement: &2156439240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2153638200
+  version_requirements: *2156439240
 description: Simple API for AWS S3
 email:
 - ben.alavi@citrusbyte.com