rack-s3 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -8,19 +8,27 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.3)
     aws-s3 (0.6.2)
       builder
       mime-types
       xml-simple
     builder (3.0.0)
+    crack (0.1.8)
     mime-types (1.16)
     rack (1.2.1)
+    shoulda (2.11.3)
+    vcr (1.5.0)
+    webmock (1.6.2)
+      addressable (>= 2.2.2)
+      crack (>= 0.1.7)
     xml-simple (1.0.13)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-s3
-  rack
   rack-s3!
+  shoulda
+  vcr
+  webmock

data/lib/rack/s3.rb

@@ -6,7 +6,6 @@ module Rack
 
     def initialize(app, options={})
       @app    = app
-      @prefix = options[:prefix]
       @bucket = options[:bucket]
 
       AWS::S3::Base.establish_connection!(
@@ -20,13 +19,7 @@ module Rack
 
     def _call(env)
       @env = env
-
-      if can_serve?
-        [ 200, headers, object.value ]
-      else
-        @app.call env
-      end
-
+      [ 200, headers, object.value ]
     rescue AWS::S3::NoSuchKey
       not_found
     end
@@ -42,16 +35,12 @@ module Rack
       }
     end
 
-    def can_serve?
-      path_info.index(@prefix) == 0
-    end
-
     def path_info
       @env['PATH_INFO']
     end
 
     def path
-      path_info.split('/').last
+      path_info[0...1] == '/' ? path_info[1..-1] : path_info
     end
 
     def object

data/lib/rack/s3/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class S3
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/rack-s3.gemspec

@@ -15,6 +15,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'aws-s3'
   s.add_dependency 'rack'
 
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'vcr'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/rack_s3_test.rb

@@ -1,50 +1,92 @@
 require 'test_helper'
-require 'rack/mock'
-
-class DummyApp
-  def call(env)
-    [ 200, {}, [ "Hello World" ]]
-  end
-end
 
 class RackS3Test < Test::Unit::TestCase
 
   def app
-    # HACK: Use your S3 credentials to run the test suite. Should use a
-    # recording library like VCR.
-    options = { :prefix => '/s3',
-                :bucket => 'rack-s3',
-                :access_key_id     => 'insert_access_key_here',
-                :secret_access_key => 'insert_secret_here' }
-
-    Rack::MockRequest.new Rack::S3.new(DummyApp.new, options)
+    options = { :bucket            => 'rack-s3',
+                :access_key_id     => 'abc123',
+                :secret_access_key => 'abc123' }
+
+    Rack::Builder.new do
+      use Rack::S3, options
+      run lambda { [ 200, {}, [ "Hello World" ]] }
+    end
+  end
+
+  def mapped_app
+    # #app isn't available inside the block below.
+    unmapped_app = app
+
+    Rack::Builder.new do
+      map '/mapped/app' do
+        run unmapped_app
+      end
+    end
+  end
+
+
+  context 'A request for a nonexistent key' do
+    subject do
+      VCR.use_cassette 'not_found' do
+        Rack::MockRequest.new(app).get '/not_found.png'
+      end
+    end
+
+    should 'render a not found response' do
+      assert_equal 404, subject.status
+      assert_equal "File not found: /not_found.png\n", subject.body
+
+      assert_equal 'text/plain', subject.headers['Content-Type']
+      assert_equal '31',         subject.headers['Content-Length']
+    end
   end
 
-  def test_serve_files_from_s3
-    response = app.get '/s3/clear.png'
+  context 'A request for a key' do
+    subject do
+      VCR.use_cassette 'clear' do
+        Rack::MockRequest.new(app).get '/clear.png'
+      end
+    end
 
-    assert_equal 200, response.status
-    assert_equal 'public; max-age=2592000', response.headers['Cache-Control']
-    assert_not_nil response.body
+    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|
-      assert_not_nil response.headers[header]
+      %w(Content-Type Last-Modified Last-Modified Etag).each do |header|
+        assert_not_nil subject.headers[header]
+      end
     end
   end
 
-  def test_ignore_requests_outside_of_prefix
-    response = app.get '/ignore_me'
+  context 'A request for a nested key' do
+    subject do
+      VCR.use_cassette 'nested_clear' do
+        Rack::MockRequest.new(app).get '/very/important/files/clear.png'
+      end
+    end
+
+    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
 
-    assert_equal 'Hello World', response.body
+      %w(Content-Type Last-Modified Last-Modified Etag).each do |header|
+        assert_not_nil subject.headers[header]
+      end
+    end
   end
 
-  def test_return_not_found_for_nonexistent_files
-    response = app.get '/s3/nil.png'
+  context 'A request to a mapped app' do
+    subject do
+      VCR.use_cassette 'clear' do
+        Rack::MockRequest.new(mapped_app).get '/mapped/app/clear.png'
+      end
+    end
 
-    assert_equal 404, response.status
-    assert_equal "File not found: /s3/nil.png\n", response.body
-    assert_equal 'text/plain', response.headers['Content-Type']
-    assert_equal '28', response.headers['Content-Length']
+    should 'render the file' do
+      assert_equal 200, subject.status
+    end
   end
 
 end

data/test/test_helper.rb

@@ -4,7 +4,15 @@ require 'test/unit'
 require 'bundler/setup'
 Bundler.require :development
 
+require 'rack/mock'
 require 'rack/s3'
 
 class Test::Unit::TestCase
+
+  VCR.config do |c|
+    c.cassette_library_dir = 'test/vcr_cassettes'
+    c.stub_with :webmock
+    c.default_cassette_options = { :record => :none }
+  end
+
 end

data/test/vcr_cassettes/clear.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=clear.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: 
+      - iIjcmkNXzlg1zNQXmrO+gglqBmJR6znWyQf3nBwiRgfxIaLhCJDzIySgjoCQPhm2
+      content-type: 
+      - application/xml
+      server: 
+      - AmazonS3
+      date: 
+      - Tue, 25 Jan 2011 21:06:13 GMT
+      x-amz-request-id: 
+      - AAAAAAAAAAAAAAAA
+      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>clear.pnf</Marker><MaxKeys>1</MaxKeys><IsTruncated>true</IsTruncated><Contents><Key>clear.png</Key><LastModified>2011-01-22T01:40:19.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/clear.png
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      etag: 
+      - "\"71a50dbba44c78128b221b7df7bb51f1\""
+      last-modified: 
+      - Sat, 22 Jan 2011 01:40:19 GMT
+      x-amz-id-2: 
+      - 5DNVaHC4B0cbQqBc10aCulfozqKEpJPLo6SNcBcFRkZLD4+cZRNY9TBXe5KLEJDK
+      content-type: 
+      - image/png
+      server: 
+      - AmazonS3
+      date: 
+      - Tue, 25 Jan 2011 21:06:13 GMT
+      content-length: 
+      - "95"
+      x-amz-request-id: 
+      - BBBBBBBBBBBBBBBB
+      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/clear.png
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      etag: 
+      - "\"71a50dbba44c78128b221b7df7bb51f1\""
+      last-modified: 
+      - Sat, 22 Jan 2011 01:40:19 GMT
+      x-amz-id-2: 
+      - VHSXty5O3M9vnhiRRL3OzbCfrNIB2BA35K4DtJ9AIO5UXeYHHTmDTzCjYVUTi3XF
+      content-type: 
+      - image/png
+      server: 
+      - AmazonS3
+      date: 
+      - Tue, 25 Jan 2011 21:06:13 GMT
+      content-length: 
+      - "95"
+      x-amz-request-id: 
+      - CCCCCCCCCCCCCCCC
+      accept-ranges: 
+      - bytes
+    body: !binary |
+      iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACn
+      ej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVO
+      RK5CYII=
+
+    http_version: "1.1"

data/test/vcr_cassettes/nested_clear.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=very/important/files/clear.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: 
+      - ffuJcBHfzAJ8xBN78wtnMwkXLLIxj9jOhV9AN0ShCLRpsiZVgKbWGts58jNTWj2A
+      content-type: 
+      - application/xml
+      server: 
+      - AmazonS3
+      date: 
+      - Tue, 25 Jan 2011 21:34:08 GMT
+      x-amz-request-id: 
+      - FEFB96BBB722B0FA
+      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>very/important/files/clear.pnf</Marker><MaxKeys>1</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>very/important/files/clear.png</Key><LastModified>2011-01-25T21:26:16.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/very/important/files/clear.png
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      etag: 
+      - "\"71a50dbba44c78128b221b7df7bb51f1\""
+      last-modified: 
+      - Tue, 25 Jan 2011 21:26:16 GMT
+      x-amz-id-2: 
+      - lbRqqCOq4dt4LICQKxbE+zWaayYw3+4A+8RjijAYIe9uW+NgeEDRdsDo9bTJcIoC
+      content-type: 
+      - image/png
+      server: 
+      - AmazonS3
+      date: 
+      - Tue, 25 Jan 2011 21:34:08 GMT
+      content-length: 
+      - "95"
+      x-amz-request-id: 
+      - 5E4F5037D17C276D
+      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/very/important/files/clear.png
+    body: 
+    headers: 
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      etag: 
+      - "\"71a50dbba44c78128b221b7df7bb51f1\""
+      last-modified: 
+      - Tue, 25 Jan 2011 21:26:16 GMT
+      x-amz-id-2: 
+      - QYMU8xe/VbyO0TOaBIjxdekTAiPd47sWRFg+GfKwD7QweTyEouln1W/7hDj3F1cr
+      content-type: 
+      - image/png
+      server: 
+      - AmazonS3
+      date: 
+      - Tue, 25 Jan 2011 21:34:09 GMT
+      content-length: 
+      - "95"
+      x-amz-request-id: 
+      - 0BCD2B062BA0FAD6
+      accept-ranges: 
+      - bytes
+    body: !binary |
+      iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACn
+      ej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVO
+      RK5CYII=
+
+    http_version: "1.1"

data/test/vcr_cassettes/not_found.yml

@@ -0,0 +1,28 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: http://s3.amazonaws.com:80/rack-s3?marker=not_found.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: 
+      - abc123
+      content-type: 
+      - application/xml
+      server: 
+      - AmazonS3
+      date: 
+      - Tue, 25 Jan 2011 20:56:58 GMT
+      x-amz-request-id: 
+      - abc123
+      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>not_found.pnf</Marker><MaxKeys>1</MaxKeys><IsTruncated>false</IsTruncated><Contents><Key>test.png</Key><LastModified>2011-01-22T02:59:53.000Z</LastModified><ETag>&quot;71a50dbba44c78128b221b7df7bb51f1&quot;</ETag><Size>47173</Size><Owner><ID>abc123</ID><DisplayName>rack-s3</DisplayName></Owner><StorageClass>STANDARD</StorageClass></Contents></ListBucketResult>
+    http_version: "1.1"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-s3
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Larry Marburger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -05:00
+date: 2011-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,48 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: vcr
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Serve files from an S3 bucket as if they were local assets similar to Rack::Static.
 email: 
 - larry@marburger.cc
@@ -67,6 +109,9 @@ files:
 - rack-s3.gemspec
 - test/rack_s3_test.rb
 - test/test_helper.rb
+- test/vcr_cassettes/clear.yml
+- test/vcr_cassettes/nested_clear.yml
+- test/vcr_cassettes/not_found.yml
 has_rdoc: true
 homepage: http://developmentastic.com
 licenses: []
@@ -104,3 +149,6 @@ summary: A Rack::Static like middleware for serving assets from S3
 test_files: 
 - test/rack_s3_test.rb
 - test/test_helper.rb
+- test/vcr_cassettes/clear.yml
+- test/vcr_cassettes/nested_clear.yml
+- test/vcr_cassettes/not_found.yml