carrierwave-qiniu 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47eb1c55cfe096e539099c1edff84fc1a1f5bfa3b931150956cb8448b3bc5600
-  data.tar.gz: 261e356f4ada5881910344e0705afcaeef0abd9e89afd52bbf6ff2625632452e
+  metadata.gz: c28afe90d4591dd7736101b5786c4116f4fd5c6f6ead62d5158b08fcf2383fd1
+  data.tar.gz: f5d85a46d048ebaa638f1dce6b41712cebf9de22bbe6a2d254dcfac009940a90
 SHA512:
-  metadata.gz: dec0c499538e460c55d7e592d266fa83026900149e4f2b32f9baf02a89b31e79e3effc47d4ef617e573937ec9910f886a0728e5644465ef423a077b73f83dfbc
-  data.tar.gz: 692d9b52765e1d917dae7075c205272ef692f109c2f88c21c1f268b99c09d8a68c9b134074a7f55931cf88bbc44b9d664592b1fa2eb531436e806316101db9ac
+  metadata.gz: a09bf317e8d01b3ab5eb203b659243154fbcf39fc75acc6ba4c9b1d9628ff1f6eaf67cd491af096e0b90e917c5f2c8922a3e089e6631f6f46fee97c330a841a9
+  data.tar.gz: cdb4a8714098091c8863e5571cdfdce5f1f8789af27cc34a1f4826abe36455a8ef761a8d74ad2e99ba303e41f08ff0d52998789b57bdaeb0d95e9e26f68a068a

data/.gitignore

@@ -5,7 +5,6 @@
 .yardoc
 .env
 .env.*
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile

@@ -5,11 +5,11 @@ source 'https://gems.ruby-china.com'
 gemspec
 
 group :test do
-  gem 'rails'
+  gem 'rails', '~> 6.0.0'
   gem 'sqlite3'
-  gem 'carrierwave'
+  gem 'carrierwave', '~> 1.3', '>= 1.3.1'
   gem 'mini_magick'
-  gem 'qiniu'
+  gem 'qiniu', '~> 6.9'
   gem 'rspec'
   gem 'mocha'
   gem 'dotenv'

data/Gemfile.lock

@@ -0,0 +1,194 @@
+PATH
+  remote: .
+  specs:
+    carrierwave-qiniu (1.1.7)
+      carrierwave (~> 1.0)
+      qiniu (~> 6.9, >= 6.9.0)
+
+GEM
+  remote: https://gems.ruby-china.com/
+  specs:
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    builder (3.2.3)
+    carrierwave (1.3.1)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
+    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)
+    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)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    metaclass (0.0.4)
+    method_source (0.9.2)
+    mime-types (3.3)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0904)
+    mimemagic (0.3.3)
+    mini_magick (4.9.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    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)
+    qiniu (6.9.0)
+      mime-types (~> 3.1)
+      rest-client (~> 2.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  carrierwave (~> 1.3, >= 1.3.1)
+  carrierwave-qiniu!
+  dotenv
+  mini_magick
+  mocha
+  qiniu (~> 6.9)
+  rails (~> 6.0.0)
+  rspec
+  sqlite3
+
+BUNDLED WITH
+   1.17.3

data/README.md

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

data/_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-leap-day
+theme: jekyll-theme-hacker

data/carrierwave-qiniu.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency "carrierwave" , "~> 1.0"
-  gem.add_dependency "qiniu", "~> 6.8", ">= 6.8.0"
+  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.6"
+    VERSION = "1.1.7"
   end
 end

data/spec/upload_spec.rb

@@ -20,14 +20,14 @@ describe "CarrierWave Qiniu" do
     end
   end
 
-require 'carrierwave/processing/mini_magick'
+  require 'carrierwave/processing/mini_magick'
   class PhotoUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
 
     self.qiniu_can_overwrite = true
 
     version :thumb do
-          process :resize_to_fill => [200, 200]
+      process :resize_to_fill => [200, 200]
     end
 
     def store_dir
@@ -85,10 +85,6 @@ require 'carrierwave/processing/mini_magick'
 
       f = load_file("mm.jpg")
       photo = WrongPhoto.new(:image => f)
-      # FIXME: also raise error, see: CarrierWave::Qiniu#store L54
-      photo.save
-      expect(photo).to_not be_valid
-
       expect {
         photo.save!
       }.to raise_error
@@ -136,21 +132,25 @@ require 'carrierwave/processing/mini_magick'
       open(photo2.image.url).should_not be_nil
     end
 
-    it 'file exists return true' do
-      f = load_file("mm.jpg")
-      photo = Photo.new(image: f)
-      photo.save
+    describe 'after remove' do
+      before(:each) do
+        f = load_file("mm.jpg")
+        @photo = Photo.new(image: f)
+        @photo.save
+        @photo.image.remove!
+      end
 
-      expect(photo.image.file.exists?).to eq(true)
-    end
+      it 'will be not cached' do
+        expect(@photo.image).not_to be_cached
+      end
 
-    it 'file exists return false' do
-      f = load_file("mm.jpg")
-      photo = Photo.new(image: f)
-      photo.save
-      photo.image.remove!
+      it 'file will be nil' do
+        expect(@photo.image.file).to be_nil
+      end
 
-      expect(photo.image.file.exists?).to eq(false)
+      it 'url will be nill' do
+        expect(@photo.image.url).to be_nil
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.8.0
+        version: 6.9.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
+        version: '6.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.8.0
+        version: 6.9.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
+        version: '6.9'
 description: Qiniu Storage support for CarrierWave
 email:
 - huobazi@gmail.com
@@ -55,6 +55,7 @@ files:
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Qiniu Storage support for CarrierWave