fakes3 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c929e6ff3d8522ac143785588c7fdc480d70ddde
-  data.tar.gz: 1c746e1eb8f08619a2a43cd8fddd8b3ce5287151
+  metadata.gz: e4b5a4bfc64bf07bbf5ebaf3038c4ddf95c7a3e4
+  data.tar.gz: 86835f87289156cbbf1ef050d9892d020adbe281
 SHA512:
-  metadata.gz: 1a6199d155b318c48d28532aab032197bc5bb25cf73f4902dcb62c55898f75c5e8187c62da57cef0e4820d849558aa77b4b2ca6c21f9d65f3a566662f9af22c1
-  data.tar.gz: 3975513dbc9051c4fe1207261ff44efafef820d3c19e7e7fceaa7042e035a6da8bcdac83a7c87f90bb0194e95492e1a14c4647b4a39551512e923dba95440aa7
+  metadata.gz: 76f712e660a295b7b1b7435ccf7890a8eb87eefdcbdfa7847d512077792206e6463d63b93786ffb60bbb250e7ebc2885817db2acf85577937dfcff8e9ec004ab
+  data.tar.gz: 691fecdbc4e377f2f23a4e19256db8a018e6357beff5ceb3d0b77915da3f529f25862bbb4177d6de4165c7f4aec2c411396ded814ce5d2a9f817435ff9b0b14f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fakes3 (0.1.7)
+    fakes3 (0.2.0)
       builder
       thor
 

data/lib/fakes3/bucket.rb

@@ -57,6 +57,7 @@ module FakeS3
       bq.delimiter = delimiter
       bq.matches = match_set.matches
       bq.is_truncated = match_set.is_truncated
+      bq.common_prefixes = match_set.common_prefixes
       return bq
     end
 

data/lib/fakes3/bucket_query.rb

@@ -1,7 +1,7 @@
 module FakeS3
   class BucketQuery
     attr_accessor :prefix,:matches,:marker,:max_keys,
-                  :delimiter,:bucket,:is_truncated
+                  :delimiter,:bucket,:is_truncated,:common_prefixes
 
     # Syntactic sugar
     def is_truncated?

data/lib/fakes3/server.rb

@@ -50,6 +50,13 @@ module FakeS3
       @root_hostnames = [hostname,'localhost','s3.amazonaws.com','s3.localhost']
     end
 
+    def validate_request(request)
+      req = request.webrick_request
+      return if req.nil?
+      return if not req.header.has_key?('expect')
+      req.continue if req.header['expect'].first=='100-continue'
+    end
+
     def do_GET(request, response)
       s_req = normalize_request(request)
 
@@ -379,6 +386,8 @@ module FakeS3
         raise "Unknown Request"
       end
 
+      validate_request(s_req)
+
       return s_req
     end
 

data/lib/fakes3/sorted_object_list.rb

@@ -1,10 +1,11 @@
 require 'set'
 module FakeS3
   class S3MatchSet
-    attr_accessor :matches,:is_truncated
+    attr_accessor :matches,:is_truncated,:common_prefixes
     def initialize
       @matches = []
       @is_truncated = false
+      @common_prefixes = []
     end
   end
 
@@ -73,9 +74,45 @@ module FakeS3
         end
       end
 
+      if delimiter
+        if prefix
+          base_prefix = prefix
+        else
+          base_prefix = ""
+        end
+        prefix_offset = base_prefix.length
+      end
+
       count = 0
+      last_chunk = nil
       @sorted_set.each do |s3_object|
         if marker_found && (!prefix or s3_object.name.index(prefix) == 0)
+          if delimiter
+            name = s3_object.name
+            remainder = name.slice(prefix_offset, name.length)
+            chunks = remainder.split(delimiter, 2)
+            if chunks.length > 1
+              if (last_chunk != chunks[0])
+                # "All of the keys rolled up in a common prefix count as
+                # a single return when calculating the number of
+                # returns. See MaxKeys."
+                # (http://awsdocs.s3.amazonaws.com/S3/latest/s3-api.pdf)
+                count += 1
+                if count <= max_keys
+                  ms.common_prefixes << base_prefix + chunks[0] + delimiter
+                  last_chunk = chunks[0]
+                else
+                  is_truncated = true
+                  break
+                end
+              end
+
+              # Continue to the next key, since this one has a
+              # delimiter.
+              next
+            end
+          end
+
           count += 1
           if count <= max_keys
             ms.matches << s3_object

data/lib/fakes3/version.rb

@@ -1,3 +1,3 @@
 module FakeS3
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/lib/fakes3/xml_adapter.rb

@@ -137,6 +137,14 @@ module FakeS3
       end
     end
 
+    def self.append_common_prefixes_to_list_bucket_result(lbr, prefixes)
+      return if prefixes.nil? or prefixes.size == 0
+
+      prefixes.each do |common_prefix|
+        lbr.CommonPrefixes { |contents| contents.Prefix(common_prefix) }
+      end
+    end
+
     def self.bucket_query(bucket_query)
       output = ""
       bucket = bucket_query.bucket
@@ -149,6 +157,7 @@ module FakeS3
         lbr.MaxKeys(bucket_query.max_keys)
         lbr.IsTruncated(bucket_query.is_truncated?)
         append_objects_to_list_bucket_result(lbr,bucket_query.matches)
+        append_common_prefixes_to_list_bucket_result(lbr, bucket_query.common_prefixes)
       }
       output
     end
@@ -189,6 +198,6 @@ module FakeS3
         result.ETag("\"#{object.md5}\"")
       }
       output
-    end    
+    end
   end
 end

data/test/right_aws_commands_test.rb

@@ -55,6 +55,38 @@ class RightAWSCommandsTest < Test::Unit::TestCase
     assert_equal buf_len,output.size
   end
 
+  # Test that GET requests with a delimiter return a list of
+  def test_list_by_delimiter
+    @s3.create_bucket("s3media")
+
+    @s3.put("s3media", "delimited/item", "item")
+
+    expected_prefixes = []
+    (1..50).each do |i|
+      key_prefix = "delimited/%02d/" % i
+      @s3.put("s3media", key_prefix + "foo", "foo")
+      @s3.put("s3media", key_prefix + "fie", "fie")
+      expected_prefixes << key_prefix
+    end
+
+    key_names = []
+    common_prefixes = []
+    @s3.incrementally_list_bucket("s3media", {:prefix => "delimited", :delimiter => '/'}) do |currentResponse|
+      common_prefixes += currentResponse[:common_prefixes]
+    end
+    assert_equal ["delimited/"], common_prefixes
+
+    common_prefixes = []
+    @s3.incrementally_list_bucket("s3media", {:prefix => "delimited/", :delimiter => '/', "max-keys" => 5}) do |currentResponse|
+      key_names += currentResponse[:contents].map do |key|
+        key[:key]
+      end
+      common_prefixes += currentResponse[:common_prefixes]
+    end
+    assert_equal expected_prefixes, common_prefixes
+    assert_equal ["delimited/item"], key_names
+  end
+
   def test_multi_directory
     @s3.put("s3media","dir/right/123.txt","recursive")
     output = ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes3
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Curtis Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler