fake_aws 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcacd66d77b727c137301c6de05fa146cb88a507
-  data.tar.gz: 614b3b3159d8b544a7826d224bf444c35383db95
+  metadata.gz: 97d179757822dc322dbb1546a8a009fdbdf58246
+  data.tar.gz: 899598101f6b165db67453d1bd5a47166a6f2c02
 SHA512:
-  metadata.gz: 9213550b7d286db1f0f7a62efc0488aa17d637a1e0a20f08c283854dbcb8a2c4a0a9fa31e13f1b288260deaaab9ed6d42930ba604199191f2287e5b91b80f5b7
-  data.tar.gz: d20fed38db8168dbf9c9588c3d4ecb198547a74f503f04ce856031b85c9c17e40e8c8d8cafa752cb2dcf91b7d87ae9d4e75d3aa80585f1413492e6a7d1c01151
+  metadata.gz: 6d071767cae22f34d7b37e3a8a8b905897a836db641fcb7f67617a4c2364afffc65a16bcdcf3214464f553b2e2142494a70d5666b5f77b4c3ec18cf20d3dfc0f
+  data.tar.gz: 1fe896cc79603bc19c15885ddfc028ab1045acc5dd2c6aa5ee21ab9189d8e98386a0752bc4efdab2d64b6be55d6ad8b2e493bbb0e8671748706991bef7dd350d

data/fake_aws.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "faraday"
+  spec.add_development_dependency "rack"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "nori", "~> 2.3.0"
 end

data/lib/fake_aws/error.rb

@@ -13,4 +13,11 @@ module FakeAWS
       super("FakeAWS doesn't (yet) support this type of AWS request.")
     end
   end
+
+  class InternalError < Error
+    def initialize
+      super("Shouldn't ever get here! Looks like a bug in FakeAWS.")
+    end
+  end
+
 end

data/lib/fake_aws/s3/object_on_disk.rb

@@ -5,7 +5,7 @@ module FakeAWS
 
     class ObjectOnDisk
 
-      def initialize(bucket_on_disk, key = nil)
+      def initialize(bucket_on_disk, key)
         @bucket_on_disk = bucket_on_disk
         @key            = key
       end
@@ -15,7 +15,7 @@ module FakeAWS
       end
 
       def write(content, metadata)
-        FileUtils.mkdir_p(directory_path)
+        FileUtils.mkdir_p(File.dirname(object_path))
         File.write(object_path, content)
         File.write(metadata_path, metadata.to_json)
       end
@@ -37,11 +37,7 @@ module FakeAWS
       end
 
       def metadata_path
-        @metadata_path ||= File.join("#{object_path}.metadata.json")
-      end
-
-      def directory_path
-        @directory_path ||= File.dirname(object_path)
+        @metadata_path ||= "#{object_path}.metadata.json"
       end
 
     end

data/lib/fake_aws/s3/operations/put_object.rb

@@ -12,7 +12,7 @@ module FakeAWS
         def call
           return no_such_bucket_response unless bucket_on_disk.exists?
 
-          object_on_disk.write(@request.content, metadata)
+          object_on_disk.write(@request.body.read, metadata)
           success_response
         end
 

data/lib/fake_aws/s3/rack_app.rb

@@ -18,17 +18,22 @@ module FakeAWS
       end
 
       def operation_class(request)
-        case request.method
-          when "PUT"
-            if request.has_key?
-              Operations::PutObject
-            else
-              Operations::PutBucket
-            end
-          when "GET"
+        case
+          when request.put?
+            get_put_operation_class(request)
+          when request.get?
             Operations::GetObject
           else
-            raise FakeAWS::UnsupportedRequestError # TODO: This needs a spec.
+            raise FakeAWS::UnsupportedRequestError
+        end
+      end
+
+      def get_put_operation_class(request)
+        case
+          when request.has_key?
+           Operations::PutObject
+          else
+            Operations::PutBucket
         end
       end
 

data/lib/fake_aws/s3/request.rb

@@ -1,28 +1,12 @@
+require "rack/request"
+
 module FakeAWS
   module S3
 
-    # Extract the bucket and key from the various different styles of S3 request.
+    # Extract information from an incoming S3 request.
     #
     # See http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
-    class Request
-      def initialize(env)
-        @env = env
-        @server_name = env["SERVER_NAME"]
-        @path_info   = env["PATH_INFO"]
-      end
-
-      def method
-        @env["REQUEST_METHOD"]
-      end
-
-      def content_type
-        @env["CONTENT_TYPE"]
-      end
-
-      def content
-        @env["rack.input"].read
-      end
-
+    class Request < Rack::Request
       def http_headers
         http_headers = env_headers.map {|key, value| [header_key_for_env_key(key), value] }
         Hash[http_headers]
@@ -33,11 +17,11 @@ module FakeAWS
           when :path
             path_components.first
           when :virtual_hosted
-            server_name_components[0..-4].join(".")
+            host_name_components[0..-4].join(".")
           when :cname
-            @server_name
+            host
           else
-            raise "Uh oh"
+            raise FakeAWS::InternalError
         end
       end
 
@@ -48,7 +32,7 @@ module FakeAWS
           when :virtual_hosted, :cname
             path_components.join("/")
           else
-            raise "Uh oh"
+            raise FakeAWS::InternalError
         end
       end
 
@@ -58,25 +42,17 @@ module FakeAWS
 
     private
 
-      def server_name
-        @server_name ||= @env["SERVER_NAME"]
-      end
-
-      def path_info
-        @path_info ||= @env["PATH_INFO"]
-      end
-
-      def server_name_components
-        @server_name_components ||= server_name.split(".")
+      def host_name_components
+        @host_name_components ||= host.split(".")
       end
 
       def path_components
-        @path_components ||= path_info.split("/").drop(1)
+        @path_components ||= path.split("/").drop(1)
       end
 
       def request_style
-        @request_style ||= if server_name =~ %r{s3[-\w\d]*\.amazonaws\.com$}
-          if server_name_components.length > 3
+        @request_style ||= if host =~ %r{s3[-\w\d]*}
+          if host_name_components.length > 3
             :virtual_hosted
           else
             :path

data/lib/fake_aws/s3/responses/empty.rb

@@ -14,7 +14,7 @@ module FakeAWS
         end
 
         def body
-          ""
+          [""]
         end
       end
 

data/lib/fake_aws/version.rb

@@ -1,3 +1,3 @@
 module FakeAWS
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/integration/s3/unsupported_request_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe "An unsupported ooperation" do
+  include S3IntegrationHelpers
+
+  it "raises an unsupported request exception" do
+    expect {
+      connection.delete("/")
+    }.to raise_error(FakeAWS::UnsupportedRequestError)
+  end
+end
+

data/spec/unit/s3/object_on_disk_spec.rb

@@ -73,10 +73,4 @@ describe FakeAWS::S3::ObjectOnDisk do
     end
   end
 
-  describe "#directory_path" do
-    it "returns the path to the directory containing the object" do
-      expect(subject.directory_path).to eq(bucket_path)
-    end
-  end
-
 end

data/spec/unit/s3/request_spec.rb

@@ -1,31 +1,6 @@
 require 'spec_helper'
 
 describe FakeAWS::S3::Request do
-  subject { described_class.new(env) }
-
-  context "#method" do
-    it "returns the request method" do
-      request = described_class.new("REQUEST_METHOD" => "GET")
-      expect(request.method).to eq("GET")
-    end
-  end
-
-  context "#content_type" do
-    it "returns the content type" do
-      request = described_class.new("CONTENT_TYPE" => "text/plain")
-      expect(request.content_type).to eq("text/plain")
-    end
-  end
-
-  context "#content" do
-    it "reads and returns the Rack input" do
-      rack_input = double("rack.input")
-      expect(rack_input).to receive(:read) { "foo" }
-      request = described_class.new("rack.input" => rack_input)
-      expect(request.content).to eq("foo")
-    end
-  end
-
   context "#http_headers" do
     it "returns the HTTP headers" do
       request = described_class.new("HTTP_X_FOO" => "foo", "HTTP_X_BAR" => "bar")
@@ -70,21 +45,21 @@ describe FakeAWS::S3::Request do
 
   context "path-style" do
     let(:bucket) { "mah-bucket" }
-    subject(:request) { described_class.new("SERVER_NAME" => "s3.amazonaws.com", "PATH_INFO" => "/#{bucket}#{key}") }
+    subject(:request) { described_class.new("SERVER_PORT" => "80", "SERVER_NAME" => "s3.amazonaws.com", "PATH_INFO" => "/#{bucket}#{key}") }
 
     include_examples "request parsing"
   end
 
   context "virtual hosted-style" do
     let(:bucket) { "mah-bucket" }
-    subject(:request) { described_class.new("SERVER_NAME" => "#{bucket}.s3.amazonaws.com", "PATH_INFO" => key) }
+    subject(:request) { described_class.new("SERVER_PORT" => "80", "SERVER_NAME" => "#{bucket}.s3.amazonaws.com", "PATH_INFO" => key) }
 
     include_examples "request parsing"
   end
 
   context "CNAME-style" do
     let(:bucket) { "mah-bucket.mah-domain.com" }
-    subject(:request) { described_class.new("SERVER_NAME" => bucket, "PATH_INFO" => key) }
+    subject(:request) { described_class.new("SERVER_PORT" => "80", "SERVER_NAME" => bucket, "PATH_INFO" => key) }
 
     include_examples "request parsing"
   end

data/spec/unit/s3/responses/empty_spec.rb

@@ -8,7 +8,7 @@ describe FakeAWS::S3::Responses::Empty do
   end
 
   it "has an empty body" do
-    expect(subject.body).to be_empty
+    expect(subject.body).to eq([''])
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fake_aws
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Pete Yandell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: finer_struct
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,7 @@ files:
 - spec/integration/s3/put_bucket_spec.rb
 - spec/integration/s3/put_object_spec.rb
 - spec/integration/s3/request_styles_spec.rb
+- spec/integration/s3/unsupported_request_spec.rb
 - spec/spec_helper.rb
 - spec/support/common_header_examples.rb
 - spec/support/s3_integration_helpers.rb
@@ -185,6 +200,7 @@ test_files:
 - spec/integration/s3/put_bucket_spec.rb
 - spec/integration/s3/put_object_spec.rb
 - spec/integration/s3/request_styles_spec.rb
+- spec/integration/s3/unsupported_request_spec.rb
 - spec/spec_helper.rb
 - spec/support/common_header_examples.rb
 - spec/support/s3_integration_helpers.rb
@@ -196,3 +212,4 @@ test_files:
 - spec/unit/s3/responses/empty_spec.rb
 - spec/unit/s3/responses/error_spec.rb
 - spec/unit/s3/responses/success_spec.rb
+has_rdoc: