shrine-google_cloud_storage 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1076839610e614727ac6be9742ee1ec630112f7
-  data.tar.gz: 638f6ad6360e4f65ef6db03ca5a0fbd8fa5e6c75
+SHA256:
+  metadata.gz: 23c1f63dede9dfeb07206378d3f05febbe2daeebe13dac4eefe44acabd56f969
+  data.tar.gz: f96cfa7a0c31b7f563844e6538bc793733b4bfacdbe30210369d57d3bcb17997
 SHA512:
-  metadata.gz: '01968d677153ad556ea301f30149813fee671e094ce1c2744d3fbe9ba59b8f0a85f032d7ce12ef9469c8be8809b36a96ffbb80c51b93dbb7dfe5abf7ea8ca0b2'
-  data.tar.gz: '060239c68bea2b0bba944991ec369bd73b32c6c8c87650ba26dc9d31168092a27ace43aa01af2f7a21f445ebecae406572ed859f40d212500c8f9d0917eb8268'
+  metadata.gz: 5d15f754a22f4eea98aeffac564a91033fd1a40fb53cd4540043e15facaa067f62f10fe7492e5c8adc2123c19a2b0964d06d6ec86e6242565a0ecc2484e4a063
+  data.tar.gz: 30d8de03eaa32029cadd2a54804c0470eec79504066fdc7ce92cc1578a064147abdba29062b2c43697715f407350b6fcf51a9d0c7f4d40952dacf15ac23d9064

data/README.md

@@ -96,5 +96,5 @@ GCS_DEBUG=true
 [MIT](http://opensource.org/licenses/MIT)
 
 [Google Cloud Storage]: https://cloud.google.com/storage/
-[Shrine]: https://github.com/janko-m/shrine
+[Shrine]: https://github.com/shrinerb/shrine
 [Project and Credential Lookup]: http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-storage/master/guides/authentication#projectandcredentiallookup

data/lib/shrine/storage/google_cloud_storage.rb

@@ -38,14 +38,16 @@ class Shrine
           end
           file
         else
-          get_bucket.create_file(
-              prepare_io(io), # file -  IO object, or IO-ish object like StringIO
-              object_name(id), # path
-              @object_options.merge(
-                  content_type: shrine_metadata["mime_type"],
-                  acl: @default_acl
-              ).merge(options)
-          )
+          with_file(io) do |file|
+              get_bucket.create_file(
+                  file,
+                  object_name(id), # path
+                  @object_options.merge(
+                      content_type: shrine_metadata["mime_type"],
+                      acl: @default_acl
+                  ).merge(options)
+              )
+          end
         end
       end
 
@@ -99,31 +101,36 @@ class Shrine
       # deletes the file from the storage
       def delete(id)
         file = get_file(id)
-        file.delete unless file.nil?
+        delete_file(file) unless file.nil?
       end
 
-      # Otherwise deletes all objects from the storage.
-      def clear!
+      # deletes all objects from the storage
+      # If block is givem, deletes only objects for which
+      # the block evaluates to true.
+      #
+      # clear!
+      # # or
+      # clear! { |file| file.updated_at < 1.week.ago }
+      def clear!(&block)
         prefix = "#{@prefix}/" if @prefix
         files = get_bucket.files prefix: prefix
-        batch_delete(files.lazy.map(&:name))
+
         loop do
-          break if !files.next?
-          batch_delete(files.next.lazy.map(&:name))
+          files.each { |file| delete_file(file) if block.nil? || block.call(file) }
+          files = files.next or break
         end
       end
 
+      # returns request data (:method, :url, and :headers) for direct uploads
       def presign(id, **options)
+        url = storage.signed_url(@bucket, object_name(id), method: "PUT", **options)
+
         headers = {}
         headers["Content-Type"] = options[:content_type] if options[:content_type]
         headers["Content-MD5"]  = options[:content_md5] if options[:content_md5]
         headers.merge!(options[:headers]) if options[:headers]
 
-        OpenStruct.new(
-          url: storage.signed_url(@bucket, object_name(id), method: "PUT", **options),
-          fields: {},
-          headers: headers
-        )
+        { method: :put, url: url, headers: headers }
       end
 
       def object_name(id)
@@ -155,27 +162,20 @@ class Shrine
         # TODO: add a check for the credentials
       end
 
-      # Google cloud storage client only accepts IO|IOString|Tempfile instances
-      # or else it will raise a "Google::Apis::ClientError, 'Invalid upload source"
-      #
-      # We need to convert our file to an IO.
-      j
-      # see:
-      # https://github.com/google/google-api-ruby-client/blob/1c2cf5d57fd5e606c03f2aecab88469f46b8f3b2/lib/google/apis/core/upload.rb#L77
-      def prepare_io(io)
-        if io.respond_to?(:to_io)
-          io.to_io
-        elsif io.respond_to?(:tempfile)
-          io.tempfile
+      def with_file(io)
+        if io.respond_to?(:tempfile) # ActionDispatch::Http::UploadedFile
+          yield io.tempfile
         else
-          io
+          Shrine.with_file(io) { |file| yield file }
         end
       end
 
-      def batch_delete(object_names)
-        bucket = get_bucket
-        object_names.each do |name|
-          bucket.file(name).delete
+      # deletes file with ignoring NotFoundError
+      def delete_file(file)
+        begin
+          file.delete
+        rescue Google::Cloud::NotFoundError
+          # we're fine if the file was already deleted
         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       = "1.0.1"
+  gem.version       = "2.0.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,11 +13,11 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "shrine-google_cloud_storage.gemspec"]
   gem.require_path = "lib"
 
-  gem.add_dependency "shrine", "~> 2.0"
+  gem.add_dependency "shrine", "~> 2.11"
   gem.add_dependency "google-cloud-storage", "~> 1.6"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "dotenv"
-  gem.add_development_dependency "http", "~> 3.0"
+  gem.add_development_dependency "http", "~> 4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-google_cloud_storage
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Renaud Chaput
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 description: 
 email:
 - renchap@gmail.com
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Provides Google Cloud Storage storage for Shrine.