carrierwave-qiniu 1.1.8 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e9ac6a7fc4b16de529b49ceda0a7e397e6cbffb5dee7dd5e22b8781a9e93e6
-  data.tar.gz: 445d456bfed1453e6daa4f0aae75bd540c67ccab359e7968c876c22fea74197a
+  metadata.gz: 88ad15a88d231142af19a674cb9b98a3d59fa043983627e8e05019f9437c4edf
+  data.tar.gz: 920e9ce74941e1fea40653adc4dd6e206563da0685ea603d12dd17a62919baeb
 SHA512:
-  metadata.gz: 2a9df16d1a6b680815907f80b38f75b5fe199bcc72e0ce536bd58f91bf9d1429fdcc44146ce1ee53bd11ca3489f6f4156d60e0d365183b631609728dd042be63
-  data.tar.gz: 37c437d0f628abd9178ac1fb701a215ee7e4038a983be6e9990215aad010fa650c3dce9013e9ca482fccb990dc5c22aa3a8f429ca25acffd946430141321bf57
+  metadata.gz: df7664665d316e856e66222267d81539cde36b2c926fd4bb3be9e3a9eb96dbfa0752c78829e353657ee665529fa7c36d19f4cb805115dfed2c3a168201b08b64
+  data.tar.gz: 378869166a509fc117a2134fb565e4eca59d81dd9e7dc579fdf9c30598b9d155acfb094401b73b25f8afd93a5bcdf08dfd510c1aa71525553046d4b9e4789bd4

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 ## CHANGE LOG
 
+### v1.2.0
+
+- Fit to carrierwave 2.0 (支持 CarrierWave 2.0)
+
 ### v1.1.8
 
 - Fix warning in ruby 2.7.

data/Gemfile

@@ -1,16 +1,16 @@
 #source 'https://rubygems.org'
-source 'https://gems.ruby-china.com'
+source "https://gems.ruby-china.com"
 
 # Specify your gem's dependencies in carrierwave-qiniu.gemspec
 gemspec
 
 group :test do
-  gem 'rails', '~> 6.0.0'
-  gem 'sqlite3'
-  gem 'carrierwave', '~> 1.3', '>= 1.3.1'
-  gem 'mini_magick'
-  gem 'qiniu', '~> 6.9'
-  gem 'rspec'
-  gem 'mocha'
-  gem 'dotenv'
+  gem "rails", "~> 6.0.0"
+  gem "sqlite3"
+  gem "carrierwave", ">= 1"
+  gem "mini_magick"
+  gem "qiniu", "~> 6.9"
+  gem "rspec"
+  gem "mocha"
+  gem "dotenv"
 end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    carrierwave-qiniu (1.1.7)
-      carrierwave (~> 1.0)
+    carrierwave-qiniu (1.2.0)
+      carrierwave (>= 1)
       qiniu (~> 6.9, >= 6.9.0)
 
 GEM
@@ -63,11 +63,16 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.3)
-    carrierwave (1.3.1)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
+    carrierwave (2.0.2)
+      activemodel (>= 5.0.0)
+      activesupport (>= 5.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      mimemagic (>= 0.3.0)
+      mini_mime (>= 0.1.3)
     concurrent-ruby (1.1.5)
     crass (1.0.4)
     diff-lcs (1.3)
@@ -75,13 +80,17 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
     erubi (1.8.0)
+    ffi (1.12.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
+    image_processing (1.10.3)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -91,20 +100,21 @@ GEM
       mimemagic (~> 0.3.2)
     metaclass (0.0.4)
     method_source (0.9.2)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0904)
+    mime-types-data (3.2019.1009)
     mimemagic (0.3.3)
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.0)
     mocha (1.9.0)
       metaclass (~> 0.0.1)
     netrc (0.11.0)
     nio4r (2.5.1)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
+    public_suffix (4.0.3)
     qiniu (6.9.0)
       mime-types (~> 3.1)
       rest-client (~> 2.0)
@@ -156,6 +166,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
+    ruby-vips (2.0.17)
+      ffi (~> 1.9)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -166,7 +178,7 @@ GEM
     sqlite3 (1.4.1)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
@@ -174,13 +186,13 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    zeitwerk (2.1.10)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  carrierwave (~> 1.3, >= 1.3.1)
+  carrierwave (>= 1)
   carrierwave-qiniu!
   dotenv
   mini_magick
@@ -191,4 +203,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?1.1.7)](http://badge.fury.io/rb/carrierwave-qiniu)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?1.1.8)](http://badge.fury.io/rb/carrierwave-qiniu)
 
 This gem adds storage support for [Qiniu](http://qiniutek.com) to [Carrierwave](https://github.com/jnicklas/carrierwave)
 
@@ -10,7 +10,7 @@ example: https://github.com/huobazi/carrierwave-qiniu-example
 
 Add the following to your application's Gemfile:
 
-    gem 'carrierwave-qiniu', '~> 1.1.7'
+    gem 'carrierwave-qiniu', '~> 1.1.8'
     gem 'carrierwave-i18n' # If you need to use locales other than English
 
 And then execute:
@@ -19,7 +19,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install carrierwave-qiniu -v 1.1.7
+    $ gem install carrierwave-qiniu -v 1.1.8
 
 ## Usage
 

data/carrierwave-qiniu.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.version       = Carrierwave::Qiniu::VERSION
 
 
-  gem.add_dependency "carrierwave" , "~> 1.0"
+  gem.add_dependency "carrierwave" , ">= 1"
   gem.add_dependency "qiniu", "~> 6.9", ">= 6.9.0"
 end

data/lib/carrierwave-qiniu/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Carrierwave
   module Qiniu
-    VERSION = "1.1.8"
+    VERSION = "1.2.0"
   end
 end

data/lib/carrierwave/storage/qiniu.rb

@@ -1,31 +1,30 @@
 # encoding: utf-8
-require 'carrierwave'
-require 'qiniu'
-require 'qiniu/http'
+require "carrierwave"
+require "qiniu"
+require "qiniu/http"
 
 module CarrierWave
   module Storage
     class Qiniu < Abstract
-
       class Connection
-        def initialize(options={})
+        def initialize(options = {})
           @qiniu_bucket_domain          = options[:qiniu_bucket_domain]
           @qiniu_bucket                 = options[:qiniu_bucket]
           @qiniu_bucket_private         = options[:qiniu_bucket_private] || false
           @qiniu_access_key             = options[:qiniu_access_key]
           @qiniu_secret_key             = options[:qiniu_secret_key]
-          @qiniu_block_size             = options[:qiniu_block_size] || 1024*1024*4
+          @qiniu_block_size             = options[:qiniu_block_size] || 1024 * 1024 * 4
           @qiniu_protocol               = options[:qiniu_protocol] || "http"
-          @qiniu_persistent_ops         = options[:qiniu_persistent_ops] || options[:qiniu_async_ops] || ''
-          @qiniu_persistent_pipeline    = options[:qiniu_persistent_pipeline] || ''
-          @qiniu_persistent_notify_url  = options[:qiniu_persistent_notify_url] || ''
+          @qiniu_persistent_ops         = options[:qiniu_persistent_ops] || options[:qiniu_async_ops] || ""
+          @qiniu_persistent_pipeline    = options[:qiniu_persistent_pipeline] || ""
+          @qiniu_persistent_notify_url  = options[:qiniu_persistent_notify_url] || ""
           @qiniu_can_overwrite          = options[:qiniu_can_overwrite] || false
           @qiniu_expires_in             = options[:qiniu_expires_in] || options[:expires_in] || 3600
           @qiniu_up_host                = options[:qiniu_up_host]
           @qiniu_private_url_expires_in = options[:qiniu_private_url_expires_in] || 3600
-          @qiniu_callback_url           = options[:qiniu_callback_url] || ''
-          @qiniu_callback_body          = options[:qiniu_callback_body] || ''
-          @qiniu_style_separator        = options[:qiniu_style_separator] || '-'
+          @qiniu_callback_url           = options[:qiniu_callback_url] || ""
+          @qiniu_callback_body          = options[:qiniu_callback_body] || ""
+          @qiniu_style_separator        = options[:qiniu_style_separator] || "-"
           @qiniu_delete_after_days      = options[:qiniu_delete_after_days] || 0
           init
         end
@@ -41,11 +40,11 @@ module CarrierWave
             nil
           )
 
-          put_policy.callback_url          = @qiniu_callback_url if @qiniu_callback_url.present?
-          put_policy.callback_body         = @qiniu_callback_body if @qiniu_callback_body.present?
-          put_policy.persistent_ops        = @qiniu_persistent_ops || @qiniu_async_ops
+          put_policy.callback_url = @qiniu_callback_url if @qiniu_callback_url.present?
+          put_policy.callback_body = @qiniu_callback_body if @qiniu_callback_body.present?
+          put_policy.persistent_ops = @qiniu_persistent_ops || @qiniu_async_ops
           put_policy.persistent_notify_url = @qiniu_persistent_notify_url if @qiniu_persistent_notify_url.present?
-          put_policy.persistent_pipeline   = @persistent_pipeline
+          put_policy.persistent_pipeline = @persistent_pipeline
 
           resp_code, resp_body, resp_headers =
             ::Qiniu::Storage.upload_with_put_policy(
@@ -53,12 +52,12 @@ module CarrierWave
               file.path,
               key,
               nil,
-              bucket: @qiniu_bucket
-          )
+              bucket: @qiniu_bucket,
+            )
 
-            if resp_code < 200 or resp_code >= 300
-              raise ::CarrierWave::UploadError, "Upload failed, status code: #{resp_code}, response: #{resp_body}"
-            end
+          if resp_code < 200 or resp_code >= 300
+            raise ::CarrierWave::UploadError, "Upload failed, status code: #{resp_code}, response: #{resp_body}"
+          end
         end
 
         #
@@ -84,18 +83,14 @@ module CarrierWave
         end
 
         def get(path)
-          code, result, _ = ::Qiniu::HTTP.get( download_url(path) )
+          code, result, _ = ::Qiniu::HTTP.get(download_url(path))
           code == 200 ? result : nil
         end
 
         def download_url(path)
           encode_path = path_escape(path)
           primitive_url = "#{@qiniu_protocol}://#{@qiniu_bucket_domain}/#{encode_path}"
-          @qiniu_bucket_private ? \
-            ::Qiniu::Auth.authorize_download_url(primitive_url, :expires_in => @qiniu_private_url_expires_in) \
-            : \
-            primitive_url
-
+          @qiniu_bucket_private ? ::Qiniu::Auth.authorize_download_url(primitive_url, :expires_in => @qiniu_private_url_expires_in) : primitive_url
         end
 
         private
@@ -110,25 +105,21 @@ module CarrierWave
           options = {
             :access_key => @qiniu_access_key,
             :secret_key => @qiniu_secret_key,
-            :user_agent => UserAgent
+            :user_agent => UserAgent,
           }
           options[:block_size] = @qiniu_block_size if @qiniu_block_size
-          options[:up_host]    = @qiniu_up_host if @qiniu_up_host
+          options[:up_host] = @qiniu_up_host if @qiniu_up_host
 
           ::Qiniu.establish_connection! options
-
         end
 
         #fix chinese file name, same as encodeURIComponent in js but preserve slash '/'
         def path_escape(value)
-          #CGI.escape(value)#.gsub("%2F", "/")
           ::URI::DEFAULT_PARSER.escape value
         end
-
       end
 
       class File
-
         def initialize(uploader, path)
           @uploader, @path = uploader, path
         end
@@ -176,7 +167,6 @@ module CarrierWave
           qiniu_connection.delete(@path)
 
           qiniu_connection.copy(origin_path, @path)
-
         end
 
         ##
@@ -191,15 +181,15 @@ module CarrierWave
         end
 
         def content_type
-          file_info['mimeType'] || 'application/octet-stream'.freeze
+          file_info["mimeType"] || "application/octet-stream".freeze
         end
 
         def size
-          file_info['fsize'] || 0
+          file_info["fsize"] || 0
         end
 
         def extension
-          path.split('.').last
+          path.split(".").last
         end
 
         def filename
@@ -210,30 +200,30 @@ module CarrierWave
 
         def qiniu_connection
           @qiniu_connection ||= begin
-                                  config = {
-                                    :qiniu_access_key             => @uploader.qiniu_access_key,
-                                    :qiniu_secret_key             => @uploader.qiniu_secret_key,
-                                    :qiniu_bucket                 => @uploader.qiniu_bucket,
-                                    :qiniu_bucket_domain          => @uploader.qiniu_bucket_domain,
-                                    :qiniu_bucket_private         => @uploader.qiniu_bucket_private,
-                                    :qiniu_block_size             => @uploader.qiniu_block_size,
-                                    :qiniu_protocol               => @uploader.qiniu_protocol,
-                                    :qiniu_expires_in             => @uploader.qiniu_expires_in,
-                                    :qiniu_up_host                => @uploader.qiniu_up_host,
-                                    :qiniu_private_url_expires_in => @uploader.qiniu_private_url_expires_in,
-                                    :qiniu_callback_url           => @uploader.qiniu_callback_url,
-                                    :qiniu_callback_body          => @uploader.qiniu_callback_body,
-                                    :qiniu_persistent_notify_url  => @uploader.qiniu_persistent_notify_url,
-                                    :qiniu_persistent_pipeline    => @uploader.qiniu_persistent_pipeline,
-                                    :qiniu_style_separator        => @uploader.qiniu_style_separator,
-                                    :qiniu_delete_after_days      => @uploader.qiniu_delete_after_days
-                                  }
-
-                                  config[:qiniu_persistent_ops] = Array(@uploader.qiniu_persistent_ops || @uploader.qiniu_async_ops).join(';') rescue ''
-                                  config[:qiniu_can_overwrite]  = @uploader.try :qiniu_can_overwrite rescue false
-
-                                  Connection.new config
-                                end
+            config = {
+              :qiniu_access_key             => @uploader.qiniu_access_key,
+              :qiniu_secret_key             => @uploader.qiniu_secret_key,
+              :qiniu_bucket                 => @uploader.qiniu_bucket,
+              :qiniu_bucket_domain          => @uploader.qiniu_bucket_domain,
+              :qiniu_bucket_private         => @uploader.qiniu_bucket_private,
+              :qiniu_block_size             => @uploader.qiniu_block_size,
+              :qiniu_protocol               => @uploader.qiniu_protocol,
+              :qiniu_expires_in             => @uploader.qiniu_expires_in,
+              :qiniu_up_host                => @uploader.qiniu_up_host,
+              :qiniu_private_url_expires_in => @uploader.qiniu_private_url_expires_in,
+              :qiniu_callback_url           => @uploader.qiniu_callback_url,
+              :qiniu_callback_body          => @uploader.qiniu_callback_body,
+              :qiniu_persistent_notify_url  => @uploader.qiniu_persistent_notify_url,
+              :qiniu_persistent_pipeline    => @uploader.qiniu_persistent_pipeline,
+              :qiniu_style_separator        => @uploader.qiniu_style_separator,
+              :qiniu_delete_after_days      => @uploader.qiniu_delete_after_days,
+            }
+
+            config[:qiniu_persistent_ops]    = Array(@uploader.qiniu_persistent_ops || @uploader.qiniu_async_ops).join(";") rescue ""
+            config[:qiniu_can_overwrite]     = @uploader.try :qiniu_can_overwrite rescue false
+
+            Connection.new config
+          end
         end
 
         def file_info
@@ -251,7 +241,6 @@ module CarrierWave
             @path
           end
         end
-
       end
 
       def store!(file)
@@ -264,10 +253,19 @@ module CarrierWave
         f
       end
 
+      def cache!(file)
+        f = ::CarrierWave::Storage::Qiniu::File.new(uploader, uploader.cache_path(uploader.filename))
+        f.store(file)
+        f
+      end
+
       def retrieve!(identifier)
         ::CarrierWave::Storage::Qiniu::File.new(uploader, uploader.store_path(identifier))
       end
 
+      def retrieve_from_cache!(identifier)
+        ::CarrierWave::Storage::Qiniu::File.new(uploader, uploader.cache_path(identifier))
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,31 +4,28 @@ require "rails"
 require "active_record"
 require "carrierwave"
 require "carrierwave/orm/activerecord"
-require 'dotenv'
-require 'mini_magick'
+require "dotenv"
+require "mini_magick"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..","lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require "carrierwave-qiniu"
 
-
 module Rails
-  class <<self
+  class << self
     def root
-      [File.expand_path(__FILE__).split('/')[0..-3].join('/'),"spec"].join("/")
+      [File.expand_path(__FILE__).split("/")[0..-3].join("/"), "spec"].join("/")
     end
   end
 end
 
-
 the_gem = Gem::Specification.find_by_name("carrierwave")
 the_gem_root = the_gem.gem_dir
 the_gem_lib = the_gem_root + "/lib"
 the_gem_locale = the_gem_lib + "/carrierwave/locale/en.yml"
 I18n.load_path << the_gem_locale
 
-
 Dotenv.load
 
 ActiveRecord::Migration.verbose = false
@@ -37,23 +34,21 @@ if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [4, 2]
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 
-
 # 测试的时候载入环境变量
 # 或者在根目录下新建 `.env` 文件，包含 <key>=<value>
 ::CarrierWave.configure do |config|
   config.storage             = :qiniu
-  config.qiniu_access_key    = ENV['qiniu_access_key']
-  config.qiniu_secret_key    = ENV['qiniu_secret_key']
+  config.cache_storage       = :file
+  config.qiniu_access_key    = ENV["qiniu_access_key"]
+  config.qiniu_secret_key    = ENV["qiniu_secret_key"]
 
-  config.qiniu_bucket        = ENV['qiniu_bucket']
-  config.qiniu_bucket_domain = ENV['qiniu_bucket_domain']
+  config.qiniu_bucket        = ENV["qiniu_bucket"]
+  config.qiniu_bucket_domain = ENV["qiniu_bucket_domain"]
 end
 
 def load_file(fname)
-  File.open([Rails.root,fname].join("/"))
+  File.open([Rails.root, fname].join("/"))
 end
 
-
 RSpec.configure do |config|
-
 end

data/spec/upload_spec.rb

@@ -59,7 +59,6 @@ describe "CarrierWave Qiniu" do
   end
 
   class Photo < ActiveRecord::Base
-
     mount_uploader :image, PhotoUploader
   end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: qiniu
   requirement: !ruby/object:Gem::Requirement