canistor 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb028e5a37a0a861d629b957b7d180452aa6fc2561e948119a7350c28c7a2b47
-  data.tar.gz: e009688e7c20b73064530ff3ce011b1013b466f15b6aecaf03b94576b50f3d13
+  metadata.gz: 1a72057225c71056a2dc5988c98c289bd510f8d3e4aa349122b0320b82ad37a8
+  data.tar.gz: b5955919a7e72c44068e83e4cb24ac531f2a35e32882008782ae4cf11e225f96
 SHA512:
-  metadata.gz: 914228524001aefdf327d627798164241a666ba2a63dc280e1ab8414e48791c5584bb4347df8d2986a3bdf89320d1ff79fbab19601fd249ba0157b5ce07dbd02
-  data.tar.gz: b625e9cfe54e19a73bfa36db8717885e484ad6fec637017055665ada06fccba83dba6c8bc4b0500df960a65f07041d0cddb5334cc56d04f07989460d96e0b259
+  metadata.gz: 92d2ca4e756258bd8074343c113636758ac2e7a8816d9301aa00a93f31cfaafbbf45dc6f029d2eb165fa6e5494d35bfacecd2a82444352dc1564f4ad819d299b
+  data.tar.gz: 1eea263424389acb1d6350be042feeb9419c1b7a229f50b9d7aa093832765b8e601ec7a9649e0360b3c33a68ea045e2f6337970a3c0dccd4f19f7a3e2360ffe7

data/lib/canistor/error_handler.rb

@@ -105,7 +105,7 @@ module Canistor
     def serve_error(status_code, body)
       response.signal_headers(
         status_code,
-        'data' => Time.now.httpdate,
+        'date' => Time.now.httpdate,
         'x-amz-request-id' => request_id
       )
       unless request.http_method == 'HEAD'

data/lib/canistor/storage/bucket.rb

@@ -48,7 +48,9 @@ module Canistor
       def get(context, access_key_id, subject)
         if !access_keys.include?(access_key_id)
           Canistor::ErrorHandler.serve_access_denied(context, subject)
-        elsif object = objects[subject.key] 
+        elsif subject.key.nil? || subject.key == ''
+          list_bucket(context)
+        elsif object = objects[subject.key]
           object.get(context, subject)
         else
           Canistor::ErrorHandler.serve_no_such_key(context, subject)
@@ -104,6 +106,58 @@ module Canistor
           key: subject.key
         )
       end
+
+      # Iterate over all objects in the bucket using the filter and pagination
+      # options which exist in S3.
+      def each(prefix:, marker:, max_keys:, &block)
+        passed_marker = marker.nil? ? false : true
+        has_prefix = (prefix.to_s.strip == '') ? false : true
+        objects.each do |path, object|
+          if !passed_marker && (!has_prefix || object.key.start_with?(prefix))
+            yield object
+            max_keys -= 1 unless max_keys.nil?
+          end
+          break if max_keys && max_keys < 1
+          passed_marker = true if (!passed_marker && object.key == marker)
+        end
+      end
+
+      def list_bucket(context)
+        context.http_response.signal_headers(
+          200,
+          'date' => Time.now.httpdate,
+          'x-amz-request-id' => SecureRandom.hex(8).upcase
+        )
+        unless context.http_request.http_method == 'HEAD'
+          context.http_response.signal_data(to_xml(context))
+        end
+      end
+
+      def to_xml(context)
+        # Only returns objects with keys that start with the prefix.
+        prefix = context.params[:prefix]
+        # Return objects until we find a key that matches the marker. Can
+        # be used to group objects.
+        marker = context.params[:marker]
+        # Stop after returning a number of objects.
+        max_keys = context.params[:max_keys]
+        max_keys = max_keys ? max_keys.to_i : nil
+        Nokogiri::XML::Builder.new do |xml|
+          xml.ListBucketResult(xmlns: 'http://s3.amazonaws.com/doc/2006-03-01/') do
+            xml.Name name
+            xml.Prefix
+            xml.Marker
+            xml.MaxKeys max_keys
+            each(prefix: prefix, marker: marker, max_keys: max_keys) do |object|
+              xml.Contents do
+                xml.Key object.key
+                xml.Size object.size
+                xml.StorageClass 'STANDARD'
+              end
+            end
+          end
+        end.to_xml
+      end
     end
   end
 end

data/lib/canistor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canistor
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canistor
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Manfred Stienstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler