carrierwave-upyun 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjA0MzI2NThlYzM0YjUyM2MxOTU5NDRiZjkyYzZlZjJmN2JkZGM5Yg==
+    YzlkYzFhMDQ5MTUyNzU1Yjg3ZGFkYTA3NjcyZTQyYjMxMzJhM2I5Zg==
   data.tar.gz: !binary |-
-    ZDQyZGE2YTk1YTlkMjViYzcyMTkxMmY5ZTc0Njg3NjY1NThiNGQ1ZQ==
+    NWYxNzY1NmI1MTUyMzE3YTgzMzRkMzU1MzdhYWM5NzZkYjg2ZTgyNw==
 SHA512:
   metadata.gz: !binary |-
-    YzdiMDExMjA0YjcxMGY2MTQ5Zjc4NzVhMmRmMWQxYTE3OGU5ZDViZGVhMWFh
-    YzBhMjBmNTIwMTNjZTAxZTY0ZmY3MTI2ZTVhMWQwOWYwMmI0Yjg3Zjg0ZDhm
-    Yjc3ODNlMmUzZTRkZThkMzgxYmRiMmY2NTEyY2EzNzY3YTU1ZjE=
+    MDNkZWRkZmFkNDVlMjc3MzUyYmM2NDJkNTQwYmEzNjU1ZTA2NWFjNDkyN2M2
+    ZTI2ZGEzN2M5YWIyZjI1ZWQ0YzE3OTMwMTMzOWI1NjQ3ZmE0M2IzMjIyMzEw
+    YzQyMGYyNzczYTU2MzYzNWNlN2U4MzcwOTQ2YTYzNTBmZTg3NTA=
   data.tar.gz: !binary |-
-    ZWM2ZWE0NGI5MjZhMWM3YTg3Y2U0MjQzMTdmOGYzNTk1Y2M4ODUyMTRiYjQ5
-    NjAxZjdiYTBmODVmYzNhODdkN2JkYTAxZmFhYWEwODZkN2NhMDQxZmNjMWY4
-    YzM3YzJjNjI4MDQxZTFiMGQyM2IyNjg0MzllNDQxNjZkOTMxY2M=
+    MmU4ZTI5OWE4N2JmNmZlMTE5NzIyN2JkZDFiODFlNThkYTVjZmNlMTRiNzYz
+    ZGFiOGE5YzdmMWI5NTc2YWFhMzMxZDBlMjJlYTQ4MTUyOGNiNmU5YmRjNmM5
+    MDNhZTM4NzAwODU3MjIxNjE3YjNmY2FkZjY4M2Q5NzZmZDljMDI=

data/carrierwave-upyun.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-upyun"
-  s.version     = "0.1.7"
+  s.version     = "0.1.8"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Nowa Zhu"]
   s.email       = ["nowazhu@gmail.com"]

data/lib/carrierwave/storage/upyun.rb

@@ -131,17 +131,13 @@ module CarrierWave
           if @uploader.upyun_bucket_host
             return [@uploader.upyun_bucket_host, @path].join("/")
           end
-          
-          if @uploader.upyun_bucket_domain
-            puts "DEPRECATION: upyun_bucket_domain config is deprecated, please use upyun_bucket_host to insead."
-            if @uploader.upyun_bucket_domain.match(/^http/)
-              [@uploader.upyun_bucket_domain, @path].join("/")
-            else
-              ["http://",@uploader.upyun_bucket_domain, @path].join("/")
-            end
-          else
-            nil
-          end
+
+          return nil unless @uploader.upyun_bucket_domain
+          puts "DEPRECATION: upyun_bucket_domain config is deprecated, please use upyun_bucket_host to insead."
+
+          bucket_host = @uploader.upyun_bucket_domain
+          bucket_host.prepend('http://') unless bucket_host.match(/^http/)
+          [bucket_host, @path].join("/")
         end
 
         def content_type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-upyun
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nowa Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave