rack-s3 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-s3 (0.0.3)
+    rack-s3 (0.0.4)
       aws-s3
       rack
 
@@ -18,11 +18,11 @@ GEM
     mime-types (1.16)
     rack (1.2.1)
     shoulda (2.11.3)
-    vcr (1.5.0)
+    vcr (1.5.1)
     webmock (1.6.2)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
-    xml-simple (1.0.13)
+    xml-simple (1.0.14)
 
 PLATFORMS
   ruby

data/lib/rack/s3.rb

@@ -1,5 +1,6 @@
 require 'rack'
 require 'aws/s3'
+require 'cgi'
 
 module Rack
   class S3
@@ -36,13 +37,12 @@ module Rack
       { 'Content-Type'   => about['content-type'],
         'Content-Length' => about['content-length'],
         'Etag'           => about['etag'],
-        'Last-Modified'  => about['last-modified'],
-        'Cache-Control'  => 'public; max-age=2592000'  # cache image for a month
+        'Last-Modified'  => about['last-modified']
       }
     end
 
     def path_info
-      @env['PATH_INFO']
+      CGI.unescape @env['PATH_INFO']
     end
 
     def path

data/lib/rack/s3/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class S3
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/rack_s3_test.rb

@@ -42,7 +42,6 @@ class RackS3Test < Test::Unit::TestCase
 
     should 'render the file' do
       assert_equal 200, subject.status
-      assert_equal 'public; max-age=2592000', subject.headers['Cache-Control']
       assert_not_nil subject.body
 
       %w(Content-Type Last-Modified Last-Modified Etag).each do |header|
@@ -60,7 +59,6 @@ class RackS3Test < Test::Unit::TestCase
 
     should 'render the file' do
       assert_equal 200, subject.status
-      assert_equal 'public; max-age=2592000', subject.headers['Cache-Control']
       assert_not_nil subject.body
 
       %w(Content-Type Last-Modified Last-Modified Etag).each do |header|
@@ -69,6 +67,18 @@ class RackS3Test < Test::Unit::TestCase
     end
   end
 
+  context 'A request for a key containing spaces' do
+    subject do
+      VCR.use_cassette 'key_with_spaces' do
+        mock_request '/key%20with%20spaces.png'
+      end
+    end
+
+    should 'render the file' do
+      assert_equal 200, subject.status
+    end
+  end
+
   context 'A request to a mapped app' do
     subject do
       VCR.use_cassette 'clear' do

data/test/vcr_cassettes/key_with_spaces.yml

@@ -0,0 +1,94 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://s3.amazonaws.com:80/rack-s3?marker=key%20with%20spaces.pnf&max-keys=1
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-amz-id-2: 
+      - pOjjAQ3Dsd3tKoFG9Hg0tK81Incbd243yIOLFMGsI5NBIvshC/drTCXkvhjEM9Iq
+      content-type: 
+      - application/xml
+      server: 
+      - AmazonS3
+      date: 
+      - Fri, 28 Jan 2011 15:54:02 GMT
+      x-amz-request-id: 
+      - C8D0513081C9FC43
+      transfer-encoding: 
+      - chunked
+    body: |-
+      <?xml version="1.0" encoding="UTF-8"?>
+      <ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><Name>rack-s3</Name><Prefix></Prefix><Marker>key with spaces.pnf</Marker><MaxKeys>1</MaxKeys><IsTruncated>true</IsTruncated><Contents><Key>key with spaces.png</Key><LastModified>2011-01-28T15:44:27.000Z</LastModified><ETag>&quot;71a50dbba44c78128b221b7df7bb51f1&quot;</ETag><Size>95</Size><Owner><ID>abc123</ID><DisplayName>rack-s3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :head
+    uri: http://s3.amazonaws.com:80/rack-s3/key%20with%20spaces.png
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      etag: 
+      - "\"71a50dbba44c78128b221b7df7bb51f1\""
+      last-modified: 
+      - Fri, 28 Jan 2011 15:44:27 GMT
+      x-amz-id-2: 
+      - o6jvTK19hfPEaaUW22trSeS3+PB6FezxvxkQCWSpGmIO3lu/wtkPY1yyX3Ao7QGT
+      content-type: 
+      - image/png
+      server: 
+      - AmazonS3
+      date: 
+      - Fri, 28 Jan 2011 15:54:03 GMT
+      content-length: 
+      - "95"
+      x-amz-request-id: 
+      - 9DB4B86707E5AD05
+      accept-ranges: 
+      - bytes
+    body: 
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://s3.amazonaws.com:80/rack-s3/key%20with%20spaces.png
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      etag: 
+      - "\"71a50dbba44c78128b221b7df7bb51f1\""
+      last-modified: 
+      - Fri, 28 Jan 2011 15:44:27 GMT
+      x-amz-id-2: 
+      - e21vM8iCkWJlB3vRiaG2V9uXWC5fJEmqPCChC0XvwwfOagz8NGjeUMEM7IW24r+c
+      content-type: 
+      - image/png
+      server: 
+      - AmazonS3
+      date: 
+      - Fri, 28 Jan 2011 15:54:03 GMT
+      content-length: 
+      - "95"
+      x-amz-request-id: 
+      - E5EF8520D4E7D879
+      accept-ranges: 
+      - bytes
+    body: !binary |
+      iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACn
+      ej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVO
+      RK5CYII=
+
+    http_version: "1.1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-s3
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Larry Marburger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -05:00
+date: 2011-01-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,6 +110,7 @@ files:
 - test/rack_s3_test.rb
 - test/test_helper.rb
 - test/vcr_cassettes/clear.yml
+- test/vcr_cassettes/key_with_spaces.yml
 - test/vcr_cassettes/nested_clear.yml
 - test/vcr_cassettes/not_found.yml
 has_rdoc: true
@@ -150,5 +151,6 @@ test_files:
 - test/rack_s3_test.rb
 - test/test_helper.rb
 - test/vcr_cassettes/clear.yml
+- test/vcr_cassettes/key_with_spaces.yml
 - test/vcr_cassettes/nested_clear.yml
 - test/vcr_cassettes/not_found.yml