carrierwave-qiniu 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7999cef021897ad06f58b741d5746b9e54a141d
-  data.tar.gz: f8ace825efc9890fa35e0b3028286497f8b8e24a
+  metadata.gz: 2969c9d64f8400822f65b783381740a8a0626774
+  data.tar.gz: 28b9f1f27b77d1325345e10abc750f127c6f5129
 SHA512:
-  metadata.gz: 88d106c2209f5a679a0ab998294f82589bc22a4ef268948660c518ee7d08cdc1d3d33f7d0b6a8bc4e35bf83a736a7a1a86b74d003a7adc611b854be3d428b941
-  data.tar.gz: 0b56be95a27fd44619f124406036eed66a4e097f6a91a61b37b39fafbb6168defd7c17cc9945fac4ae8957ff4fddf096fb1de0353fe58c42d250885443432c41
+  metadata.gz: d11c7c6cf9982b4afbe13ebd5751e54070bfd7dcb011d8b1d61223037942dbfe8ae46842464ccc0cbab5fcfc57da42d237262a32a20a76ffd68a4c9e5b78fc8d
+  data.tar.gz: 4dc11efc08ada1f331d57c49d5b0622514147f8339b165274e6b22c9626761063ffd932411cfad1babee078066981878771aeead0dde2602d41a3699c6109827

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 
 ## CHANGE LOG
 
+### v1.1.4
+
+- 支持带样式的私有链接
+
+https://github.com/huobazi/carrierwave-qiniu/pull/80
+
 ### v1.1.3
 
 新增参数 qiniu_delete_after_days
@@ -19,7 +25,7 @@ https://github.com/huobazi/carrierwave-qiniu/pull/78
 ### v1.1.0
 
 - Require carrierwave ~> 1.0
-- 
+ 
 https://github.com/huobazi/carrierwave-qiniu/pull/73
 
 ### v1.0.1

data/README.md

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

data/lib/carrierwave-qiniu/version.rb

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

data/lib/carrierwave/qiniu/url.rb

@@ -1,6 +1,8 @@
 module CarrierWave
   module Qiniu
     module Url
+
+      ##
       # === Examples:
       #
       #     avatar.url(:version)
@@ -10,33 +12,33 @@ module CarrierWave
       def url(*args)
         return super if args.empty?
 
-        # Usage: avatar.url(style: 'imageView/0/w/200')
-        url = super({})
-        return unless url
+        # return nil if blank
+        return if file.blank?
 
+        # Usage: avatar.url(style: 'imageView/0/w/200')
         if args.first.is_a? Hash
-          options = args.first
-          if options[:style]
-            return "#{url}?#{options[:style]}"
+          if style = args.first[:style]
+            return file.url(style: style)
           end
         else
-        # Usage: avatar.url(version, options)
+          # Usage: avatar.url(version, options)
           version = args.first.to_sym
-          if styles.key? version.to_sym
+          if styles.has_key? version
             options = args.last
 
-            # TODO: handle private url
             # Usage: avatar.url(:version, inline: true)
-            if options.present? && options.is_a?(Hash) && options[:inline] && styles[version]
-              return "#{url}?#{styles[version]}"
-            else # Usage: avatar.url(:version)
-              # inline mode
-              if self.class.qiniu_style_inline && styles[version]
-                return "#{url}?#{styles[version]}"
-              else
-                return "#{url}#{self.class.qiniu_style_separator}#{version}"
-              end
-            end
+            url_options = if options.present? && options.is_a?(Hash) && options[:inline] && styles[version]
+                            { style: styles[version] }
+                          else
+                            # global inline mode
+                            if self.class.qiniu_style_inline && styles[version]
+                              { style: styles[version] }
+                            else
+                              # Usage: avatar.url(:version)
+                              { version: version }
+                            end
+                          end
+            return file.url(url_options) if url_options
           end
         end
 

data/lib/carrierwave/storage/qiniu.rb

@@ -131,8 +131,19 @@ module CarrierWave
           @path
         end
 
-        def url
-          qiniu_connection.download_url(@path)
+        ##
+        # Return qiniu URl, maybe with style
+        #
+        # === Parameters
+        # [options (Hash)] optional options hash, 图片样式 { version: :thumb } 或者 { style: "imageView2/1/w/200" }
+        #
+        # === Returns
+        #
+        # [String]
+        #
+        def url(options = {})
+          path = options.present? ? path_with_style(options) : @path
+          qiniu_connection.download_url(path)
         end
 
         def store(file)
@@ -219,6 +230,18 @@ module CarrierWave
           @file_info ||= qiniu_connection.stat(@path)
         end
 
+        def path_with_style(options)
+          return @path unless options
+
+          if version = options[:version]
+            "#{@path}#{@uploader.class.qiniu_style_separator}#{version}"
+          elsif style = options[:style]
+            "#{@path}?#{style}"
+          else
+            @path
+          end
+        end
+
       end
 
       def store!(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-qiniu
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Marble Wu