carrierwave-aliyun 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88fa0eb30adeceb86f58ba51613ede7fd5ad252d
-  data.tar.gz: 37bcfc260f4213ba2db3e19aa193d0d1bd998e5e
+  metadata.gz: 66ec3f177151654773bc1eddd296f93c79832fab
+  data.tar.gz: c9f0a7b23e521a236139992f8b0c08034335a80b
 SHA512:
-  metadata.gz: fa0bf265b62fb7c081c9266a8868965b310d8dffd0d743e132b1b077368b54c981741ad314ae3b9da519e64e8e10392687145bd7162b51c79ca544e73be6d05f
-  data.tar.gz: 91434a7ce71d32805b88bd12397c0730948ea3ef695323e03b8438204aae266cac242490a2b7f8d3b9246f85749e04313f3fb75940722232008e739b950df343
+  metadata.gz: 2b0e87655cc012e33a7c5741ac6a30207bc950ebc201135eb2df49e7f0f419bc290665a7c99c08ee65de70c418a727dff2b7eb1b35e4ddb261b37e6ea495f0c4
+  data.tar.gz: 2be951bd4e828cecd28650a31b08950ea7d2b84b77ac430c7b6b7f66a8363f3563196b0fef69d48b1e6ce968a06e3ff6d35fb207c9a9be9991f0c5129e745fa0

data/Changelogs.md

@@ -1,3 +1,7 @@
+## 0.1.5
+
+* 自定义域名支持
+
 ## 0.1.3
 
 * delete 接口加入。

data/README.md

@@ -28,6 +28,9 @@ CarrierWave.configure do |config|
   config.aliyun_bucket = "simple"
   # 是否使用内部连接，true - 使用 Aliyun 局域网的方式访问  false - 外部网络访问
   config.aliyun_internal = true
+  # 使用自定义域名，设定此项，carrierwave 返回的 URL 将会用自定义域名
+  # 自定于域名请 CNAME 到 you_bucket_name.oss.aliyuncs.com (you_bucket_name 是你的 bucket 的名称)
+  config.aliyun_host = "foo.bar.com" 
 end
 ```
 

data/lib/carrierwave/aliyun/configuration.rb

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

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -13,9 +13,10 @@ module CarrierWave
           @aliyun_access_id = options[:aliyun_access_id]
           @aliyun_access_key = options[:aliyun_access_key]
           @aliyun_bucket = options[:aliyun_bucket]
-          @aliyun_host = "oss.aliyuncs.com"
+          @aliyun_upload_host = "oss.aliyuncs.com"
+          @aliyun_host = options[:aliyun_host] || @aliyun_upload_host
           if options[:aliyun_internal] == true
-            @aliyun_host = "oss-internal.aliyuncs.com"
+            @aliyun_upload_host = "oss-internal.aliyuncs.com"
           end
         end
 
@@ -31,24 +32,24 @@ module CarrierWave
             "Content-Type" => content_type,
             "Content-Length" => file_data.length,
             "Date" => date,
-            "Host" => @aliyun_host,
+            "Host" => @aliyun_upload_host,
             "Expect" => "100-Continue"
           }
           response = RestClient.put(url, file_data, headers)
-          return url
+          return path_to_url(path, :get => true)
         end
         
         def delete(path)
           path = format_path(path)
           date = gmtdate
           headers = {
-            "Host" => @aliyun_host,
+            "Host" => @aliyun_upload_host,
             "Date" => date,
             "Authorization" => sign("DELETE", path, "", "" ,date)
           }
           url = path_to_url(path)
           RestClient.delete(url, headers)
-          return url
+          return path_to_url(path, :get => true)
         end
         
         def gmtdate
@@ -61,8 +62,10 @@ module CarrierWave
           [@aliyun_bucket, path].join("/")
         end
         
-        def path_to_url(path)
-          "http://#{@aliyun_host}/#{path}"
+        def path_to_url(path, opts = {})
+          host = @aliyun_upload_host
+          host = @aliyun_host if opts[:get]
+          "http://#{host}/#{path}"
         end
           
       private      
@@ -122,7 +125,7 @@ module CarrierWave
         end
 
         def url
-          "http://oss.aliyuncs.com/#{@uploader.aliyun_bucket}/#{@path}"
+          "http://#{@uploader.aliyun_host}/#{@uploader.aliyun_bucket}/#{@path}"
         end
 
         def store(data, opts = {})

data/spec/aliyun_spec.rb

@@ -4,26 +4,38 @@ require "net/http"
 
 describe "Aliyun" do
   before(:all) do
-    opts = {
+    @opts = {
       :aliyun_access_id => ALIYUN_ACCESS_ID,
       :aliyun_access_key => ALIYUN_ACCESS_KEY,
       :aliyun_bucket => ALIYUN_BUCKET
     }
-    @connection = CarrierWave::Storage::Aliyun::Connection.new(opts)
+    @connection = CarrierWave::Storage::Aliyun::Connection.new(@opts)
   end
-    
+  
   it "should put" do
     url = @connection.put("a/a.jpg",load_file("foo.jpg").read)
     Net::HTTP.get_response(URI.parse(url)).code.should == "200"
   end
-  
+
   it "should put with / prefix" do
     url = @connection.put("/a/a.jpg",load_file("foo.jpg").read)
     Net::HTTP.get_response(URI.parse(url)).code.should == "200"
   end
-    
+  
   it "should delete" do
     url = @connection.delete("/a/a.jpg")
     Net::HTTP.get_response(URI.parse(url)).code.should == "404"
   end
+  
+  it "should use default domain" do
+    url = @connection.put("a/a.jpg",load_file("foo.jpg").read)
+    url.should == "http://oss.aliyuncs.com/#{ALIYUN_BUCKET}/a/a.jpg"
+  end
+  
+  it "should support custom domain" do
+    @opts[:aliyun_host] = "foo.bar.com"
+    @connection = CarrierWave::Storage::Aliyun::Connection.new(@opts)
+    url = @connection.put("a/a.jpg",load_file("foo.jpg").read)
+    url.should == "http://foo.bar.com/#{ALIYUN_BUCKET}/a/a.jpg"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave