carrierwave-aliyun 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552fc80ab3151b427003443f8494970253c87db4
-  data.tar.gz: 15d4f27db9d2173cda033098646ad82c21a29b20
+  metadata.gz: a099dd1e65c2265f3c61a400c508240e49d62116
+  data.tar.gz: b62b42570960b74d220ca9052f190d3469339eae
 SHA512:
-  metadata.gz: 86801d09e20af64fc5574ae94db229e806dbb2bbc63067c2c2e6a0ad9046abf1f2b361014f854ad59cb5c3a0fcd239caeb7f3fdab9d6d57b7b6bf5f77c2d0bbd
-  data.tar.gz: 7a71ecb5d1d1c1428cd00d37b9f04dd05b45a5bd6e9cd7210ce20a827bf11a945683f227d640af02ff4646708a9062b0fa02998762e90cd25a03ef7001765b6d
+  metadata.gz: e04cb4af3cad79a767a0972dc5f2fb918b5934d7d8e51c4599cddfe788df24bf28919b71ccde25c681a0a4ee59bedce40bb7801d1f0b5d9fdd8f7a36b3e22292
+  data.tar.gz: 9a5d2c87ea663865a2b0d4a246f1398ce0e045bd1cc8c6599f3e6c1d38e978c9640aa8e725fba10a9055ea2e7367cb4b98372b48044b0124fcb4764d09a581e3

data/.rubocop.yml

@@ -0,0 +1,53 @@
+Style/Documentation:
+  Enabled: false
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/RedundantSelf:
+  Enabled: false
+
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+Style/MutableConstant:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 1200
+
+Metrics/ClassLength:
+  Max: 1200
+
+Metrics/MethodLength:
+  Max: 1200
+
+Metrics/ModuleLength:
+  Max: 1200
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Rails/TimeZone:
+  Enabled: false
+
+Style/GlobalVars:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Rails/FindBy:
+  Enabled: false
+
+Rails/HasAndBelongsToMany:
+  Enabled: false

data/.travis.yml

@@ -3,6 +3,5 @@ bundler_args: --without development
 
 rvm:
   - 2.3.0
-  - 2.1.8
 
 script: rspec spec

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.7.0
+
+- 支持设置 Content-Disposition;
+
+## 0.6.0
+
+- 调整，优化类结构:
+  - `CarrierWave::Storage::Aliyun::Connection` -> `CarrierWave::Aliyun::Bucket`
+  - `CarrierWave::Storage::Aliyun::File` -> `CarrierWave::Storage::AliyunFile`
+
 ## 0.5.1
 
 - 修正 Aliyun 内部网络上传的支持；(#36)

data/Gemfile

@@ -1,9 +1,9 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
 gem 'rake'
-gem 'rails', '4.2.0'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'rails', '~> 4.2.0'
+gem 'sqlite3-ruby', require: 'sqlite3'
 gem 'mini_magick'
 gem 'rspec'

data/Gemfile.lock

@@ -1,43 +1,43 @@
 PATH
   remote: .
   specs:
-    carrierwave-aliyun (0.5.1)
+    carrierwave-aliyun (0.7.0)
       aliyun-oss-sdk (>= 0.1.6)
       carrierwave (>= 0.5.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.6)
+      actionview (= 4.2.6)
+      activesupport (= 4.2.6)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.6)
+      activesupport (= 4.2.6)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.6)
+      activemodel (= 4.2.6)
+      activesupport (= 4.2.6)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -56,43 +56,46 @@ GEM
       json (>= 1.7)
       mime-types (>= 1.16)
       mimemagic (>= 0.3.0)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    httparty (0.13.7)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.99.1)
-    mimemagic (0.3.1)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mimemagic (0.3.2)
     mini_magick (4.4.0)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
     multi_xml (0.5.5)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.6)
+      actionmailer (= 4.2.6)
+      actionpack (= 4.2.6)
+      actionview (= 4.2.6)
+      activejob (= 4.2.6)
+      activemodel (= 4.2.6)
+      activerecord (= 4.2.6)
+      activesupport (= 4.2.6)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.6)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -102,9 +105,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.6)
+      actionpack (= 4.2.6)
+      activesupport (= 4.2.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.2.2)
@@ -121,10 +124,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    sprockets (3.5.2)
+    sprockets (3.6.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.4)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -142,7 +145,7 @@ PLATFORMS
 DEPENDENCIES
   carrierwave-aliyun!
   mini_magick
-  rails (= 4.2.0)
+  rails (~> 4.2.0)
   rake
   rspec
   sqlite3-ruby

data/README.md

@@ -2,7 +2,7 @@
 
 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.svg)](https://rubygems.org/gems/carrierwave-aliyun) [![Build Status](https://travis-ci.org/huacnlee/carrierwave-aliyun.svg?branch=master)](https://travis-ci.org/huacnlee/carrierwave-aliyun)
+[![Gem Version](https://badge.fury.io/rb/carrierwave-aliyun.svg)](https://rubygems.org/gems/carrierwave-aliyun) [![Build Status](https://travis-ci.org/huacnlee/carrierwave-aliyun.svg?branch=master)](https://travis-ci.org/huacnlee/carrierwave-aliyun) [![Code Climate](https://codeclimate.com/github/huacnlee/carrierwave-aliyun/badges/gpa.svg)](https://codeclimate.com/github/huacnlee/carrierwave-aliyun)
 
 > NOTE: 此 Gem 是一个 CarrierWave 的组件，你需要配合 CarrierWave 一起使用，如果你需要直接用 Aliyun OSS，可以尝试用 [aliyun-oss-ruby-sdk](https://github.com/aliyun-beta/aliyun-oss-ruby-sdk) 这个 Gem。
 
@@ -55,3 +55,22 @@ https://simple.img-cn-hangzhou.aliyuncs.com/users/avatar/12.png@100w_200h_1c_95q
 # 你也可以用自定义的缩略图格式
 irb> User.last.avatar.url(thumb: '@!large')
 ```
+
+## 增对文件设置 Content-Disposition
+
+在文件上传的场景（非图片），你可能需要给上传的文件设置 Content-Disposition 以便于用户直接访问 URL 的时候能够用你期望的文件名或原文件名来下载并保存。
+
+这个时候你需要给 Uploader 实现 `content_disposition` 函数，例如：
+
+```rb
+# app/uploaders/attachment_uploader.rb
+class AttachmentUploader < CarrierWave::Uploader::Base
+  def content_disposition
+    # 非图片文件，给 content_disposition
+    unless file.extension.downcase.in?(%w(jpg jpeg gif png svg))
+      "attachment;filename=#{file.original_filename}"
+    end
+  end
+end
+
+```

data/carrierwave-aliyun.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require File.expand_path('lib/carrierwave/aliyun/version')
 
 Gem::Specification.new do |s|
-  s.name        = "carrierwave-aliyun"
+  s.name        = 'carrierwave-aliyun'
   s.version     = CarrierWave::Aliyun::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jason Lee"]
-  s.email       = ["huacnlee@gmail.com"]
-  s.homepage    = "https://github.com/huacnlee/carrierwave-aliyun"
-  s.summary     = %q{Aliyun OSS support for Carrierwave}
-  s.description = %q{Aliyun OSS support for Carrierwave}
+  s.authors     = ['Jason Lee']
+  s.email       = ['huacnlee@gmail.com']
+  s.homepage    = 'https://github.com/huacnlee/carrierwave-aliyun'
+  s.summary     = 'Aliyun OSS support for Carrierwave'
+  s.description = 'Aliyun OSS support for Carrierwave'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
   s.license       = 'MIT'
 
-  s.add_dependency "carrierwave", [">= 0.5.7"]
-  s.add_dependency "aliyun-oss-sdk", [">= 0.1.6"]
+  s.add_dependency 'carrierwave', ['>= 0.5.7']
+  s.add_dependency 'aliyun-oss-sdk', ['>= 0.1.6']
 end

data/lib/carrierwave-aliyun.rb

@@ -1,9 +1,9 @@
 require 'carrierwave/storage/aliyun'
+require 'carrierwave/storage/aliyun_file'
+require 'carrierwave/aliyun/bucket'
+require 'carrierwave/aliyun/version'
 require 'carrierwave/aliyun/configuration'
 
-CarrierWave.configure do |config|
-  config.storage_engines.merge!({ aliyun: 'CarrierWave::Storage::Aliyun' })
-end
 CarrierWave::Uploader::Base.send(:include, CarrierWave::Aliyun::Configuration)
 
 if CarrierWave::VERSION <= '0.11.0'

data/lib/carrierwave/aliyun/bucket.rb

@@ -0,0 +1,147 @@
+module CarrierWave
+  module Aliyun
+    class Bucket
+      PATH_PREFIX = %r{^/}
+
+      def initialize(uploader)
+        @aliyun_access_id    = uploader.aliyun_access_id
+        @aliyun_access_key   = uploader.aliyun_access_key
+        @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"
+        @aliyun_img_host = uploader.aliyun_img_host || "http://#{@aliyun_bucket}.img-#{@aliyun_area}.aliyuncs.com"
+
+        unless @aliyun_host.include?('//')
+          raise "config.aliyun_host requirement include // http:// or https://, but you give: #{@aliyun_host}"
+        end
+      end
+
+      # 上传文件
+      # params:
+      # - path - remote 存储路径
+      # - file - 需要上传文件的 File 对象
+      # - opts:
+      #   - content_type - 上传文件的 MimeType，默认 `image/jpg`
+      #   - content_disposition - Content-Disposition
+      # returns:
+      # 图片的下载地址
+      def put(path, file, opts = {})
+        path.sub!(PATH_PREFIX, '')
+
+        headers = {}
+        headers['Content-Type'] = opts[:content_type] || 'image/jpg'
+        content_disposition = opts[:content_disposition]
+        if content_disposition
+          headers['Content-Disposition'] = content_disposition
+        end
+
+        res = oss_upload_client.bucket_create_object(path, file, headers)
+        if res.success?
+          path_to_url(path)
+        else
+          raise 'Put file failed'
+        end
+      end
+
+      # 读取文件
+      # params:
+      # - path - remote 存储路径
+      # returns:
+      # file data
+      def get(path)
+        path.sub!(PATH_PREFIX, '')
+        res = oss_upload_client.bucket_get_object(path)
+        if res.success?
+          return res.parsed_response
+        else
+          raise 'Get content faild'
+        end
+      end
+
+      # 删除 Remote 的文件
+      #
+      # params:
+      # - path - remote 存储路径
+      #
+      # returns:
+      # 图片的下载地址
+      def delete(path)
+        path.sub!(PATH_PREFIX, '')
+        res = oss_upload_client.bucket_delete_object(path)
+        if res.success?
+          return path_to_url(path)
+        else
+          raise 'Delete failed'
+        end
+      end
+
+      ##
+      # 根据配置返回完整的上传文件的访问地址
+      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, opts = {})
+        path.sub!(PATH_PREFIX, '')
+        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
+
+      def head(path)
+        oss_client.bucket_get_meta_object(path)
+      end
+
+      private
+
+      def oss_client
+        return @oss_client if defined?(@oss_client)
+        opts = {
+          host: "oss-#{@aliyun_area}.aliyuncs.com",
+          bucket: @aliyun_bucket
+        }
+        @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)
+
+        host = if @aliyun_internal
+                 "oss-#{@aliyun_area}-internal.aliyuncs.com"
+               else
+                 "oss-#{@aliyun_area}.aliyuncs.com"
+               end
+
+        opts = {
+          host: host,
+          bucket: @aliyun_bucket
+        }
+
+        @oss_upload_client = ::Aliyun::Oss::Client.new(@aliyun_access_id, @aliyun_access_key, opts)
+      end
+    end
+  end
+end

data/lib/carrierwave/aliyun/configuration.rb

@@ -12,29 +12,10 @@ module CarrierWave
         add_config :aliyun_host
         add_config :aliyun_img_host
         add_config :aliyun_private_read
-      end
-    end
-
-    module ClassMethods
-      def add_config(name)
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def self.#{name}(value=nil)
-            @#{name} = value if value
-            return @#{name} if self.object_id == #{self.object_id} || defined?(@#{name})
-            name = superclass.#{name}
-            return nil if name.nil? && !instance_variable_defined?("@#{name}")
-            @#{name} = name && !name.is_a?(Module) && !name.is_a?(Symbol) && !name.is_a?(Numeric) && !name.is_a?(TrueClass) && !name.is_a?(FalseClass) ? name.dup : name
-          end
-
-          def self.#{name}=(value)
-            @#{name} = value
-          end
 
-          def #{name}
-            value = self.class.#{name}
-            value.instance_of?(Proc) ? value.call : value
-          end
-        RUBY
+        configure do |config|
+          config.storage_engines[:aliyun] = 'CarrierWave::Storage::Aliyun'
+        end
       end
     end
   end

data/lib/carrierwave/aliyun/version.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -5,233 +5,19 @@ require 'uri'
 module CarrierWave
   module Storage
     class Aliyun < Abstract
-      class Connection
-        PATH_PREFIX = %r{^/}
-
-        def initialize(uploader)
-          @uploader = uploader
-          @aliyun_access_id    = uploader.aliyun_access_id
-          @aliyun_access_key   = uploader.aliyun_access_key
-          @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"
-          @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}"
-          end
-        end
-
-        # 上传文件
-        # params:
-        # - path - remote 存储路径
-        # - file - 需要上传文件的 File 对象
-        # - options:
-        #   - content_type - 上传文件的 MimeType，默认 `image/jpg`
-        # returns:
-        # 图片的下载地址
-        def put(path, file, options = {})
-          path.sub!(PATH_PREFIX, '')
-          opts = {
-            'Content-Type' => options[:content_type] || 'image/jpg'
-          }
-
-          res = oss_upload_client.bucket_create_object(path, file, opts)
-          if res.success?
-            path_to_url(path)
-          else
-            fail 'Put file failed'
-          end
-        end
-
-        # 读取文件
-        # params:
-        # - path - remote 存储路径
-        # returns:
-        # file data
-        def get(path)
-          path.sub!(PATH_PREFIX, '')
-          res = oss_upload_client.bucket_get_object(path)
-          if res.success?
-            return res.parsed_response
-          else
-            fail 'Get content faild'
-          end
-        end
-
-        # 删除 Remote 的文件
-        #
-        # params:
-        # - path - remote 存储路径
-        #
-        # returns:
-        # 图片的下载地址
-        def delete(path)
-          path.sub!(PATH_PREFIX, '')
-          res = oss_upload_client.bucket_delete_object(path)
-          if res.success?
-            return path_to_url(path)
-          else
-            fail 'Delete failed'
-          end
-        end
-
-        ##
-        # 根据配置返回完整的上传文件的访问地址
-        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, opts = {})
-          path.sub!(PATH_PREFIX, '')
-          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
-
-        def oss_client
-          return @oss_client if defined?(@oss_client)
-          opts = {
-            host: "oss-#{@aliyun_area}.aliyuncs.com",
-            bucket: @aliyun_bucket
-          }
-          @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)
-
-          if @aliyun_internal
-            host = "oss-#{@aliyun_area}-internal.aliyuncs.com"
-          else
-            host = "oss-#{@aliyun_area}.aliyuncs.com"
-          end
-
-          opts = {
-            host: host,
-            bucket: @aliyun_bucket
-          }
-
-          @oss_upload_client = ::Aliyun::Oss::Client.new(@aliyun_access_id, @aliyun_access_key, opts)
-        end
-      end
-
-      class File < CarrierWave::SanitizedFile
-        ##
-        # Returns the current path/filename of the file on Cloud Files.
-        #
-        # === Returns
-        #
-        # [String] A path
-        #
-        attr_reader :path
-
-        def initialize(uploader, base, path)
-          @uploader = uploader
-          @path     = URI.encode(path)
-          @base     = base
-        end
-
-        ##
-        # Reads the contents of the file from Cloud Files
-        #
-        # === Returns
-        #
-        # [String] contents of the file
-        #
-        def read
-          object = oss_connection.get(@path)
-          @headers = object.headers
-          object.body
-        end
-
-        ##
-        # Remove the file from Cloud Files
-        #
-        def delete
-          oss_connection.delete(@path)
-          true
-        rescue => e
-          # If the file's not there, don't panic
-          puts "carrierwave-aliyun delete file failed: #{e}"
-          nil
-        end
-
-        ##
-        # 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, opts)
-          else
-            oss_connection.path_to_url(@path, opts)
-          end
-        end
-
-        def content_type
-          headers[:content_type]
-        end
-
-        def content_type=(new_content_type)
-          headers[:content_type] = new_content_type
-        end
-
-        def store(file, opts = {})
-          oss_connection.put(@path, file, opts)
-        end
-
-        private
-
-        def headers
-          @headers ||= {}
-        end
-
-        def connection
-          @base.connection
-        end
-
-        def oss_connection
-          return @oss_connection if defined? @oss_connection
-
-          @oss_connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
-        end
-      end
-
       def store!(file)
-        f = CarrierWave::Storage::Aliyun::File.new(uploader, self, uploader.store_path)
-        f.store(::File.open(file.file), content_type: file.content_type)
+        f = AliyunFile.new(uploader, self, uploader.store_path)
+        headers = {
+          content_type: file.content_type,
+          content_disposition: uploader.try(:content_disposition)
+        }
+
+        f.store(::File.open(file.file), headers)
         f
       end
 
       def retrieve!(identifier)
-        CarrierWave::Storage::Aliyun::File.new(uploader, self, uploader.store_path(identifier))
+        AliyunFile.new(uploader, self, uploader.store_path(identifier))
       end
     end
   end

data/lib/carrierwave/storage/aliyun_file.rb

@@ -0,0 +1,65 @@
+module CarrierWave
+  module Storage
+    class AliyunFile < CarrierWave::SanitizedFile
+      attr_reader :path
+
+      def initialize(uploader, base, path)
+        @uploader = uploader
+        @path     = URI.encode(path)
+        @base     = base
+      end
+
+      def read
+        object = bucket.get(@path)
+        @headers = object.headers
+        object.body
+      end
+
+      def delete
+        bucket.delete(@path)
+        true
+      rescue => e
+        # If the file's not there, don't panic
+        puts "carrierwave-aliyun delete file failed: #{e}"
+        nil
+      end
+
+      ##
+      # Generate file url
+      # params
+      #    :thumb - Aliyun OSS Image Processor option, etc: @100w_200h_95q
+      #
+      def url(opts = {})
+        if @uploader.aliyun_private_read
+          bucket.private_get_url(@path, opts)
+        else
+          bucket.path_to_url(@path, opts)
+        end
+      end
+
+      def content_type
+        headers[:content_type]
+      end
+
+      def content_type=(new_content_type)
+        headers[:content_type] = new_content_type
+      end
+
+      def store(file, headers = {})
+        bucket.put(@path, file, headers)
+      end
+
+      private
+
+      def headers
+        @headers ||= {}
+      end
+
+      def bucket
+        return @bucket if defined? @bucket
+
+        @bucket = CarrierWave::Aliyun::Bucket.new(@uploader)
+      end
+    end
+  end
+end

data/spec/aliyun_spec.rb

@@ -1,25 +1,23 @@
 require File.dirname(__FILE__) + '/spec_helper'
-require "open-uri"
-require "net/http"
 
-describe "Aliyun" do
+describe 'Aliyun' do
   before(:all) do
     @opts = {
-      :aliyun_access_id => ALIYUN_ACCESS_ID,
-      :aliyun_access_key => ALIYUN_ACCESS_KEY,
-      :aliyun_bucket => ALIYUN_BUCKET,
-      :aliyun_area => ALIYUN_AREA,
-      :aliyun_internal => false,
-      :aliyun_host => "http://bison-dev.cn-hangzhou.oss.aliyun-inc.com"
+      aliyun_access_id: ALIYUN_ACCESS_ID,
+      aliyun_access_key: ALIYUN_ACCESS_KEY,
+      aliyun_bucket: ALIYUN_BUCKET,
+      aliyun_area: ALIYUN_AREA,
+      aliyun_internal: false,
+      aliyun_host: 'http://test.cn-hangzhou.oss.aliyun-inc.com'
     }
 
     @uploader = CarrierWave::Uploader::Base.new
-    @connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
+    @bucket = CarrierWave::Aliyun::Bucket.new(@uploader)
   end
 
   # it "should put by internal network" do
   #   @uploader.aliyun_internal = true
-  #   @connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
+  #   @connection = CarrierWave::Storage::Aliyun.new(@uploader)
   #   puts @connection.to_json
   #   url = @connection.put("/a/a.jpg",load_file("foo.jpg"))
   #   res = Net::HTTP.get_response(URI.parse(url))
@@ -27,57 +25,57 @@ describe "Aliyun" do
   #   expect(res.code).to eq "200"
   # end
 
-  it "should put" do
-    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
+  it 'should put' do
+    url = @bucket.put('a/a.jpg', load_file('foo.jpg'))
     res = Net::HTTP.get_response(URI.parse(url))
-    expect(res.code).to eq "200"
+    expect(res.code).to eq '200'
   end
 
-  it "should put with / prefix" do
-    url = @connection.put("/a/a.jpg",load_file("foo.jpg"))
+  it 'should put with / prefix' do
+    url = @bucket.put('/a/a.jpg', load_file('foo.jpg'))
     res = Net::HTTP.get_response(URI.parse(url))
-    expect(res.code).to eq "200"
+    expect(res.code).to eq '200'
   end
 
-  it "should delete" do
-    url = @connection.delete("/a/a.jpg")
+  it 'should delete' do
+    url = @bucket.delete('/a/a.jpg')
     res = Net::HTTP.get_response(URI.parse(url))
-    expect(res.code).to eq "404"
+    expect(res.code).to eq '404'
   end
 
-  it "should support custom domain" do
-    @uploader.aliyun_host = "https://foo.bar.com"
-    @connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
-    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
-    expect(url).to eq "https://foo.bar.com/a/a.jpg"
-    @uploader.aliyun_host = "http://foo.bar.com"
-    @connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
-    url = @connection.put("a/a.jpg",load_file("foo.jpg"))
-    expect(url).to eq "http://foo.bar.com/a/a.jpg"
+  it 'should support custom domain' do
+    @uploader.aliyun_host = 'https://foo.bar.com'
+    @bucket = CarrierWave::Aliyun::Bucket.new(@uploader)
+    url = @bucket.put('a/a.jpg', load_file('foo.jpg'))
+    expect(url).to eq 'https://foo.bar.com/a/a.jpg'
+    @uploader.aliyun_host = 'http://foo.bar.com'
+    @bucket = CarrierWave::Aliyun::Bucket.new(@uploader)
+    url = @bucket.put('a/a.jpg', load_file('foo.jpg'))
+    expect(url).to eq 'http://foo.bar.com/a/a.jpg'
   end
 
   describe 'private read bucket' do
     before do
       @uploader.aliyun_private_read = true
-      @connection = CarrierWave::Storage::Aliyun::Connection.new(@uploader)
+      @bucket = CarrierWave::Aliyun::Bucket.new(@uploader)
     end
 
     it 'should get url include token' do
-      url = @connection.private_get_url('bar/foo.jpg')
+      url = @bucket.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-#{@uploader.aliyun_area}.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')
+    it 'should get url with :thumb' do
+      url = @bucket.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
     it 'should have respond_to identifier' do
-      f = CarrierWave::Storage::Aliyun::File.new(@uploader, '', '')
+      f = CarrierWave::Storage::AliyunFile.new(@uploader, '', '')
       expect(f).to respond_to(:identifier)
       expect(f).to respond_to(:filename)
     end

data/spec/spec_helper.rb

@@ -2,28 +2,30 @@ require 'rubygems'
 require 'rspec'
 require 'rails'
 require 'active_record'
-require "carrierwave"
+require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 require 'carrierwave/processing/mini_magick'
+require 'open-uri'
+require 'net/http'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require "carrierwave-aliyun"
-
+require 'carrierwave-aliyun'
 
 module Rails
   class <<self
     def root
-      [File.expand_path(__FILE__).split('/')[0..-3].join('/'),"spec"].join("/")
+      [File.expand_path(__FILE__).split('/')[0..-3].join('/'), 'spec'].join('/')
     end
   end
 end
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.raise_in_transactional_callbacks = true
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3',
+                                        database: ':memory:')
 
-# 测试的时候需要修改这个地方
 ALIYUN_ACCESS_ID = ENV['ALIYUN_ACCESS_ID'] || ''
 ALIYUN_ACCESS_KEY = ENV['ALIYUN_ACCESS_KEY'] || ''
 ALIYUN_BUCKET = ENV['ALIYUN_BUCKET'] || 'carrierwave-aliyun-test'
@@ -39,5 +41,5 @@ CarrierWave.configure do |config|
 end
 
 def load_file(fname)
-  File.open([Rails.root,fname].join("/"))
+  File.open([Rails.root, fname].join('/'))
 end

data/spec/upload_spec.rb

@@ -1,12 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-require "open-uri"
-require "net/http"
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
-describe "Upload" do
+describe 'Upload' do
   def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
+    ActiveRecord::Schema.define(version: 1) do
       create_table :photos do |t|
         t.column :image, :string
         t.column :content_type, :string
@@ -29,11 +25,11 @@ describe "Upload" do
     include CarrierWave::MiniMagick
 
     version :small do
-      process :resize_to_fill => [120, 120]
+      process resize_to_fill: [120, 120]
     end
 
     def store_dir
-      "photos"
+      'photos'
     end
   end
 
@@ -41,7 +37,11 @@ describe "Upload" do
     include CarrierWave::MiniMagick
 
     def store_dir
-      "attachs"
+      'attachs'
+    end
+
+    def content_disposition
+      "attachment;filename=#{file.original_filename}"
     end
   end
 
@@ -53,7 +53,6 @@ describe "Upload" do
     mount_uploader :file, AttachUploader
   end
 
-
   before :all do
     setup_db
   end
@@ -62,35 +61,39 @@ describe "Upload" do
     drop_db
   end
 
-  describe "Upload Image" do
-    context "should upload image" do
+  describe 'Upload Image' do
+    context 'should upload image' do
       before(:all) do
-        @file = load_file("foo.jpg")
-        @file1 = load_file("foo.gif")
-        @photo = Photo.new(:image => @file)
-        @photo1 = Photo.new(:image => @file1)
+        @file = load_file('foo.jpg')
+        @file1 = load_file('foo.gif')
+        @photo = Photo.new(image: @file)
+        @photo1 = Photo.new(image: @file1)
       end
 
-      it "should upload file" do
+      it 'should upload file' do
         expect(@photo.save).to eq true
-        expect(@photo1.save).to eq true
+        expect(@photo[:image].present?).to eq true
+        # FIXME: image? 需要实现
+        # expect(@photo.image?).to eq true
       end
 
-      it "should get uploaded file" 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'
+
+        expect(@photo1.save).to eq true
         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
+      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
+      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')
@@ -103,28 +106,29 @@ describe "Upload" do
       end
     end
 
-    context "should update zip" do
+    context 'should update zip' do
       before(:all) do
-        @file = load_file("foo.zip")
-        @attachment = Attachment.new(:file => @file)
+        @file = load_file('foo.zip')
+        @attachment = Attachment.new(file: @file)
       end
 
-      it "should upload file" do
+      it 'should upload file' do
         expect(@attachment.save).to eq true
       end
 
-      it "should get uploaded file" 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'
+        expect(attach.meta['content-disposition']).to eq 'attachment;filename=foo.zip'
       end
 
-      it "should delete old file when upload a new file again" do
+      it 'should delete old file when upload a new file again' do
         old_url = @attachment.file.url
-        @attachment.file = load_file("foo.gif")
+        @attachment.file = load_file('foo.gif')
         @attachment.save
         res = Net::HTTP.get_response(URI.parse(old_url))
-        expect(res.code).to eq "404"
+        expect(res.code).to eq '404'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -55,9 +56,11 @@ files:
 - Rakefile
 - carrierwave-aliyun.gemspec
 - lib/carrierwave-aliyun.rb
+- lib/carrierwave/aliyun/bucket.rb
 - lib/carrierwave/aliyun/configuration.rb
 - lib/carrierwave/aliyun/version.rb
 - lib/carrierwave/storage/aliyun.rb
+- lib/carrierwave/storage/aliyun_file.rb
 - spec/aliyun_spec.rb
 - spec/foo.gif
 - spec/foo.jpg