plntr-fakes3 1.0.0.pre.8 → 1.0.0.pre.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad35de80cc0ad0cdeadc06efbabcfab575019f752c9de6920b37d828be2e7b90
-  data.tar.gz: f4d9f748d2b5a00b53caf2aede0d20b8104dff0f3b6d52a33d14ff1d798bf946
+  metadata.gz: fcb8df09bf3dcf01c1fa618ac431ded197270a86c23909279630ed1708990310
+  data.tar.gz: 9a42f614efb72eb786121118db63db46e560a1224af84ad9a3c8017bc62dceec
 SHA512:
-  metadata.gz: 1fdb862334a9e2d2af670dbf6eb71f85bd74998d713997d8a3d8012d6655d9295b5d8b91bd9872cdd79cf253988256a59fdd56f58c0bb95fa4835abc47192312
-  data.tar.gz: 8fad04cbba235d61df287ce8d27a990d4fc11beecfaa88ddbb7ac20e2ec84b9b0ca6ef71be35dd00a86ca274a878213fc78990252de17669a8608facdb663f5f
+  metadata.gz: 266ab8177917fc9fa265ec2501761ea57d58f924016bfc3d71257a5630329eb333a13fda737b3833cab28cba16a683e14cfde0bc75d4332289213791076b7c10
+  data.tar.gz: 31cbdcdd05e151a7c02df7b83c7b49220d8bce7c5dbbd9ac900878aef1dfabeef417e5198729bee0074f3b345078e19e36d0add59a687c21d64e22c404b58642

data/lib/fakes3/file_store.rb

@@ -105,56 +105,62 @@ module FakeS3
     end
 
     def copy_object(src_bucket_name, src_name, dst_bucket_name, dst_name, request)
-      src_root = File.join(@root,src_bucket_name,src_name,FAKE_S3_METADATA_DIR)
-      src_metadata_filename = File.join(src_root, "metadata")
-      src_metadata = YAML.load(File.open(src_metadata_filename, 'rb').read)
-      src_content_filename = File.join(src_root, "content")
+      begin
+        src_root = File.join(@root,src_bucket_name,src_name,FAKE_S3_METADATA_DIR)
+        src_metadata_filename = File.join(src_root, "metadata")
+        src_metadata = File.open(src_metadata_filename) { |file| YAML::load(file) }
+        src_content_filename = File.join(src_root, "content")
 
-      dst_filename= File.join(@root,dst_bucket_name,dst_name)
-      FileUtils.mkdir_p(dst_filename)
+        dst_filename= File.join(@root,dst_bucket_name,dst_name)
+        FileUtils.mkdir_p(dst_filename)
 
-      metadata_dir = File.join(dst_filename,FAKE_S3_METADATA_DIR)
-      FileUtils.mkdir_p(metadata_dir)
+        metadata_dir = File.join(dst_filename,FAKE_S3_METADATA_DIR)
+        FileUtils.mkdir_p(metadata_dir)
 
-      content = File.join(metadata_dir, "content")
-      metadata = File.join(metadata_dir, "metadata")
+        content = File.join(metadata_dir, "content")
+        metadata = File.join(metadata_dir, "metadata")
 
-      if src_bucket_name != dst_bucket_name || src_name != dst_name
-        File.open(content, 'wb') do |f|
-          File.open(src_content_filename, 'rb') do |input|
-            f << input.read
+        if src_bucket_name != dst_bucket_name || src_name != dst_name
+          File.open(content, 'wb') do |f|
+            File.open(src_content_filename, 'rb') do |input|
+              f << input.read
+            end
           end
-        end
 
-        File.open(metadata,'w') do |f|
-          File.open(src_metadata_filename,'r') do |input|
-            f << input.read
+          File.open(metadata,'w') do |f|
+            File.open(src_metadata_filename,'r') do |input|
+              f << input.read
+            end
           end
         end
-      end
 
-      metadata_directive = request.header["x-amz-metadata-directive"].first
-      if metadata_directive == "REPLACE"
-        metadata_struct = create_metadata(content,request)
-        File.open(metadata,'w') do |f|
-          f << YAML::dump(metadata_struct)
+        metadata_directive = request.header["x-amz-metadata-directive"].first
+        if metadata_directive == "REPLACE"
+          metadata_struct = create_metadata(content,request)
+          File.open(metadata,'w') do |f|
+            f << YAML::dump(metadata_struct)
+          end
         end
-      end
 
-      src_bucket = get_bucket(src_bucket_name) || create_bucket(src_bucket_name)
-      dst_bucket = get_bucket(dst_bucket_name) || create_bucket(dst_bucket_name)
+        src_bucket = get_bucket(src_bucket_name) || create_bucket(src_bucket_name)
+        dst_bucket = get_bucket(dst_bucket_name) || create_bucket(dst_bucket_name)
 
-      obj = S3Object.new
-      obj.name = dst_name
-      obj.md5 = src_metadata[:md5]
-      obj.content_type = src_metadata[:content_type]
-      obj.content_encoding = src_metadata[:content_encoding]
-      obj.size = src_metadata[:size]
-      obj.modified_date = src_metadata[:modified_date]
-
-      src_bucket.find(src_name)
-      dst_bucket.add(obj)
-      return obj
+        obj = S3Object.new
+        obj.name = dst_name
+        obj.md5 = src_metadata[:md5]
+        obj.content_type = src_metadata[:content_type]
+        obj.content_encoding = src_metadata[:content_encoding]
+        obj.size = src_metadata[:size]
+        obj.modified_date = src_metadata[:modified_date]
+
+        src_bucket.find(src_name)
+        dst_bucket.add(obj)
+        return obj
+      rescue
+        puts $!
+        $!.backtrace.each { |line| puts line }
+        return nil
+      end
     end
 
     def store_object(bucket, object_name, request)

data/lib/fakes3/server.rb

@@ -184,6 +184,12 @@ module FakeS3
       case s_req.type
       when Request::COPY
         object = @store.copy_object(s_req.src_bucket, s_req.src_object, s_req.bucket, s_req.object, request)
+        if !object
+          response.status = 404
+          response.body = XmlAdapter.error_no_such_key(s_req.object)
+          response['Content-Type'] = "application/xml"
+          return
+        end
         response.body = XmlAdapter.copy_object_result(object)
       when Request::STORE
         bucket_obj = @store.get_bucket(s_req.bucket)

data/lib/fakes3/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plntr-fakes3
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.8
+  version: 1.0.0.pre.9
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -234,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Fork of https://github.com/jubos/fake-s3. Fake S3 is a server that simulates