miasma-aws 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2967860cfc9a00bdddaeec82c625e67b0deebbc2
-  data.tar.gz: 5aed93a44a616148a18a432b2e5f6a94b41c2958
+  metadata.gz: 73b61343ba58ba168a4374d7a27ebccf03be0755
+  data.tar.gz: 4a0890aae5f14b0fe5199aca62993698f92b7404
 SHA512:
-  metadata.gz: 83cc2ff04ee739492a8c721d532c1c801f4e2a409c1472c5221c8e5cb67524406b067fa832d1307113e6621ae38eb83e08808cbaca507c0e798463a644f81e1e
-  data.tar.gz: 8ed083d3348fd7dfc087c7195275b5c272bb8500e05c1a45eda9fef0978862cd3aee6ad55105916a4f43dd9aab3318e96f1cd99149713e0152bd5eb71e3fb984
+  metadata.gz: 8760d6337a22a3575ae9f95aa4a658b84138c790fa933250630b48791630223de8d0cfbc0ca1ae792da71c66d4b83c5507a31b88f779bdaaebfa73d3145c71ff
+  data.tar.gz: 61df3b1d4b30f7500bba01565bb0158276cafcb8d4b0ae4bd500a68a495168d1cd32c9571f157c92c89c3d9f39f291f83135869ad48e93912a3e20e3c5bfa1f6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.1.14
+* Fix checksum generation on multi-part uploads
+* Fix paginated fetching of bucket objects
+
 ## v0.1.12
 * Update default file paths to use `Dir.home` instead of ~ expansion
 * Fix bug reading .aws/credentials when whitespace is used

data/lib/miasma-aws/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAws
   # Current library version
-  VERSION = Gem::Version.new('0.1.12')
+  VERSION = Gem::Version.new('0.1.14')
 end

data/lib/miasma/contrib/aws/storage.rb

@@ -15,6 +15,33 @@ module Miasma
         include Contrib::AwsApiCore::ApiCommon
         include Contrib::AwsApiCore::RequestUtils
 
+        # Fetch all results when tokens are being used
+        # for paging results
+        #
+        # @param next_token [String]
+        # @param result_key [Array<String, Symbol>] path to result
+        # @yield block to perform request
+        # @yieldparam options [Hash] request parameters (token information)
+        # @return [Array]
+        # @note this is customized to S3 since its API is slightly
+        #   different than the usual token based fetching
+        def all_result_pages(next_token, *result_key, &block)
+          list = []
+          options = next_token ? Smash.new('marker' => next_token) : Smash.new
+          result = block.call(options)
+          content = result.get(*result_key.dup)
+          if(content.is_a?(Array))
+            list += content
+          else
+            list << content
+          end
+          set = result.get(*result_key.slice(0, 2))
+          if(set.is_a?(Hash) && set['IsTruncated'] && set['Contents'])
+            list += all_result_pages(set['Contents'].last['Key'], *result_key, &block)
+          end
+          list.compact
+        end
+
         # Simple init override to force HOST and adjust region for
         # signatures if required
         def initialize(args)
@@ -222,7 +249,7 @@ module Miasma
                 count = 1
                 parts = []
                 file.body.rewind
-                while(content = file.body.read(Storage::READ_BODY_CHUNK_SIZE))
+                while(content = file.body.read(Storage::READ_BODY_CHUNK_SIZE * 1.5))
                   parts << [
                     count,
                     request(
@@ -231,7 +258,7 @@ module Miasma
                       :endpoint => bucket_endpoint(file.bucket),
                       :headers => Smash.new(
                         'Content-Length' => content.size,
-                        'Content-MD5' => Base64.urlsafe_encode64(Digest::MD5.digest(content))
+                        'Content-MD5' => Digest::MD5.base64digest(content)
                       ),
                       :params => Smash.new(
                         'partNumber' => count,
@@ -266,7 +293,7 @@ module Miasma
                   :body => complete
                 )
                 file.etag = result.get(:body, 'CompleteMultipartUploadResult', 'ETag')
-              rescue
+              rescue => e
                 request(
                   :method => :delete,
                   :path => file_path(file),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma