plntr-fakes3 1.0.0.pre.9test8 → 1.0.0.pre.9test9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b739788195db42a3d1d4c5da7050550c5bfd4b3b6ef19c0a4fe5841e9c07be4
-  data.tar.gz: 572690c009f95b300c7b82b70999ad7f0ba1ec7c9fae943eca7c4c1805fef8d1
+  metadata.gz: 0d7d7534e1cb3a29382c746a57c385dcf4c2562398fc9f48ed3080ad1edcf09b
+  data.tar.gz: a1a7eed1674f3b1bc8723ec12d03cc3571f92f0f878c8ab33255aa6bbedd6355
 SHA512:
-  metadata.gz: 2887298e1f44d9fe4076394c75ffe4916f9810a0d29172d7740df69be691b8e187e258c4cbce3d3770601d640b75a4845879df29d5e8ceb1119a91878fc18a43
-  data.tar.gz: 77537015a1531ca1c03d02142a4583da5f4c975aea49cfc630a423fa50ddf0e1272a8925fa58fd121d67d7343573919707bb55dab5a3eb700995b6462182714f
+  metadata.gz: f40ab027de1f168e10219a4abe8d0b7b2318236f4ea3374f96e85f69edc89ca9d002d6ff9c24caa156220ea8b509c91d59d729398ebeb2115908a9762e3c7b5e
+  data.tar.gz: eb3f2a7b1ec661e48d00002a9a39b724833a0b589af75474676d6b3267c511d11126dc7c2ac2e3ad4a470d9f9703980ac7245a99c33d99582ea0183424707c12

data/lib/fakes3/file_store.rb

@@ -110,65 +110,71 @@ module FakeS3
     end
 
     def copy_object(src_bucket_name, src_name, dst_bucket_name, dst_name, request)
-      warn "copy_object:"
-      warn ". root:         '#{@root}'"
-      warn ". dst bucket:   '#{dst_bucket_name}'"
-      warn ". dst path:     '#{dst_name}'"
-      warn ". src bucket:   '#{src_bucket_name}'"
-      warn ". src path:     '#{src_name}'"
-      src_root = File.join(@root,src_bucket_name,src_name,FAKE_S3_METADATA_DIR)
-      src_metadata_filename = File.join(src_root, "metadata")
-      warn ". src metadata: '#{src_metadata_filename}'"
-      warn ""
-      # src_metadata = YAML.load(File.open(src_metadata_filename, 'rb').read)
-      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)
-
-      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")
-
-      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
+      begin
+        warn "copy_object:"
+        warn ". root:         '#{@root}'"
+        warn ". dst bucket:   '#{dst_bucket_name}'"
+        warn ". dst path:     '#{dst_name}'"
+        warn ". src bucket:   '#{src_bucket_name}'"
+        warn ". src path:     '#{src_name}'"
+        src_root = File.join(@root,src_bucket_name,src_name,FAKE_S3_METADATA_DIR)
+        src_metadata_filename = File.join(src_root, "metadata")
+        warn ". src metadata: '#{src_metadata_filename}'"
+        warn ""
+        # src_metadata = YAML.load(File.open(src_metadata_filename, 'rb').read)
+        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)
+
+        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")
+
+        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)
 
-      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 = get_bucket(src_bucket_name) || create_bucket(src_bucket_name)
+        dst_bucket = get_bucket(dst_bucket_name) || create_bucket(dst_bucket_name)
 
-      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

@@ -188,6 +188,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-9test8"
+  VERSION = "1.0.0-9test9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plntr-fakes3
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.9test8
+  version: 1.0.0.pre.9test9
 platform: ruby
 authors:
 - Curtis Spencer