carrierwave-aliyun 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: de75b74723a825b2db59c61c2062cc57847ec4d2
+  data.tar.gz: 2b96649234614f4fbc559ba2e4be3daafdb7d861
+SHA512:
+  metadata.gz: 6c2c7d7be67f169d47144e3eb8a061efe8127ba1e9c94ff33b4324b0cfb449d859ca73fc301d6656b4ddf5b22c321ffa2d67e8b95a2dfb402aec27bb4a61b30b
+  data.tar.gz: c1d55f78f3a70c9bba297e4fb5a38e87863b555b5c8bfa5762519c0979c256be51319fe975f314a7a480dd4e8a7239d3054120bd52b2992da001e53ce1f16627

data/Changelogs.md

@@ -1,3 +1,8 @@
+## 0.1.3
+
+* delete 接口加入。
+* 支持 Carriewave 自动在更新上传文件的时候删除老文件（比如，用户重新上传头像，老头像图片文件将会被 CarrierWave 删除）。
+
 ## 0.1.2
 
 * 修正 content_type 的支持，自动用原始文件的 content_type，以免上传 zip 之类的文件以后无法下载.

data/README.md

@@ -29,4 +29,8 @@ CarrierWave.configure do |config|
   # 是否使用内部连接，true - 使用 Aliyun 局域网的方式访问  false - 外部网络访问
   config.aliyun_internal = true
 end
-```
+```
+
+## 跳过 CarrierWave 直接调用 Aliyun API
+
+如果你有需求想跳过 CarrierWave，直接调用 Aliyun 的接口，可以参看 `spec/aliyun_spec.rb` 里面有例子。

data/carrierwave-aliyun.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+require File.expand_path('lib/carrierwave/aliyun/version')
 
 Gem::Specification.new do |s|
   s.name        = "carrierwave-aliyun"
-  s.version     = "0.1.2"
+  s.version     = CarrierWave::Aliyun::Version.current
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jason Lee"]
   s.email       = ["huacnlee@gmail.com"]

data/lib/carrierwave/aliyun/version.rb

@@ -0,0 +1,32 @@
+module CarrierWave
+  module Aliyun
+    class Version
+      MAJOR, MINOR, PATCH = 0, 1, 3
+
+      ##
+      # Returns the major version ( big release based off of multiple minor releases )
+      def self.major
+        MAJOR
+      end
+
+      ##
+      # Returns the minor version ( small release based off of multiple patches )
+      def self.minor
+        MINOR
+      end
+
+      ##
+      # Returns the patch version ( updates, features and (crucial) bug fixes )
+      def self.patch
+        PATCH
+      end
+
+      ##
+      # Returns the current version of the Backup gem ( qualified for the gemspec )
+      def self.current
+        "#{major}.#{minor}.#{patch}"
+      end
+
+    end
+  end
+end

data/lib/carrierwave/storage/aliyun.rb

@@ -19,26 +19,50 @@ module CarrierWave
           end
         end
 
-        def put(path, file, options={})
-          content_md5 = Digest::MD5.hexdigest(file)
+        def put(path, file_data, options={})
+          path = format_path(path)
+          content_md5 = Digest::MD5.hexdigest(file_data)
           content_type = options[:content_type] || "image/jpg"
-          date = Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
-          path = "#{@aliyun_bucket}/#{path}"
-          url = "http://#{@aliyun_host}/#{path}"
-          auth_sign = sign("PUT", path, content_md5, content_type ,date)
+          date = gmtdate
+          url = path_to_url(path)
+          auth_sign = sign("PUT", path, content_md5, content_type,date)
           headers = {
             "Authorization" => auth_sign, 
             "Content-Type" => content_type,
-            "Content-Length" => file.length,
+            "Content-Length" => file_data.length,
             "Date" => date,
             "Host" => @aliyun_host,
             "Expect" => "100-Continue"
           }
-          response = RestClient.put(url, file, headers)
+          response = RestClient.put(url, file_data, headers)
+          return url
         end
         
-        def get(path)
-          @http.get(path)            
+        def delete(path)
+          path = format_path(path)
+          date = gmtdate
+          headers = {
+            "Host" => @aliyun_host,
+            "Date" => date,
+            "Authorization" => sign("DELETE", path, "", "" ,date)
+          }
+          url = path_to_url(path)
+          RestClient.delete(url, headers)
+          return url
+        end
+        
+        def gmtdate
+          Time.now.gmtime.strftime("%a, %d %b %Y %H:%M:%S GMT")
+        end
+        
+        def format_path(path)
+          return "" if path.blank?
+          path.gsub!(/^\//,"")
+          [@aliyun_bucket, path].join("/")
+        end
+        
+        def path_to_url(path)
+          "http://#{@aliyun_host}/#{path}"
         end
           
       private      
@@ -92,6 +116,7 @@ module CarrierWave
             true
           rescue Exception => e
             # If the file's not there, don't panic
+            puts "carrierwave-aliyun delete file failed: #{e}"
             nil
           end
         end

data/spec/aliyun_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require "open-uri"
+require "net/http"
+
+describe "Aliyun" do
+  before(:all) do
+    opts = {
+      :aliyun_access_id => ALIYUN_ACCESS_ID,
+      :aliyun_access_key => ALIYUN_ACCESS_KEY,
+      :aliyun_bucket => ALIYUN_BUCKET
+    }
+    @connection = CarrierWave::Storage::Aliyun::Connection.new(opts)
+  end
+    
+  it "should put" do
+    url = @connection.put("a/a.jpg",load_file("foo.jpg").read)
+    Net::HTTP.get_response(URI.parse(url)).code.should == "200"
+  end
+  
+  it "should put with / prefix" do
+    url = @connection.put("/a/a.jpg",load_file("foo.jpg").read)
+    Net::HTTP.get_response(URI.parse(url)).code.should == "200"
+  end
+    
+  it "should delete" do
+    url = @connection.delete("/a/a.jpg")
+    Net::HTTP.get_response(URI.parse(url)).code.should == "404"
+  end
+end

data/spec/spec_helper.rb

@@ -24,11 +24,15 @@ end
 ActiveRecord::Migration.verbose = false
 
 # 测试的时候需要修改这个地方
+ALIYUN_ACCESS_ID = "7ewl4zm3mhi45vko9zx022ul"
+ALIYUN_ACCESS_KEY = 'Ajpi7IRKDKdXYHHFFoS89uQJQE8='
+ALIYUN_BUCKET = "carrierwave"
+
 CarrierWave.configure do |config|
   config.storage = :aliyun
-  config.aliyun_access_id = "7ewl4zm3mhi45vko9zx022ul"
-  config.aliyun_access_key = 'Ajpi7IRKDKdXYHHFFoS89uQJQE8='
-  config.aliyun_bucket = "carrierwave"
+  config.aliyun_access_id = ALIYUN_ACCESS_ID
+  config.aliyun_access_key = ALIYUN_ACCESS_KEY
+  config.aliyun_bucket = ALIYUN_BUCKET
   # config.aliyun_internal = false
 end
 

data/spec/upload_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 require "open-uri"
+require "net/http"
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 describe "Upload" do
@@ -101,6 +102,12 @@ describe "Upload" do
         attach.size.should == @file.size
       end
       
+      it "should delete old file when upload a new file again" do
+        old_url = @attachment.file.url
+        @attachment.file = load_file("foo.gif")
+        @attachment.save
+        Net::HTTP.get_response(URI.parse(old_url)).code.should == "404"
+      end
     end
   end
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.7
-    none: false
 - !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
-    none: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
-    none: false
 description: Aliyun OSS support for Carrierwave
 email:
 - huacnlee@gmail.com
@@ -59,7 +54,9 @@ files:
 - carrierwave-aliyun.gemspec
 - lib/carrierwave-aliyun.rb
 - lib/carrierwave/aliyun/configuration.rb
+- lib/carrierwave/aliyun/version.rb
 - lib/carrierwave/storage/aliyun.rb
+- spec/aliyun_spec.rb
 - spec/foo.gif
 - spec/foo.jpg
 - spec/foo.zip
@@ -67,29 +64,29 @@ files:
 - spec/upload_spec.rb
 homepage: https://github.com/nowa/carrierwave-aliyun
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Aliyun OSS support for Carrierwave
 test_files:
+- spec/aliyun_spec.rb
 - spec/foo.gif
 - spec/foo.jpg
 - spec/foo.zip