shrine-google_cloud_storage 3.0.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08794b4f3567a2c3b92a4d6eb5e6bcb3c39c1e11ddbc1af9025e71cb62cd42c7'
-  data.tar.gz: ef6f88db81fa575e99606f18e501d69b2ca8a912e1395434b2d850314ef3abad
+  metadata.gz: 021de2771b75b7e440d36788d7d3c45cec306d026c6aa08ed9e8218e69e61c86
+  data.tar.gz: cdbf68b610dca3468ba12095b2cff8fd38460593df573d6e8025c571659d9643
 SHA512:
-  metadata.gz: f537db521f553056a92b3c607e143bcf7b8b868c580bd5518198c5d88b7088bb28b9173af4a653657f82546439059b12858946ffa2ebe82cdd801d01846c7894
-  data.tar.gz: a677c3b1588ce6fcbd686bbacae9131b1f9f239035c9fbc7042c59f9f35f21350d0149b097f33c56d55919e28e2cdff7e36b5e083a71ce6cb2a97079168d14c5
+  metadata.gz: b088638b0c81d49587b2e9919267167c46de45638a661acee1558f7a017365ca25efc39c163a2e3a61ef0a4d494b527b4c1474d6e1b50c39349b017abbb6a6b9
+  data.tar.gz: bd972313c44c20899c4b1dd0b1909051d0b75cfadef0aadc0957c1f54f3741107a8ee3e3425673ae88e55626a4724f64660cbafac876f15cf82e1e4188f0d807

data/README.md

@@ -12,7 +12,7 @@ gem "shrine-google_cloud_storage"
 
 ## Authentication
 
-The GCS plugin uses the `google-cloud-storage` gem. Please refer to [its documentation for setting up authentication](http://googleapis.github.io/google-cloud-ruby/docs/google-cloud-storage/latest/file.AUTHENTICATION.html).
+The GCS plugin uses the `google-cloud-storage` gem. Please refer to [its documentation for setting up authentication](https://googleapis.dev/ruby/google-cloud-storage/latest/file.AUTHENTICATION.html).
 
 ## Usage
 
@@ -65,7 +65,7 @@ cp .env.sample .env
 
 #### Option 2 - manual setup
 
-Create your own bucket and provide variables that allow for [project and credential lookup](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-storage/v1.6.0/guides/authentication#projectandcredentiallookup).
+Create your own bucket and provide variables that allow for [project and credential lookup](https://googleapis.dev/ruby/google-cloud-storage/latest/file.AUTHENTICATION.html#project-and-credential-lookup).
 For example:
 
 ```sh

data/lib/shrine/storage/google_cloud_storage.rb

@@ -10,15 +10,22 @@ class Shrine
       # Initialize a Shrine::Storage for GCS allowing for auto-discovery of the Google::Cloud::Storage client.
       # @param [String] project Provide if not using auto discovery
       # @see http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-storage/v1.6.0/guides/authentication#environmentvariables for information on discovery
-      def initialize(project: nil, bucket:, prefix: nil, host: nil, default_acl: nil, object_options: {}, credentials: nil)
+      def initialize(project: nil, bucket:, prefix: nil, host: nil, default_acl: nil, object_options: {}, credentials: nil, public: false)
         @project = project
         @bucket = bucket
         @prefix = prefix
         @host = host
-        @default_acl = default_acl
         @object_options = object_options
         @storage = nil
         @credentials = credentials
+
+        @default_acl = if public && default_acl && default_acl != "publicRead"
+                         raise Shrine::Error, "You can not set both public and default_acl"
+                       elsif public
+                         "publicRead"
+                       else
+                         default_acl
+                       end
       end
 
       # If the file is an UploadFile from GCS, issues a copy command, otherwise it uploads a file.
@@ -30,7 +37,7 @@ class Shrine
           file = existing_file.copy(
               @bucket, # dest_bucket_or_path - the bucket to copy the file to
               object_name(id), # dest_path - the path to copy the file to in the given bucket
-              acl: @default_acl
+              acl: options.fetch(:acl) { @default_acl }
           ) do |f|
             # Workaround a bug in File#copy where the content-type is not copied if you provide a block
             # See https://github.com/renchap/shrine-google_cloud_storage/issues/36
@@ -45,14 +52,16 @@ class Shrine
           file
         else
           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)
-              )
+            file_options = @object_options.merge(
+              content_type: shrine_metadata["mime_type"],
+              acl: options.fetch(:acl) { @default_acl }
+            ).merge(options)
+
+            get_bucket.create_file(
+                file,
+                object_name(id), # path
+                **file_options
+            )
           end
         end
       end
@@ -60,12 +69,12 @@ class Shrine
       # URL to the remote file, accepts options for customizing the URL
       def url(id, **options)
         if options.key? :expires
-          signed_url = storage.signed_url(@bucket, object_name(id), options)
+          signed_url = storage.signed_url(@bucket, object_name(id), **options)
           signed_url.gsub!(/storage.googleapis.com\/#{@bucket}/, @host) if @host
           signed_url
         else
           host = @host || "storage.googleapis.com/#{@bucket}"
-          "https://#{host}/#{object_name(id)}"
+          "https://#{host}/#{Addressable::URI.encode_component(object_name(id), Addressable::URI::CharacterClasses::PATH)}"
         end
       end
 
@@ -157,7 +166,7 @@ class Shrine
         opts[:project] = @project if @project
         opts[:credentials] = @credentials if @credentials
 
-        @storage = Google::Cloud::Storage.new(opts)
+        @storage = Google::Cloud::Storage.new(**opts)
       end
 
       def copyable?(io)

data/shrine-google_cloud_storage.gemspec

@@ -1,23 +1,31 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-google_cloud_storage"
-  gem.version       = "3.0.1"
+  gem.version       = "3.3.0"
 
-  gem.required_ruby_version = ">= 2.1"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.summary      = "Provides Google Cloud Storage storage for Shrine."
   gem.homepage     = "https://github.com/renchap/shrine-google_cloud_storage"
   gem.authors      = ["Renaud Chaput"]
   gem.email        = ["renchap@gmail.com"]
   gem.license      = "MIT"
+  gem.metadata     = {
+                       "bug_tracker_uri"       => "https://github.com/renchap/shrine-google_cloud_storage/issues",
+                       "changelog_uri"         => "https://github.com/renchap/shrine-google_cloud_storage/blob/main/CHANGELOG.md",
+                       "homepage_uri"          => "https://github.com/renchap/shrine-google_cloud_storage/",
+                       "source_code_uri"       => "https://github.com/renchap/shrine-google_cloud_storage/",
+                       "rubygems_mfa_required" => "true",
+                     }
 
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "shrine-google_cloud_storage.gemspec"]
   gem.require_path = "lib"
 
   gem.add_dependency "shrine", "~> 3.0"
   gem.add_dependency "google-cloud-storage", "~> 1.6"
+  gem.add_dependency "addressable" # no version constraint to use the same as `google-cloud-storage`
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "dotenv"
-  gem.add_development_dependency "http", "~> 4.0"
+  gem.add_development_dependency "http", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-google_cloud_storage
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Renaud Chaput
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,15 +100,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-description: 
+        version: '5.0'
+description:
 email:
 - renchap@gmail.com
 executables: []
@@ -107,8 +121,13 @@ files:
 homepage: https://github.com/renchap/shrine-google_cloud_storage
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/renchap/shrine-google_cloud_storage/issues
+  changelog_uri: https://github.com/renchap/shrine-google_cloud_storage/blob/main/CHANGELOG.md
+  homepage_uri: https://github.com/renchap/shrine-google_cloud_storage/
+  source_code_uri: https://github.com/renchap/shrine-google_cloud_storage/
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,15 +135,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Provides Google Cloud Storage storage for Shrine.
 test_files: []