carrierwave-aliyun 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66ec3f177151654773bc1eddd296f93c79832fab
-  data.tar.gz: c9f0a7b23e521a236139992f8b0c08034335a80b
+  metadata.gz: fbbd6d9b648b70321516cf2719ed5561f0eeed67
+  data.tar.gz: 50993ea58483e6b9ef829b10189bfb372b9350b1
 SHA512:
-  metadata.gz: 2b0e87655cc012e33a7c5741ac6a30207bc950ebc201135eb2df49e7f0f419bc290665a7c99c08ee65de70c418a727dff2b7eb1b35e4ddb261b37e6ea495f0c4
-  data.tar.gz: 2be951bd4e828cecd28650a31b08950ea7d2b84b77ac430c7b6b7f66a8363f3563196b0fef69d48b1e6ce968a06e3ff6d35fb207c9a9be9991f0c5129e745fa0
+  metadata.gz: 1f080757c46c13e1d5b9a704131c507711cc72d99fb29b011ea0bf919fefec62f1a236b924a6792da473fe9d47f7ddfa829ba59b3b11cb1150e8a93a80f9cb69
+  data.tar.gz: 8e5a6bc22996c840400830e544f93c912041d5efcf40071a1307320062d7f7a9db4e793dcd2a66388249552f0ff20d0904ed188bc32af398f930d9e24b3fc52d

data/.gitignore

@@ -1,2 +1,3 @@
 uploads
 *.gem
+Gemfile.lock

data/Changelogs.md

@@ -1,3 +1,8 @@
+## 0.2.0
+
+* Aliyun OSS 新的[三级域名规则支持](http://bbs.aliyun.com/read.php?tid=139226) by [chaixl](https://github.com/chaixl)
+* 注意! 如果你之前使用 0.1.5 一下的版本，你可能需要调整一下你的自定义域名的 CNAME 解析，阿里云新的 URL 结构变化(少了 Bucket 一层目录)，当然你也可以选择不要升级，之前 0.1.5 版本是稳定的。
+
 ## 0.1.5
 
 * 自定义域名支持

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -3,6 +3,7 @@ require 'carrierwave'
 require 'digest/hmac'
 require 'digest/md5'
 require "rest-client"
+require 'uri'
 
 module CarrierWave
   module Storage
@@ -13,20 +14,23 @@ module CarrierWave
           @aliyun_access_id = options[:aliyun_access_id]
           @aliyun_access_key = options[:aliyun_access_key]
           @aliyun_bucket = options[:aliyun_bucket]
-          @aliyun_upload_host = "oss.aliyuncs.com"
-          @aliyun_host = options[:aliyun_host] || @aliyun_upload_host
+          # Host for upload
+          @aliyun_upload_host = "#{@aliyun_bucket}.oss.aliyuncs.com"
           if options[:aliyun_internal] == true
-            @aliyun_upload_host = "oss-internal.aliyuncs.com"
+            @aliyun_upload_host = "#{@aliyun_bucket}.oss-internal.aliyuncs.com"
           end
+          # Host for get request
+          @aliyun_host = options[:aliyun_host] || "#{@aliyun_bucket}.oss.aliyuncs.com"
         end
 
         def put(path, file_data, options={})
           path = format_path(path)
+          bucket_path = get_bucket_path(path)
           content_md5 = Digest::MD5.hexdigest(file_data)
           content_type = options[:content_type] || "image/jpg"
           date = gmtdate
           url = path_to_url(path)
-          auth_sign = sign("PUT", path, content_md5, content_type,date)
+          auth_sign = sign("PUT", bucket_path, content_md5, content_type,date)
           headers = {
             "Authorization" => auth_sign, 
             "Content-Type" => content_type,
@@ -35,20 +39,21 @@ module CarrierWave
             "Host" => @aliyun_upload_host,
             "Expect" => "100-Continue"
           }
-          response = RestClient.put(url, file_data, headers)
+          RestClient.put(URI.encode(url), file_data, headers)
           return path_to_url(path, :get => true)
         end
         
         def delete(path)
           path = format_path(path)
+          bucket_path = get_bucket_path(path)
           date = gmtdate
           headers = {
             "Host" => @aliyun_upload_host,
             "Date" => date,
-            "Authorization" => sign("DELETE", path, "", "" ,date)
+            "Authorization" => sign("DELETE", bucket_path, "", "" ,date)
           }
           url = path_to_url(path)
-          RestClient.delete(url, headers)
+          RestClient.delete(URI.encode(url), headers)
           return path_to_url(path, :get => true)
         end
         
@@ -59,15 +64,22 @@ module CarrierWave
         def format_path(path)
           return "" if path.blank?
           path.gsub!(/^\//,"")
-          [@aliyun_bucket, path].join("/")
+          
+          path
+        end
+
+        def get_bucket_path(path)
+          [@aliyun_bucket,path].join("/")
         end
         
         def path_to_url(path, opts = {})
-          host = @aliyun_upload_host
-          host = @aliyun_host if opts[:get]
-          "http://#{host}/#{path}"
+          if opts[:get]
+            "http://#{@aliyun_host}/#{path}"
+          else
+            "http://#{@aliyun_upload_host}/#{path}"
+          end
         end
-          
+
       private      
         def sign(verb, path, content_md5 = '', content_type = '', date)
           canonicalized_oss_headers = ''
@@ -125,7 +137,7 @@ module CarrierWave
         end
 
         def url
-          "http://#{@uploader.aliyun_host}/#{@uploader.aliyun_bucket}/#{@path}"
+          oss_connection.path_to_url(@path, :get => true)
         end
 
         def store(data, opts = {})
@@ -144,11 +156,13 @@ module CarrierWave
 
           def oss_connection
             return @oss_connection if @oss_connection
-            
+         
             config = {
               :aliyun_access_id => @uploader.aliyun_access_id, 
               :aliyun_access_key => @uploader.aliyun_access_key, 
-              :aliyun_bucket => @uploader.aliyun_bucket
+              :aliyun_bucket => @uploader.aliyun_bucket,
+              :aliyun_internal => @uploader.aliyun_internal,
+              :aliyun_host => @uploader.aliyun_host
             }
             @oss_connection ||= CarrierWave::Storage::Aliyun::Connection.new(config)
           end

data/spec/aliyun_spec.rb

@@ -29,13 +29,13 @@ describe "Aliyun" do
   
   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"
+    url.should == "http://#{ALIYUN_BUCKET}.oss.aliyuncs.com/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"
+    url.should == "http://foo.bar.com/a/a.jpg"
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -49,7 +49,6 @@ files:
 - .rspec
 - Changelogs.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - carrierwave-aliyun.gemspec
 - lib/carrierwave-aliyun.rb
@@ -81,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave
@@ -92,4 +91,3 @@ test_files:
 - spec/foo.zip
 - spec/spec_helper.rb
 - spec/upload_spec.rb
-has_rdoc: 

data/Gemfile.lock

@@ -1,114 +0,0 @@
-GEM
-  remote: http://ruby.taobao.org/
-  specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.0)
-    builder (3.0.0)
-    carrierwave (0.5.8)
-      activesupport (~> 3.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.17.2)
-    mini_magick (3.4)
-      subexec (~> 0.2.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
-      bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sprockets (2.1.2)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    subexec (0.2.1)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  carrierwave
-  mini_magick
-  mocha (= 0.10.0)
-  rails
-  rake
-  rest-client
-  rspec (~> 2.6.0)
-  sqlite3-ruby