carrierwave-aliyun-crud 0.1.0 → 0.1.1

data/README.md

@@ -17,16 +17,30 @@ gem 'carrierwave-aliyun-crud'
 
 ## Configuration
 
-创建这么个脚本 `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'
-  # 你需要在 Aliyum OSS 上面提前创建一个 Bucket
+  # 需要在 Aliyum OSS 上面提前创建一个 Bucket
   config.aliyun_bucket = "simple"
   # 是否使用内部连接，true - 使用 Aliyun 局域网的方式访问  false - 外部网络访问
   config.aliyun_internal = true
 end
-```
+```
+## Usage
+
+上传文件
+
+```ruby
+CarrierWave::Storage::Aliyun::Connection.new(options).put relative_store_url, File.read(file_path)
+```
+
+删除文件
+
+```ruby
+CarrierWave::Storage::Aliyun::Connection.new(options).delete relative_store_url
+#如果删除的文件不存在，不会有异常
+```

data/lib/carrierwave-aliyun-crud.rb

@@ -1,6 +1,8 @@
 require "carrierwave/storage/aliyun"
 require 'carrierwave/processing/mime_types'
 require "carrierwave/aliyun/configuration"
+
+
 CarrierWave.configure do |config|
   config.storage_engines.merge!({:aliyun => "CarrierWave::Storage::Aliyun"})
 end

data/lib/carrierwave/storage/aliyun.rb

@@ -4,6 +4,7 @@ require 'digest/hmac'
 require 'digest/md5'
 require 'net/http'
 require "rest-client"
+require 'uri'
 
 module CarrierWave
   module Storage
@@ -26,14 +27,14 @@ module CarrierWave
           path = "#{@aliyun_bucket}/#{path}"
           url = "http://#{@aliyun_host}/#{path}"
           headers = generate_header("PUT", path, content_md5, options).merge!({"Content-Length" => file.length})
-          RestClient.put url, file, headers
+          RestClient.put URI.escape(url), file, headers
         end
 
         def get(path, options={})
           path = "#{@aliyun_bucket}/#{path}"
           url = "http://#{@aliyun_host}/#{path}"
           headers = generate_header "GET", path, "", options
-          RestClient.get url, headers
+          RestClient.get URI.escape(url), headers
         end
 
         def delete path
@@ -45,7 +46,7 @@ module CarrierWave
               "Date" => date,
               "Host" => @aliyun_host,
           }
-          RestClient.delete url, headers
+          RestClient.delete URI.escape(url), headers
         end
 
         private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-aliyun-crud
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -50,21 +50,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- Changelogs.md
-- Gemfile
-- Gemfile.lock
-- README.md
-- carrierwave-aliyun-crud.gemspec
-- lib/carrierwave-aliyun-crud.rb
 - lib/carrierwave/aliyun/configuration.rb
 - lib/carrierwave/storage/aliyun.rb
-- spec/foo.gif
-- spec/foo.jpg
-- spec/foo.zip
-- spec/spec_helper.rb
-- spec/upload_spec.rb
+- lib/carrierwave-aliyun-crud.rb
+- README.md
 homepage: https://github.com/warmwind/carrierwave-aliyun-crud
 licenses: []
 post_install_message: 
@@ -85,13 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Aliyun OSS support for Carrierwave
-test_files:
-- spec/foo.gif
-- spec/foo.jpg
-- spec/foo.zip
-- spec/spec_helper.rb
-- spec/upload_spec.rb
+test_files: []

data/.gitignore

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

data/.rspec

@@ -1 +0,0 @@
---colour --format nested

data/Changelogs.md

@@ -1,12 +0,0 @@
-## 0.1.2
-
-* 修正 content_type 的支持，自动用原始文件的 content_type，以免上传 zip 之类的文件以后无法下载.
-
-## 0.1.1
-
-* 修改 Aliyun OSS 的请求地址.
-* 加入可选项，使用 Aliyun 内部地址调用上传，以提高内部网络使用的速度.
-
-## 0.1.0
-
-* 功能实现.

data/Gemfile

@@ -1,12 +0,0 @@
-source "http://ruby.taobao.org"
-gem "rake"
-
-group :test do
-  gem 'rails'
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-  gem 'carrierwave'
-  gem 'mini_magick'
-  gem 'rest-client'
-  gem 'rspec','~> 2.6.0'
-  gem 'mocha','0.10.0'
-end

data/Gemfile.lock

@@ -1,114 +0,0 @@
-GEM
-  remote: http://ruby.taobao.org/
-  specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.0)
-    builder (3.0.0)
-    carrierwave (0.5.8)
-      activesupport (~> 3.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.17.2)
-    mini_magick (3.4)
-      subexec (~> 0.2.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
-      bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sprockets (2.1.2)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    subexec (0.2.1)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  carrierwave
-  mini_magick
-  mocha (= 0.10.0)
-  rails
-  rake
-  rest-client
-  rspec (~> 2.6.0)
-  sqlite3-ruby

data/carrierwave-aliyun-crud.gemspec

@@ -1,20 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = "carrierwave-aliyun-crud"
-  s.version     = "0.1.0"
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jiang Peng"]
-  s.email       = ["pengj0520@gmail.com"]
-  s.homepage    = "https://github.com/warmwind/carrierwave-aliyun-crud"
-  s.summary     = %q{Aliyun OSS support for Carrierwave}
-  s.description = %q{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.add_dependency "carrierwave", [">= 0.5.7"]
-  s.add_dependency "rest-client", [">= 1.6.7"]
-end

data/spec/spec_helper.rb

@@ -1,37 +0,0 @@
-require 'rubygems'
-require 'rspec'
-require 'rspec/autorun'
-require 'rails'
-require 'active_record'
-require "carrierwave"
-require 'carrierwave/orm/activerecord'
-require 'carrierwave/processing/mini_magick'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require "carrierwave-aliyun-crud"
-
-
-module Rails
-  class <<self
-    def root
-      [File.expand_path(__FILE__).split('/')[0..-3].join('/'),"spec"].join("/")
-    end
-  end
-end
-
-ActiveRecord::Migration.verbose = false
-
-# 测试的时候需要修改这个地方
-CarrierWave.configure do |config|
-  config.storage = :aliyun
-  config.aliyun_access_id = "n4R7XBeTZqd2blQz"
-  config.aliyun_access_key = 'WiMTt42rLMT9bPGfGaEaNlzHahG9du'
-  config.aliyun_bucket = "carrierwave-jp"
-  config.aliyun_internal = false
-end
-
-def load_file(fname)
-  File.open([Rails.root,fname].join("/"))
-end

data/spec/upload_spec.rb

@@ -1,112 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-require "open-uri"
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
-describe "Upload" do
-  def setup_db
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :photos do |t|
-        t.column :image, :string
-      end
-      
-      create_table :attachments do |t|
-        t.column :file, :string
-      end
-    end
-  end
-  
-  def drop_db
-    ActiveRecord::Base.connection.tables.each do |table|
-      ActiveRecord::Base.connection.drop_table(table)
-    end
-  end
-  
-  class PhotoUploader < CarrierWave::Uploader::Base
-    include CarrierWave::MiniMagick
-
-    version :small do
-      process :resize_to_fill => [120, 120]
-    end
-    
-    def store_dir
-      "photos"
-    end
-  end
-  
-  class AttachUploader < CarrierWave::Uploader::Base
-    include CarrierWave::MiniMagick
-
-    def store_dir
-      "attachs"
-    end
-  end
-
-  class Photo < ActiveRecord::Base
-    mount_uploader :image, PhotoUploader
-  end
-  
-  class Attachment < ActiveRecord::Base
-    mount_uploader :file, AttachUploader
-  end
-  
-  
-  before :all do
-    setup_db
-  end
-  
-  after :all do
-    drop_db
-  end
-  
-  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)
-      end
-      
-      it "should upload file" do
-        @photo.save.should be_true
-        @photo1.save.should be_true
-      end
-      
-      it "should get uploaded file" do
-        img = open(@photo.image.url)
-        img.size.should == @file.size
-        img1 = open(@photo1.image.url)
-        img1.size.should == @file1.size
-      end
-
-      it "should get small version uploaded file" do
-        open(@photo.image.small.url).should_not == nil
-        open(@photo1.image.small.url).should_not == nil
-      end
-
-      it "should delete uploaded files" do
-        @photo.remove_image!
-        @photo.reload
-        expect {open(@photo.image.url)}.to raise_error(OpenURI::HTTPError)
-      end
-    end
-    
-    context "should update zip" do
-      before(:all) do
-        @file = load_file("foo.zip")
-        @attachment = Attachment.new(:file => @file)
-      end
-      
-      it "should upload file" do
-        @attachment.save.should be_true
-      end
-      
-      it "should get uploaded file" do
-        attach = open(@attachment.file.url)
-        attach.size.should == @file.size
-      end
-      
-    end
-  end
-end