carrierwave-aliyun 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32069f77772a0096a898c9edb0449f2626623911
-  data.tar.gz: 24e3c0c5cda7292b9083443b9c907887b370c01f
+  metadata.gz: 387db2e8862191a027f5d4dd99d1df9bdfd4b77b
+  data.tar.gz: 69404451e625d3703a0f4918bce885e2ad2519c2
 SHA512:
-  metadata.gz: 3073b74446c7f29d3e8cd9973f85235f46e3df074a6028d97f5c99bc1ea8672d87589ad0af9232dd4c134511639e0b8a9d02ad6bc2b889cd9b35296d9a12bac2
-  data.tar.gz: dc8d9f2809f437090939a91344b8588d281c513a6910e7b0f52954254ec23d60ef97aa6f995cb2b4acfba1ef03deaeb23681916b92380020a75554825777b243
+  metadata.gz: ee77d72ac9f0f7c3c09181cf2a745bd151d4d899c6215efb95944203aa7123d8adaf40932a7ffd8364c335c6cb76ee19b0c49b55b849e7043c4f8cc9e5edfc56
+  data.tar.gz: b6ac51e377646fe0f63a7217654f564192fc47507f75ff9569d6bba532eb88b676711c23766b701911d1df9af4a1c687ca3735e86f641c1148182eb1190aa5cd

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.0
+
+- 增加 Aliyun OSS 图片处理参数的支持，允许 url 传入 `:thumb` 以生成缩略图 URL；
+- 配置项增加 `config.aliyun_img_host`。
+
 ## 0.4.4
 
 - 修正对 Carrierwave master 版本的支持，它们[移除了](https://github.com/carrierwaveuploader/carrierwave/pull/1813) `carrierwave/processing/mime_types`；

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://gems.ruby-china.org"
+source "https://rubygems.org"
 
 gemspec
 

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    carrierwave-aliyun (0.4.4)
+    carrierwave-aliyun (0.5.0)
       aliyun-oss-sdk (>= 0.1.6)
       carrierwave (>= 0.5.7)
 
 GEM
-  remote: http://gems.ruby-china.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (4.2.0)
       actionpack (= 4.2.0)
@@ -107,7 +107,7 @@ GEM
       activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.2.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -148,4 +148,4 @@ DEPENDENCIES
   sqlite3-ruby
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -28,13 +28,30 @@ CarrierWave.configure do |config|
   # 配置存储的地区数据中心，默认: cn-hangzhou
   # config.aliyun_area     = "cn-hangzhou"
   # 使用自定义域名，设定此项，carrierwave 返回的 URL 将会用自定义域名
-  # 自定于域名请 CNAME 到 you_bucket_name.oss.aliyuncs.com (you_bucket_name 是你的 bucket 的名称)
+  # 自定于域名请 CNAME 到 you_bucket_name.oss-cn-hangzhou.aliyuncs.com (you_bucket_name 是你的 bucket 的名称)
   config.aliyun_host       = "http://foo.bar.com"
+  # 配置缩略图 Host，默认 #{aliyun_bucket}.img-#{aliyun_area}.aliyuncs.com
+  # config.aliyun_img_host   = "http://you_bucket_name.img-cn-hangzhou.aliyuncs.com"
   # Bucket 为私有读取请设置 true，默认 false，以便得到的 URL 是能带有 private 空间访问权限的逻辑
   # config.aliyun_private_read = false
 end
 ```
 
-## 跳过 CarrierWave 直接调用 Aliyun API
+## 阿里云 OSS 图片缩略图
 
-如果你有需求想跳过 CarrierWave，直接调用 Aliyun 的接口，可以参看 `spec/aliyun_spec.rb` 里面有例子。
+从 **0.5.0** 版本开始，carrierwave-aliyun 支持 Aliyun OSS 的图片缩略图了，你只需要在 Uploader 对象的 `url` 函数后面跟上 `:thumb` 附带缩略图参数就可以了。
+
+> NOTE: 此方法同样支持 Private 的 Bucket 哦！
+
+关于阿里云 OSS 图片缩略图的详细文档，请仔细阅读: [Aliyun OSS 接入图片服务](https://help.aliyun.com/document_detail/32210.html)
+
+```rb
+irb> User.last.avatar.url(thumb: '@100w_1c')
+https://simple.img-cn-hangzhou.aliyuncs.com/users/avatar/12.png@100w_1c
+irb> User.last.avatar.url(thumb: '@100w_200h_1c.jpg')
+https://simple.img-cn-hangzhou.aliyuncs.com/users/avatar/12.png@100w_200h_1c.jpg
+irb> User.last.avatar.url(thumb: '@100w_200h_1c_95q')
+https://simple.img-cn-hangzhou.aliyuncs.com/users/avatar/12.png@100w_200h_1c_95q
+# 你也可以用自定义的缩略图格式
+irb> User.last.avatar.url(thumb: '@!large')
+```

data/lib/carrierwave/aliyun/configuration.rb

@@ -10,6 +10,7 @@ module CarrierWave
         add_config :aliyun_area
         add_config :aliyun_internal
         add_config :aliyun_host
+        add_config :aliyun_img_host
         add_config :aliyun_private_read
       end
     end

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -18,6 +18,7 @@ module CarrierWave
 
           # Host for get request
           @aliyun_host = uploader.aliyun_host || "http://#{@aliyun_bucket}.oss-#{@aliyun_area}.aliyuncs.com"
+          @aliyun_img_host = uploader.aliyun_img_host || "http://#{@aliyun_bucket}.img-#{@aliyun_area}.aliyuncs.com"
 
           unless @aliyun_host.include?('//')
             fail "config.aliyun_host requirement include // http:// or https://, but you give: #{@aliyun_host}"
@@ -80,15 +81,25 @@ module CarrierWave
 
         ##
         # 根据配置返回完整的上传文件的访问地址
-        def path_to_url(path)
-          [@aliyun_host, path].join('/')
+        def path_to_url(path, opts = {})
+          if opts[:thumb]
+            thumb_path = [path, opts[:thumb]].join('')
+            [@aliyun_img_host, thumb_path].join('/')
+          else
+            [@aliyun_host, path].join('/')
+          end
         end
 
         # 私有空间访问地址，会带上实时算出的 token 信息
         # 有效期 3600s
-        def private_get_url(path)
+        def private_get_url(path, opts = {})
           path.sub!(PATH_PREFIX, '')
-          oss_client.bucket_get_object_share_link(path, 3600)
+          if opts[:thumb]
+            thumb_path = [path, opts[:thumb]].join('')
+            img_client.bucket_get_object_share_link(thumb_path, 3600)
+          else
+            oss_client.bucket_get_object_share_link(path, 3600)
+          end
         end
 
         private
@@ -102,6 +113,15 @@ module CarrierWave
           @oss_client = ::Aliyun::Oss::Client.new(@aliyun_access_id, @aliyun_access_key, opts)
         end
 
+        def img_client
+          return @img_client if defined?(@img_client)
+          opts = {
+            host: "img-#{@aliyun_area}.aliyuncs.com",
+            bucket: @aliyun_bucket
+          }
+          @img_client = ::Aliyun::Oss::Client.new(@aliyun_access_id, @aliyun_access_key, opts)
+        end
+
         def oss_upload_client
           return @oss_upload_client if defined?(@oss_upload_client)
 
@@ -158,11 +178,16 @@ module CarrierWave
           nil
         end
 
-        def url
+        ##
+        # Generate file url
+        # params
+        #    :thumb - Aliyun OSS Image Processor option, etc: @100w_200h_95q
+        #
+        def url(opts = {})
           if @uploader.aliyun_private_read
-            oss_connection.private_get_url(@path)
+            oss_connection.private_get_url(@path, opts)
           else
-            oss_connection.path_to_url(@path)
+            oss_connection.path_to_url(@path, opts)
           end
         end
 

data/spec/aliyun_spec.rb

@@ -58,6 +58,11 @@ describe "Aliyun" do
       expect(url).to include(*%w(Signature Expires OSSAccessKeyId))
       expect(url).to include "http://#{@uploader.aliyun_bucket}.oss-cn-beijing.aliyuncs.com/bar/foo.jpg"
     end
+
+    it "should get url with :thumb" do
+      url = @connection.private_get_url('bar/foo.jpg', thumb: '@100w_200h_90q')
+      expect(url).to include "http://#{@uploader.aliyun_bucket}.img-cn-beijing.aliyuncs.com/bar/foo.jpg@100w_200h_90q"
+    end
   end
 
   describe 'File' do

data/spec/upload_spec.rb

@@ -9,10 +9,12 @@ describe "Upload" do
     ActiveRecord::Schema.define(:version => 1) do
       create_table :photos do |t|
         t.column :image, :string
+        t.column :content_type, :string
       end
 
       create_table :attachments do |t|
         t.column :file, :string
+        t.column :content_type, :string
       end
     end
   end
@@ -77,14 +79,28 @@ describe "Upload" do
       it "should get uploaded file" do
         img = open(@photo.image.url)
         expect(img.size).to eq @file.size
+        expect(img.content_type).to eq 'image/jpeg'
         img1 = open(@photo1.image.url)
         expect(img1.size).to eq @file1.size
+        expect(img1.content_type).to eq 'image/gif'
       end
 
       it "sholud get small version uploaded file" do
         expect(open(@photo.image.small.url)).not_to eq nil
         expect(open(@photo1.image.small.url)).not_to eq nil
       end
+
+      it "should get Aliyun OSS thumb url with :thumb option" do
+        url = @photo.image.url(thumb: '@150w_140h.png')
+        expect(url).to include('.img-')
+        expect(url).to include('@150w_140h.png')
+        url1 = @photo.image.url(thumb: '@!150w_140h.jpg')
+        expect(url1).to include('.img-')
+        expect(url1).to include('@!150w_140h.jpg')
+        img1 = open(url)
+        expect(img1.size).not_to eq 0
+        expect(img1.content_type).to eq 'image/png'
+      end
     end
 
     context "should update zip" do
@@ -100,6 +116,7 @@ describe "Upload" do
       it "should get uploaded file" do
         attach = open(@attachment.file.url)
         expect(attach.size).to eq @file.size
+        expect(attach.content_type).to eq 'application/zip'
       end
 
       it "should delete old file when upload a new file again" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Aliyun OSS support for Carrierwave