carrierwave-qiniu 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93ed29055600a3cc7f50860cb13b84568e93f59c
-  data.tar.gz: c99cd2a790de9b9f3efd3062ac208ae85db8bf9c
+  metadata.gz: ccbd315d40ee92225c01233111bb7fe0dba63bf6
+  data.tar.gz: f971548c853f9e1969e7c2154bcdd772f01ffc94
 SHA512:
-  metadata.gz: b9d15a44ff62760e6a878552064332b3424f60dbfbc9e82bcb580dfead90cb3d50eac4e79e1e74c5587fa53e49173256a59711f2378c2edb110a84f51f5b3d55
-  data.tar.gz: b07c0c7f072869a6860dcb2e3cb1d958aa1a9b57a3124bbe96779ac71db9d48aba45c6c1ac5f615730d5aac1fb2f83a987b89f20d574f528a31265192e9f8878
+  metadata.gz: 3eef04296696a3088e96ea06e0cb2b813c4f7235a6b9d64ba89164c4a386a61c21fc96c027a6d148320fb856010c9b9b3e2887718531098c34e8b96e99224893
+  data.tar.gz: ce454ab4c3af772794e92703576a167df5c1a802e2d0e67cf34164262e6372663ffecf35010cd8af101b67dd80826c028994ef82f8de0670dd46d6c8ae172ae3

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+
+## CHANGE LOG
+
+### 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)

data/README.md

@@ -1,6 +1,6 @@
 # Carrierwave::Qiniu
 
-[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu.svg)](http://badge.fury.io/rb/carrierwave-qiniu)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-qiniu@2x.png)](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
@@ -33,6 +33,8 @@ You'll need to configure it in config/initializes/carrierwave.rb
   config.qiniu_bucket_private= true #default is false
   config.qiniu_block_size    = 4*1024*1024
   config.qiniu_protocol      = "http"
+
+  config.qiniu_up_host       = 'http://up.qiniug.com' #七牛上传海外服务器,国内使用可以不要这行配置
 end
 ```
 
@@ -87,3 +89,7 @@ or see the spec test on https://github.com/huobazi/carrierwave-qiniu/blob/master
 ## Contributors
 
 See the [Contributors List](https://github.com/huobazi/carrierwave-qiniu/graphs/contributors).
+
+## CHANGE LOG
+
+See the [CHANGELOGS.md](https://github.com/huobazi/carrierwave-qiniu/blob/master/CHANGELOG.md).

data/carrierwave-qiniu.gemspec

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

data/lib/carrierwave-qiniu/version.rb

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

data/lib/carrierwave/qiniu/configuration.rb

@@ -15,6 +15,8 @@ module CarrierWave
         add_config :qiniu_async_ops
         add_config :qiniu_can_overwrite
         add_config :qiniu_expires_in
+        add_config :qiniu_up_host
+        add_config :qiniu_private_url_expires_in
 
         alias_config :qiniu_protocal, :qiniu_protocol
       end

data/lib/carrierwave/storage/qiniu.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'carrierwave'
 require 'qiniu'
+require 'qiniu/http'
 
 module CarrierWave
   module Storage
@@ -18,6 +19,8 @@ module CarrierWave
           @qiniu_async_ops     = options[:qiniu_async_ops] || ''
           @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
           init
         end
 
@@ -54,10 +57,17 @@ module CarrierWave
           code == 200 ? result : {}
         end
 
+        def get(path)
+          code, result, response_headers = ::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
           primitive_url = "#{@qiniu_protocol}://#{@qiniu_bucket_domain}/#{encode_path}"
-          @qiniu_bucket_private ? ::Qiniu::Auth.authorize_download_url(primitive_url) : primitive_url
+          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
         end
 
         private
@@ -67,13 +77,16 @@ module CarrierWave
         end
 
         def init_qiniu_rs_connection
-          return if @qiniu_rs_connection_inited
-
-          ::Qiniu.establish_connection! :access_key => @qiniu_access_key,
+          options = {
+            :access_key => @qiniu_access_key,
             :secret_key => @qiniu_secret_key,
-            :block_size => @qiniu_block_size
+            :user_agent => 'CarrierWave-Qiniu/' + Carrierwave::Qiniu::VERSION + ' ('+RUBY_PLATFORM+')' + ' Ruby/'+ RUBY_VERSION
+          }
+          options.merge(:block_size => @qiniu_block_size) if @qiniu_block_size
+          options.merge(:up_host    => @qiniu_up_host) if @qiniu_up_host
+
+          ::Qiniu.establish_connection! options
 
-          @qiniu_rs_connection_inited = true
         end
 
       end
@@ -100,6 +113,17 @@ module CarrierWave
           qiniu_connection.delete(@path)
         end
 
+        ##
+        # Reads the contents of the file from Cloud Files
+        #
+        # === Returns
+        #
+        # [String] contents of the file
+        #
+        def read
+          qiniu_connection.get(@path) if self.size > 0
+        end
+
         def content_type
           file_info['mimeType'] || 'application/octet-stream'
         end
@@ -122,7 +146,9 @@ module CarrierWave
               :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_expires_in    => @uploader.qiniu_expires_in,
+              :qiniu_up_host       => @uploader.qiniu_up_host,
+              :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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Marble Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.4
+        version: 6.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.2.4
+        version: 6.4.2
 description: Qiniu Storage support for CarrierWave
 email:
 - huobazi@gmail.com
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Qiniu Storage support for CarrierWave