plntr-fakes3 1.0.0.pre.10alpha29 → 1.0.0.pre.10alpha33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a090d373d3c4efb368d92ad4b36fca98539b6e6cc6db3860b70f1bd9d8ee1bda
-  data.tar.gz: 3e1a11b8d48930a638cd090f3686f8835ef37ac29d3ec7462e2b961f1d82eddf
+  metadata.gz: 2f0e9a469b82f105ed857e8d6864ef896f72bcdbac8ba3e58ebce5f111711aaa
+  data.tar.gz: d813f49a103bd4bd188614845c3334986a1fd3251be5b120db0e4043f9ec60e7
 SHA512:
-  metadata.gz: 2546d4943cff9fdc2933ee9e4636f0bbfded93d7bf050cc48770dcae9ac8d781de6655f8f0a52733c08afa9652be4ca6702fab538343bf28221634d5810c310d
-  data.tar.gz: 3be0ccb3e486d6873fe40d735b44da58a79c63963e4fd48b0a55892e4b30c82483aad5340edb4f74de82609041f8e143177123e1cfc7232d5a07966f97342016
+  metadata.gz: c79dfb5b59e9eba9317349f79b78e282475a7886d73a2c689c481f55b723e6a6242f2bf7b02eb17399e8b27d74890ce1868be5be1b38504b1580b3865f747c45
+  data.tar.gz: 43130d209c04b5af118ee352fc82d18443d8878da375cc9c2c16cd3c2642d490e5d86b296ece7465c82d33deb5d98670641ce0bcc41ae2ab0d4a23bfbe1b7425

data/lib/fakes3/server.rb

@@ -328,7 +328,7 @@ module FakeS3
       case s_req.type
       when Request::DELETE_OBJECT
         bucket_obj = @store.get_bucket(s_req.bucket)
-        @store.delete_object(bucket_obj,s_req.object,s_req.webrick_request)
+        @store.delete_object(bucket_obj,s_req.object)
         response.status = 204
         response.body = ""
       when Request::DELETE_BUCKET
@@ -338,7 +338,23 @@ module FakeS3
       when Request::DELETE_OBJECTS
         warn 'Request::DELETE_OBJECTS'
         warn "bucket: #{s_req.bucket}"
-        parse_delete_objects s_req.webrick_request
+        bucket_obj = @store.get_bucket(s_req.bucket)
+        objects = parse_delete_objects s_req.webrick_request
+        responses = objects.collect do |obj|
+          warn "process key=#{obj[:key]} version_id=#{obj[:version_id]}"
+          # @store.delete_object(bucket_obj, obj.key)
+          "<Deleted><Key>#{obj[:key]}</Key></Deleted>"
+        end
+        response.status = 200
+        response.body = <<-eos.strip
+          <?xml version="1.0" encoding="UTF-8"?>
+          <DeleteResult>
+            #{responses.join '\n'}
+          </DeleteResult>
+        eos
+        warn '--- RESPONSE ---'
+        warn response.body
+        warn '--- RESPONSE END ---'
         warn ''
       end
 
@@ -542,11 +558,21 @@ module FakeS3
     end
 
     def parse_delete_objects(request)
-      parts_xml   = ""
-      request.body { |chunk| parts_xml << chunk }
-      warn " ::: BODY ::: (type=#{parts_xml.class})"
-      warn parts_xml
+      objects_xml   = ""
+      request.body { |chunk| objects_xml << chunk }
+      warn " ::: BODY ::: (type=#{objects_xml.class})"
+      warn objects_xml
       warn " ::: END BODY :::"
+
+      # TODO: improve parsing xml
+      objects_xml = objects_xml.scan(/<Object>.*?<\/Object>/)
+
+      objects_xml.collect do |obj| 
+        {
+          key: obj[/<Key>(.+)<\/Key>/, 1],
+          version_id: obj[/<VersionId>(.+)<\/VersionId>/, 1]
+        }
+      end
     end
 
     def dump_request(request)

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "1.0.0-10alpha29"
+  VERSION = "1.0.0-10alpha33"
 end

metadata

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