paperclip-cloudfiles 2.3.1.1.2 → 2.3.1.1.3

data/lib/paperclip.rb

@@ -46,7 +46,7 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.3.1.1.2"
+  VERSION = "2.3.1.1.3"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:

data/lib/paperclip/storage.rb

@@ -293,7 +293,8 @@ module Paperclip
           @@cdn_url ||= cloudfiles_container.cdn_url
           @path_filename            = ":cf_path_filename" unless @url.to_s.match(/^:cf.*filename$/)
           @url = @@cdn_url + "/#{URI.encode(@path_filename).gsub(/&/,'%26')}"
-          @path = @options[:path] || ":attachment/:id/:style/:basename.:extension"
+          @path = (Paperclip::Attachment.default_options[:path] == @options[:path]) ? ":attachment/:id/:style/:basename.:extension" : @options[:path]
+          File.open('/tmp/path.log', 'a+') {|f| f.write("Path is #{@path} from options #{@options[:path]}\n") }
         end
           Paperclip.interpolates(:cf_path_filename) do |attachment, style|
             attachment.path(style)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-cloudfiles
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.1.2
+  version: 2.3.1.1.3
 platform: ruby
 authors: 
 - Jon Yurek
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 -06:00
+date: 2010-02-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency