upyun-paperclip 0.1.4 → 0.1.5

data/lib/paperclip/storage/upyun.rb

@@ -14,7 +14,7 @@ module Paperclip
           @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/'
+          @upyun_api_host = @options[:upyun_api_host] || ( defined? Paperclip::Storage::Upyun::Config  || Paperclip::Storage::Upyun::Config[:upyun_api_host].nil?) ? 'http://v1.api.upyun.com/' : Paperclip::Storage::Upyun::Config[:upyun_api_host]
 
           @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public/, @upyun_domain)
           @options[:url] =  @upyun_domain + @options[:url]
@@ -41,15 +41,7 @@ module Paperclip
           @queued_for_write.each do |style_name, file|       
             current_path = ''
             relative_path = path(style_name).gsub(@upyun_domain, '')
-            path_array = relative_path.split('/')
-            path_array.pop
-            path_array.reject!{|p| p == ''}
-            path_array.each do |p|
-              current_path = current_path + p + '/'
-              @resource[current_path].post '', :folder => true
-            end
-            @resource[relative_path].post File.read(file) 
-            
+            @resource[relative_path].post File.read(file), {'Expect' => '', 'Mkdir' => 'true'}
           end
 
           after_flush_writes # allows attachment to clean up temp files
@@ -68,9 +60,6 @@ module Paperclip
           @queued_for_delete = []
         end
 
-
-
-    
     end
   end
 end

data/lib/upyun-paperclip/version.rb

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

data/spec/dummy/Gemfile

@@ -17,9 +17,9 @@ group :assets do
 end
 
 gem "nifty-generators"
-gem 'paperclip', :path => '~/github/paperclip'
-gem 'upyun-paperclip', :path => '~/github/upyun-paperclip'
-gem 'ruby-debug19'
+gem 'paperclip', :git => 'git://github.com/thoughtbot/paperclip.git'
+gem 'upyun-paperclip',:git => 'git://github.com/frankel/upyun-paperclip.git'
+gem 'ruby-debug19', :require => 'ruby-debug'
 
 gem 'jquery-rails'
 

data/spec/dummy/app/views/home/index.html.erb

@@ -1,2 +1,2 @@
 <h1>Home#index</h1>
-<p>Find me in app/views/home/index.html.erb</p>
+<p><a href="/users">Users</a></p>

metadata

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