carrierwave-aliyun 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 387db2e8862191a027f5d4dd99d1df9bdfd4b77b
-  data.tar.gz: 69404451e625d3703a0f4918bce885e2ad2519c2
+  metadata.gz: 552fc80ab3151b427003443f8494970253c87db4
+  data.tar.gz: 15d4f27db9d2173cda033098646ad82c21a29b20
 SHA512:
-  metadata.gz: ee77d72ac9f0f7c3c09181cf2a745bd151d4d899c6215efb95944203aa7123d8adaf40932a7ffd8364c335c6cb76ee19b0c49b55b849e7043c4f8cc9e5edfc56
-  data.tar.gz: b6ac51e377646fe0f63a7217654f564192fc47507f75ff9569d6bba532eb88b676711c23766b701911d1df9af4a1c687ca3735e86f641c1148182eb1190aa5cd
+  metadata.gz: 86801d09e20af64fc5574ae94db229e806dbb2bbc63067c2c2e6a0ad9046abf1f2b361014f854ad59cb5c3a0fcd239caeb7f3fdab9d6d57b7b6bf5f77c2d0bbd
+  data.tar.gz: 7a71ecb5d1d1c1428cd00d37b9f04dd05b45a5bd6e9cd7210ce20a827bf11a945683f227d640af02ff4646708a9062b0fa02998762e90cd25a03ef7001765b6d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.1
+
+- 修正 Aliyun 内部网络上传的支持；(#36)
+
 ## 0.5.0
 
 - 增加 Aliyun OSS 图片处理参数的支持，允许 url 传入 `:thumb` 以生成缩略图 URL；

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carrierwave-aliyun (0.5.0)
+    carrierwave-aliyun (0.5.1)
       aliyun-oss-sdk (>= 0.1.6)
       carrierwave (>= 0.5.7)
 

data/lib/carrierwave/aliyun/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Aliyun
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/lib/carrierwave/storage/aliyun.rb

@@ -15,6 +15,7 @@ module CarrierWave
           @aliyun_bucket       = uploader.aliyun_bucket
           @aliyun_area         = uploader.aliyun_area || 'cn-hangzhou'
           @aliyun_private_read = uploader.aliyun_private_read
+          @aliyun_internal     = uploader.aliyun_internal
 
           # Host for get request
           @aliyun_host = uploader.aliyun_host || "http://#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
@@ -125,8 +126,11 @@ module CarrierWave
         def oss_upload_client
           return @oss_upload_client if defined?(@oss_upload_client)
 
-          # TODO: 实现根据 config.aliyun_internal 来使用内部 host 上传
-          host = "oss-#{@aliyun_area}.aliyuncs.com"
+          if @aliyun_internal
+            host = "oss-#{@aliyun_area}-internal.aliyuncs.com"
+          else
+            host = "oss-#{@aliyun_area}.aliyuncs.com"
+          end
 
           opts = {
             host: host,

data/spec/aliyun_spec.rb

@@ -8,8 +8,8 @@ describe "Aliyun" do
       :aliyun_access_id => ALIYUN_ACCESS_ID,
       :aliyun_access_key => ALIYUN_ACCESS_KEY,
       :aliyun_bucket => ALIYUN_BUCKET,
-      :aliyun_area => "cn-hangzhou",
-      :aliyun_internal => true,
+      :aliyun_area => ALIYUN_AREA,
+      :aliyun_internal => false,
       :aliyun_host => "http://bison-dev.cn-hangzhou.oss.aliyun-inc.com"
     }
 
@@ -17,6 +17,16 @@ describe "Aliyun" do
     @connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
   end
 
+  # it "should put by internal network" do
+  #   @uploader.aliyun_internal = true
+  #   @connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
+  #   puts @connection.to_json
+  #   url = @connection.put("/a/a.jpg",load_file("foo.jpg"))
+  #   res = Net::HTTP.get_response(URI.parse(url))
+  #   puts res.to_json
+  #   expect(res.code).to eq "200"
+  # end
+
   it "should put" do
     url = @connection.put("a/a.jpg",load_file("foo.jpg"))
     res = Net::HTTP.get_response(URI.parse(url))
@@ -56,7 +66,7 @@ describe "Aliyun" do
       url = @connection.private_get_url('bar/foo.jpg')
       # http://oss-cn-beijing.aliyuncs.com.//carrierwave-aliyun-test.oss-cn-beijing.aliyuncs.com/bar/foo.jpg?OSSAccessKeyId=1OpWEtPTjIDv5u8q&Expires=1455172009&Signature=4ibgQpfHOjVpqxG6162S8Ar3c6c=
       expect(url).to include(*%w(Signature Expires OSSAccessKeyId))
-      expect(url).to include "http://#{@uploader.aliyun_bucket}.oss-cn-beijing.aliyuncs.com/bar/foo.jpg"
+      expect(url).to include "http://#{@uploader.aliyun_bucket}.oss-#{@uploader.aliyun_area}.aliyuncs.com/bar/foo.jpg"
     end
 
     it "should get url with :thumb" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jason Lee