upyun-paperclip 0.1.3 → 0.1.4

data/README.md

@@ -6,9 +6,18 @@ This gem allows you to use [UpYun Storage](http://www.upyun.com) as storage engi
 
     gem install upyun-paperclip
     
+## Rails 3
+
+Using paperclip's master branch since this [issue](https://github.com/thoughtbot/paperclip/issues/655) is fixed in it.
+
+    gem "paperclip", :git => 'git://github.com/thoughtbot/paperclip.git'
+    gem "upyun-paperclip", :git => 'git://github.com/frankel/upyun-paperclip.git'
+    
 ## Usage
 
-For example, if you have a model named User, then you can 
+If you have a model named User, then you can set options like this.
+
+### One model
 
 ```ruby
 class User < ActiveRecord::Base  
@@ -27,4 +36,17 @@ class User < ActiveRecord::Base
   }
 end
 ```
+### Multiple models
+
+If you have more than one model to use paperclip, and feel bored to set the same options for each one, you can create a file named `paperclip.rb` under `config\initializers` folder, and write code like this:
+
+```ruby
+Paperclip::Storage::Upyun::Config = { 
+  :upyun_bucketname => 'bucketname',
+  :upyun_username => 'username',
+  :upyun_password => 'password',
+  :upyun_domain => 'domain'
+}
+```
 
+and only set `:storage => :upyun` in each models.

data/lib/paperclip/storage/upyun.rb

@@ -1,16 +1,24 @@
+require 'rest-client'
+
 module Paperclip
   module Storage
     module Upyun
       def self.extended base
         base.instance_eval do
-          @upyun_bucketname = @options[:upyun_bucketname]
-          @upyun_username =  @options[:upyun_username]
-          @upyun_password =  @options[:upyun_password]
-          @upyun_domain = @options[:upyun_domain]
-          @upyun_api_host = @options[:upyun_api_host] || 'http://v1.api.upyun.com/'
           
-          @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public\/system/, @upyun_domain)
+          # Please use the latest paperclip from git://github.com/thoughtbot/paperclip.git
+          # Since the latest one solves this issue:
+          # https://github.com/thoughtbot/paperclip/issues/655
+
+          @upyun_bucketname = @options[:upyun_bucketname] || Paperclip::Storage::Upyun::Config[:upyun_bucketname]
+          @upyun_username =  @options[:upyun_username] || Paperclip::Storage::Upyun::Config[:upyun_username]
+          @upyun_password =  @options[:upyun_password] || Paperclip::Storage::Upyun::Config[:upyun_password]
+          @upyun_domain = @options[:upyun_domain] || Paperclip::Storage::Upyun::Config[:upyun_domain]
+          @upyun_api_host = @options[:upyun_api_host] || Paperclip::Storage::Upyun::Config[:upyun_api_host] || 'http://v1.api.upyun.com/'
 
+          @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public/, @upyun_domain)
+          @options[:url] =  @upyun_domain + @options[:url]
+          
           @resource = RestClient::Resource.new("#{@upyun_api_host}#{@upyun_bucketname}", :user => @upyun_username, :password => @upyun_password )
         end
       end
@@ -30,7 +38,7 @@ module Paperclip
 
 
         def flush_writes #:nodoc:
-          @queued_for_write.each do |style_name, file|            
+          @queued_for_write.each do |style_name, file|       
             current_path = ''
             relative_path = path(style_name).gsub(@upyun_domain, '')
             path_array = relative_path.split('/')
@@ -51,7 +59,11 @@ module Paperclip
         
         def flush_deletes #:nodoc:
           @queued_for_delete.each do |path|
-            # TODO:
+            relative_path = path.gsub(@upyun_domain, '')
+            begin
+              @resource[relative_path].delete
+            rescue
+            end
           end
           @queued_for_delete = []
         end

data/lib/upyun-paperclip/version.rb

@@ -1,5 +1,5 @@
 module Upyun
   module Paperclip
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - frankel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 +08:00
+date: 2012-01-06 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency