fakes3 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16457cde1a8c9b7d7f0dc52dd894a7c868096318
-  data.tar.gz: 18428ffb5399d332c335c27fcba9927a7d216016
+  metadata.gz: 1ac47d99abf4623ccf2a5a740d3eaf13c399de93
+  data.tar.gz: fc625c2b3ef6c954b81ac3002477abd61fa0e378
 SHA512:
-  metadata.gz: b135cbfe0ae4ded874344b00ee0977119791e43da5f6dab25ca0813a07f9cf6563ee2ca1cb1f3fdabe146ed250ba33416654f948401e5525e2827c7f1ed55cd9
-  data.tar.gz: 09ba62b7df31ecc535b1912117b813bf47217bbe5e7c321153cb684447160b8337f13e3a7d8e177fff8ebd3886b908939abb0bf691ad3e9f075e4a511e799e69
+  metadata.gz: 78738e022fbdc49460e9abeb3f9b65c66ecf18de3d7f8b336aeb259f5e791c5653ce86200748e0c8d7d74f54ef33ed01d59880a7f6f07c25543bdfe0f183466f
+  data.tar.gz: 6f2e4df7a1d351315f59595a5c94605deebbc5346add671a47ef3503dda69533111cee1a8b662e639e529c23b9980267412fc63010423856ce2e4a4ffbcfc0a0

data/README.md

@@ -23,9 +23,9 @@ To run the server, you just specify a root and a port.
 
 ## Licensing
 
-As of the latest version, we are licensing with Supported Source. To get a license, visit:
+As of the latest version, we are licensing with Super Source. To get a license, visit:
 
-https://supportedsource.org/projects/fake-s3 
+https://supso.org/projects/fake-s3 
 
 Depending on your company's size, the license may be free. It is also free for individuals.
 

data/fakes3.gemspec

@@ -6,12 +6,12 @@ Gem::Specification.new do |s|
   s.version     = FakeS3::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Curtis Spencer"]
-  s.email       = ["fakes3@supportedsource.org"]
+  s.email       = ["fakes3@supso.org"]
   s.homepage    = "https://github.com/jubos/fake-s3"
   s.summary     = %q{Fake S3 is a server that simulates Amazon S3 commands so you can test your S3 functionality in your projects}
   s.description = %q{Use Fake S3 to test basic Amazon S3 functionality without actually connecting to AWS}
   s.license     = "Supported-Source"
-  s.post_install_message = "Fake S3: if you don't already have a license for Fake S3, you can get one at https://supportedsource.org/projects/fake-s3"
+  s.post_install_message = "Fake S3: if you don't already have a license for Fake S3, you can get one at https://supso.org/projects/fake-s3"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "aws-s3"

data/lib/fakes3/cli.rb

@@ -21,7 +21,7 @@ module FakeS3
       if options[:root]
         root = File.expand_path(options[:root])
         # TODO Do some sanity checking here
-        store = FileStore.new(root)
+        store = FileStore.new(root, !!options[:quiet])
       end
 
       if store.nil?

data/lib/fakes3/file_store.rb

@@ -16,10 +16,11 @@ module FakeS3
     # sub second precision.
     SUBSECOND_PRECISION = 3
 
-    def initialize(root)
+    def initialize(root, quiet_mode)
       @root = root
       @buckets = []
       @bucket_hash = {}
+      @quiet_mode = quiet_mode
       Dir[File.join(root,"*")].each do |bucket|
         bucket_name = File.basename(bucket)
         bucket_obj = Bucket.new(bucket_name,Time.now,[])
@@ -85,7 +86,7 @@ module FakeS3
         real_obj.name = object_name
         real_obj.md5 = metadata[:md5]
         real_obj.content_type = metadata.fetch(:content_type) { "application/octet-stream" }
-        real_obj.content_encoding = metadata.fetch(:content_encoding)
+        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 }
         real_obj.creation_date = File.ctime(obj_root).utc.iso8601(SUBSECOND_PRECISION)
@@ -95,8 +96,10 @@ module FakeS3
         real_obj.custom_metadata = metadata.fetch(:custom_metadata) { {} }
         return real_obj
       rescue
-        puts $!
-        $!.backtrace.each { |line| puts line }
+        unless @quiet_mode
+          puts $!
+          $!.backtrace.each { |line| puts line }
+        end
         return nil
       end
     end
@@ -135,7 +138,7 @@ module FakeS3
 
       metadata_directive = request.header["x-amz-metadata-directive"].first
       if metadata_directive == "REPLACE"
-        metadata_struct = create_metadata(content,request)
+        metadata_struct = create_metadata(content, request)
         File.open(metadata,'w') do |f|
           f << YAML::dump(metadata_struct)
         end
@@ -148,7 +151,7 @@ module FakeS3
       obj.name = dst_name
       obj.md5 = src_metadata[:md5]
       obj.content_type = src_metadata[:content_type]
-      obj.content_encoding = src_metadata[:content_encoding]
+      obj.content_encoding = src_metadata[:content_encoding] # if src_metadata[:content_encoding]
       obj.size = src_metadata[:size]
       obj.modified_date = src_metadata[:modified_date]
 
@@ -203,15 +206,17 @@ module FakeS3
         obj.name = object_name
         obj.md5 = metadata_struct[:md5]
         obj.content_type = metadata_struct[:content_type]
-        obj.content_encoding = metadata_struct[:content_encoding]
+        obj.content_encoding = metadata_struct[:content_encoding] # if metadata_struct[:content_encoding]
         obj.size = metadata_struct[:size]
         obj.modified_date = metadata_struct[:modified_date]
 
         bucket.add(obj)
         return obj
       rescue
-        puts $!
-        $!.backtrace.each { |line| puts line }
+        unless @quiet_mode
+          puts $!
+          $!.backtrace.each { |line| puts line }
+        end
         return nil
       end
     end
@@ -264,7 +269,11 @@ module FakeS3
       metadata = {}
       metadata[:md5] = Digest::MD5.file(content).hexdigest
       metadata[:content_type] = request.header["content-type"].first
-      metadata[:content_encoding] = request.header["content-encoding"].first
+      content_encoding = request.header["content-encoding"].first
+      metadata[:content_encoding] = content_encoding
+      #if content_encoding
+      #  metadata[:content_encoding] = content_encoding
+      #end
       metadata[:size] = File.size(content)
       metadata[:modified_date] = File.mtime(content).utc.iso8601(SUBSECOND_PRECISION)
       metadata[:amazon_metadata] = {}

data/lib/fakes3/server.rb

@@ -282,9 +282,14 @@ module FakeS3
         response['Etag'] = "\"#{real_obj.md5}\""
 
         if success_action_redirect
-          response.status      = 307
+          object_params = [ [ :bucket, s_req.bucket ], [ :key, key ] ]
+          location_uri = URI.parse(success_action_redirect)
+          original_location_params = URI.decode_www_form(String(location_uri.query))
+          location_uri.query = URI.encode_www_form(original_location_params + object_params)
+
+          response.status      = 303
           response.body        = ""
-          response['Location'] = success_action_redirect
+          response['Location'] = location_uri.to_s
         else
           response.status = success_action_status || 204
           if response.status == "201"

data/lib/fakes3/version.rb

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

data/test/post_test.rb

@@ -24,11 +24,11 @@ class PostTest < Test::Unit::TestCase
     res = RestClient.post(
       @url,
       'key'=>'uploads/12345/${filename}',
-      'success_action_redirect'=>'http://somewhere.else.com/',
+      'success_action_redirect'=>'http://somewhere.else.com/?foo=bar',
       'file'=>File.new(__FILE__,"rb")
     ) { |response|
-      assert_equal(response.code, 307)
-      assert_equal(response.headers[:location], 'http://somewhere.else.com/')
+      assert_equal(response.code, 303)
+      assert_equal(response.headers[:location], 'http://somewhere.else.com/?foo=bar&bucket=posttest&key=uploads%2F12345%2Fpost_test.rb')
     }
   end
 

data/test/right_aws_commands_test.rb

@@ -1,6 +1,5 @@
 require 'test/test_helper'
 require 'fileutils'
-#require 'fakes3/server'
 require 'right_aws'
 require 'time'
 
@@ -22,13 +21,21 @@ class RightAWSCommandsTest < Test::Unit::TestCase
   end
 
   def test_store
-    @s3.put("s3media","helloworld", "Hello World Man!")
+    @s3.put("s3media", "helloworld", "Hello World Man!")
     obj = @s3.get("s3media", "helloworld")
     assert_equal "Hello World Man!", obj[:object]
-
-    obj = @s3.get("s3media", "helloworld")
   end
 
+  # TODO - get Chinese to work
+  #def test_store_chinese
+  #  ni_hao = "你好"
+  #  great_wall = "中国的长城"
+#
+  #  @s3.put("s3media", ni_hao, great_wall)
+  #  obj = @s3.get("s3media", ni_hao)
+  #  assert_equal(great_wall, obj[:object])
+  #end
+
   def test_store_not_found
     begin
       obj = @s3.get("s3media", "helloworldnotexist")
@@ -47,13 +54,17 @@ class RightAWSCommandsTest < Test::Unit::TestCase
     end
 
     buf_len = buffer.length
+    time_before = Time.now
     @s3.put("s3media", "big", buffer)
 
     output = ""
     @s3.get("s3media","big") do |chunk|
       output << chunk
     end
-    assert_equal buf_len, output.size
+    time_after = Time.now
+
+    assert(time_after - time_before < 2) # Should run in under 2 seconds on normal machines
+    assert_equal(buf_len, output.size)
   end
 
   # Test that GET requests with a delimiter return a list of
@@ -164,7 +175,6 @@ class RightAWSCommandsTest < Test::Unit::TestCase
     rescue
       fail 'Should have caught NoSuchBucket Exception'
     end
-
   end
 
   def test_if_none_match

data/test/s3_commands_test.rb

@@ -41,10 +41,10 @@ class S3CommandsTest < Test::Unit::TestCase
 
   def test_store
     bucket = Bucket.create("ruby_aws_s3")
-    S3Object.store("hello","world","ruby_aws_s3")
+    S3Object.store("hello", "world", "ruby_aws_s3")
 
     output = ""
-    obj = S3Object.stream("hello","ruby_aws_s3") do |chunk|
+    obj = S3Object.stream("hello", "ruby_aws_s3") do |chunk|
       output << chunk
     end
     assert_equal "world", output
@@ -109,7 +109,6 @@ class S3CommandsTest < Test::Unit::TestCase
     assert_equal "two, three", obj.metadata[:param2]
   end
 
-
   def test_multi_directory
     bucket = Bucket.create("ruby_aws_s3")
     S3Object.store("dir/myfile/123.txt","recursive","ruby_aws_s3")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes3
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,7 @@ dependencies:
 description: Use Fake S3 to test basic Amazon S3 functionality without actually connecting
   to AWS
 email:
-- fakes3@supportedsource.org
+- fakes3@supso.org
 executables:
 - fakes3
 extensions: []
@@ -219,7 +219,7 @@ licenses:
 - Supported-Source
 metadata: {}
 post_install_message: 'Fake S3: if you don''t already have a license for Fake S3,
-  you can get one at https://supportedsource.org/projects/fake-s3'
+  you can get one at https://supso.org/projects/fake-s3'
 rdoc_options: []
 require_paths:
 - lib
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fake S3 is a server that simulates Amazon S3 commands so you can test your