fakes3 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac47d99abf4623ccf2a5a740d3eaf13c399de93
-  data.tar.gz: fc625c2b3ef6c954b81ac3002477abd61fa0e378
+  metadata.gz: d257019492e12513dd0de611fd983d31277420ee
+  data.tar.gz: fb8546e21de97909554805fc6082b07e7f43db48
 SHA512:
-  metadata.gz: 78738e022fbdc49460e9abeb3f9b65c66ecf18de3d7f8b336aeb259f5e791c5653ce86200748e0c8d7d74f54ef33ed01d59880a7f6f07c25543bdfe0f183466f
-  data.tar.gz: 6f2e4df7a1d351315f59595a5c94605deebbc5346add671a47ef3503dda69533111cee1a8b662e639e529c23b9980267412fc63010423856ce2e4a4ffbcfc0a0
+  metadata.gz: 2d2cad4af718747f5b93ab6f6831c6230a209221c0d5950b8ba6b3976f78982edf7ddda23a33b144cd671bb661b3baec887c7a30eaa9af422473883d46e7397d
+  data.tar.gz: 125638e4c8b6d312cf34a26ebaa724dab1a87f70d2d61007f2e86f76e838a406731deba8f8fb50c2eac7ea54112b2cb8c01759a265ec9be5e21ac19e26976b45

data/lib/fakes3/cli.rb

@@ -9,7 +9,7 @@ module FakeS3
     desc "server", "Run a server on a particular hostname"
     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 :address, :type => :string, :aliases => '-a', :required => false, :desc => "Bind to this address. Defaults to all IP addresses of the machine."
     method_option :hostname, :type => :string, :aliases => '-H', :desc => "The root name of the host.  Defaults to s3.amazonaws.com."
     method_option :quiet, :type => :boolean, :aliases => '-q', :desc => "Quiet; do not write anything to standard output."
     method_option :limit, :aliases => '-l', :type => :string, :desc => 'Rate limit for serving (ie. 50K, 1.0M)'
@@ -45,7 +45,7 @@ module FakeS3
         end
       end
 
-      address = options[:address] || '0.0.0.0'
+      address = options[:address]
       ssl_cert_path = options[:sslcert]
       ssl_key_path = options[:sslkey]
 

data/lib/fakes3/file_store.rb

@@ -85,7 +85,10 @@ module FakeS3
         metadata = File.open(File.join(obj_root, "metadata")) { |file| YAML::load(file) }
         real_obj.name = object_name
         real_obj.md5 = metadata[:md5]
-        real_obj.content_type = metadata.fetch(:content_type) { "application/octet-stream" }
+        real_obj.content_type = request.query['response-content-type'] ||
+          metadata.fetch(:content_type) { "application/octet-stream" }
+        real_obj.content_disposition = request.query['response-content-disposition'] ||
+          metadata[:content_disposition]
         real_obj.content_encoding = metadata.fetch(:content_encoding) # if metadata.fetch(:content_encoding)
         real_obj.io = RateLimitableFile.open(File.join(obj_root, "content"), 'rb')
         real_obj.size = metadata.fetch(:size) { 0 }
@@ -151,6 +154,7 @@ module FakeS3
       obj.name = dst_name
       obj.md5 = src_metadata[:md5]
       obj.content_type = src_metadata[:content_type]
+      obj.content_disposition = src_metadata[:content_disposition]
       obj.content_encoding = src_metadata[:content_encoding] # if src_metadata[:content_encoding]
       obj.size = src_metadata[:size]
       obj.modified_date = src_metadata[:modified_date]
@@ -206,6 +210,7 @@ module FakeS3
         obj.name = object_name
         obj.md5 = metadata_struct[:md5]
         obj.content_type = metadata_struct[:content_type]
+        obj.content_disposition = metadata_struct[:content_disposition]
         obj.content_encoding = metadata_struct[:content_encoding] # if metadata_struct[:content_encoding]
         obj.size = metadata_struct[:size]
         obj.modified_date = metadata_struct[:modified_date]
@@ -269,6 +274,9 @@ module FakeS3
       metadata = {}
       metadata[:md5] = Digest::MD5.file(content).hexdigest
       metadata[:content_type] = request.header["content-type"].first
+      if request.header['content-disposition']
+        metadata[:content_disposition] = request.header['content-disposition'].first
+      end
       content_encoding = request.header["content-encoding"].first
       metadata[:content_encoding] = content_encoding
       #if content_encoding

data/lib/fakes3/s3_object.rb

@@ -1,7 +1,7 @@
 module FakeS3
   class S3Object
     include Comparable
-    attr_accessor :name,:size,:creation_date,:modified_date,:md5,:io,:content_type,:content_encoding,:custom_metadata
+    attr_accessor :name,:size,:creation_date,:modified_date,:md5,:io,:content_type,:content_disposition,:content_encoding,:custom_metadata
 
     def hash
       @name.hash

data/lib/fakes3/server.rb

@@ -124,6 +124,7 @@ module FakeS3
           response.header['Content-Encoding'] = real_obj.content_encoding
         end
 
+        response['Content-Disposition'] = real_obj.content_disposition if real_obj.content_disposition
         stat = File::Stat.new(real_obj.io.path)
 
         response['Last-Modified'] = Time.iso8601(real_obj.modified_date).httpdate
@@ -334,7 +335,7 @@ module FakeS3
 
       response['Access-Control-Allow-Origin']   = '*'
       response['Access-Control-Allow-Methods']  = 'PUT, POST, HEAD, GET, OPTIONS'
-      response['Access-Control-Allow-Headers']  = 'Accept, Content-Type, Authorization, Content-Length, ETag, X-CSRF-Token'
+      response['Access-Control-Allow-Headers']  = 'Accept, Content-Type, Authorization, Content-Length, ETag, X-CSRF-Token, Content-Disposition'
       response['Access-Control-Expose-Headers'] = 'ETag'
     end
 

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/aws_sdk_commands_test.rb

@@ -1,5 +1,6 @@
 require 'test/test_helper'
 require 'aws-sdk-v1'
+require 'rest-client'
 
 class AwsSdkCommandsTest < Test::Unit::TestCase
   def setup
@@ -55,4 +56,43 @@ class AwsSdkCommandsTest < Test::Unit::TestCase
     assert metadata_file[:amazon_metadata].has_key?('storage-class'), ':amazon_metadata does not contain field "storage-class"'
     assert_equal 'REDUCED_REDUNDANCY', metadata_file[:amazon_metadata]['storage-class'], '"storage-class" does not equal expected value "REDUCED_REDUNDANCY"'
   end
+
+  def test_content_disposition
+    bucket = @s3.buckets["test_bucket"]
+    bucket.objects.create("test_object", "asdf", :content_disposition => "application/test")
+    assert_equal "application/test", content_disposition("test_bucket", "test_object")
+  end
+
+  def test_content_disposition_copy
+    bucket = @s3.buckets["test_bucket"]
+    object = bucket.objects.create("test_object", "asdf", :content_disposition => "application/test")
+    object.copy_to("test_copy_object")
+    assert_equal "application/test", content_disposition("test_bucket", "test_copy_object")
+  end
+
+  def test_content_disposition_request_parameter
+    bucket = @s3.buckets["test_bucket"]
+    object = bucket.objects.create("test_object", "asdf")
+    url = object.url_for(:read, :response_content_disposition => "application/test", :signature_version => :v4)
+    assert_equal "application/test", response_header(url, :content_disposition)
+  end
+
+  def test_content_type_request_parameter
+    bucket = @s3.buckets["test_bucket"]
+    object = bucket.objects.create("test_object", "asdf")
+    url = object.url_for(:read, :response_content_type => "application/test", :signature_version => :v4)
+    assert_equal "application/test", response_header(url, :content_type)
+  end
+
+  # Unfortunately v1 of the AWS SDK doesn't support reading the content_disposition of an object
+  def content_disposition(bucket_name, key)
+    url = "http://localhost:#{@s3.client.port}/#{bucket_name}/#{key}"
+    response_header(url, :content_disposition)
+  end
+
+  def response_header(url, header_name)
+    RestClient.head(url.to_s) do |response|
+      response.headers[header_name]
+    end
+  end
 end

data/test/post_test.rb

@@ -15,7 +15,7 @@ class PostTest < Test::Unit::TestCase
       assert_equal(response.code, 200)
       assert_equal(response.headers[:access_control_allow_origin],"*")
       assert_equal(response.headers[:access_control_allow_methods], "PUT, POST, HEAD, GET, OPTIONS")
-      assert_equal(response.headers[:access_control_allow_headers], "Accept, Content-Type, Authorization, Content-Length, ETag, X-CSRF-Token")
+      assert_equal(response.headers[:access_control_allow_headers], "Accept, Content-Type, Authorization, Content-Length, ETag, X-CSRF-Token, Content-Disposition")
       assert_equal(response.headers[:access_control_expose_headers], "ETag")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler