paperclip 3.1.2 → 3.1.4

data/NEWS

@@ -1,3 +1,22 @@
+New in 3.1.4:
+
+* Bug fix: Allow user to be able to set path without `:style` attribute and not raising an error.
+  This is a regression introduced in 3.1.3, and that feature will be postponed to another minor
+  release instead.
+* Feature: Allow for URI Adapter as an optional paperclip io adapter.
+
+New in 3.1.3:
+
+* Bug fix: Copy empty attachment between instances is now working.
+* Bug fix: Correctly rescue Fog error.
+* Bug fix: Using default path and url options in Fog storage now work as expected.
+* Bug fix: `Attachment#s3_protocol` now returns a protocol without colon suffix.
+* Feature: Paperclip will now raise an error if multiple styles are defined but no `:style`
+  interpolation exists in `:path`.
+* Feature: Add support for `#{attachment}_created_at` field
+* Bug fix: Paperclip now gracefully handles msising file command.
+* Bug fix: `StringIOAdapter` now accepts content type.
+
 New in 3.1.2:
 
 * Bug fix: #remove_attachment on 3.1.0 and 3.1.1 mistakenly trying to remove the column that has

data/README.md

@@ -1,7 +1,7 @@
 Paperclip
 =========
 
-[![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.png?branch=master)](http://travis-ci.org/thoughtbot/paperclip) [![Dependency Status](https://gemnasium.com/thoughtbot/paperclip.png?travis)](https://gemnasium.com/thoughtbot/paperclip)
+[![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.png?branch=master)](http://travis-ci.org/thoughtbot/paperclip) [![Dependency Status](https://gemnasium.com/thoughtbot/paperclip.png?travis)](https://gemnasium.com/thoughtbot/paperclip) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/thoughtbot/paperclip)
 
 Paperclip is intended as an easy file attachment library for Active Record. The
 intent behind it was to keep setup as easy as possible and to treat files as
@@ -89,6 +89,7 @@ Quick Start
 In your model:
 
     class User < ActiveRecord::Base
+      attr_accessible :avatar
       has_attached_file :avatar, :styles => { :medium => "300x300>", :thumb => "100x100>" }
     end
 
@@ -108,7 +109,7 @@ In your migrations:
 
 In your edit and new views:
 
-    <%= form_for :user, @user, :url => user_path, :html => { :multipart => true } do |form| %>
+    <%= form_for @user, :url => users_path, :html => { :multipart => true } do |form| %>
       <%= form.file_field :avatar %>
     <% end %>
 
@@ -202,7 +203,7 @@ An example Rails initializer would look something like this:
 Paperclip::Attachment.default_options[:storage] = :fog
 Paperclip::Attachment.default_options[:fog_credentials] = {:provider => "Local", :local_root => "#{Rails.root}/public"}
 Paperclip::Attachment.default_options[:fog_directory] = ""
-Paperclip::Attachment.default_options[:fog_host] = "http://localhost:3000"}
+Paperclip::Attachment.default_options[:fog_host] = "http://localhost:3000"
 ```
 
 Migrations
@@ -274,13 +275,13 @@ gems along side with Paperclip:
 
 The files that are assigned as attachments are, by default, placed in the
 directory specified by the `:path` option to `has_attached_file`. By default, this
-location is `:rails_root/public/system/:attachment/:id/:style/:filename`. This
-location was chosen because on standard Capistrano deployments, the
+location is `:rails_root/public/system/:class/:attachment/:id_partition/:style/:filename`.
+This location was chosen because on standard Capistrano deployments, the
 `public/system` directory is symlinked to the app's shared directory, meaning it
 will survive between deployments. For example, using that `:path`, you may have a
 file at
 
-    /data/myapp/releases/20081229172410/public/system/user/avatar/000/000/013/small/my_pic.png
+    /data/myapp/releases/20081229172410/public/system/users/avatar/000/000/013/small/my_pic.png
 
 _**NOTE**: This is a change from previous versions of Paperclip, but is overall a
 safer choice for the default file store._
@@ -447,7 +448,7 @@ allowing custom styles and processors to be applied for specific model
 instances, rather than applying defined styles and processors across all
 instances.
 
-Dynamic Styles:
+### Dynamic Styles:
 
 Imagine a user model that had different styles based on the role of the user.
 Perhaps some users are bosses (e.g. a User model instance responds to #boss?)
@@ -460,7 +461,7 @@ look as follows where a boss will receive a `300x300` thumbnail otherwise a
       has_attached_file :avatar, :styles => lambda { |attachment| { :thumb => (attachment.instance.boss? ? "300x300>" : "100x100>") }
     end
 
-Dynamic Processors:
+### Dynamic Processors:
 
 Another contrived example is a user model that is aware of which file processors
 should be applied to it (beyond the implied `thumbnail` processor invoked when

data/lib/paperclip.rb

@@ -40,6 +40,7 @@ require 'paperclip/attachment'
 require 'paperclip/attachment_options'
 require 'paperclip/storage'
 require 'paperclip/callbacks'
+require 'paperclip/content_type_detector'
 require 'paperclip/glue'
 require 'paperclip/errors'
 require 'paperclip/missing_attachment_styles'
@@ -102,7 +103,7 @@ module Paperclip
     #   that can control permissions. You can specify the full domain and path, but usually
     #   just an absolute path is sufficient. The leading slash *must* be included manually for
     #   absolute paths. The default value is
-    #   "/system/:attachment/:id/:style/:filename". See
+    #   "/system/:class/:attachment/:id_partition/:style/:filename". See
     #   Paperclip::Attachment#interpolate for more information on variable interpolaton.
     #     :url => "/:class/:attachment/:id/:style_:filename"
     #     :url => "http://some.other.host/stuff/:class/:id_:extension"
@@ -222,3 +223,4 @@ require 'paperclip/io_adapters/stringio_adapter'
 require 'paperclip/io_adapters/nil_adapter'
 require 'paperclip/io_adapters/attachment_adapter'
 require 'paperclip/io_adapters/uploaded_file_adapter'
+require 'paperclip/io_adapters/uri_adapter'

data/lib/paperclip/attachment.rb

@@ -99,6 +99,7 @@ module Paperclip
       instance_write(:content_type,    file.content_type.to_s.strip)
       instance_write(:file_size,       file.size)
       instance_write(:fingerprint,     file.fingerprint) if instance_respond_to?(:fingerprint)
+      instance_write(:created_at,      Time.now) if has_enabled_but_unset_created_at?
       instance_write(:updated_at,      Time.now)
 
       @dirty = true
@@ -254,6 +255,15 @@ module Paperclip
       instance_read(:content_type)
     end
 
+    # Returns the creation time of the file as originally assigned, and
+    # lives in the <attachment>_created_at attribute of the model.
+    def created_at
+      if able_to_store_created_at?
+        time = instance_read(:created_at)
+        time && time.to_f.to_i
+      end
+    end
+
     # Returns the last modified time of the file as originally assigned, and
     # lives in the <attachment>_updated_at attribute of the model.
     def updated_at
@@ -429,6 +439,7 @@ module Paperclip
       instance_write(:content_type, nil)
       instance_write(:file_size, nil)
       instance_write(:fingerprint, nil)
+      instance_write(:created_at, nil) if has_enabled_but_unset_created_at?
       instance_write(:updated_at, nil)
     end
 
@@ -453,5 +464,15 @@ module Paperclip
         filename
       end
     end
+
+    # Check if attachment database table has a created_at field
+    def able_to_store_created_at?
+      @instance.respond_to?("#{name}_created_at".to_sym)
+    end
+
+    # Check if attachment database table has a created_at field which is not yet set
+    def has_enabled_but_unset_created_at?
+      able_to_store_created_at? && !instance_read(:created_at)
+    end
   end
 end

data/lib/paperclip/content_type_detector.rb

@@ -0,0 +1,67 @@
+module Paperclip
+  class ContentTypeDetector
+    EMPTY_TYPE = "inode/x-empty"
+    SENSIBLE_DEFAULT = "application/octet-stream"
+
+    def initialize(filename)
+      @filename = filename
+    end
+
+    def detect
+      if blank?
+        SENSIBLE_DEFAULT
+      elsif empty?
+        EMPTY_TYPE
+      elsif !match?
+        type_from_file_command
+      elsif !multiple?
+        possible_types.first
+      else
+        best_type_match
+      end.to_s
+    end
+
+    private
+
+    def empty?
+      File.exists?(@filename) && File.size(@filename) == 0
+    end
+
+    def blank?
+      @filename.nil? || @filename.empty?
+    end
+
+    def possible_types
+      @possible_types ||= MIME::Types.type_for(@filename)
+    end
+
+    def match?
+      possible_types.length > 0
+    end
+
+    def multiple?
+      possible_types.length > 1
+    end
+
+    def best_type_match
+      official_types = possible_types.reject {|type| type.content_type.match(/\/x-/) }
+      (official_types.first || possible_types.first).content_type
+    end
+
+    def type_from_file_command
+      type = begin
+        # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
+        Paperclip.run("file", "-b --mime :file", :file => @filename)
+      rescue Cocaine::CommandLineError => e
+        Paperclip.log("Error while determining content type: #{e}")
+        SENSIBLE_DEFAULT
+      end
+
+      if type.match(/\(.*?\)/)
+        type = SENSIBLE_DEFAULT
+      end
+      type.split(/[:;\s]+/)[0]
+    end
+
+  end
+end

data/lib/paperclip/geometry.rb

@@ -149,7 +149,7 @@ module Paperclip
     # scale to the requested geometry and preserve the aspect ratio
     def scale_to(new_geometry)
       scale = [new_geometry.width.to_f / self.width.to_f , new_geometry.height.to_f / self.height.to_f].min
-      Paperclip::Geometry.new (self.width * scale).round, (self.height * scale).round
+      Paperclip::Geometry.new((self.width * scale).round, (self.height * scale).round)
     end
   end
 end

data/lib/paperclip/interpolations.rb

@@ -97,9 +97,12 @@ module Paperclip
         File.extname(attachment.original_filename).gsub(/^\.+/, "")
     end
 
-    # Returns an extension based on the content type. e.g. "jpeg" for "image/jpeg".
+    # Returns an extension based on the content type. e.g. "jpeg" for
+    # "image/jpeg". If the style has a specified format, it will override the
+    # content-type detection.
+    #
     # Each mime type generally has multiple extensions associated with it, so
-    # if the extension from teh original filename is one of these extensions,
+    # if the extension from the original filename is one of these extensions,
     # that extension is used, otherwise, the first in the list is used.
     def content_type_extension attachment, style_name
       mime_type = MIME::Types[attachment.content_type]
@@ -110,7 +113,10 @@ module Paperclip
       end
 
       original_extension = extension(attachment, style_name)
-      if extensions_for_mime_type.include? original_extension
+      style = attachment.styles[style_name.to_s.to_sym]
+      if style && style[:format]
+        style[:format].to_s
+      elsif extensions_for_mime_type.include? original_extension
         original_extension
       elsif !extensions_for_mime_type.empty?
         extensions_for_mime_type.first

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -13,6 +13,10 @@ module Paperclip
       @tempfile.read(length, buffer)
     end
 
+    def inspect
+      "#{self.class}: #{self.original_filename}"
+    end
+
     private
 
     def destination
@@ -23,23 +27,5 @@ module Paperclip
       FileUtils.cp(src.path, destination.path)
       destination
     end
-
-    def best_content_type_option(types)
-      best = types.reject {|type| type.content_type.match(/\/x-/) }
-      if best.size == 0
-        types.first.content_type
-      else
-        best.first.content_type
-      end
-    end
-
-    def type_from_file_command
-      # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
-      type = (File.extname(self.path.to_s)).downcase
-      type = "octet-stream" if type.empty?
-      mime_type = Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;\s]+/)[0]
-      mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
-      mime_type
-    end
   end
 end

data/lib/paperclip/io_adapters/file_adapter.rb

@@ -11,20 +11,9 @@ module Paperclip
       @original_filename = @target.original_filename if @target.respond_to?(:original_filename)
       @original_filename ||= File.basename(@target.path)
       @tempfile = copy_to_tempfile(@target)
-      @content_type = calculate_content_type
+      @content_type = ContentTypeDetector.new(@target.path).detect
       @size = File.size(@target)
     end
-
-    def calculate_content_type
-      types = MIME::Types.type_for(original_filename)
-      if types.length == 0
-        type_from_file_command
-      elsif types.length == 1
-        types.first.content_type
-      else
-        best_content_type_option(types)
-      end
-    end
   end
 end
 

data/lib/paperclip/io_adapters/nil_adapter.rb

@@ -30,5 +30,5 @@ module Paperclip
 end
 
 Paperclip.io_adapters.register Paperclip::NilAdapter do |target|
-  target.nil?
+  target.nil? || ( (Paperclip::Attachment === target) && !target.present? )
 end

data/lib/paperclip/io_adapters/stringio_adapter.rb

@@ -6,6 +6,7 @@ module Paperclip
       @tempfile = copy_to_tempfile(@target)
     end
 
+    attr_writer :original_filename, :content_type
     private
 
     def cache_current_values

data/lib/paperclip/io_adapters/uri_adapter.rb

@@ -0,0 +1,42 @@
+require 'open-uri'
+
+module Paperclip
+  class UriAdapter < AbstractAdapter
+    def initialize(target)
+      @target = target
+      @content = download_content
+      cache_current_values
+      @tempfile = copy_to_tempfile(@content)
+    end
+
+    attr_writer :original_filename, :content_type
+    private
+
+    def download_content
+      open(@target)
+    end
+
+    def cache_current_values
+      @original_filename = @target.path.split("/").last
+      @original_filename ||= "index.html"
+      @original_filename = @original_filename.strip
+
+      @content_type = @content.content_type if @content.respond_to?(:content_type)
+      @content_type ||= "text/html"
+
+      @size = @content.size
+    end
+
+    def copy_to_tempfile(src)
+      while data = src.read(16*1024)
+        destination.write(data)
+      end
+      destination.rewind
+      destination
+    end
+  end
+end
+
+Paperclip.io_adapters.register Paperclip::UriAdapter do |target|
+  target.kind_of?(URI)
+end

data/lib/paperclip/storage/fog.rb

@@ -42,7 +42,7 @@ module Paperclip
 
         base.instance_eval do
           unless @options[:url].to_s.match(/^:fog.*url$/)
-            @options[:path]  = @options[:path].gsub(/:url/, @options[:url])
+            @options[:path]  = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public\/system\//, '')
             @options[:url]   = ':fog_public_url'
           end
           Paperclip.interpolates(:fog_public_url) do |attachment, style|
@@ -120,7 +120,7 @@ module Paperclip
         end
       end
 
-      def expiring_url(time = 3600, style = default_style)
+      def expiring_url(time = (Time.now + 3600), style = default_style)
         expiring_url = directory.files.get_http_url(path(style), time)
 
         if @options[:fog_host]
@@ -142,7 +142,7 @@ module Paperclip
         file = directory.files.get(path(style))
         local_file.write(file.body)
         local_file.close
-      rescue Fog::Errors::Error => e
+      rescue ::Fog::Errors::Error => e
         warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
         false
       end
@@ -159,12 +159,7 @@ module Paperclip
 
       def host_name_for_directory
         if @options[:fog_directory].to_s =~ Fog::AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX
-          # This:
-          "#{@options[:fog_directory]}."
-
-          # Should be modified to this:
-          # "#{@options[:fog_directory]}.s3.amazonaws.com"
-          # When fog with https://github.com/fog/fog/pull/857 gets released
+          "#{@options[:fog_directory]}.s3.amazonaws.com"
         else
           "s3.amazonaws.com/#{@options[:fog_directory]}"
         end

data/lib/paperclip/storage/s3.rb

@@ -150,13 +150,13 @@ module Paperclip
         end
 
         Paperclip.interpolates(:s3_alias_url) do |attachment, style|
-          "#{attachment.s3_protocol(style)}//#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style, true)}//#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_alias_url
         Paperclip.interpolates(:s3_path_url) do |attachment, style|
-          "#{attachment.s3_protocol(style)}//#{attachment.s3_host_name}/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style, true)}//#{attachment.s3_host_name}/#{attachment.bucket_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_path_url
         Paperclip.interpolates(:s3_domain_url) do |attachment, style|
-          "#{attachment.s3_protocol(style)}//#{attachment.bucket_name}.#{attachment.s3_host_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style, true)}//#{attachment.bucket_name}.#{attachment.s3_host_name}/#{attachment.path(style).gsub(%r{^/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_domain_url
         Paperclip.interpolates(:asset_host) do |attachment, style|
           "#{attachment.path(style).gsub(%r{^/}, "")}"
@@ -276,15 +276,15 @@ module Paperclip
         s3_permissions
       end
 
-      def s3_protocol(style = default_style)
-        protocol = if @s3_protocol.respond_to?(:call)
-          @s3_protocol.call(style, self).to_s
+      def s3_protocol(style = default_style, with_colon = false)
+        protocol = @s3_protocol
+        protocol = protocol.call(style, self) if protocol.respond_to?(:call)
+
+        if with_colon && !protocol.empty?
+          "#{protocol}:"
         else
-          @s3_protocol.to_s
+          protocol.to_s
         end
-
-        protocol = protocol.split(":").first + ":" unless protocol.empty?
-        protocol
       end
 
       def create_bucket
@@ -343,6 +343,8 @@ module Paperclip
         false
       end
 
+      private
+
       def find_credentials creds
         case creds
         when File
@@ -355,12 +357,10 @@ module Paperclip
           raise ArgumentError, "Credentials are not a path, file, proc, or hash."
         end
       end
-      private :find_credentials
 
       def use_secure_protocol?(style_name)
-        s3_protocol(style_name) == "https:"
+        s3_protocol(style_name) == "https"
       end
-      private :use_secure_protocol?
     end
   end
 end

data/lib/paperclip/version.rb

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

data/paperclip.gemspec

@@ -43,9 +43,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
   s.add_development_dependency('cocaine', '~> 0.2')
-  s.add_development_dependency('fog')
+  s.add_development_dependency('fog', '~> 1.4.0')
   s.add_development_dependency('pry')
   s.add_development_dependency('launchy')
   s.add_development_dependency('rake')
   s.add_development_dependency('fakeweb')
+  s.add_development_dependency('railties')
+  s.add_development_dependency('actionmailer')
 end

data/test/attachment_test.rb

@@ -1101,6 +1101,36 @@ class AttachmentTest < Test::Unit::TestCase
       assert_equal File.size(@file), @dummy.avatar.size
     end
 
+    context "and avatar_created_at column" do
+      setup do
+        ActiveRecord::Base.connection.add_column :dummies, :avatar_created_at, :timestamp
+        rebuild_class
+        @dummy = Dummy.new
+      end
+
+      should "not error when assigned an attachment" do
+        assert_nothing_raised { @dummy.avatar = @file }
+      end
+
+      should "return the creation time when sent #avatar_created_at" do
+        now = Time.now
+        Time.stubs(:now).returns(now)
+        @dummy.avatar = @file
+        assert_equal now.to_i, @dummy.avatar.created_at
+      end
+
+      should "return the creation time when sent #avatar_created_at and the entry has been updated" do
+        creation = 2.hours.ago
+        now = Time.now
+        Time.stubs(:now).returns(creation)
+        @dummy.avatar = @file
+        Time.stubs(:now).returns(now)
+        @dummy.avatar = @file
+        assert_equal creation.to_i, @dummy.avatar.created_at
+        assert_not_equal now.to_i, @dummy.avatar.created_at
+      end
+    end
+
     context "and avatar_updated_at column" do
       setup do
         ActiveRecord::Base.connection.add_column :dummies, :avatar_updated_at, :timestamp

data/test/content_type_detector_test.rb

@@ -0,0 +1,40 @@
+require './test/helper'
+
+class ContentTypeDetectorTest < Test::Unit::TestCase
+  context 'given a name' do
+    should 'return a content type based on that name' do
+      @filename = "/path/to/something.jpg"
+      assert_equal "image/jpeg", Paperclip::ContentTypeDetector.new(@filename).detect
+    end
+
+    should 'return a content type based on the content of the file' do
+      tempfile = Tempfile.new("something")
+      tempfile.write("This is a file.")
+      tempfile.rewind
+
+      assert_equal "text/plain", Paperclip::ContentTypeDetector.new(tempfile.path).detect
+    end
+
+    should 'return an empty content type if the file is empty' do
+      tempfile = Tempfile.new("something")
+      tempfile.rewind
+
+      assert_equal "inode/x-empty", Paperclip::ContentTypeDetector.new(tempfile.path).detect
+    end
+
+    should 'return a sensible default if no filename is supplied' do
+      assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new('').detect
+    end
+
+    should 'return a sensible default if something goes wrong' do
+      @filename = "/path/to/something"
+      assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
+    end
+
+    should 'return a sensible default when the file command is missing' do
+      Paperclip.stubs(:run).raises(Cocaine::CommandLineError.new)
+      @filename = "/path/to/something"
+      assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
+    end
+  end
+end

data/test/integration_test.rb

@@ -630,7 +630,6 @@ class IntegrationTest < Test::Unit::TestCase
 
       context "with non-english character in the file name" do
         setup do
-
           @file.stubs(:original_filename).returns("クリップ.png")
           @dummy.avatar = @file
         end
@@ -641,4 +640,38 @@ class IntegrationTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "Copying attachments between models" do
+    setup do
+      rebuild_model
+      @file = File.new(fixture_file("5k.png"), 'rb')
+    end
+
+    teardown { @file.close }
+
+    should "succeed when original attachment is a file" do
+      original = Dummy.new
+      original.avatar = @file
+      assert original.save
+
+      copy = Dummy.new
+      copy.avatar = original.avatar
+      assert copy.save
+
+      assert copy.avatar.present?
+    end
+
+    should "succeed when original attachment is empty" do
+      original = Dummy.create!
+
+      copy = Dummy.new
+      copy.avatar = @file
+      assert copy.save
+      assert copy.avatar.present?
+
+      copy.avatar = original.avatar
+      assert copy.save
+      assert !copy.avatar.present?
+    end
+  end
 end

data/test/interpolations_test.rb

@@ -56,6 +56,7 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the extension of the file based on the content type" do
     attachment = mock
     attachment.expects(:content_type).returns('image/jpeg')
+    attachment.expects(:styles).returns({})
     interpolations = Paperclip::Interpolations
     interpolations.expects(:extension).returns('random')
     assert_equal "jpeg", interpolations.content_type_extension(attachment, :style)
@@ -64,6 +65,7 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the original extension of the file if it matches a content type extension" do
     attachment = mock
     attachment.expects(:content_type).returns('image/jpeg')
+    attachment.expects(:styles).returns({})
     interpolations = Paperclip::Interpolations
     interpolations.expects(:extension).returns('jpe')
     assert_equal "jpe", interpolations.content_type_extension(attachment, :style)
@@ -72,11 +74,21 @@ class InterpolationsTest < Test::Unit::TestCase
   should "return the latter half of the content type of the extension if no match found" do
     attachment = mock
     attachment.expects(:content_type).at_least_once().returns('not/found')
+    attachment.expects(:styles).returns({})
     interpolations = Paperclip::Interpolations
     interpolations.expects(:extension).returns('random')
     assert_equal "found", interpolations.content_type_extension(attachment, :style)
   end
 
+  should "return the format if defined in the style, ignoring the content type" do
+    attachment = mock
+    attachment.expects(:content_type).returns('image/jpeg')
+    attachment.expects(:styles).returns({:style => {:format => "png"}})
+    interpolations = Paperclip::Interpolations
+    interpolations.expects(:extension).returns('random')
+    assert_equal "png", interpolations.content_type_extension(attachment, :style)
+  end
+
   should "be able to handle numeric style names" do
     attachment = mock(
       :styles => {:"4" => {:format => :expected_extension}}

data/test/io_adapters/abstract_adapter_test.rb

@@ -5,15 +5,14 @@ class AbstractAdapterTest < Test::Unit::TestCase
     attr_accessor :original_file_name, :tempfile
 
     def content_type
-      type_from_file_command
+      Paperclip::ContentTypeDetector.new(path).detect
     end
   end
 
   context "content type from file command" do
     setup do
       @adapter = TestAdapter.new
-      @adapter.stubs(:path)
-      Paperclip.stubs(:run).returns("image/png\n")
+      @adapter.stubs(:path).returns("image.png")
     end
 
     should "return the content type without newline" do

data/test/io_adapters/attachment_adapter_test.rb

@@ -1,12 +1,12 @@
 require './test/helper'
 
 class AttachmentAdapterTest < Test::Unit::TestCase
-  
+
   def setup
     rebuild_model :path => "tmp/:class/:attachment/:style/:filename", :styles => {:thumb => '50x50'}
     @attachment = Dummy.new.avatar
   end
-  
+
   context "for an attachment" do
     setup do
       @file = File.new(fixture_file("5k.png"))
@@ -53,19 +53,19 @@ class AttachmentAdapterTest < Test::Unit::TestCase
       assert_equal expected.length, actual.length
       assert_equal expected, actual
     end
-    
+
   end
-  
+
   context "for a style" do
     setup do
       @file = File.new(fixture_file("5k.png"))
       @file.binmode
 
       @attachment.assign(@file)
-    
+
       @thumb = Tempfile.new("thumbnail").tap(&:binmode)
       FileUtils.cp @attachment.queued_for_write[:thumb].path, @thumb.path
-    
+
       @attachment.save
       @subject = Paperclip.io_adapters.for(@attachment.styles[:thumb])
     end
@@ -108,6 +108,6 @@ class AttachmentAdapterTest < Test::Unit::TestCase
       assert_equal expected.length, actual.length
       assert_equal expected, actual
     end
-    
+
   end
 end

data/test/io_adapters/stringio_adapter_test.rb

@@ -37,5 +37,15 @@ class StringioFileProxyTest < Test::Unit::TestCase
       assert_equal "abc123", @subject.read
     end
 
+    should 'accept a content_type' do
+      @subject.content_type = 'image/png'
+      assert_equal 'image/png', @subject.content_type
+    end
+
+    should 'accept an orgiginal_filename' do
+      @subject.original_filename = 'image.png'
+      assert_equal 'image.png', @subject.original_filename
+    end
+
   end
 end

data/test/io_adapters/uri_adapter_test.rb

@@ -0,0 +1,82 @@
+require './test/helper'
+
+class UriProxyTest < Test::Unit::TestCase
+  context "a new instance" do
+    setup do
+      @open_return = StringIO.new("xxx")
+      @open_return.stubs(:content_type).returns("image/png")
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(@open_return)
+      @uri = URI.parse("http://thoughtbot.com/images/thoughtbot-logo.png")
+      @subject = Paperclip.io_adapters.for(@uri)
+    end
+
+    should "return a file name" do
+      assert_equal "thoughtbot-logo.png", @subject.original_filename
+    end
+
+    should "return a content type" do
+      assert_equal "image/png", @subject.content_type
+    end
+
+    should "return the size of the data" do
+      assert_equal @open_return.size, @subject.size
+    end
+
+    should "generate an MD5 hash of the contents" do
+      assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
+    end
+
+    should "generate correct fingerprint after read" do
+      fingerprint = Digest::MD5.hexdigest(@subject.read)
+      assert_equal fingerprint, @subject.fingerprint
+    end
+
+    should "generate same fingerprint" do
+      assert_equal @subject.fingerprint, @subject.fingerprint
+    end
+
+    should "return the data contained in the StringIO" do
+      assert_equal "xxx", @subject.read
+    end
+
+    should 'accept a content_type' do
+      @subject.content_type = 'image/png'
+      assert_equal 'image/png', @subject.content_type
+    end
+
+    should 'accept an orgiginal_filename' do
+      @subject.original_filename = 'image.png'
+      assert_equal 'image.png', @subject.original_filename
+    end
+
+  end
+
+  context "a directory index url" do
+    setup do
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
+      @uri = URI.parse("http://thoughtbot.com")
+      @subject = Paperclip.io_adapters.for(@uri)
+    end
+
+    should "return a file name" do
+      assert_equal "index.html", @subject.original_filename
+    end
+
+    should "return a content type" do
+      assert_equal "text/html", @subject.content_type
+    end
+  end
+
+  context "a url with query params" do
+    setup do
+      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
+      @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
+      @subject = Paperclip.io_adapters.for(@uri)
+    end
+
+    should "return a file name" do
+      assert_equal "paperclip", @subject.original_filename
+    end
+  end
+
+end

data/test/storage/fog_test.rb

@@ -66,6 +66,29 @@ class FogTest < Test::Unit::TestCase
                      @dummy.avatar.path
       end
     end
+    
+    context "with no path or url given and using defaults" do
+      setup do
+        rebuild_model :styles => { :medium => "300x300>", :thumb => "100x100>" },
+                      :storage => :fog,
+                      :fog_directory => "paperclip",
+                      :fog_credentials => {
+                        :provider => 'AWS',
+                        :aws_access_key_id => 'AWS_ID',
+                        :aws_secret_access_key => 'AWS_SECRET'
+                      }
+        @file = File.new(fixture_file('5k.png'), 'rb')
+        @dummy = Dummy.new
+        @dummy.id = 1
+        @dummy.avatar = @file
+      end
+      
+      teardown { @file.close }
+      
+      should "have correct path and url from interpolated defaults" do
+        assert_equal "dummies/avatars/000/000/001/original/5k.png", @dummy.avatar.path
+      end
+    end
 
     setup do
       @fog_directory = 'papercliptests'
@@ -211,19 +234,11 @@ class FogTest < Test::Unit::TestCase
 
       context "with a valid bucket name for a subdomain" do
         should "provide an url in subdomain style" do
-          # The following line is the correct one when this pull request in Fog is released:
-          # https://github.com/fog/fog/pull/857
-          # assert_match /^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
-          # For now, use this passing one:
-          assert_match /^https:\/\/papercliptests.\/avatars\/5k.png\?\d*$/, @dummy.avatar.url
+          assert_match @dummy.avatar.url, /^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/
         end
 
         should "provide an url that expires in subdomain style" do
-          # The following line is the correct one when this pull request in Fog is released:
-          # https://github.com/fog/fog/pull/857
-          # assert_match /^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
-          # For now, use this passing one:
-          assert_match /^http:\/\/papercliptests.\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
+          assert_match /^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
         end
       end
 

data/test/storage/s3_test.rb

@@ -125,7 +125,22 @@ class S3Test < Test::Unit::TestCase
     should "use the correct key" do
       assert_equal "avatars/stringio.txt", @dummy.avatar.s3_object.key
     end
+  end
+
+  context "s3_protocol" do
+    ["http", :http, ""].each do |protocol|
+      context "as #{protocol.inspect}" do
+        setup do
+          rebuild_model :storage => :s3, :s3_protocol => protocol
 
+          @dummy = Dummy.new
+        end
+
+        should "return the s3_protocol in string" do
+          assert_equal protocol.to_s, @dummy.avatar.s3_protocol
+        end
+      end
+    end
   end
 
   context ":s3_protocol => 'https'" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -288,17 +288,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -363,6 +363,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easy upload management for ActiveRecord
 email:
 - jyurek@thoughtbot.com
@@ -410,6 +442,7 @@ files:
 - lib/paperclip/attachment.rb
 - lib/paperclip/attachment_options.rb
 - lib/paperclip/callbacks.rb
+- lib/paperclip/content_type_detector.rb
 - lib/paperclip/errors.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/glue.rb
@@ -424,6 +457,7 @@ files:
 - lib/paperclip/io_adapters/registry.rb
 - lib/paperclip/io_adapters/stringio_adapter.rb
 - lib/paperclip/io_adapters/uploaded_file_adapter.rb
+- lib/paperclip/io_adapters/uri_adapter.rb
 - lib/paperclip/locales/en.yml
 - lib/paperclip/logger.rb
 - lib/paperclip/matchers.rb
@@ -454,6 +488,7 @@ files:
 - shoulda_macros/paperclip.rb
 - test/attachment_options_test.rb
 - test/attachment_test.rb
+- test/content_type_detector_test.rb
 - test/database.yml
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
@@ -481,6 +516,7 @@ files:
 - test/io_adapters/registry_test.rb
 - test/io_adapters/stringio_adapter_test.rb
 - test/io_adapters/uploaded_file_adapter_test.rb
+- test/io_adapters/uri_adapter_test.rb
 - test/matchers/have_attached_file_matcher_test.rb
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
@@ -557,6 +593,7 @@ test_files:
 - features/support/selectors.rb
 - test/attachment_options_test.rb
 - test/attachment_test.rb
+- test/content_type_detector_test.rb
 - test/database.yml
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
@@ -584,6 +621,7 @@ test_files:
 - test/io_adapters/registry_test.rb
 - test/io_adapters/stringio_adapter_test.rb
 - test/io_adapters/uploaded_file_adapter_test.rb
+- test/io_adapters/uri_adapter_test.rb
 - test/matchers/have_attached_file_matcher_test.rb
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb