fakes3 0.1.6.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69d4e3942f56c4509fb48ff63077170b7be0cef0
-  data.tar.gz: f02b9f875c59110a0247c2fae8a65fd819e355e2
+  metadata.gz: c929e6ff3d8522ac143785588c7fdc480d70ddde
+  data.tar.gz: 1c746e1eb8f08619a2a43cd8fddd8b3ce5287151
 SHA512:
-  metadata.gz: 7011a1d606e2336f6b344b64c341aa1fc96a571aa60cddf5044bea0aa9afe376fa2d42e8113de3f418ed7862a4f9681c11d3076bea217776226da38f4d591d7c
-  data.tar.gz: 9e6566785bb12340bd0b4eeb23464c2b02c9b343cf4742b19747e6f7de3b5fd753703e91e349231537960fe347dde22da8859002fbb4cfd86bc5d9945b493d89
+  metadata.gz: 1a6199d155b318c48d28532aab032197bc5bb25cf73f4902dcb62c55898f75c5e8187c62da57cef0e4820d849558aa77b4b2ca6c21f9d65f3a566662f9af22c1
+  data.tar.gz: 3975513dbc9051c4fe1207261ff44efafef820d3c19e7e7fceaa7042e035a6da8bcdac83a7c87f90bb0194e95492e1a14c4647b4a39551512e923dba95440aa7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fakes3 (0.1.6.1)
+    fakes3 (0.1.7)
       builder
       thor
 
@@ -12,8 +12,15 @@ GEM
       builder
       mime-types
       xml-simple
+    aws-sdk-v1 (1.59.0)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
     builder (3.2.2)
+    json (1.8.1)
     mime-types (1.25)
+    mini_portile (0.6.1)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
     rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -28,6 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   aws-s3
+  aws-sdk-v1
   bundler (>= 1.0.0)
   fakes3!
   rake

data/fakes3.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "right_aws"
   s.add_development_dependency "rest-client"
   s.add_development_dependency "rake"
-  #s.add_development_dependency "aws-sdk"
+  s.add_development_dependency "aws-sdk-v1"
   #s.add_development_dependency "ruby-debug"
   #s.add_development_dependency "debugger"
   s.add_dependency "thor"

data/lib/fakes3/cli.rb

@@ -10,7 +10,7 @@ module FakeS3
     method_option :root, :type => :string, :aliases => '-r', :required => true
     method_option :port, :type => :numeric, :aliases => '-p', :required => true
     method_option :address, :type => :string, :aliases => '-a', :required => false, :desc => "Bind to this address. Defaults to 0.0.0.0"
-    method_option :hostname, :type => :string, :aliases => '-h', :desc => "The root name of the host.  Defaults to s3.amazonaws.com."
+    method_option :hostname, :type => :string, :aliases => '-H', :desc => "The root name of the host.  Defaults to s3.amazonaws.com."
     method_option :limit, :aliases => '-l', :type => :string, :desc => 'Rate limit for serving (ie. 50K, 1.0M)'
     method_option :sslcert, :type => :string, :desc => 'Path to SSL certificate'
     method_option :sslkey, :type => :string, :desc => 'Path to SSL certificate key'

data/lib/fakes3/file_store.rb

@@ -152,7 +152,6 @@ module FakeS3
 
       src_obj = src_bucket.find(src_name)
       dst_bucket.add(obj)
-      src_bucket.remove(src_obj)
       return obj
     end
 

data/lib/fakes3/server.rb

@@ -90,6 +90,21 @@ module FakeS3
           return
         end
 
+        if_none_match = request["If-None-Match"]
+        if if_none_match == "\"#{real_obj.md5}\"" or if_none_match == "*"
+          response.status = 304
+          return
+        end
+
+        if_modified_since = request["If-Modified-Since"]
+        if if_modified_since
+          time = Time.httpdate(if_modified_since)
+          if time >= Time.iso8601(real_obj.modified_date)
+            response.status = 304
+            return
+          end 
+        end
+
         response.status = 200
         response['Content-Type'] = real_obj.content_type
         stat = File::Stat.new(real_obj.io.path)
@@ -98,6 +113,7 @@ module FakeS3
         response.header['ETag'] = "\"#{real_obj.md5}\""
         response['Accept-Ranges'] = "bytes"
         response['Last-Ranges'] = "bytes"
+        response['Access-Control-Allow-Origin'] = '*'
 
         real_obj.custom_metadata.each do |header, value|
           response.header['x-amz-meta-' + header] = value
@@ -141,6 +157,7 @@ module FakeS3
       response.status = 200
       response.body = ""
       response['Content-Type'] = "text/xml"
+      response['Access-Control-Allow-Origin'] = '*'
 
       case s_req.type
       when Request::COPY
@@ -197,7 +214,7 @@ module FakeS3
         end
       end
       response['Content-Type'] = 'text/xml'
-      response['Access-Control-Allow-Origin']='*'
+      response['Access-Control-Allow-Origin'] = '*'
     end
 
     def do_DELETE(request,response)
@@ -217,7 +234,10 @@ module FakeS3
 
     def do_OPTIONS(request, response)
       super
-      response["Access-Control-Allow-Origin"]="*"
+      response["Access-Control-Allow-Origin"] = "*"
+      response["Access-Control-Allow-Methods"] = "HEAD, GET, PUT, POST"
+      response["Access-Control-Allow-Headers"] = "accept, content-type"
+      response["Access-Control-Expose-Headers"] = "ETag, x-amz-meta-custom-header"
     end
 
     private

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "0.1.6.1"
+  VERSION = "0.1.7"
 end

data/test/aws_sdk_commands_test.rb

@@ -0,0 +1,23 @@
+require 'test/test_helper'
+require 'aws-sdk-v1'
+
+class AwsSdkCommandsTest < Test::Unit::TestCase
+  def setup
+    @s3 = AWS::S3.new(:access_key_id => '123',
+                      :secret_access_key => 'abc',
+                      :s3_endpoint => 'localhost',
+                      :s3_port => 10453,
+                      :use_ssl => false)
+  end
+
+  def test_copy_to
+    bucket = @s3.buckets["test_copy_to"]
+    object = bucket.objects["key1"]
+    object.write("asdf")
+
+    assert object.exists?
+    object.copy_to("key2")
+
+    assert_equal 2, bucket.objects.count
+  end
+end

data/test/right_aws_commands_test.rb

@@ -2,6 +2,7 @@ require 'test/test_helper'
 require 'fileutils'
 #require 'fakes3/server'
 require 'right_aws'
+require 'time'
 
 class RightAWSCommandsTest < Test::Unit::TestCase
 
@@ -117,4 +118,43 @@ class RightAWSCommandsTest < Test::Unit::TestCase
 
   end
 
+  def test_if_none_match
+    @s3.put("s3media","if_none_match_test","Hello World 1!")
+    obj = @s3.get("s3media","if_none_match_test")
+    tag = obj[:headers]["etag"]
+    begin
+      @s3.get("s3media", "if_none_match_test", {"If-None-Match"=>tag})
+    rescue URI::InvalidURIError
+      # expected error for 304
+    else
+      fail 'Should have encountered an error due to the server not returning a response due to caching'
+    end
+    @s3.put("s3media","if_none_match_test","Hello World 2!")
+    obj = @s3.get("s3media", "if_none_match_test", {"If-None-Match"=>tag})
+    assert_equal "Hello World 2!",obj[:object]
+  end
+
+  def test_if_modified_since
+    @s3.put("s3media","if_modified_since_test","Hello World 1!")
+    obj = @s3.get("s3media","if_modified_since_test")
+    modified = obj[:headers]["last-modified"]
+    begin
+      @s3.get("s3media", "if_modified_since_test", {"If-Modified-Since"=>modified})
+    rescue URI::InvalidURIError
+      # expected error for 304
+    else
+      fail 'Should have encountered an error due to the server not returning a response due to caching'
+    end
+    # Granularity of an HTTP Date is 1 second which isn't enough for the test
+    # so manually rewind the clock by a second
+    timeInThePast = Time.httpdate(modified) - 1
+    begin
+      obj = @s3.get("s3media", "if_modified_since_test", {"If-Modified-Since"=>timeInThePast.httpdate()})
+    rescue
+      fail 'Should have been downloaded since the date is in the past now'
+    else
+      #expected scenario
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes3
 version: !ruby/object:Gem::Version
-  version: 0.1.6.1
+  version: 0.1.7
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-v1
+  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +152,7 @@ files:
 - lib/fakes3/unsupported_operation.rb
 - lib/fakes3/version.rb
 - lib/fakes3/xml_adapter.rb
+- test/aws_sdk_commands_test.rb
 - test/boto_test.rb
 - test/botocmd.py
 - test/local_s3_cfg
@@ -172,6 +187,7 @@ specification_version: 4
 summary: FakeS3 is a server that simulates S3 commands so you can test your S3 functionality
   in your projects
 test_files:
+- test/aws_sdk_commands_test.rb
 - test/boto_test.rb
 - test/botocmd.py
 - test/local_s3_cfg
@@ -180,3 +196,4 @@ test_files:
 - test/s3_commands_test.rb
 - test/s3cmd_test.rb
 - test/test_helper.rb
+has_rdoc: