carrierwave-google-storage 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d74ba19cc3e6aeb961c24c00e923e9c5dc4042c0
-  data.tar.gz: 068e42fe00e040c66ca5968b415aed0d53c4434d
+  metadata.gz: b5dfca5548a4c471cf6e394371707876c087c8ca
+  data.tar.gz: 499ef7b488e98cbc81cbb79a3267ffac4e4fd360
 SHA512:
-  metadata.gz: 43827bbf9a6a6963215dda5a39189671b0d2d0536dd57d66616285151caaacfb858e40e9d0a9d9c9e9021ef10e664e5e9f8c1fde77fc61089f5659f01aef6d5f
-  data.tar.gz: 305c284173189a29f1c51c794fe74634482d3918f8078e2530aa7378eba1615d318b56c60454c64cac241fc490270a9c4a45637b47f18ce76d9636bae041783e
+  metadata.gz: b5696f16b95a947270b694f626f7eebd2664b1c9148ec3646eb64705127ae089d9d6815fecda973abd7498b13bde0e4e958d45d356547dd2618e809eb12bba3f
+  data.tar.gz: 4bbfb4067e0e012b6ad017ae76906990b8f71bccf4d7402bcae25f24f05432122cc9a752a2b5dbb599d9a2e0b3edd7ac3bff232447a2790148d84b66f09e3465

data/.travis.yml

@@ -1,10 +1,10 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.0
   - 2.2.0
   - 2.3.0
+  - 2.4.1
 before_install:
   - openssl aes-256-cbc -K $encrypted_121e786cd5aa_key -iv $encrypted_121e786cd5aa_iv -in .gcp-keyfile.json.enc -out .gcp-keyfile.json -d
   - gem install bundler -v 1.12.1

data/carrierwave-google-storage.gemspec

@@ -1,35 +1,36 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'carrierwave/google/storage/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "carrierwave-google-storage"
+  spec.name          = 'carrierwave-google-storage'
   spec.version       = Carrierwave::Google::Storage::VERSION
-  spec.authors       = ["Jasdeep Singh"]
-  spec.email         = ["narang.jasdeep@gmail.com"]
+  spec.authors       = ['Jasdeep Singh']
+  spec.email         = ['narang.jasdeep@gmail.com']
 
-  spec.summary       = %q{Use gcloud for Google Cloud Storage support in CarrierWave.}
-  spec.description   = %q{A slimmer alternative to using Fog for Google Cloud Storage support in CarrierWave. Heavily inspired from carrierwave-aws}
-  spec.homepage      = "https://github.com/metaware/carrierwave-google-storage"
-  spec.license       = "MIT"
+  spec.summary       = %q(Use gcloud for Google Cloud Storage support in CarrierWave.)
+  spec.description   = %q(A slimmer alternative to using Fog for Google Cloud Storage support in CarrierWave. Heavily inspired from carrierwave-aws)
+  spec.homepage      = 'https://github.com/metaware/carrierwave-google-storage'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  
-  spec.add_dependency 'google-cloud-storage', '~> 0.21.0'
-  spec.add_dependency 'carrierwave', '~> 0.11.2'
-  if RUBY_VERSION >= "2.2.2"
-    spec.add_dependency 'activemodel', ">= 3.2.0"
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'carrierwave', '~> 1.2.0'
+  spec.add_dependency 'google-cloud-storage', '~> 1.9.0'
+  if RUBY_VERSION >= '2.2.2'
+    spec.add_dependency 'activemodel', '>= 3.2.0'
   else
-    spec.add_dependency 'activemodel', "~> 4.2.7"
+    spec.add_dependency 'activemodel', '~> 4.2.7'
   end
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.10.3"
-  spec.add_development_dependency "uri-query_params", "~> 0.7.1"
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'pry', '~> 0.10.3'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'uri-query_params', '~> 0.7.1'
 end

data/lib/carrierwave-google-storage.rb

@@ -6,18 +6,21 @@ require 'carrierwave/storage/gcloud_file'
 require 'carrierwave/storage/gcloud_options'
 require 'carrierwave/support/uri_filename'
 
-class CarrierWave::Uploader::Base
-  
-  ConfigurationError = Class.new(StandardError)
+module CarrierWave
+  module Uploader
+    class Base
 
-  add_config :gcloud_attributes
-  add_config :gcloud_bucket
-  add_config :gcloud_bucket_is_public
-  add_config :gcloud_credentials
-  add_config :gcloud_authenticated_url_expiration
+      ConfigurationError = Class.new(StandardError)
 
-  configure do |config|
-    config.storage_engines[:gcloud] = 'CarrierWave::Storage::Gcloud'
-  end
+      add_config :gcloud_attributes
+      add_config :gcloud_bucket
+      add_config :gcloud_bucket_is_public
+      add_config :gcloud_credentials
+      add_config :gcloud_authenticated_url_expiration
 
-end
+      configure do |config|
+        config.storage_engines[:gcloud] = 'CarrierWave::Storage::Gcloud'
+      end
+    end
+  end
+end

data/lib/carrierwave/google/storage/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Carrierwave
   module Google
     module Storage
-      VERSION = "0.7.0"
+      VERSION = '0.8.0'.freeze
     end
   end
 end

data/lib/carrierwave/storage/gcloud.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module CarrierWave
   module Storage
     class Gcloud < Abstract
-    
       def self.connection_cache
         @connection_cache ||= {}
       end
@@ -9,28 +10,54 @@ module CarrierWave
       def self.clear_connection_cache!
         @connection_cache = {}
       end
-      
+
       def store!(file)
-        CarrierWave::Storage::GcloudFile.new(uploader, connection, uploader.store_path).tap do |gcloud_file|
+        GcloudFile.new(uploader, connection, uploader.store_path).tap do |gcloud_file|
           gcloud_file.store(file)
         end
       end
 
       def retrieve!(identifier)
-        CarrierWave::Storage::GcloudFile.new(uploader, connection, uploader.store_path(identifier)).retrieve
+        GcloudFile.new(uploader, connection, uploader.store_path(identifier))
+      end
+
+      def cache!(file)
+        GcloudFile.new(uploader, connection, uploader.cache_path).tap do |gcloud_file|
+          gcloud_file.store(file)
+        end
+      end
+
+      def retrieve_from_cache!(identifier)
+        GcloudFile.new(uploader, connection, uploader.cache_path(identifier))
+      end
+
+      def clean_cache!(_seconds)
+        raise 'use Object Lifecycle Management to clean the cache'
       end
 
       def connection
         @connection ||= begin
-          cert_path = Gem.loaded_specs['google-api-client'].full_gem_path+'/lib/cacerts.pem'
+          conn_cache = self.class.connection_cache
           ENV['SSL_CERT_FILE'] = cert_path
-          self.class.connection_cache[credentials] ||= ::Google::Cloud.new(credentials[:gcloud_project] || ENV["GCLOUD_PROJECT"], credentials[:gcloud_keyfile] || ENV["GCLOUD_KEYFILE"]).storage
+          conn_cache[credentials] ||= ::Google::Cloud.new(
+            credentials[:gcloud_project] || ENV['GCLOUD_PROJECT'],
+            credentials[:gcloud_keyfile] || ENV['GCLOUD_KEYFILE']
+          ).storage.bucket(uploader.gcloud_bucket)
         end
       end
 
       def credentials
-        uploader.gcloud_credentials
+        uploader.gcloud_credentials || {}
+      end
+
+      private
+
+      def cert_path
+        @cert_path ||= begin
+          gem_path = Gem.loaded_specs['google-api-client'].full_gem_path
+          gem_path + '/lib/cacerts.pem'
+        end
       end
     end
   end
-end
+end

data/lib/carrierwave/storage/gcloud_file.rb

@@ -1,39 +1,28 @@
+# frozen_string_literal: true
+
 module CarrierWave
   module Storage
     class GcloudFile
-    
+      GCLOUD_STORAGE_URL = 'https://storage.googleapis.com'
+
       attr_writer :file
-      attr_accessor :uploader, :connection, :path, 
-        :gcloud_options, :file_exists
+      attr_accessor :uploader, :connection, :path, :gcloud_options, :file_exists
 
       delegate :content_type, :size, to: :file
 
       def initialize(uploader, connection, path)
-        @uploader, @connection, @path = uploader, connection, path
+        @uploader   = uploader
+        @connection = connection
+        @path       = path
       end
 
       def file
-        by_verifying_existence { @file ||= bucket.file(path) }
-        @file
-      end
-      alias_method :to_file, :file
-      
-      def retrieve
-        by_verifying_existence { @file ||= bucket.file(path) }
-        self
-      end
-      
-      def by_verifying_existence(&block)
-        begin
-          self.file_exists = true
-          yield
-        rescue Exception => exception
-          self.file_exists = false if (exception.class == ::Google::Cloud::Error::NotFoundError) && (exception.message == "Not Found")
-        end
+        @file ||= bucket.file(path)
       end
+      alias to_file file
 
       def attributes
-        return unless file_exists
+        return unless exists?
         {
           content_type: file.content_type,
           size: file.size,
@@ -41,15 +30,15 @@ module CarrierWave
           etag: file.etag
         }
       end
-      
+
       def delete
         deleted = file.delete
-        self.file_exists = false if deleted
+        @file = nil if deleted
         deleted
       end
-      
+
       def exists?
-        self.file_exists
+        !file.nil?
       end
 
       def extension
@@ -62,14 +51,17 @@ module CarrierWave
       end
 
       def read
-        tmp_file = Tempfile.new(CarrierWave::Support::UriFilename.filename(file.name))
+        tmp_file = Tempfile.new(
+          CarrierWave::Support::UriFilename.filename(file.name)
+        )
         (file.download tmp_file.path, verify: :all).read
       end
 
       def store(new_file)
-        new_file_path = uploader.filename ?  uploader.filename : new_file.filename
-        # bucket.create_file new_file.path, "#{uploader.store_dir}/#{new_file_path}" 
-        bucket.create_file new_file.path, path, content_type: new_file.content_type
+        new_file_path = uploader.filename ? uploader.filename : new_file.filename
+        bucket.create_file(
+          new_file.path, path, content_type: new_file.content_type
+        )
         self
       end
 
@@ -78,28 +70,26 @@ module CarrierWave
       end
 
       def url(options = {})
-        return unless file_exists
         uploader.gcloud_bucket_is_public ? public_url : authenticated_url
       end
-      
+
       def authenticated_url(options = {})
-        file.signed_url
+        bucket.signed_url(path, options)
       end
 
       def public_url
         if uploader.asset_host
           "#{uploader.asset_host}/#{path}"
         else
-          file.public_url.to_s
+          "#{GCLOUD_STORAGE_URL}/#{uploader.gcloud_bucket}/#{@path}"
         end
       end
 
       private
 
       def bucket
-        bucket ||= connection.bucket(uploader.gcloud_bucket)
+        connection
       end
-
     end
   end
-end
+end

data/lib/carrierwave/utilities/uri.rb

@@ -0,0 +1,23 @@
+require 'uri'
+
+module CarrierWave
+  module Utilities
+    module Uri
+    # based on Ruby < 2.0's URI.encode
+    SAFE_STRING = URI::REGEXP::PATTERN::UNRESERVED + '\/'
+    UNSAFE = Regexp.new("[^#{SAFE_STRING}]", false)
+
+    private
+      def encode_path(path)
+        path.to_s.gsub(UNSAFE) do
+          us = $&
+          tmp = ''
+          us.each_byte do |uc|
+            tmp << sprintf('%%%02X', uc)
+          end
+          tmp
+        end
+      end
+    end # Uri
+  end # Utilities
+end # CarrierWave

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-google-storage
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jasdeep Singh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-cloud-storage
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: uri-query_params
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,7 @@ files:
 - lib/carrierwave/storage/gcloud_file.rb
 - lib/carrierwave/storage/gcloud_options.rb
 - lib/carrierwave/support/uri_filename.rb
+- lib/carrierwave/utilities/uri.rb
 homepage: https://github.com/metaware/carrierwave-google-storage
 licenses:
 - MIT
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Use gcloud for Google Cloud Storage support in CarrierWave.