carrierwave-aliyun 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26578c252fe9854ba9c649f43f34085a9e08d8a9
-  data.tar.gz: 4aa49c1451a5552aa9918bc5482bbfbc143e329f
+  metadata.gz: 6c88a9af587b855318be9ced43af6fd29e964f40
+  data.tar.gz: ecab21ea3488317eeb406fdf71024181e1610328
 SHA512:
-  metadata.gz: b0ed5151b787618e4496807b065ec493c3a60e141ac7286d9eab5acdbd8c1fa74197b328867243daa62979defd237642a518fd97b9fa2f06eb2aa9aab3dcdb4a
-  data.tar.gz: 6a4a619a5e131a94bc2a4b3e1c8e12eeb26143a074227b3d9ff59f8425a71f00a3e6e602cfa5e14a0159b1dbb7c53e223a06d1b1ca21d75e02faf7450403d97c
+  metadata.gz: 37a7b3e42a51bae11d7cd9f829c827f4eea442e79aa34895e835a3a95203a37702f1d1a6a9fde48eed1afa9346e0d70486a378ddac37f89c4caf21f958e36315
+  data.tar.gz: e9418dafc9f763fc80006d13e99a5c968349a06fbb3b7675944eb99d7927de4fde32e680e2a3270cb7b12f1bd8f69837813fb838415c5cb73b6d268f59e5c3fa

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+bundler_args: --without development
+
+rvm:
+  - 2.0.0
+	- 1.9.3
+	- 1.9.2
+
+script: RAILS_ENV=test bundle exec rake spec

data/Changelogs.md

@@ -1,3 +1,7 @@
+## 0.3.0
+
+* 新增 `aliyun_area` 参数，用于配置 OSS 所在地区数据中心；
+
 ## 0.2.1
 
 * 避免计算上传文件的时候读取所有内容到内存，之前的做法对于大文件会耗费过多的内存；

data/README.md

@@ -2,6 +2,8 @@
 
 This gem adds support for [Aliyun OSS](http://oss.aliyun.com) to [CarrierWave](https://github.com/jnicklas/carrierwave/)
 
+- [![Gem Version](https://badge.fury.io/rb/carrierwave-aliyun.png)](https://rubygems.org/gems/carrierwave-aliyun)
+
 ## Installation
 
 ```bash
@@ -28,6 +30,8 @@ CarrierWave.configure do |config|
   config.aliyun_bucket = "simple"
   # 是否使用内部连接，true - 使用 Aliyun 局域网的方式访问  false - 外部网络访问
   config.aliyun_internal = true
+  # 配置存储的地区数据中心，默认: cn-hangzhou
+  # config.aliyun_area = "cn-hangzhou" 
   # 使用自定义域名，设定此项，carrierwave 返回的 URL 将会用自定义域名
   # 自定于域名请 CNAME 到 you_bucket_name.oss.aliyuncs.com (you_bucket_name 是你的 bucket 的名称)
   config.aliyun_host = "foo.bar.com" 
@@ -36,4 +40,4 @@ end
 
 ## 跳过 CarrierWave 直接调用 Aliyun API
 
-如果你有需求想跳过 CarrierWave，直接调用 Aliyun 的接口，可以参看 `spec/aliyun_spec.rb` 里面有例子。
+如果你有需求想跳过 CarrierWave，直接调用 Aliyun 的接口，可以参看 `spec/aliyun_spec.rb` 里面有例子。

data/lib/carrierwave/aliyun/configuration.rb

@@ -6,6 +6,7 @@ module CarrierWave
         add_config :aliyun_access_id
         add_config :aliyun_access_key
         add_config :aliyun_bucket
+        add_config :aliyun_area
         add_config :aliyun_internal
         add_config :aliyun_host
       end

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -14,13 +14,14 @@ module CarrierWave
           @aliyun_access_id = options[:aliyun_access_id]
           @aliyun_access_key = options[:aliyun_access_key]
           @aliyun_bucket = options[:aliyun_bucket]
+          @aliyun_area   = options[:aliyun_area] || 'cn-hangzhou'
           # Host for upload
-          @aliyun_upload_host = "#{@aliyun_bucket}.oss.aliyuncs.com"
+          @aliyun_upload_host = "#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
           if options[:aliyun_internal] == true
-            @aliyun_upload_host = "#{@aliyun_bucket}.oss-internal.aliyuncs.com"
+            @aliyun_upload_host = "#{@aliyun_bucket}.oss-#{@aliyun_area}-internal.aliyuncs.com"
           end
           # Host for get request
-          @aliyun_host = options[:aliyun_host] || "#{@aliyun_bucket}.oss.aliyuncs.com"
+          @aliyun_host = options[:aliyun_host] || "#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
         end
 
 =begin rdoc
@@ -185,6 +186,7 @@ module CarrierWave
             config = {
               :aliyun_access_id => @uploader.aliyun_access_id,
               :aliyun_access_key => @uploader.aliyun_access_key,
+              :aliyun_area => @uploader.aliyun_area,
               :aliyun_bucket => @uploader.aliyun_bucket,
               :aliyun_internal => @uploader.aliyun_internal,
               :aliyun_host => @uploader.aliyun_host

data/spec/aliyun_spec.rb

@@ -11,7 +11,7 @@ describe "Aliyun" do
     }
     @connection = CarrierWave::Storage::Aliyun::Connection.new(@opts)
   end
-  
+
   it "should put" do
     url = @connection.put("a/a.jpg",load_file("foo.jpg"))
     Net::HTTP.get_response(URI.parse(url)).code.should == "200"
@@ -29,7 +29,7 @@ describe "Aliyun" do
   
   it "should use default domain" do
     url = @connection.put("a/a.jpg",load_file("foo.jpg"))
-    url.should == "http://#{ALIYUN_BUCKET}.oss.aliyuncs.com/a/a.jpg"
+    url.should == "http://#{ALIYUN_BUCKET}.oss-cn-hangzhou.aliyuncs.com/a/a.jpg"
   end
   
   it "should support custom domain" do

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ CarrierWave.configure do |config|
   config.aliyun_access_id = ALIYUN_ACCESS_ID
   config.aliyun_access_key = ALIYUN_ACCESS_KEY
   config.aliyun_bucket = ALIYUN_BUCKET
+  config.aliyun_area = "cn-hangzhou"
   # config.aliyun_internal = false
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Changelogs.md
 - Gemfile
 - README.md
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave
@@ -92,4 +93,3 @@ test_files:
 - spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
-has_rdoc: