plntr-fakes3 1.0.0.pre.10alpha46 → 1.0.0.pre.10alpha47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b787f4925cf0186e0b39877980c0c64d81e292c57742672ba2e085bed54810d
-  data.tar.gz: b4e11d23e5f0bed09da5b69b5289ec32ca5a344aaa6271c3058849f7cc7bdb4a
+  metadata.gz: 6199fe28260288a5dd88de8f495388a37d2032527eacf177dded63ecc984d8e5
+  data.tar.gz: 02116b1ce0d287335a2e6d88f81fc9e73f7f2cff3bad48c33e22b0ba1ec1f111
 SHA512:
-  metadata.gz: 064fb587cd7b72b3b0133773cdb6e78358c9956ca2b3808ca08cb00a1ab6f795003f2adb4784ca9825aafb2bc10822a950a98f0a1ba9f82d676d290c64be0b21
-  data.tar.gz: 5b8e4e843c5fa57819b6c92c8f87d27971cef6f73854035be901c3576e40b86a853deed24b768672bf7bc4b799f89b011491e75a2b27169c9887e22ab7cd6f07
+  metadata.gz: 9de3d9bc2699a6014c4f8278b6fb810a0a13a2d033fd963b1bfb617e273557ebafeccb8552bb02c9fbc4158156b0e0c82aa88e2c377682d3331256a626d8b3ee
+  data.tar.gz: b28af92f0a0737a61e9703462316ed5008e4ec042c1edd65f139d8f00718fe8b51a2082479058cd3533f9c3097031482be0d5f4062f51d470d1dda8d415f75b9

data/lib/fakes3/server.rb

@@ -340,28 +340,24 @@ module FakeS3
         warn "bucket: #{s_req.bucket}"
         objects = parse_delete_objects s_req.webrick_request
         bucket_obj = @store.get_bucket(s_req.bucket)
-        response.status = 200
-        response.body = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        response.body << "<DeleteResult>\n"
-        objects.each do |obj|
+        results = objects.collect do |obj|
           warn "process key=#{obj[:key]} version_id=#{obj[:version_id]}"
           if not obj[:version_id].nil?
-            response.body << <<-eos
-              <Error>
-                <Key>#{obj[:key]}</Key>
-                <Code>XXX_Unimplmented_XXX</Code>
-                <Message>Deletion of object verions is not implemented</Message>
-              </Error>
-            eos
+            {
+              key: obj[:key],
+              code: 'XXX_Unimplmented_XXX',
+              message: 'Deletion of object verions is not implemented',
+            }
           else
             @store.delete_object(bucket_obj, obj[:key])
-            response.body << <<-eos
-              <Deleted>
-                <Key>#{obj[:key]}</Key>
-              </Deleted>
-            eos
+            {
+              key: obj[:key],
+            }
           end
         end
+
+        response.status = 200
+        response.body = XmlAdapter.delete_objects_result(results)
         response.body << "</DeleteResult>"
         warn '--- RESPONSE ---'
         warn response.body

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "1.0.0-10alpha46"
+  VERSION = "1.0.0-10alpha47"
 end

data/lib/fakes3/xml_adapter.rb

@@ -218,5 +218,31 @@ module FakeS3
       }
       output
     end
+
+    # <CompleteMultipartUploadResult>
+    #   <Location>http://Example-Bucket.s3.amazonaws.com/Example-Object</Location>
+    #   <Bucket>Example-Bucket</Bucket>
+    #   <Key>Example-Object</Key>
+    #   <ETag>"3858f62230ac3c915f300c664312c11f-9"</ETag>
+    # </CompleteMultipartUploadResult>
+    def self.delete_objects_result(results)
+      output = ""
+      xml = Builder::XmlMarkup.new(:target => output)
+      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+      xml.DeleteResult { |lst|
+        results.each do |res|
+          if res[:error]
+            lst.Error { |err|
+              err.Key(res[:key])
+              err.Code(res[:code])
+              err.Code(res[:message])
+            }
+          else
+            lst.Deleted { |del| del.Key(res[:key]) }
+          end
+        end
+      }
+      output
+    end
   end
 end

metadata

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