paperclip 4.2.4 → 4.3.0

data/RELEASING.md

@@ -0,0 +1,17 @@
+Releasing paperclip
+
+1. Update `lib/paperclip/version.rb` file accordingly.
+2. Update `NEWS` to reflect the changes since last release.
+3. Commit changes. There shouldn’t be code changes, and thus CI doesn’t need to
+   run, you can then add “[ci skip]” to the commit message.
+4. Tag the release: `git tag -m 'vVERSION' vVERSION`
+5. Push changes: `git push --tags`
+6. Build and publish the gem:
+
+   ```bash
+   gem build paperclip.gemspec
+   gem push paperclip-VERSION.gem
+   ```
+
+7. Announce the new release, making sure to say “thank you” to the contributors
+   who helped shape this version.

data/Rakefile

@@ -11,7 +11,7 @@ task :all do |t|
   if ENV['BUNDLE_GEMFILE']
     exec('rake spec cucumber')
   else
-    exec("rm gemfiles/*.lock")
+    exec("rm -f gemfiles/*.lock")
     Rake::Task["appraisal:gemfiles"].execute
     Rake::Task["appraisal:install"].execute
     exec('rake appraisal')

data/features/basic_integration.feature

@@ -12,17 +12,20 @@ Feature: Rails integration
   Scenario: Configure defaults for all attachments through Railtie
     Given I add this snippet to config/application.rb:
       """
-      config.paperclip_defaults = {:url => "/paperclip/custom/:attachment/:style/:filename"}
+      config.paperclip_defaults = {
+        :url => "/paperclip/custom/:attachment/:style/:filename",
+        :validate_media_type => false
+      }
       """
     And I attach :attachment
     And I start the rails application
     When I go to the new user page
     And I fill in "Name" with "something"
-    And I attach the file "spec/support/fixtures/5k.png" to "Attachment"
+    And I attach the file "spec/support/fixtures/animated.unknown" to "Attachment"
     And I press "Submit"
     Then I should see "Name: something"
-    And I should see an image with a path of "/paperclip/custom/attachments/original/5k.png"
-    And the file at "/paperclip/custom/attachments/original/5k.png" should be the same as "spec/support/fixtures/5k.png"
+    And I should see an image with a path of "/paperclip/custom/attachments/original/animated.unknown"
+    And the file at "/paperclip/custom/attachments/original/animated.unknown" should be the same as "spec/support/fixtures/animated.unknown"
 
   Scenario: Add custom processors
     Given I add a "test" processor in "lib/paperclip"

data/features/step_definitions/attachment_steps.rb

@@ -49,7 +49,13 @@ end
 
 Then /^the attachment should have the same content type as the fixture "([^"]*)"$/ do |filename|
   in_current_dir do
-    require 'mime/types'
+    begin
+      # Use mime/types/columnar if available, for reduced memory usage
+      require "mime/types/columnar"
+    rescue LoadError
+      require "mime/types"
+    end
+
     attachment_content_type = `bundle exec #{runner_command} "puts User.last.attachment_content_type"`.strip
     attachment_content_type.should == MIME::Types.type_for(filename).first.content_type
   end

data/gemfiles/3.2.gemfile

@@ -8,12 +8,13 @@ gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
-gem "rails", "~> 3.2.0"
+gem "rails", "~> 3.2.15"
 gem "paperclip", :path => "../"
 
 group :development, :test do
   gem "mime-types", "~> 1.16"
   gem "builder"
+  gem "rubocop", :require => false
 end
 
 gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -14,6 +14,7 @@ gem "paperclip", :path => "../"
 group :development, :test do
   gem "mime-types", "~> 1.16"
   gem "builder"
+  gem "rubocop", :require => false
 end
 
 gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -8,12 +8,13 @@ gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
-gem "rails", "~> 4.2.0.rc2"
+gem "rails", "~> 4.2.0"
 gem "paperclip", :path => "../"
 
 group :development, :test do
   gem "mime-types", "~> 1.16"
   gem "builder"
+  gem "rubocop", :require => false
 end
 
 gemspec :path => "../"

data/lib/paperclip.rb

@@ -55,11 +55,21 @@ require 'paperclip/helpers'
 require 'paperclip/has_attached_file'
 require 'paperclip/attachment_registry'
 require 'paperclip/filename_cleaner'
-require 'mime/types'
+require 'paperclip/rails_environment'
+
+begin
+  # Use mime/types/columnar if available, for reduced memory usage
+  require "mime/types/columnar"
+rescue LoadError
+  require "mime/types"
+end
+
+require 'mimemagic'
+require 'mimemagic/overlay'
 require 'logger'
 require 'cocaine'
 
-require 'paperclip/railtie' if defined?(Rails)
+require 'paperclip/railtie' if defined?(Rails::Railtie)
 
 # The base module that gets included in ActiveRecord::Base. See the
 # documentation for Paperclip::ClassMethods for more useful information.
@@ -136,7 +146,7 @@ module Paperclip
     #     user.avatar.url # => "/avatars/23/normal_me.png"
     # * +keep_old_files+: Keep the existing attachment files (original + resized) from
     #   being automatically deleted when an attachment is cleared or updated. Defaults to +false+.
-    # * +preserve_files+: Keep the existing attachment files in all cases, even if the parent 
+    # * +preserve_files+: Keep the existing attachment files in all cases, even if the parent
     #   record is destroyed. Defaults to +false+.
     # * +whiny+: Will raise an error if Paperclip cannot post_process an uploaded file due
     #   to a command line error. This will override the global setting for this attachment.

data/lib/paperclip/attachment.rb

@@ -137,6 +137,8 @@ module Paperclip
     # +#for(style_name, options_hash)+
 
     def url(style_name = default_style, options = {})
+      return nil if @instance.new_record?
+
       if options == true || options == false # Backwards compatibility.
         @url_generator.for(style_name, default_options.merge(:timestamp => options))
       else
@@ -528,7 +530,7 @@ module Paperclip
         @queued_for_write[name] = Paperclip.io_adapters.for(@queued_for_write[name])
         unadapted_file.close if unadapted_file.respond_to?(:close)
         @queued_for_write[name]
-      rescue Paperclip::Error => e
+      rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
         log("An error was received while processing: #{e.inspect}")
         (@errors[:processing] ||= []) << e.message if @options[:whiny]
       ensure

data/lib/paperclip/attachment_registry.rb

@@ -52,7 +52,7 @@ module Paperclip
 
     def definitions_for(klass)
       klass.ancestors.each_with_object({}) do |ancestor, inherited_definitions|
-        inherited_definitions.merge! @attachments[ancestor]
+        inherited_definitions.deep_merge! @attachments[ancestor]
       end
     end
   end

data/lib/paperclip/content_type_detector.rb

@@ -2,7 +2,7 @@ module Paperclip
   class ContentTypeDetector
     # The content-type detection strategy is as follows:
     #
-    # 1. Blank/Empty files: If there's no filename or the file is empty,
+    # 1. Blank/Empty files: If there's no filepath or the file is empty,
     #    provide a sensible default (application/octet-stream or inode/x-empty)
     #
     # 2. Calculated match: Return the first result that is found by both the
@@ -20,8 +20,8 @@ module Paperclip
     EMPTY_TYPE = "inode/x-empty"
     SENSIBLE_DEFAULT = "application/octet-stream"
 
-    def initialize(filename)
-      @filename = filename
+    def initialize(filepath)
+      @filepath = filepath
     end
 
     # Returns a String describing the file's content type
@@ -33,32 +33,47 @@ module Paperclip
       elsif calculated_type_matches.any?
         calculated_type_matches.first
       else
-        type_from_file_command || SENSIBLE_DEFAULT
+        type_from_file_contents || SENSIBLE_DEFAULT
       end.to_s
     end
 
     private
 
+    def blank_name?
+      @filepath.nil? || @filepath.empty?
+    end
+
     def empty_file?
-      File.exist?(@filename) && File.size(@filename) == 0
+      File.exist?(@filepath) && File.size(@filepath) == 0
     end
 
     alias :empty? :empty_file?
 
-    def blank_name?
-      @filename.nil? || @filename.empty?
+    def calculated_type_matches
+      possible_types.select do |content_type|
+        content_type == type_from_file_contents
+      end
     end
 
     def possible_types
-      MIME::Types.type_for(@filename).collect(&:content_type)
+      MIME::Types.type_for(@filepath).collect(&:content_type)
     end
 
-    def calculated_type_matches
-      possible_types.select{|content_type| content_type == type_from_file_command }
+    def type_from_file_contents
+      type_from_mime_magic || type_from_file_command
+    rescue Errno::ENOENT => e
+      Paperclip.log("Error while determining content type: #{e}")
+      SENSIBLE_DEFAULT
+    end
+
+    def type_from_mime_magic
+      @type_from_mime_magic ||=
+        MimeMagic.by_magic(File.open(@filepath)).try(:type)
     end
 
     def type_from_file_command
-      @type_from_file_command ||= FileCommandContentTypeDetector.new(@filename).detect
+      @type_from_file_command ||=
+        FileCommandContentTypeDetector.new(@filepath).detect
     end
   end
 end

data/lib/paperclip/file_command_content_type_detector.rb

@@ -13,20 +13,18 @@ module Paperclip
     private
 
     def type_from_file_command
+      # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
       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
+               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.nil? || type.match(/\(.*?\)/)
         type = SENSIBLE_DEFAULT
       end
       type.split(/[:;\s]+/)[0]
     end
-
   end
 end
-

data/lib/paperclip/glue.rb

@@ -8,7 +8,7 @@ module Paperclip
       base.extend ClassMethods
       base.send :include, Callbacks
       base.send :include, Validators
-      base.send :include, Schema if defined? ActiveRecord
+      base.send :include, Schema
 
       locale_path = Dir.glob(File.dirname(__FILE__) + "/locales/*.{rb,yml}")
       I18n.load_path += locale_path unless I18n.load_path.include?(locale_path)

data/lib/paperclip/has_attached_file.rb

@@ -79,7 +79,8 @@ module Paperclip
     end
 
     def add_required_validations
-      if @options[:validate_media_type] != false
+      options = Paperclip::Attachment.default_options.deep_merge(@options)
+      if options[:validate_media_type] != false
         name = @name
         @klass.validates_media_type_spoof_detection name,
           :if => ->(instance){ instance.send(name).dirty? }

data/lib/paperclip/interpolations.rb

@@ -172,7 +172,7 @@ module Paperclip
       when Integer
         ("%09d" % id).scan(/\d{3}/).join("/")
       when String
-        ('%9.9s' % id).tr(" ", "0").scan(/.{3}/).join("/")
+        id.scan(/.{3}/).first(3).join("/")
       else
         nil
       end

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -6,6 +6,7 @@ module Paperclip
 
     attr_reader :content_type, :original_filename, :size
     delegate :binmode, :binmode?, :close, :close!, :closed?, :eof?, :path, :rewind, :unlink, :to => :@tempfile
+    alias :length :size
 
     def fingerprint
       @fingerprint ||= Digest::MD5.file(path).to_s

data/lib/paperclip/media_type_spoof_detector.rb

@@ -42,7 +42,7 @@ module Paperclip
     end
 
     def mapping_override_mismatch?
-      mapped_content_type != calculated_content_type
+      !Array(mapped_content_type).include?(calculated_content_type)
     end
 
 

data/lib/paperclip/rails_environment.rb

@@ -0,0 +1,25 @@
+module Paperclip
+  class RailsEnvironment
+    def self.get
+      new.get
+    end
+
+    def get
+      if rails_exists? && rails_environment_exists?
+        Rails.env
+      else
+        nil
+      end
+    end
+
+    private
+
+    def rails_exists?
+      Object.const_defined?("Rails")
+    end
+
+    def rails_environment_exists?
+      Rails.respond_to?(:env)
+    end
+  end
+end

data/lib/paperclip/storage/fog.rb

@@ -141,8 +141,9 @@ module Paperclip
 
       def expiring_url(time = (Time.now + 3600), style_name = default_style)
         time = convert_time(time)
-        if path(style_name) && directory.files.respond_to?(:get_http_url)
-          expiring_url = directory.files.get_http_url(path(style_name), time)
+        http_url_method = "get_#{scheme}_url"
+        if path(style_name) && directory.files.respond_to?(http_url_method)
+          expiring_url = directory.files.public_send(http_url_method, path(style_name), time)
 
           if @options[:fog_host]
             expiring_url.gsub!(/#{host_name_for_directory}/, dynamic_fog_host_for_style(style_name))
@@ -156,8 +157,7 @@ module Paperclip
 
       def parse_credentials(creds)
         creds = find_credentials(creds).stringify_keys
-        env = Object.const_defined?(:Rails) ? Rails.env : nil
-        (creds[env] || creds).symbolize_keys
+        (creds[RailsEnvironment.get] || creds).symbolize_keys
       end
 
       def copy_to_local_file(style, local_dest_path)

data/lib/paperclip/storage/s3.rb

@@ -4,7 +4,7 @@ module Paperclip
     # distribution. You can find out more about it at http://aws.amazon.com/s3
     #
     # To use Paperclip with S3, include the +aws-sdk+ gem in your Gemfile:
-    #   gem 'aws-sdk'
+    #   gem 'aws-sdk', '~> 1.6'
     # There are a few S3-specific options for has_attached_file:
     # * +s3_credentials+: Takes a path, a File, a Hash or a Proc. The path (or File) must point
     #   to a YAML file containing the +access_key_id+ and +secret_access_key+ that Amazon
@@ -288,8 +288,7 @@ module Paperclip
       def parse_credentials creds
         creds = creds.respond_to?('call') ? creds.call(self) : creds
         creds = find_credentials(creds).stringify_keys
-        env = Object.const_defined?(:Rails) ? Rails.env : nil
-        (creds[env] || creds).symbolize_keys
+        (creds[RailsEnvironment.get] || creds).symbolize_keys
       end
 
       def exists?(style = default_style)

data/lib/paperclip/thumbnail.rb

@@ -29,7 +29,6 @@ module Paperclip
       super
 
       geometry             = options[:geometry].to_s
-      @file                = file
       @crop                = geometry[-1,1] == '#'
       @target_geometry     = options.fetch(:string_geometry_parser, Geometry).parse(geometry)
       @current_geometry    = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
@@ -64,8 +63,8 @@ module Paperclip
     # that contains the new image.
     def make
       src = @file
-      dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
-      dst.binmode
+      filename = [@basename, @format ? ".#{@format}" : ""].join
+      dst = TempfileFactory.new.generate(filename)
 
       begin
         parameters = []

data/lib/paperclip/version.rb

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

data/lib/tasks/paperclip.rake

@@ -108,4 +108,20 @@ namespace :paperclip do
       end
     end
   end
+
+ desc "find missing attachments. Useful to know which attachments are broken"
+  task :find_broken_attachments => :environment do
+    klass = Paperclip::Task.obtain_class
+    names = Paperclip::Task.obtain_attachments(klass)
+    names.each do |name|
+      Paperclip.each_instance_with_attachment(klass, name) do |instance|
+        attachment = instance.send(name)
+        if attachment.exists?
+          print "."
+        else
+          Paperclip::Task.log_error("#{instance.class}##{attachment.name}, #{instance.id}, #{attachment.url}")
+        end
+      end
+    end
+  end
 end

data/paperclip.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |s|
   s.description       = "Easy upload management for ActiveRecord"
   s.license           = "MIT"
 
-  s.rubyforge_project = "paperclip"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -26,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activesupport', '>= 3.2.0')
   s.add_dependency('cocaine', '~> 0.5.5')
   s.add_dependency('mime-types')
+  s.add_dependency('mimemagic', '0.3.0')
 
   s.add_development_dependency('activerecord', '>= 3.2.0')
   s.add_development_dependency('shoulda')
@@ -34,11 +33,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency('mocha')
   s.add_development_dependency('aws-sdk', '>= 1.5.7', "<= 2.0")
   s.add_development_dependency('bourne')
-  s.add_development_dependency('cucumber', '~> 1.3.11')
+  s.add_development_dependency('cucumber', '~> 1.3.18')
   s.add_development_dependency('aruba')
   s.add_development_dependency('nokogiri')
   # Ruby version < 1.9.3 can't install capybara > 2.0.3.
-  s.add_development_dependency('capybara', '= 2.0.3')
+  s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
   s.add_development_dependency('fog', '~> 1.0')
   s.add_development_dependency('launchy')