carrierwave-aliyun 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e4c65f600597e1c2cc8ec0e9f4cf06044b0e60
-  data.tar.gz: 364f0df6e6f470ec901df437f0831a2f1c473040
+  metadata.gz: 44f8c4c57b183fdc5bab9da03770fbb6452743d4
+  data.tar.gz: aa0cef55223b90429fb3928d87e687104d27fcc5
 SHA512:
-  metadata.gz: 60925c4e88c63a2bc82caf7856c7703cf55b9cd634f855b931d2aee9a2150b915627c1e341cbb9ace24f7d9d303bae67871e118132f51976e81a26c0364ed0c2
-  data.tar.gz: 4e82ed9ba1c8c212bfc22f9299c778e1ee16b741a271a31408df58ed5230c23abe308a25a75bc34549e3dcceb9c945625acf79c47b8e6a2124b28e384644506b
+  metadata.gz: 7692eeb1bf7f5ed272a2b981f99c2eaf394168cdf7762b297553c6508073661e3ad3de3a349a43ff2d1a4fb20f262f35537e1e0fbb4bd3d599b2999f0ae05242
+  data.tar.gz: 21ef8f4d3f2b06f335280c688c016bd8e37f0c2cd528584caa1daebc8f5bca6e864b2b857a6dbf950333c5b45589dee0540d6c673288c869e7fa393a883964f6

data/{Changelogs.md → CHANGELOG.md}

@@ -1,3 +1,7 @@
+## 0.3.3
+
+* 增加 `config.aliyun_upload_host`, 以便有需要的时候，可以自由修改上传的 host.
+
 ## 0.3.2
 
 * 请注意 `config.aliyun_host` 要求修改带 HTTP 协议，以便支持设置 http:// 或 https://.

data/README.md

@@ -35,6 +35,8 @@ CarrierWave.configure do |config|
   # 使用自定义域名，设定此项，carrierwave 返回的 URL 将会用自定义域名
   # 自定于域名请 CNAME 到 you_bucket_name.oss.aliyuncs.com (you_bucket_name 是你的 bucket 的名称)
   config.aliyun_host       = "http://foo.bar.com"
+  # 如果有需要，你可以自己定义上传 host, 比如阿里内部的上传地址和 Aliyun OSS 对外的不同，可以在这里定义，没有需要可以不用配置
+  # config.aliyun_upload_host = "http://you_bucket_name.oss.aliyun-inc.com"
 end
 ```
 

data/lib/carrierwave/aliyun/configuration.rb

@@ -9,6 +9,7 @@ module CarrierWave
         add_config :aliyun_area
         add_config :aliyun_internal
         add_config :aliyun_host
+        add_config :aliyun_upload_host
       end
     end
     

data/lib/carrierwave/aliyun/version.rb

@@ -1,7 +1,7 @@
 module CarrierWave
   module Aliyun
     class Version
-      MAJOR, MINOR, PATCH = 0, 3, 2
+      MAJOR, MINOR, PATCH = 0, 3, 3
 
       ##
       # Returns the major version ( big release based off of multiple minor releases )

data/lib/carrierwave/storage/aliyun.rb

@@ -15,14 +15,17 @@ module CarrierWave
           @aliyun_access_key = options[:aliyun_access_key]
           @aliyun_bucket     = options[:aliyun_bucket]
           @aliyun_area       = options[:aliyun_area] || 'cn-hangzhou'
+          @aliyun_upload_host = options[:aliyun_upload_host]
 
           # Host for upload
-          if options[:aliyun_internal] == true
-            @aliyun_upload_host = "http://#{@aliyun_bucket}.oss-#{@aliyun_area}-internal.aliyuncs.com"
-          else
-            @aliyun_upload_host = "http://#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
+          if @aliyun_upload_host.nil?
+            if options[:aliyun_internal] == true
+              @aliyun_upload_host = "http://#{@aliyun_bucket}.oss-#{@aliyun_area}-internal.aliyuncs.com"
+            else
+              @aliyun_upload_host = "http://#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
+            end
           end
-          
+
           # Host for get request
           @aliyun_host = options[:aliyun_host] || "http://#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
 
@@ -216,7 +219,8 @@ module CarrierWave
               :aliyun_area       => @uploader.aliyun_area,
               :aliyun_bucket     => @uploader.aliyun_bucket,
               :aliyun_internal   => @uploader.aliyun_internal,
-              :aliyun_host       => @uploader.aliyun_host
+              :aliyun_host       => @uploader.aliyun_host,
+              :aliyun_upload_host => @uploader.aliyun_upload_host
             }
             @oss_connection ||= CarrierWave::Storage::Aliyun::Connection.new(config)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -48,7 +48,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Changelogs.md
+- CHANGELOG.md
 - Gemfile
 - README.md
 - carrierwave-aliyun.gemspec
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave
@@ -93,4 +93,3 @@ test_files:
 - spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
-has_rdoc: