carrierwave-qiniu 0.1.8.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2467d7c391ebc4ef470c30992b8edd74a38bbde
-  data.tar.gz: 0ae998c7b57e17c82c5f2c5c156a6a9b570306da
+  metadata.gz: e43e7e5fdcf0da4e9de0d0925050ec9d7a459b27
+  data.tar.gz: e6453512b87881c5547619c17b6657c8ce54f1e8
 SHA512:
-  metadata.gz: 6ad9a56792682750696a4a3c4678bbf297492df83c3a5336311b34798544f9e79b660f0967fb52db330fdde27e146ee76037af3051f58dd496e4bed521fad7ee
-  data.tar.gz: eea4fd668a93a248fb34c62cd57b312cffca9406bbd5dd1cb122a90481dd95800cdb11aabd1c4aa4ee12fa9a9d194b6cd9d0f78682e6e419bc867602b8117e2b
+  metadata.gz: fa856dc9e7a97f5c2c080c1170a9d8126cce7868052a58892313799bb50c7fd922d5e0402c8a066ebe3e71eaf7e4be72917a0413b9a0c2c6a93b8cfef9b7facc
+  data.tar.gz: b15d06236154333a3e1ae389412db9e0c7c1ce5d5bdc1040b6c1260968d494318c15e957905e056e5f156af23dc7da120f50bbb42cd42dcdf6c8bb548ac8747e

data/.rspec

@@ -0,0 +1,3 @@
+--color
+-f progress
+--require spec_helper

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 ## CHANGE LOG
 
+### v0.2.0
+
+- 升级七牛 SDK 至 6.5.2
+
 ### v0.1.8.2
 
 https://github.com/huobazi/carrierwave-qiniu/pull/42

data/Gemfile

@@ -1,11 +1,11 @@
 #source 'https://rubygems.org'
-source 'http://ruby.taobao.org'
+source 'https://ruby.taobao.org'
 
 # Specify your gem's dependencies in carrierwave-qiniu.gemspec
 gemspec
 
 group :test do
-  gem 'rails', '>=3.2.8'
+  gem 'rails', '>=4.2.5'
   gem 'sqlite3', '>=1.3.6'
   gem 'carrierwave', '>=0.6.2'
   gem 'mini_magick', '>=3.4'

data/carrierwave-qiniu.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency "carrierwave"
-  gem.add_dependency "qiniu",["~> 6.4.2"]
+  gem.add_dependency "qiniu",["~> 6.5.1"]
 end

data/lib/carrierwave-qiniu/version.rb

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

data/spec/spec_helper.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
 require "rubygems"
-require "rspec"
-require "rspec/autorun"
 require "rails"
 require "active_record"
 require "carrierwave"
 require "carrierwave/orm/activerecord"
 require 'dotenv'
+require 'mini_magick'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..","lib"))
 
 require "carrierwave-qiniu"
 
+
 module Rails
   class <<self
     def root
@@ -21,10 +21,23 @@ module Rails
   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
 
+if [ActiveRecord::VERSION::MAJOR, ActiveRecord::VERSION::MINOR] == [4, 2]
+  ActiveRecord::Base.raise_in_transactional_callbacks = true
+end
+
+
 # 测试的时候载入环境变量
 # 或者在根目录下新建 `.env` 文件，包含 <key>=<value>
 ::CarrierWave.configure do |config|
@@ -42,3 +55,9 @@ end
 def load_file(fname)
   File.open([Rails.root,fname].join("/"))
 end
+
+
+RSpec.configure do |config|
+
+end
+

data/spec/upload_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 # thanks for https://github.com/nowa/carrierwave-upyun/blob/master/spec/upload_spec.rb
-
 require File.dirname(__FILE__) + '/spec_helper'
 require "open-uri"
 
@@ -21,7 +20,15 @@ describe "CarrierWave Qiniu" do
     end
   end
 
+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]
+    end
 
     def store_dir
       "carrierwave-qiniu-spec"
@@ -56,7 +63,6 @@ describe "CarrierWave Qiniu" do
     mount_uploader :image, PhotoUploader
   end
 
-
   before :all do
     setup_db
   end
@@ -71,15 +77,21 @@ describe "CarrierWave Qiniu" do
       photo = Photo.new(:image => f)
       photo.save
 
+      puts photo.errors.full_messages if photo.errors.count > 0
+
       photo.errors.count.should == 0
 
-      puts ""
       puts 'The image was uploaded to:'
       puts photo.image.url
 
       open(photo.image.url).should_not be_nil
 
-      puts photo.image.url
+
+      puts "The thumb image:"
+      puts photo.image.url(:thumb)
+
+      open(photo.image.thumb.url).should_not be_nil
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.1.8.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 6.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.2
+        version: 6.5.1
 description: Qiniu Storage support for CarrierWave
 email:
 - huobazi@gmail.com
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE