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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7d7534e1cb3a29382c746a57c385dcf4c2562398fc9f48ed3080ad1edcf09b
-  data.tar.gz: a1a7eed1674f3b1bc8723ec12d03cc3571f92f0f878c8ab33255aa6bbedd6355
+  metadata.gz: 6172bc1c1a9d1f643197e35dbfeb6e8b943a27a2c6e18cf6c53d1b48f6b7428d
+  data.tar.gz: cc4c2ee5640e9f2b4e0f1af47b6b46a7cddb441dd562e6a4c8f7ec2e8dfcedb8
 SHA512:
-  metadata.gz: f40ab027de1f168e10219a4abe8d0b7b2318236f4ea3374f96e85f69edc89ca9d002d6ff9c24caa156220ea8b509c91d59d729398ebeb2115908a9762e3c7b5e
-  data.tar.gz: eb3f2a7b1ec661e48d00002a9a39b724833a0b589af75474676d6b3267c511d11126dc7c2ac2e3ad4a470d9f9703980ac7245a99c33d99582ea0183424707c12
+  metadata.gz: ac49b2d42151ee6105daf77b6e45d8a7113bce6bdb13f598411da3262bae7204d1ab950c89dedc0a16056781b6291ce4e08b86211ce4b8f8c42a6392ef0a4070
+  data.tar.gz: 51f4d295844bdb3a8ad81f4a0c7b1042bdc3746711ab0329fa54c7f7b83893de0adfa434220307b37cfef6bceb5bd057a1dff8e738282171a4e05988b95b4574

data/Makefile

@@ -1,4 +1,35 @@
-.PHONY: test
+.PHONY: build-run-docker test 
+
+build-run-docker:
+	gem build ./fakes3.gemspec | tee gem-build.txt
+	gem push $$(grep '^  File: ' gem-build.txt | sed 's@^  File: @@')
+	echo "Waiting for gem to appear in the repo" && \
+	  v=$$(grep '^  File: ' gem-build.txt | sed -e 's@^  File: plntr-fakes3-@@' -e 's@\.gem$$@@') && \
+	  until gem list plntr-fakes3 -r --prerelease | grep -q -w $${v}; do \
+	    echo -n '.'; \
+	    sleep 3; \
+	  done && \
+	  echo
+	v=$$(grep '^  File: ' gem-build.txt | sed -e 's@^  File: plntr-fakes3-@@' -e 's@\.gem$$@@') && \
+	  sed -i "s/^PLNTR_FAKES3_VERSION=.*/PLNTR_FAKES3_VERSION=$${v}/" \
+	    ~/dev/docker-image-fakes3/Makefile
+	make -C ~/dev/docker-image-fakes3/ || make -C ~/dev/docker-image-fakes3/
+	docker rm -f fakes3 || true
+	docker run -ti --rm \
+	  --name fakes3 \
+	  -e HOSTNAME=b2d \
+	  -p 4567:4567 \
+	  -v /tmp/s3:/s3 \
+	  planitar/fakes3
+
+run-docker:
+	make -C ~/dev/docker-image-fakes3/
+	docker rm -f fakes3 || true
+	docker run -ti --rm \
+	  -e HOSTNAME=b2d \
+	  -p 4567:4567 \
+	  -v /tmp/s3:/s3 \
+	  planitar/fakes3
 
 build-test-container:
 	docker build -t fake-s3 .

data/lib/fakes3/file_store.rb

@@ -79,13 +79,8 @@ module FakeS3
 
     def get_object(bucket, object_name, request)
       begin
-        warn "get_object:"
-        warn ". root:     '#{@root}'"
-        warn ". bucket:   '#{bucket}'"
-        warn ". path:     '#{object_name}'"
         real_obj = S3Object.new
         obj_root = File.join(@root,bucket,object_name,FAKE_S3_METADATA_DIR)
-        warn ". metadata: '#{File.join(obj_root, "metadata")}'"
         metadata = File.open(File.join(obj_root, "metadata")) { |file| YAML::load(file) }
         real_obj.name = object_name
         real_obj.md5 = metadata[:md5]
@@ -111,17 +106,8 @@ module FakeS3
 
     def copy_object(src_bucket_name, src_name, dst_bucket_name, dst_name, request)
       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")
 
@@ -266,7 +252,7 @@ module FakeS3
       object
     end
 
-    def delete_object(bucket,object_name,request)
+    def delete_object(bucket,object_name)
       begin
         filename = File.join(@root,bucket.name,object_name)
         FileUtils.rm_rf(filename)

data/lib/fakes3/server.rb

@@ -25,6 +25,7 @@ module FakeS3
     SET_ACL = "SET_ACL"
     MOVE = "MOVE"
     DELETE_OBJECT = "DELETE_OBJECT"
+    DELETE_OBJECTS = "DELETE_OBJECTS"
     DELETE_BUCKET = "DELETE_BUCKET"
 
     attr_accessor :bucket, :object, :type, :src_bucket,
@@ -62,8 +63,6 @@ module FakeS3
     end
 
     def do_GET(request, response)
-      warn "= do_GET"
-      dump_request request
       s_req = normalize_request(request)
 
       case s_req.type
@@ -173,8 +172,6 @@ module FakeS3
     end
 
     def do_PUT(request, response)
-      warn "= do_PUT"
-      dump_request request
       s_req = normalize_request(request)
       query = CGI::parse(request.request_uri.query || "")
 
@@ -249,6 +246,10 @@ module FakeS3
     end
 
     def do_POST(request,response)
+      if request.request_line =~ /\?delete\b/
+        return do_DELETE(request, response)
+      end
+
       s_req = normalize_request(request)
       key   = request.query['key']
       query = CGI::parse(request.request_uri.query || "")
@@ -325,13 +326,32 @@ 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
         @store.delete_bucket(s_req.bucket)
+        response.status = 204
+        response.body = ""
+      when Request::DELETE_OBJECTS
+        objects = parse_delete_objects s_req.webrick_request
+        bucket_obj = @store.get_bucket(s_req.bucket)
+        results = objects.collect do |obj|
+          if not obj[:version_id].nil?
+            {
+              key: obj[:key],
+              code: 'XXX_Unimplmented_XXX',
+              message: 'Deletion of object verions is not implemented',
+            }
+          else
+            @store.delete_object(bucket_obj, obj[:key])
+            { key: obj[:key] }
+          end
+        end
+        response.status = 200
+        response.body = XmlAdapter.delete_objects_result(results)
       end
 
-      response.status = 204
-      response.body = ""
     end
 
     def do_OPTIONS(request, response)
@@ -476,6 +496,10 @@ module FakeS3
       else
         s_req.object = path[1..-1]
       end
+
+      if webrick_req.request_line =~ /\?delete\b/
+        s_req.type = Request::DELETE_OBJECTS
+      end
     end
 
     # This method takes a webrick request and generates a normalized FakeS3 request
@@ -486,13 +510,10 @@ module FakeS3
       s_req = Request.new
       s_req.path = webrick_req.path
       s_req.is_path_style = true
-      warn "normalize_request: host='#{host}' path='#{s_req.path}' is_path_style=T"
 
-      warn "                 : root-hostnames='#{@root_hostnames}'"
       if !@root_hostnames.include?(host) && !(IPAddr.new(host) rescue nil)
         s_req.bucket = host.split(".")[0]
         s_req.is_path_style = false
-        warn "                 : bucket='#{s_req.bucket}' is_path_style=F"
       end
 
       s_req.http_verb = webrick_req.request_method
@@ -530,14 +551,29 @@ module FakeS3
       end
     end
 
+    def parse_delete_objects(request)
+      objects_xml   = ""
+      request.body { |chunk| objects_xml << chunk }
+
+      # 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)
-      warn "----------Dump Request-------------"
-      warn request.request_method
-      warn request.path
+      puts "----------Dump Request-------------"
+      puts request.request_method
+      puts request.path
       request.each do |k,v|
-        warn "#{k}:#{v}"
+        puts "#{k}:#{v}"
       end
-      warn "----------End Dump -------------"
+      puts "----------End Dump -------------"
     end
   end
 

data/lib/fakes3/version.rb

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

data/lib/fakes3/xml_adapter.rb

@@ -218,5 +218,37 @@ module FakeS3
       }
       output
     end
+
+    # <DeleteResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+    #   <Deleted>
+    #     <Key>sample1.txt</Key>
+    #   </Deleted>
+    #   <Error>
+    #     <Key>sample2.txt</Key>
+    #     <Code>AccessDenied</Code>
+    #     <Message>Access Denied</Message>
+    #   </Error>
+    # </DeleteResult>
+    def self.delete_objects_result(result_objects)
+      output = ""
+      xml = Builder::XmlMarkup.new(:target => output)
+      xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+      xml.DeleteResult(:xmlns => "http://s3.amazonaws.com/doc/2006-03-01/") { |result|
+        result_objects.each do |res|
+          if not res[:code].nil?
+            result.Error { |error|
+              error.Key(res[:key])
+              error.Code(res[:code])
+              error.Message(res[:message])
+            }
+          else
+            result.Deleted { |deleted|
+              deleted.Key(res[:key])
+            }
+          end
+        end
+      }
+      output
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plntr-fakes3
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.9test9
+  version: 1.0.0.pre.10
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler