carrierwave-aliyun 0.1.0 → 0.1.1

data/.gitignore

@@ -1 +1,2 @@
 uploads
+*.gem

data/Changelogs.md

@@ -0,0 +1,8 @@
+## 0.1.1
+
+* 修改 Aliyun OSS 的请求地址.
+* 加入可选项，使用 Aliyun 内部地址调用上传，以提高内部网络使用的速度.
+
+## 0.1.0
+
+* 功能实现.

data/README.md

@@ -4,23 +4,29 @@ This gem adds support for [Aliyun OSS](http://oss.aliyun.com) to [CarrierWave](h
 
 ## Installation
 
-    gem install carrierwave-aliyun
+```bash
+gem install carrierwave-aliyun
+```
 
 ## Using Bundler
 
-    gem 'rest-client'
-    gem 'carrierwave-aliyun'
+```ruby
+gem 'rest-client'
+gem 'carrierwave-aliyun'
+```
 
 ## Configuration
 
-You'll need to configure the to use this in config/initializes/carrierwave.rb
+创建这么个脚本 `config/initializes/carrierwave.rb` 填入下面的代码，并修改对应的配置：
 
 ```ruby
 CarrierWave.configure do |config|
   config.storage = :aliyun
   config.aliyun_access_id = "xxxxxx"
   config.aliyun_access_key = 'xxxxxx'
-  # you need create this bucket first!
+  # 你需要在 Aliyum OSS 上面提前创建一个 Bucket
   config.aliyun_bucket = "simple"
+  # 是否使用内部连接，true - 使用 Aliyun 局域网的方式访问  false - 外部网络访问
+  config.aliyun_internal = true
 end
 ```

data/carrierwave-aliyun.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-aliyun"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jason Lee"]
   s.email       = ["huacnlee@gmail.com"]
@@ -17,6 +17,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency "carrierwave", [">= 0.5.7"]
   s.add_dependency "rest-client", [">= 1.6.7"]
-  s.add_development_dependency "rspec", ["~> 2.6"]
-  s.add_development_dependency "rake", ["~> 0.9"]
 end

data/lib/carrierwave/aliyun/configuration.rb

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

data/lib/carrierwave/storage/aliyun.rb

@@ -13,6 +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"
+          if options[:aliyun_internal] == true
+            @aliyun_host = "oss-internal.aliyuncs.com"
+          end
         end
         
         def put(path, file)
@@ -20,14 +24,14 @@ module CarrierWave
           content_type = "image/jpg"
           date = Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
           path = "#{@aliyun_bucket}/#{path}"
-          url = "http://storage.aliyun.com/#{path}"
+          url = "http://#{@aliyun_host}/#{path}"
           auth_sign = sign("PUT", path, content_md5, content_type ,date)
           headers = {
             "Authorization" => auth_sign, 
             "Content-Type" => content_type,
             "Content-Length" => file.length,
             "Date" => date,
-            "Host" => "storage.aliyun.com",
+            "Host" => @aliyun_host,
             "Expect" => "100-Continue"
           }
           response = RestClient.put(url, file, headers)
@@ -93,7 +97,7 @@ module CarrierWave
         end
 
         def url
-          "http://storage.aliyun.com/#{@uploader.aliyun_bucket}/#{@path}"
+          "http://oss.aliyuncs.com/#{@uploader.aliyun_bucket}/#{@path}"
         end
 
         def store(data)
@@ -113,13 +117,14 @@ module CarrierWave
           def oss_connection
             return @oss_connection if @oss_connection
             
-            config = {:aliyun_access_id => @uploader.aliyun_access_id, 
+            config = {
+              :aliyun_access_id => @uploader.aliyun_access_id, 
               :aliyun_access_key => @uploader.aliyun_access_key, 
               :aliyun_bucket => @uploader.aliyun_bucket
             }
             @oss_connection ||= CarrierWave::Storage::Aliyun::Connection.new(config)
           end
-
+          
       end
       
       def store!(file)

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ CarrierWave.configure do |config|
   config.aliyun_access_id = "7ewl4zm3mhi45vko9zx022ul"
   config.aliyun_access_key = 'Ajpi7IRKDKdXYHHFFoS89uQJQE8='
   config.aliyun_bucket = "carrierwave"
+  # config.aliyun_internal = false
 end
 
 def load_file(fname)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70172009111240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,40 +21,28 @@ dependencies:
         version: 0.5.7
   type: :runtime
   prerelease: false
-  version_requirements: *70172009111240
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &70172009110740 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.7
-  type: :runtime
-  prerelease: false
-  version_requirements: *70172009110740
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70172009110260 !ruby/object:Gem::Requirement
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
+        version: 1.6.7
+  type: :runtime
   prerelease: false
-  version_requirements: *70172009110260
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70172009109780 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: *70172009109780
+        version: 1.6.7
 description: Aliyun OSS support for Carrierwave
 email:
 - huacnlee@gmail.com
@@ -64,6 +52,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- Changelogs.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -95,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Aliyun OSS support for Carrierwave
@@ -104,3 +93,4 @@ test_files:
 - spec/foo.jpg
 - spec/spec_helper.rb
 - spec/upload_spec.rb
+has_rdoc: