shrine-google_cloud_storage 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900ee63b1a59397ff36fe30add0c7efbca93e07f
-  data.tar.gz: 8fcf629cbd6f125ad18c30c5d135f4b39d20c771
+  metadata.gz: '08d6183e134fdb573cb7a432c55489f17a59d05a'
+  data.tar.gz: 4c0604286ce8695f96509d6f332f5b6045c408c4
 SHA512:
-  metadata.gz: d8e8f6e0b56adf09b010edfcaedac63769a9e6c5d3d096e7e78cfd6f71faee1e1774604e847d7360f29b365b80ac41d8d20f55cd0ec464adc1e4b8c31261dad9
-  data.tar.gz: 58f5b6adabf36e897ab6f475aa589744ff4aaf5031d961296a2407d17c41770220bb9ef2a0e65f79f98db9ffc04c40a4be9e011ddd8ef4426fec3439561355b7
+  metadata.gz: fa358fd9e4a7a53ba56da9612860eee38998f544858e3010103b492c6fa9ee1ebb8937e39e42e42572daf29aea0e8a9a1d799ac39ebdf5b31248536e07ba8f1d
+  data.tar.gz: 963493555038ef7918db7b129a1b5e837edb59212570ae936cc8fa78db4fd99fe9082d7395d87c47b9f6553297f976575523e3a82cbe5d5d4dcfecfa14ad7c0f

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/shrine-google_cloud_storage.svg)](https://badge.fury.io/rb/shrine-google_cloud_storage)
+
 # Shrine::Storage::GoogleCloudStorage
 
 Provides [Google Cloud Storage] (GCS) storage for [Shrine].

data/lib/shrine/storage/google_cloud_storage.rb

@@ -92,9 +92,7 @@ class Shrine
       end
 
       def clear!
-        ids = []
-
-        storage_api.fetch_all do |token, s|
+        all_objects = storage_api.fetch_all do |token, s|
           prefix = "#{@prefix}/" if @prefix
           s.list_objects(
             @bucket,
@@ -102,18 +100,9 @@ class Shrine
             fields: "items/name",
             page_token: token,
           )
-        end.each do |object|
-          ids << object.name
-
-          if ids.size >= 100
-            # Batches are limited to 100, so we execute it and reset the ids
-            batch_delete(ids)
-            ids = []
-          end
         end
 
-        # We delete the remaining ones
-        batch_delete(ids) unless ids.empty?
+        batch_delete(all_objects.lazy.map(&:name))
       end
 
       def presign(id, **options)
@@ -152,9 +141,12 @@ class Shrine
       end
 
       def batch_delete(object_names)
-        storage_api.batch do |storage|
-          object_names.each do |name|
-            storage.delete_object(@bucket, name)
+        # Batches are limited to 100 operations
+        object_names.each_slice(100) do |names|
+          storage_api.batch do |storage|
+            names.each do |name|
+              storage.delete_object(@bucket, name)
+            end
           end
         end
       end

data/shrine-google_cloud_storage.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-google_cloud_storage"
-  gem.version       = "0.1.0"
+  gem.version       = "0.2.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_path = "lib"
 
   gem.add_dependency "shrine", "~> 2.0"
-  gem.add_dependency "google-api-client", "~> 0.11.0"
+  gem.add_dependency "google-api-client", "~> 0.13.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-google_cloud_storage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Renaud Chaput
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement