fix to carrierwave 2.0

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.

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

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,25 +63,34 @@ 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)
     domain_name (0.5.20190701)
       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,21 +178,21 @@ 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
     unf_ext (0.0.7.6)
     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

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

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