paperclip 2.3.11 → 2.3.16

data/lib/paperclip/style.rb

@@ -30,8 +30,9 @@ module Paperclip
     # (which method (in the attachment) will call any supplied procs)
     # There is an important change of interface here: a style rule can set its own processors
     # by default we behave as before, though.
+    # if a proc has been supplied, we call it here
     def processors
-      @processors || attachment.processors
+      @processors.respond_to?(:call) ? @processors.call(attachment.instance) : (@processors || attachment.processors)
     end
 
     # retrieves from the attachment the whiny setting
@@ -71,7 +72,7 @@ module Paperclip
     # Supports getting and setting style properties with hash notation to ensure backwards-compatibility
     # eg. @attachment.styles[:large][:geometry]@ will still work
     def [](key)
-      if [:name, :convert_options, :whiny, :processors, :geometry, :format].include?(key)
+      if [:name, :convert_options, :whiny, :processors, :geometry, :format, :animated].include?(key)
         send(key)
       elsif defined? @other_args[key]
         @other_args[key]
@@ -79,7 +80,7 @@ module Paperclip
     end
 
     def []=(key, value)
-      if [:name, :convert_options, :whiny, :processors, :geometry, :format].include?(key)
+      if [:name, :convert_options, :whiny, :processors, :geometry, :format, :animated].include?(key)
         send("#{key}=".intern, value)
       else
         @other_args[key] = value

data/lib/paperclip/thumbnail.rb

@@ -2,7 +2,11 @@ module Paperclip
   # Handles thumbnailing images that are uploaded.
   class Thumbnail < Processor
 
-    attr_accessor :current_geometry, :target_geometry, :format, :whiny, :convert_options, :source_file_options
+    attr_accessor :current_geometry, :target_geometry, :format, :whiny, :convert_options,
+                  :source_file_options, :animated
+
+    # List of formats that we need to preserve animation
+    ANIMATED_FORMATS = %w(gif)
 
     # Creates a Thumbnail object set to work on the +file+ given. It
     # will attempt to transform the image into one defined by +target_geometry+
@@ -22,6 +26,7 @@ module Paperclip
       @convert_options     = options[:convert_options]
       @whiny               = options[:whiny].nil? ? true : options[:whiny]
       @format              = options[:format]
+      @animated            = options[:animated].nil? ? true : options[:animated]
 
       @source_file_options = @source_file_options.split(/\s+/) if @source_file_options.respond_to?(:split)
       @convert_options     = @convert_options.split(/\s+/)     if @convert_options.respond_to?(:split)
@@ -58,9 +63,11 @@ module Paperclip
 
         parameters = parameters.flatten.compact.join(" ").strip.squeeze(" ")
 
-        success = Paperclip.run("convert", parameters, :source => "#{File.expand_path(src.path)}[0]", :dest => File.expand_path(dst.path))
-      rescue PaperclipCommandLineError => e
+        success = Paperclip.run("convert", parameters, :source => "#{File.expand_path(src.path)}#{'[0]' unless animated?}", :dest => File.expand_path(dst.path))
+      rescue Cocaine::ExitStatusError => e
         raise PaperclipError, "There was an error processing the thumbnail for #{@basename}" if @whiny
+      rescue Cocaine::CommandNotFoundError => e
+        raise Paperclip::CommandNotFoundError.new("Could not run the `convert` command. Please install ImageMagick.")
       end
 
       dst
@@ -71,9 +78,17 @@ module Paperclip
     def transformation_command
       scale, crop = @current_geometry.transformation_to(@target_geometry, crop?)
       trans = []
+      trans << "-coalesce" if animated?
       trans << "-resize" << %["#{scale}"] unless scale.nil? || scale.empty?
       trans << "-crop" << %["#{crop}"] << "+repage" if crop
       trans
     end
+
+    protected
+
+    # Return true if the format is animated
+    def animated?
+      @animated && ANIMATED_FORMATS.include?(@current_format[1..-1]) && (ANIMATED_FORMATS.include?(@format.to_s) || @format.blank?)
+    end
   end
 end

data/lib/paperclip/upfile.rb

@@ -1,3 +1,5 @@
+require 'mime/types'
+
 module Paperclip
   # The Upfile module is a convenience module for adding uploaded-file-type methods
   # to the +File+ class. Useful for testing.
@@ -6,23 +8,28 @@ module Paperclip
 
     # Infer the MIME-type of the file from the extension.
     def content_type
-      type = (self.path.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
-      case type
-      when %r"jp(e|g|eg)"            then "image/jpeg"
-      when %r"tiff?"                 then "image/tiff"
-      when %r"png", "gif", "bmp"     then "image/#{type}"
-      when "txt"                     then "text/plain"
-      when %r"html?"                 then "text/html"
-      when "js"                      then "application/js"
-      when "csv", "xml", "css"       then "text/#{type}"
+      types = MIME::Types.type_for(self.original_filename)
+      if types.length == 0
+        type_from_file_command
+      elsif types.length == 1
+        types.first.content_type
       else
-        # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
-        content_type = (Paperclip.run("file", "-b --mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
-        content_type = "application/x-#{type}" if content_type.match(/\(.*?\)/)
-        content_type
+        iterate_over_array_to_find_best_option(types)
       end
     end
 
+    def iterate_over_array_to_find_best_option(types)
+      types.reject {|type| type.content_type.match(/\/x-/) }.first
+    end
+
+    def type_from_file_command
+    #  On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
+      type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
+      mime_type = (Paperclip.run("file", "-b --mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
+      mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
+      mime_type
+    end
+
     # Returns the file's normal name.
     def original_filename
       File.basename(self.path)

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.3.11" unless defined? Paperclip::VERSION
+  VERSION = "2.3.16" unless defined? Paperclip::VERSION
 end

data/lib/paperclip.rb

@@ -5,7 +5,7 @@
 # columns to your table.
 #
 # Author:: Jon Yurek
-# Copyright:: Copyright (c) 2008-2009 thoughtbot, inc.
+# Copyright:: Copyright (c) 2008-2011 thoughtbot, inc.
 # License:: MIT License (http://www.opensource.org/licenses/mit-license.php)
 #
 # Paperclip defines an attachment as any file, though it makes special considerations
@@ -38,14 +38,9 @@ require 'paperclip/interpolations'
 require 'paperclip/style'
 require 'paperclip/attachment'
 require 'paperclip/storage'
-require 'paperclip/callback_compatability'
-require 'paperclip/command_line'
+require 'paperclip/callback_compatibility'
 require 'paperclip/railtie'
-if defined?(Rails.root) && Rails.root
-  Dir.glob(File.join(File.expand_path(Rails.root), "lib", "paperclip_processors", "*.rb")).each do |processor|
-    require processor
-  end
-end
+require 'cocaine'
 
 # The base module that gets included in ActiveRecord::Base. See the
 # documentation for Paperclip::ClassMethods for more useful information.
@@ -87,7 +82,7 @@ module Paperclip
     # symlink them so they are all in the same directory.
     #
     # If the command returns with a result code that is not one of the
-    # expected_outcodes, a PaperclipCommandLineError will be raised. Generally
+    # expected_outcodes, a Cocaine::CommandLineError will be raised. Generally
     # a code of 0 is expected, but a list of codes may be passed if necessary.
     # These codes should be passed as a hash as the last argument, like so:
     #
@@ -100,12 +95,13 @@ module Paperclip
       if options[:image_magick_path]
         Paperclip.log("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
       end
-      CommandLine.path = options[:command_path] || options[:image_magick_path]
-      CommandLine.new(cmd, *params).run
+      Cocaine::CommandLine.path = options[:command_path] || options[:image_magick_path]
+      Cocaine::CommandLine.new(cmd, *params).run
     end
 
     def processor name #:nodoc:
       name = name.to_s.camelize
+      load_processor(name) unless Paperclip.const_defined?(name)
       processor = Paperclip.const_get(name)
       unless processor.ancestors.include?(Paperclip::Processor)
         raise PaperclipError.new("Processor #{name} was not found")
@@ -113,8 +109,14 @@ module Paperclip
       processor
     end
 
+    def load_processor(name)
+      if defined?(Rails.root) && Rails.root
+        require File.expand_path(Rails.root.join("lib", "paperclip_processors", "#{name.underscore}.rb"))
+      end
+    end
+
     def each_instance_with_attachment(klass, name)
-      Object.const_get(klass).all.each do |instance|
+      class_for(klass).all.each do |instance|
         yield(instance) if instance.send(:"#{name}?")
       end
     end
@@ -126,23 +128,40 @@ module Paperclip
     end
 
     def logger #:nodoc:
-      ActiveRecord::Base.logger
+      defined?(ActiveRecord::Base) ? ActiveRecord::Base.logger : Rails.logger
     end
 
     def logging? #:nodoc:
       options[:log]
     end
-  end
 
-  class PaperclipError < StandardError #:nodoc:
+    def class_for(class_name)
+      # Ruby 1.9 introduces an inherit argument for Module#const_get and
+      # #const_defined? and changes their default behavior.
+      # https://github.com/rails/rails/blob/v3.0.9/activesupport/lib/active_support/inflector/methods.rb#L89
+      if Module.method(:const_get).arity == 1
+        class_name.split('::').inject(Object) do |klass, partial_class_name|
+          klass.const_defined?(partial_class_name) ? klass.const_get(partial_class_name) : klass.const_missing(partial_class_name)
+        end
+      else
+        class_name.split('::').inject(Object) do |klass, partial_class_name|
+          klass.const_defined?(partial_class_name) ? klass.const_get(partial_class_name, false) : klass.const_missing(partial_class_name)
+        end
+      end
+    rescue ArgumentError => e
+      # Sadly, we need to capture ArguementError here because Rails 2.3.x
+      # Active Support dependency's management will try to the constant inherited
+      # from Object, and fail misably with "Object is not missing constant X" error
+      # https://github.com/rails/rails/blob/v2.3.12/activesupport/lib/active_support/dependencies.rb#L124
+      if e.message =~ /is not missing constant/
+        raise NameError, "uninitialized constant #{class_name}"
+      else
+        raise e
+      end
+    end
   end
 
-  class PaperclipCommandLineError < PaperclipError #:nodoc:
-    attr_accessor :output
-    def initialize(msg = nil, output = nil)
-      super(msg)
-      @output = output
-    end
+  class PaperclipError < StandardError #:nodoc:
   end
 
   class StorageMethodNotFound < PaperclipError
@@ -160,7 +179,8 @@ module Paperclip
   module Glue
     def self.included base #:nodoc:
       base.extend ClassMethods
-      if base.respond_to?("set_callback")
+      base.class_attribute :attachment_definitions if base.respond_to?(:class_attribute)
+      if base.respond_to?(:set_callback)
         base.send :include, Paperclip::CallbackCompatability::Rails3
       else
         base.send :include, Paperclip::CallbackCompatability::Rails21
@@ -224,7 +244,7 @@ module Paperclip
     #                                }
     #   NOTE: While not deprecated yet, it is not recommended to specify options this way.
     #   It is recommended that :convert_options option be included in the hash passed to each
-    #   :styles for compatability with future versions.
+    #   :styles for compatibility with future versions.
     #   NOTE: Strings supplied to :convert_options are split on space in order to undergo
     #   shell quoting for safety. If your options require a space, please pre-split them
     #   and pass an array to :convert_options instead.
@@ -235,7 +255,14 @@ module Paperclip
     def has_attached_file name, options = {}
       include InstanceMethods
 
-      write_inheritable_attribute(:attachment_definitions, {}) if attachment_definitions.nil?
+      if attachment_definitions.nil?
+        if respond_to?(:class_attribute)
+          self.attachment_definitions = {}
+        else
+          write_inheritable_attribute(:attachment_definitions, {})
+        end
+      end
+
       attachment_definitions[name] = {:validations => []}.merge(options)
 
       after_save :save_attached_files
@@ -275,7 +302,7 @@ module Paperclip
       min     = options[:greater_than] || (options[:in] && options[:in].first) || 0
       max     = options[:less_than]    || (options[:in] && options[:in].last)  || (1.0/0)
       range   = (min..max)
-      message = options[:message] || "file size must be between :min and :max bytes."
+      message = options[:message] || "file size must be between :min and :max bytes"
       message = message.call if message.respond_to?(:call)
       message = message.gsub(/:min/, min.to_s).gsub(/:max/, max.to_s)
 
@@ -301,7 +328,7 @@ module Paperclip
     #   be run is this lambda or method returns true.
     # * +unless+: Same as +if+ but validates if lambda or method returns false.
     def validates_attachment_presence name, options = {}
-      message = options[:message] || "must be set."
+      message = options[:message] || "must be set"
       validates_presence_of :"#{name}_file_name",
                             :message   => message,
                             :if        => options[:if],
@@ -324,6 +351,8 @@ module Paperclip
     # NOTE: If you do not specify an [attachment]_content_type field on your
     # model, content_type validation will work _ONLY upon assignment_ and
     # re-validation after the instance has been reloaded will always succeed.
+    # You'll still need to have a virtual attribute (created by +attr_accessor+)
+    # name +[attachment]_content_type+ to be able to use this validator.
     def validates_attachment_content_type name, options = {}
       validation_options = options.dup
       allowed_types = [validation_options[:content_type]].flatten
@@ -343,7 +372,11 @@ module Paperclip
     # Returns the attachment definitions defined by each call to
     # has_attached_file.
     def attachment_definitions
-      read_inheritable_attribute(:attachment_definitions)
+      if respond_to?(:class_attribute)
+        self.attachment_definitions
+      else
+        read_inheritable_attribute(:attachment_definitions)
+      end
     end
   end
 

data/lib/tasks/paperclip.rake

@@ -1,17 +1,21 @@
-def obtain_class
-  class_name = ENV['CLASS'] || ENV['class']
-  raise "Must specify CLASS" unless class_name
-  class_name
-end
+module Paperclip
+  module Task
+    def self.obtain_class
+      class_name = ENV['CLASS'] || ENV['class']
+      raise "Must specify CLASS" unless class_name
+      class_name
+    end
 
-def obtain_attachments(klass)
-  klass = Object.const_get(klass.to_s)
-  name = ENV['ATTACHMENT'] || ENV['attachment']
-  raise "Class #{klass.name} has no attachments specified" unless klass.respond_to?(:attachment_definitions)
-  if !name.blank? && klass.attachment_definitions.keys.include?(name)
-    [ name ]
-  else
-    klass.attachment_definitions.keys
+    def self.obtain_attachments(klass)
+      klass = Paperclip.class_for(klass.to_s)
+      name = ENV['ATTACHMENT'] || ENV['attachment']
+      raise "Class #{klass.name} has no attachments specified" unless klass.respond_to?(:attachment_definitions)
+      if !name.blank? && klass.attachment_definitions.keys.include?(name)
+        [ name ]
+      else
+        klass.attachment_definitions.keys
+      end
+    end
   end
 end
 
@@ -20,14 +24,15 @@ namespace :paperclip do
   task :refresh => ["paperclip:refresh:metadata", "paperclip:refresh:thumbnails"]
 
   namespace :refresh do
-    desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT)."
+    desc "Regenerates thumbnails for a given CLASS (and optional ATTACHMENT and STYLES splitted by comma)."
     task :thumbnails => :environment do
       errors = []
-      klass = obtain_class
-      names = obtain_attachments(klass)
+      klass = Paperclip::Task.obtain_class
+      names = Paperclip::Task.obtain_attachments(klass)
+      styles = (ENV['STYLES'] || ENV['styles'] || '').split(',').map(&:to_sym)
       names.each do |name|
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
-          result = instance.send(name).reprocess!
+          instance.send(name).reprocess!(*styles)
           errors << [instance.id, instance.errors] unless instance.errors.blank?
         end
       end
@@ -36,15 +41,19 @@ namespace :paperclip do
 
     desc "Regenerates content_type/size metadata for a given CLASS (and optional ATTACHMENT)."
     task :metadata => :environment do
-      klass = obtain_class
-      names = obtain_attachments(klass)
+      klass = Paperclip::Task.obtain_class
+      names = Paperclip::Task.obtain_attachments(klass)
       names.each do |name|
         Paperclip.each_instance_with_attachment(klass, name) do |instance|
-          if file = instance.send(name).to_file
+          if file = instance.send(name).to_file(:original)
             instance.send("#{name}_file_name=", instance.send("#{name}_file_name").strip)
             instance.send("#{name}_content_type=", file.content_type.strip)
             instance.send("#{name}_file_size=", file.size) if instance.respond_to?("#{name}_file_size")
-            instance.save(false)
+            if Rails.version >= "3.0.0"
+              instance.save(:validate => false)
+            else
+              instance.save(false)
+            end
           else
             true
           end
@@ -55,8 +64,8 @@ namespace :paperclip do
 
   desc "Cleans out invalid attachments. Useful after you've added new validations."
   task :clean => :environment do
-    klass = obtain_class
-    names = obtain_attachments(klass)
+    klass = Paperclip::Task.obtain_class
+    names = Paperclip::Task.obtain_attachments(klass)
     names.each do |name|
       Paperclip.each_instance_with_attachment(klass, name) do |instance|
         instance.send(name).send(:validate)

data/test/attachment_test.rb

@@ -14,6 +14,28 @@ class AttachmentTest < Test::Unit::TestCase
     assert_equal "#{Rails.root}/public/fake_models/1234/fake", @attachment.path
   end
 
+  should "return the url by interpolating the default_url option when no file assigned" do
+    @attachment = attachment :default_url => ":class/blegga.png"
+    @model = @attachment.instance
+    assert_nil @model.avatar_file_name
+    assert_equal "fake_models/blegga.png", @attachment.url
+  end
+
+  should "return the url by executing and interpolating the default_url Proc when no file assigned" do
+    @attachment = attachment :default_url => lambda { |a| ":class/blegga.png" }
+    @model = @attachment.instance
+    assert_nil @model.avatar_file_name
+    assert_equal "fake_models/blegga.png", @attachment.url
+  end
+
+  should "return the url by executing and interpolating the default_url Proc with attachment arg when no file assigned" do
+    @attachment = attachment :default_url => lambda { |a| a.instance.some_method_to_determine_default_url }
+    @model = @attachment.instance
+    @model.stubs(:some_method_to_determine_default_url).returns(":class/blegga.png")
+    assert_nil @model.avatar_file_name
+    assert_equal "fake_models/blegga.png", @attachment.url
+  end
+
   context "Attachment default_options" do
     setup do
       rebuild_model
@@ -76,6 +98,19 @@ class AttachmentTest < Test::Unit::TestCase
           end
         end
       end
+
+      context "with nested hash default" do
+        setup do
+          @nested_hash = {:thumb => {:first => "second" }}
+          Paperclip::Attachment.default_options[:styles] = @nested_hash
+          @dummy = Dummy.new
+          @attachment = @dummy.avatar
+        end
+
+        should "correctly clone the nested hash" do
+          assert_equal(@nested_hash, @attachment.instance_variable_get(:@styles))
+        end
+      end
     end
   end
 
@@ -228,6 +263,24 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with :only_process" do
+    setup do
+      rebuild_model :styles => {
+                      :thumb => "100x100",
+                      :large => "400x400"
+                    },
+                    :only_process => [:thumb]
+      @file = StringIO.new("...")
+      @attachment = Dummy.new.avatar
+    end
+
+    should "only process the provided style" do
+      @attachment.expects(:post_process).with(:thumb)
+      @attachment.expects(:post_process).with(:large).never
+      @attachment.assign(@file)
+    end
+  end
+
   context "An attachment with :convert_options that is a proc" do
     setup do
       rebuild_model :styles => {
@@ -287,6 +340,24 @@ class AttachmentTest < Test::Unit::TestCase
       assert_equal "50x50#", @attachment.styles[:thumb][:geometry]
     end
   end
+  
+  context "An attachment with conditional :styles that is a proc" do
+    setup do
+      rebuild_model :styles => lambda{ |attachment| attachment.instance.other == 'a' ? {:thumb => "50x50#"} : {:large => "400x400"} }
+
+      @dummy = Dummy.new(:other => 'a')
+    end
+
+    should "have the correct styles for the assigned instance values" do
+      assert_equal "50x50#", @dummy.avatar.styles[:thumb][:geometry]
+      assert_nil @dummy.avatar.styles[:large]
+
+      @dummy.other = 'b'
+      
+      assert_equal "400x400", @dummy.avatar.styles[:large][:geometry]
+      assert_nil @dummy.avatar.styles[:thumb]
+    end
+  end
 
   context "An attachment with :url that is a proc" do
     setup do
@@ -425,6 +496,19 @@ class AttachmentTest < Test::Unit::TestCase
     rebuild_model :storage => :FileSystem
     @dummy = Dummy.new
     assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
+    
+    rebuild_model :storage => :Filesystem
+    @dummy = Dummy.new
+    assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
+  end
+  
+  should "convert underscored storage name to camelcase" do
+    rebuild_model :storage => :not_here
+    @dummy = Dummy.new
+    exception = assert_raises(Paperclip::StorageMethodNotFound) do |e|
+      @dummy.avatar
+    end
+    assert exception.message.include?("NotHere")
   end
 
   should "raise an error if you try to include a storage module that doesn't exist" do
@@ -642,6 +726,15 @@ class AttachmentTest < Test::Unit::TestCase
       assert_equal nil, @attachment.path(:blah)
     end
 
+    context "with a file assigned but not saved yet" do
+      should "clear out any attached files" do
+        @attachment.assign(@file)
+        assert !@attachment.queued_for_write.blank?
+        @attachment.clear
+        assert @attachment.queued_for_write.blank?
+      end
+    end
+
     context "with a file assigned in the database" do
       setup do
         @attachment.stubs(:instance_read).with(:file_name).returns("5k.png")
@@ -918,4 +1011,27 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "an attachment with delete_file option set to false" do
+    setup do
+      rebuild_model :preserve_files => true
+      @dummy = Dummy.new
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @dummy.avatar = @file
+      @dummy.save!
+      @attachment = @dummy.avatar 
+      @path = @attachment.path      
+    end
+    
+    should "not delete the files from storage when attachment is destroyed" do      
+      @attachment.destroy
+      assert File.exists?(@path)
+    end
+    
+    should "not dleete the file when model is destroy" do
+      @dummy.destroy
+      assert File.exists?(@path)
+    end
+  end
+
 end

data/test/fog_test.rb

@@ -16,15 +16,20 @@ class FogTest < Test::Unit::TestCase
       }
 
       @connection = Fog::Storage.new(@credentials)
+      @connection.directories.create(
+        :key => @fog_directory
+      )
 
-      rebuild_model(
+      @options = {
         :fog_directory    => @fog_directory,
         :fog_credentials  => @credentials,
         :fog_host         => nil,
-        :fog_public       => true,
+        :fog_file         => {:cache_control => 1234},
         :path             => ":attachment/:basename.:extension",
         :storage          => :fog
-      )
+      }
+
+      rebuild_model(@options)
     end
 
     should "be extended by the Fog module" do
@@ -46,16 +51,17 @@ class FogTest < Test::Unit::TestCase
       end
 
       context "without a bucket" do
-        should "succeed" do
+        setup do
+          @connection.directories.get(@fog_directory).destroy
+        end
+
+        should "create the bucket" do
           assert @dummy.save
+          assert @connection.directories.get(@fog_directory)
         end
       end
 
       context "with a bucket" do
-        setup do
-          @connection.directories.create(:key => @fog_directory)
-        end
-
         should "succeed" do
           assert @dummy.save
         end
@@ -63,14 +69,7 @@ class FogTest < Test::Unit::TestCase
 
       context "without a fog_host" do
         setup do
-          rebuild_model(
-            :fog_directory    => @fog_directory,
-            :fog_credentials  => @credentials,
-            :fog_host         => nil,
-            :fog_public       => true,
-            :path             => ":attachment/:basename.:extension",
-            :storage          => :fog
-          )
+          rebuild_model(@options.merge(:fog_host => nil))
           @dummy = Dummy.new
           @dummy.avatar = StringIO.new('.')
           @dummy.save
@@ -82,12 +81,24 @@ class FogTest < Test::Unit::TestCase
       end
 
       context "with a fog_host" do
+        setup do
+          rebuild_model(@options.merge(:fog_host => 'http://example.com'))
+          @dummy = Dummy.new
+          @dummy.avatar = StringIO.new('.')
+          @dummy.save
+        end
+
+        should "provide a public url" do
+          assert @dummy.avatar.url =~ /^http:\/\/example\.com\/avatars\/stringio\.txt\?\d*$/
+        end
+      end
+
+      context "with a fog_host that includes a wildcard placeholder" do
         setup do
           rebuild_model(
             :fog_directory    => @fog_directory,
             :fog_credentials  => @credentials,
-            :fog_host         => 'http://example.com',
-            :fog_public       => true,
+            :fog_host         => 'http://img%d.example.com',
             :path             => ":attachment/:basename.:extension",
             :storage          => :fog
           )
@@ -97,7 +108,7 @@ class FogTest < Test::Unit::TestCase
         end
 
         should "provide a public url" do
-          assert @dummy.avatar.url =~ /^http:\/\/example\.com\/avatars\/stringio\.txt\?\d*$/
+          assert @dummy.avatar.url =~ /^http:\/\/img[0123]\.example\.com\/avatars\/stringio\.txt\?\d*$/
         end
       end