rack-s3 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-s3 (0.0.1)
+    rack-s3 (0.0.3)
       aws-s3
       rack
 

data/lib/rack/s3/version.rb

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

data/lib/rack/s3.rb

@@ -4,13 +4,19 @@ require 'aws/s3'
 module Rack
   class S3
 
-    def initialize(app, options={})
-      @app    = app
+    def initialize(options={})
       @bucket = options[:bucket]
 
+      establish_aws_connection(options[:access_key_id],
+                               options[:secret_access_key])
+    end
+
+    def establish_aws_connection(access_key_id, secret_access_key)
+      return unless access_key_id && secret_access_key
+
       AWS::S3::Base.establish_connection!(
-        :access_key_id     => options[:access_key_id],
-        :secret_access_key => options[:secret_access_key])
+        :access_key_id     => access_key_id,
+        :secret_access_key => secret_access_key)
     end
 
     def call(env)

data/test/rack_s3_test.rb

@@ -2,33 +2,25 @@ require 'test_helper'
 
 class RackS3Test < Test::Unit::TestCase
 
-  def app
-    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
+  def mock_request(path)
+    Rack::MockRequest.new(app).get path, :lint => true
   end
 
-  def mapped_app
-    # #app isn't available inside the block below.
-    unmapped_app = app
+  def app
+    Rack::S3.new :bucket            => 'rack-s3',
+                 :access_key_id     => 'abc123',
+                 :secret_access_key => 'abc123'
+  end
 
-    Rack::Builder.new do
-      map '/mapped/app' do
-        run unmapped_app
-      end
-    end
+  def teardown
+    AWS::S3::Base.disconnect!
   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'
+        mock_request '/not_found.png'
       end
     end
 
@@ -44,7 +36,7 @@ class RackS3Test < Test::Unit::TestCase
   context 'A request for a key' do
     subject do
       VCR.use_cassette 'clear' do
-        Rack::MockRequest.new(app).get '/clear.png'
+        mock_request '/clear.png'
       end
     end
 
@@ -62,7 +54,7 @@ class RackS3Test < Test::Unit::TestCase
   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'
+        mock_request '/very/important/files/clear.png'
       end
     end
 
@@ -80,6 +72,13 @@ class RackS3Test < Test::Unit::TestCase
   context 'A request to a mapped app' do
     subject do
       VCR.use_cassette 'clear' do
+        unmapped_app = app
+        mapped_app   = Rack::Builder.new do
+                         map '/mapped/app' do
+                           run unmapped_app
+                         end
+                       end
+
         Rack::MockRequest.new(mapped_app).get '/mapped/app/clear.png'
       end
     end
@@ -89,4 +88,18 @@ class RackS3Test < Test::Unit::TestCase
     end
   end
 
+  context 'Without AWS credentials' do
+    subject do
+      app = Rack::S3.new :bucket => 'rack-s3'
+
+      Rack::MockRequest.new(app).get '/clear.png'
+    end
+
+    should 'not attempt to establish a connection to AWS' do
+      assert_raise AWS::S3::NoConnectionEstablished do
+        subject
+      end
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-s3
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Larry Marburger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-01-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency