carrierwave-qiniu 0.1.8 → 0.1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccbd315d40ee92225c01233111bb7fe0dba63bf6
-  data.tar.gz: f971548c853f9e1969e7c2154bcdd772f01ffc94
+  metadata.gz: ce0788a33edf4b269a2f351ee329b23ff8447f10
+  data.tar.gz: 78414ebcc9b2bfee47ba3a92a8e33118b561f81c
 SHA512:
-  metadata.gz: 3eef04296696a3088e96ea06e0cb2b813c4f7235a6b9d64ba89164c4a386a61c21fc96c027a6d148320fb856010c9b9b3e2887718531098c34e8b96e99224893
-  data.tar.gz: ce454ab4c3af772794e92703576a167df5c1a802e2d0e67cf34164262e6372663ffecf35010cd8af101b67dd80826c028994ef82f8de0670dd46d6c8ae172ae3
+  metadata.gz: cf2a596f92ffca378a6f60ef023dbc358775c35f6cb4695fc1df66706159d7ec6e8c265bcb849e289517a8217c30073bf37fb9bfe0c93a5b27b88ec894269ee5
+  data.tar.gz: d8372b8f85ba30d4c650492e3e4ec2d425b0e3dd9c8f50f3f01e6970e5a634e74d2356bc583cb7ae98f2083c5a08f70f59bdf11038055f0f92b74e9bae6575b8

data/.gitignore

@@ -3,6 +3,8 @@
 .bundle
 .config
 .yardoc
+.env
+.env.*
 Gemfile.lock
 InstalledFiles
 _yardoc
@@ -16,4 +18,3 @@ test/tmp
 test/version_tmp
 tmp
 uploads/
-

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 
 ## CHANGE LOG
 
+### v0.1.8.1
+
+https://github.com/huobazi/carrierwave-qiniu/pull/36
+
+https://github.com/huobazi/carrierwave-qiniu/pull/38
+
 ### v0.1.7
 
 - 添加从云端读取（下载）文件  。 [https://github.com/huobazi/carrierwave-qiniu/pull/27](https://github.com/huobazi/carrierwave-qiniu/pull/27)
 
 - 增加获取有时效性url链接地址的方法 。 [https://github.com/huobazi/carrierwave-qiniu/issues/25](https://github.com/huobazi/carrierwave-qiniu/issues/25)
+
+- 升级七牛 SDK 至 6.4.2

data/Gemfile

@@ -12,4 +12,5 @@ group :test do
   gem 'qiniu'
   gem 'rspec', '~> 2.11'
   gem 'mocha', '>=0.10.0'
+  gem 'dotenv'
 end

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png)](http://badge.fury.io/rb/carrierwave-qiniu)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png?20150410001)](http://badge.fury.io/rb/carrierwave-qiniu)
 
 This gem adds storage support for [Qiniu](http://qiniutek.com) to [Carrierwave](https://github.com/jnicklas/carrierwave)
 example: https://github.com/huobazi/carrierwave-qiniu-example

data/lib/carrierwave/storage/qiniu.rb

@@ -36,7 +36,7 @@ module CarrierWave
           )
           put_policy.persistent_ops = @qiniu_async_ops
 
-          code, result, response_headers = ::Qiniu::Storage.upload_with_put_policy(
+          ::Qiniu::Storage.upload_with_put_policy(
             put_policy,
             file.path,
             key
@@ -45,29 +45,27 @@ module CarrierWave
         end
 
         def delete(key)
-          begin
-            ::Qiniu::Storage.delete(@qiniu_bucket, key)
-          rescue Exception
-            nil
-          end
+          ::Qiniu::Storage.delete(@qiniu_bucket, key) rescue nil
         end
 
         def stat(key)
-          code, result, response_headers = ::Qiniu::Storage.stat(@qiniu_bucket, key)
+          code, result, _ = ::Qiniu::Storage.stat(@qiniu_bucket, key)
           code == 200 ? result : {}
         end
 
         def get(path)
-          code, result, response_headers = ::Qiniu::HTTP.get( download_url(path) )
+          code, result, _ = ::Qiniu::HTTP.get( download_url(path) )
           code == 200 ? result : nil
         end
 
         def download_url(path)
-          private_url_args = {}
-          encode_path = URI.escape(path, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")) #fix chinese file name, same as encodeURIComponent in js
+          encode_path = URI.escape(path) #fix chinese file name, same as encodeURIComponent in js but preserve slash '/'
           primitive_url = "#{@qiniu_protocol}://#{@qiniu_bucket_domain}/#{encode_path}"
-          private_url_args.merge!(expires_in: @qiniu_private_url_expires_in) if @qiniu_bucket_private
-          @qiniu_bucket_private ? ::Qiniu::Auth.authorize_download_url(primitive_url, private_url_args) : primitive_url
+          @qiniu_bucket_private ? \
+            ::Qiniu::Auth.authorize_download_url(primitive_url, :expires_in => @qiniu_private_url_expires_in) \
+            : \
+            primitive_url
+
         end
 
         private
@@ -76,14 +74,16 @@ module CarrierWave
           init_qiniu_rs_connection
         end
 
+        UserAgent = "CarrierWave-Qiniu/#{Carrierwave::Qiniu::VERSION} (#{RUBY_PLATFORM}) Ruby/#{RUBY_VERSION}".freeze
+
         def init_qiniu_rs_connection
           options = {
             :access_key => @qiniu_access_key,
             :secret_key => @qiniu_secret_key,
-            :user_agent => 'CarrierWave-Qiniu/' + Carrierwave::Qiniu::VERSION + ' ('+RUBY_PLATFORM+')' + ' Ruby/'+ RUBY_VERSION
+            :user_agent => UserAgent
           }
-          options.merge(:block_size => @qiniu_block_size) if @qiniu_block_size
-          options.merge(:up_host    => @qiniu_up_host) if @qiniu_up_host
+          options[:block_size] = @qiniu_block_size if @qiniu_block_size
+          options[:up_host] = @qiniu_up_host if @qiniu_up_host
 
           ::Qiniu.establish_connection! options
 
@@ -125,7 +125,7 @@ module CarrierWave
         end
 
         def content_type
-          file_info['mimeType'] || 'application/octet-stream'
+          file_info['mimeType'] || 'application/octet-stream'.freeze
         end
 
         def size
@@ -135,9 +135,7 @@ module CarrierWave
         private
 
         def qiniu_connection
-          if @qiniu_connection
-            @qiniu_connection
-          else
+          @qiniu_connection ||= begin
             config = {
               :qiniu_access_key    => @uploader.qiniu_access_key,
               :qiniu_secret_key    => @uploader.qiniu_secret_key,
@@ -151,23 +149,10 @@ module CarrierWave
               :qiniu_private_url_expires_in => @uploader.qiniu_private_url_expires_in
             }
 
-            if @uploader.respond_to?(:qiniu_async_ops) and !@uploader.qiniu_async_ops.nil? and @uploader.qiniu_async_ops.size > 0
-              if @uploader.qiniu_async_ops.is_a?(Array)
-                config.merge!(:qiniu_async_ops => @uploader.qiniu_async_ops.join(';'))
-              else
-                config.merge!(:qiniu_async_ops => @uploader.qiniu_async_ops)
-              end
-            end
-
-            if @uploader.respond_to?(:qiniu_can_overwrite) and !@uploader.qiniu_can_overwrite.nil?
-              if @uploader.qiniu_can_overwrite.is_a?(TrueClass) or @uploader.is_a?(FalseClass)
-                config.merge!(:qiniu_can_overwrite => @uploader.qiniu_can_overwrite)
-              else
-                config.merge!(:qiniu_can_overwrite => false)
-              end
-            end
-
-            @qiniu_connection ||= Connection.new config
+            config[:qiniu_async_ops] = Array(@uploader.qiniu_async_ops).join(';') rescue ''
+            config[:qiniu_can_overwrite] = @uploader.try :qiniu_can_overwrite rescue false
+
+            Connection.new config
           end
         end
 

data/lib/carrierwave-qiniu/version.rb

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

data/lib/carrierwave-qiniu.rb

@@ -4,7 +4,7 @@ require "carrierwave/qiniu/configuration"
 require "carrierwave-qiniu/version"
 
 ::CarrierWave.configure do |config|
-  config.storage_engines.merge!({:qiniu => "::CarrierWave::Storage::Qiniu"})
+  config.storage_engines[:qiniu] = "::CarrierWave::Storage::Qiniu".freeze
 end
 
 ::CarrierWave::Uploader::Base.send(:include, ::CarrierWave::Qiniu::Configuration)

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require "rails"
 require "active_record"
 require "carrierwave"
 require "carrierwave/orm/activerecord"
+require 'dotenv'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),"..","lib"))
@@ -20,16 +21,19 @@ module Rails
   end
 end
 
+Dotenv.load
+
 ActiveRecord::Migration.verbose = false
 
-# 测试的时候需要修改这个地方
+# 测试的时候载入环境变量
+# 或者在根目录下新建 `.env` 文件，包含 <key>=<value>
 ::CarrierWave.configure do |config|
   config.storage             = :qiniu
-  config.qiniu_access_key    = "xxx"
-  config.qiniu_secret_key    = "xxx"
+  config.qiniu_access_key    = ENV['qiniu_access_key']
+  config.qiniu_secret_key    = ENV['qiniu_secret_key']
 
-  config.qiniu_bucket        = "xxx"
-  config.qiniu_bucket_domain = "xxx"
+  config.qiniu_bucket        = ENV['qiniu_bucket']
+  config.qiniu_bucket_domain = ENV['qiniu_bucket_domain']
 
   config.qiniu_block_size    = 4*1024*1024
   config.qiniu_protocol      = "http"

data/spec/upload_spec.rb

@@ -75,7 +75,7 @@ describe "CarrierWave Qiniu" do
 
       puts ""
       puts 'The image was uploaded to:'
-      puts ""
+      puts photo.image.url
 
       open(photo.image.url).should_not be_nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.8.1
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave