paperclip 3.0.4 → 3.1.0

data/lib/paperclip/matchers.rb

@@ -41,7 +41,7 @@ module Paperclip
     #
     #   class ActiveSupport::TestCase
     #     extend Paperclip::Shoulda::Matchers
-    #     
+    #
     #     #...other initializers...#
     #   end
     #
@@ -57,7 +57,7 @@ module Paperclip
     #     should validate_attachment_size(:avatar).
     #                  less_than(2.megabytes)
     #   end
-    #  
+    #
     module Matchers
     end
   end

data/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb

@@ -39,18 +39,10 @@ module Paperclip
         end
 
         def failure_message
-          "".tap do |str|
-            str << "Content types #{@allowed_types.join(", ")} should be accepted" if @allowed_types.present?
-            str << "\n" if @allowed_types.present? && @rejected_types.present?
-            str << "Content types #{@rejected_types.join(", ")} should be rejected by #{@attachment_name}" if @rejected_types.present?
-          end
-        end
-
-        def negative_failure_message
-          "".tap do |str|
-            str << "Content types #{@allowed_types.join(", ")} should be rejected" if @allowed_types.present?
-            str << "\n" if @allowed_types.present? && @rejected_types.present?
-            str << "Content types #{@rejected_types.join(", ")} should be accepted by #{@attachment_name}" if @rejected_types.present?
+          "#{expected_attachment}\n".tap do |message|
+            message << accepted_types_and_failures
+            message << "\n\n" if @allowed_types.present? && @rejected_types.present?
+            message << rejected_types_and_failures
           end
         end
 
@@ -60,20 +52,47 @@ module Paperclip
 
         protected
 
+        def accepted_types_and_failures
+          if @allowed_types.present?
+            "Accept content types: #{@allowed_types.join(", ")}\n".tap do |message|
+              if @missing_allowed_types.any?
+                message << "  #{@missing_allowed_types.join(", ")} were rejected."
+              else
+                message << "  All were accepted successfully."
+              end
+            end
+          end
+        end
+        def rejected_types_and_failures
+          if @rejected_types.present?
+            "Reject content types: #{@rejected_types.join(", ")}\n".tap do |message|
+              if @missing_rejected_types.any?
+                message << "  #{@missing_rejected_types.join(", ")} were accepted."
+              else
+                message << "  All were rejected successfully."
+              end
+            end
+          end
+        end
+
+        def expected_attachment
+          "Expected #{@attachment_name}:\n"
+        end
+
         def type_allowed?(type)
-          file = Paperclip.io_adapters.for(StringIO.new("."))
-          file.content_type = type
-          @subject.attachment_for(@attachment_name).assign(file)
+          @subject.send("#{@attachment_name}_content_type=", type)
           @subject.valid?
           @subject.errors[:"#{@attachment_name}_content_type"].blank?
         end
 
         def allowed_types_allowed?
-          @allowed_types.all? { |type| type_allowed?(type) }
+          @missing_allowed_types ||= @allowed_types.reject { |type| type_allowed?(type) }
+          @missing_allowed_types.none?
         end
 
         def rejected_types_rejected?
-          !@rejected_types.any? { |type| type_allowed?(type) }
+          @missing_rejected_types ||= @rejected_types.select { |type| type_allowed?(type) }
+          @missing_rejected_types.none?
         end
       end
     end

data/lib/paperclip/railtie.rb

@@ -5,10 +5,14 @@ module Paperclip
   require 'rails'
 
   class Railtie < Rails::Railtie
-    initializer 'paperclip.insert_into_active_record' do
+    initializer 'paperclip.insert_into_active_record' do |app|
       ActiveSupport.on_load :active_record do
         Paperclip::Railtie.insert
       end
+
+      if app.config.respond_to?(:paperclip_defaults)
+        Paperclip::Attachment.default_options.merge!(app.config.paperclip_defaults)
+      end
     end
 
     rake_tasks { load "tasks/paperclip.rake" }

data/lib/paperclip/schema.rb

@@ -1,39 +1,75 @@
+require 'active_support/deprecation'
+
 module Paperclip
-  # Provides two helpers that can be used in migrations.
-  #
-  # In order to use this module, the target class should implement a
-  # +column+ method that takes the column name and type, both as symbols,
-  # as well as a +remove_column+ method that takes a table and column name,
-  # also both symbols.
+  # Provides helper methods that can be used in migrations.
   module Schema
-    @@columns = {:file_name    => :string,
-                 :content_type => :string,
-                 :file_size    => :integer,
-                 :updated_at   => :datetime}
+    COLUMNS = {:file_name    => :string,
+               :content_type => :string,
+               :file_size    => :integer,
+               :updated_at   => :datetime}
+
+    def self.included(base)
+      ActiveRecord::ConnectionAdapters::Table.send :include, TableDefinition
+      ActiveRecord::ConnectionAdapters::TableDefinition.send :include, TableDefinition
+      ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, Statements
 
-    def has_attached_file(attachment_name)
-      with_columns_for(attachment_name) do |column_name, column_type|
-        column(column_name, column_type)
+      if defined?(ActiveRecord::Migration::CommandRecorder) # Rails 3.1+
+        ActiveRecord::Migration::CommandRecorder.send :include, CommandRecorder
       end
     end
 
-    def drop_attached_file(table_name, attachment_name)
-      with_columns_for(attachment_name) do |column_name, column_type|
-        remove_column(table_name, column_name)
+    module Statements
+      def add_attachment(table_name, *attachment_names)
+        raise ArgumentError, "Please specify attachment name in your add_attachment call in your migration." if attachment_names.empty?
+
+        attachment_names.each do |attachment_name|
+          COLUMNS.each_pair do |column_name, column_type|
+            add_column(table_name, "#{attachment_name}_#{column_name}", column_type)
+          end
+        end
+      end
+
+      def remove_attachment(table_name, *attachment_names)
+        raise ArgumentError, "Please specify attachment name in your remove_attachment call in your migration." if attachment_names.empty?
+
+        attachment_names.each do |attachment_name|
+          COLUMNS.each_pair do |column_name, column_type|
+            remove_column(table_name, "#{attachment_name}_#{column_name}", column_type)
+          end
+        end
+      end
+
+      def drop_attached_file(*args)
+        ActiveSupport::Deprecation.warn "Method `drop_attached_file` in the migration has been deprecated and will be replaced by `remove_attachment`."
+        remove_attachment(*args)
       end
     end
 
-    protected
+    module TableDefinition
+      def attachment(*attachment_names)
+        attachment_names.each do |attachment_name|
+          COLUMNS.each_pair do |column_name, column_type|
+            column("#{attachment_name}_#{column_name}", column_type)
+          end
+        end
+      end
 
-    def with_columns_for(attachment_name)
-      @@columns.each do |suffix, column_type|
-        column_name = full_column_name(attachment_name, suffix)
-        yield column_name, column_type
+      def has_attached_file(*attachment_names)
+        ActiveSupport::Deprecation.warn "Method `t.has_attached_file` in the migration has been deprecated and will be replaced by `t.attachment`."
+        attachment(*attachment_names)
       end
     end
 
-    def full_column_name(attachment_name, column_name)
-      "#{attachment_name}_#{column_name}".to_sym
+    module CommandRecorder
+      def add_attachment(*args)
+        record(:add_attachment, args)
+      end
+
+      private
+
+      def invert_add_attachment(args)
+        [:remove_attachment, args]
+      end
     end
   end
 end

data/lib/paperclip/storage/filesystem.rb

@@ -36,6 +36,7 @@ module Paperclip
             end
           end
           FileUtils.chmod(0666&~File.umask, path(style_name))
+          file.rewind
         end
 
         after_flush_writes # allows attachment to clean up temp files
@@ -68,5 +69,9 @@ module Paperclip
       end
     end
 
+    def copy_to_local_file(style, local_dest_path)
+      FileUtils.cp(path(style), local_dest_path)
+    end
+
   end
 end

data/lib/paperclip/storage/fog.rb

@@ -90,6 +90,8 @@ module Paperclip
             retried = true
             directory.save
             retry
+          ensure
+            file.rewind
           end
         end
 
@@ -108,27 +110,26 @@ module Paperclip
 
       def public_url(style = default_style)
         if @options[:fog_host]
-          host = if @options[:fog_host].respond_to?(:call)
-            @options[:fog_host].call(self)
-          else
-            (@options[:fog_host] =~ /%d/) ? @options[:fog_host] % (path(style).hash % 4) : @options[:fog_host]
-          end
-
-          "#{host}/#{path(style)}"
+          "#{dynamic_fog_host_for_style(style)}/#{path(style)}"
         else
           if fog_credentials[:provider] == 'AWS'
-            if @options[:fog_directory].to_s =~ Fog::AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX
-              "https://#{@options[:fog_directory]}.s3.amazonaws.com/#{path(style)}"
-            else
-              # directory is not a valid subdomain, so use path style for access
-              "https://s3.amazonaws.com/#{@options[:fog_directory]}/#{path(style)}"
-            end
+            "https://#{host_name_for_directory}/#{path(style)}"
           else
             directory.files.new(:key => path(style)).public_url
           end
         end
       end
 
+      def expiring_url(time = 3600, style = default_style)
+        expiring_url = directory.files.get_http_url(path(style), time)
+
+        if @options[:fog_host]
+          expiring_url.gsub!(/#{host_name_for_directory}/, dynamic_fog_host_for_style(style))
+        end
+
+        return expiring_url
+      end
+
       def parse_credentials(creds)
         creds = find_credentials(creds).stringify_keys
         env = Object.const_defined?(:Rails) ? Rails.env : nil
@@ -148,6 +149,27 @@ module Paperclip
 
       private
 
+      def dynamic_fog_host_for_style(style)
+        if @options[:fog_host].respond_to?(:call)
+          @options[:fog_host].call(self)
+        else
+          (@options[:fog_host] =~ /%d/) ? @options[:fog_host] % (path(style).hash % 4) : @options[:fog_host]
+        end
+      end
+
+      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
+        else
+          "s3.amazonaws.com/#{@options[:fog_directory]}"
+        end
+      end
+
       def find_credentials(creds)
         case creds
         when File
@@ -175,7 +197,7 @@ module Paperclip
         else
           @options[:fog_directory]
         end
-        
+
         @directory ||= connection.directories.new(:key => dir)
       end
     end

data/lib/paperclip/storage/s3.rb

@@ -61,7 +61,7 @@ module Paperclip
     #   Normally, this won't matter in the slightest and you can leave the default (which is
     #   path-style, or :s3_path_url). But in some cases paths don't work and you need to use
     #   the domain-style (:s3_domain_url). Anything else here will be treated like path-style.
-    #   
+    #
     #   Notes:
     #   * The value of this option is a string, not a symbol.
     #     <b>right:</b> <tt>":s3_domain_url"</tt>
@@ -119,12 +119,12 @@ module Paperclip
           @s3_protocol    = @options[:s3_protocol]    ||
             Proc.new do |style, attachment|
               permission  = (@s3_permissions[style.to_s.to_sym] || @s3_permissions[:default])
-              permission  = permission.call(attachment, style) if permission.is_a?(Proc)
+              permission  = permission.call(attachment, style) if permission.respond_to?(:call)
               (permission == :public_read) ? 'http' : 'https'
             end
           @s3_metadata = @options[:s3_metadata] || {}
           @s3_headers = @options[:s3_headers] || {}
-          @s3_headers = @s3_headers.call(instance) if @s3_headers.is_a?(Proc)
+          @s3_headers = @s3_headers.call(instance) if @s3_headers.respond_to?(:call)
           @s3_headers = (@s3_headers).inject({}) do |headers,(name,value)|
             case name.to_s
             when /^x-amz-meta-(.*)/i
@@ -180,19 +180,19 @@ module Paperclip
 
       def s3_host_alias
         @s3_host_alias = @options[:s3_host_alias]
-        @s3_host_alias = @s3_host_alias.call(self) if @s3_host_alias.is_a?(Proc)
+        @s3_host_alias = @s3_host_alias.call(self) if @s3_host_alias.respond_to?(:call)
         @s3_host_alias
       end
 
       def s3_url_options
         s3_url_options = @options[:s3_url_options] || {}
-        s3_url_options = s3_url_options.call(instance) if s3_url_options.is_a?(Proc)
+        s3_url_options = s3_url_options.call(instance) if s3_url_options.respond_to?(:call)
         s3_url_options
       end
 
       def bucket_name
         @bucket = @options[:bucket] || s3_credentials[:bucket]
-        @bucket = @bucket.call(self) if @bucket.is_a?(Proc)
+        @bucket = @bucket.call(self) if @bucket.respond_to?(:call)
         @bucket or raise ArgumentError, "missing required :bucket option"
       end
 
@@ -249,12 +249,8 @@ module Paperclip
       end
 
       def set_permissions permissions
-        if permissions.is_a?(Hash)
-          permissions[:default] = permissions[:default] || :public_read
-        else
-          permissions = { :default => permissions || :public_read }
-        end
-        permissions
+        permissions = { :default => permissions } unless permissions.respond_to?(:merge)
+        permissions.merge :default => (permissions[:default] || :public_read)
       end
 
       def parse_credentials creds
@@ -276,15 +272,15 @@ module Paperclip
 
       def s3_permissions(style = default_style)
         s3_permissions = @s3_permissions[style] || @s3_permissions[:default]
-        s3_permissions = s3_permissions.call(self, style) if s3_permissions.is_a?(Proc)
+        s3_permissions = s3_permissions.call(self, style) if s3_permissions.respond_to?(:call)
         s3_permissions
       end
 
       def s3_protocol(style = default_style)
-        protocol = if @s3_protocol.is_a?(Proc)
-          @s3_protocol.call(style, self)
+        protocol = if @s3_protocol.respond_to?(:call)
+          @s3_protocol.call(style, self).to_s
         else
-          @s3_protocol
+          @s3_protocol.to_s
         end
 
         protocol = protocol.split(":").first + ":" unless protocol.empty?
@@ -314,6 +310,8 @@ module Paperclip
           rescue AWS::S3::Errors::NoSuchBucket => e
             create_bucket
             retry
+          ensure
+            file.rewind
           end
         end
 

data/lib/paperclip/style.rb

@@ -52,12 +52,12 @@ module Paperclip
     end
 
     def convert_options
-      @convert_options.respond_to?(:call) ? @convert_options.call(attachment.instance) : 
+      @convert_options.respond_to?(:call) ? @convert_options.call(attachment.instance) :
         (@convert_options || attachment.send(:extra_options_for, name))
     end
 
     def source_file_options
-      @source_file_options.respond_to?(:call) ? @source_file_options.call(attachment.instance) : 
+      @source_file_options.respond_to?(:call) ? @source_file_options.call(attachment.instance) :
         (@source_file_options || attachment.send(:extra_source_file_options_for, name))
     end
 

data/lib/paperclip/tempfile_factory.rb

@@ -0,0 +1,21 @@
+module Paperclip
+  class TempfileFactory
+
+    ILLEGAL_FILENAME_CHARACTERS = /^~/
+
+    def generate(name)
+      @name = name
+      file = Tempfile.new([basename, extension])
+      file.binmode
+      file
+    end
+
+    def extension
+      File.extname(@name)
+    end
+
+    def basename
+      File.basename(@name, extension).gsub(ILLEGAL_FILENAME_CHARACTERS, '_')
+    end
+  end
+end

data/lib/paperclip/thumbnail.rb

@@ -98,7 +98,16 @@ module Paperclip
 
     # 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?)
+      @animated && (ANIMATED_FORMATS.include?(@format.to_s) || @format.blank?)  && identified_as_animated?
+    end
+
+    # Return true if ImageMagick's +identify+ returns an animated format
+    def identified_as_animated?
+      ANIMATED_FORMATS.include? identify("-format %m :file", :file => "#{@file.path}[0]").to_s.downcase.strip
+    rescue Cocaine::ExitStatusError => e
+      raise Paperclip::Error, "There was an error running `identify` for #{@basename}" if @whiny
+    rescue Cocaine::CommandNotFoundError => e
+      raise Paperclip::Errors::CommandNotFoundError.new("Could not run the `identify` command. Please install ImageMagick.")
     end
   end
 end