paperclip 3.5.2 → 3.5.3

data/lib/paperclip/io_adapters/data_uri_adapter.rb

@@ -1,7 +1,7 @@
 module Paperclip
   class DataUriAdapter < StringioAdapter
 
-    REGEXP = /^data:([-\w]+\/[-\w\+]+);base64,(.*)/m
+    REGEXP = /\Adata:([-\w]+\/[-\w\+]+);base64,(.*)/m
 
     def initialize(target_uri)
       @target_uri = target_uri

data/lib/paperclip/io_adapters/http_url_proxy_adapter.rb

@@ -1,7 +1,7 @@
 module Paperclip
   class HttpUrlProxyAdapter < UriAdapter
 
-    REGEXP = /^https?:\/\//
+    REGEXP = /\Ahttps?:\/\//
 
     def initialize(target)
       super(URI(target))

data/lib/paperclip/storage/fog.rb

@@ -43,8 +43,8 @@ module Paperclip
         end unless defined?(Fog)
 
         base.instance_eval do
-          unless @options[:url].to_s.match(/^:fog.*url$/)
-            @options[:path]  = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public\/system\//, '')
+          unless @options[:url].to_s.match(/\A:fog.*url\Z/)
+            @options[:path]  = @options[:path].gsub(/:url/, @options[:url]).gsub(/\A:rails_root\/public\/system\//, '')
             @options[:url]   = ':fog_public_url'
           end
           Paperclip.interpolates(:fog_public_url) do |attachment, style|
@@ -53,7 +53,7 @@ module Paperclip
         end
       end
 
-      AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+      AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX = /\A(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}\Z))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]\Z/
 
       def exists?(style = default_style)
         if original_filename
@@ -138,15 +138,16 @@ module Paperclip
         end
       end
 
-      def expiring_url(time = (Time.now + 3600), style = default_style)
-        if directory.files.respond_to?(:get_http_url)
-          expiring_url = directory.files.get_http_url(path(style), time)
+      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)
 
           if @options[:fog_host]
-            expiring_url.gsub!(/#{host_name_for_directory}/, dynamic_fog_host_for_style(style))
+            expiring_url.gsub!(/#{host_name_for_directory}/, dynamic_fog_host_for_style(style_name))
           end
         else
-          expiring_url = public_url
+          expiring_url = url(style_name)
         end
 
         return expiring_url
@@ -171,6 +172,13 @@ module Paperclip
 
       private
 
+      def convert_time(time)
+        if time.is_a?(Fixnum)
+          time = Time.now + time
+        end
+        time
+      end
+
       def dynamic_fog_host_for_style(style)
         if @options[:fog_host].respond_to?(:call)
           @options[:fog_host].call(self)

data/lib/paperclip/storage/s3.rb

@@ -6,7 +6,7 @@ module Paperclip
     # To use Paperclip with S3, include the +aws-sdk+ gem in your Gemfile:
     #   gem 'aws-sdk'
     # There are a few S3-specific options for has_attached_file:
-    # * +s3_credentials+: Takes a path, a File, or a Hash. The path (or File) must point
+    # * +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
     #   gives you. You can 'environment-space' this just like you do to your
     #   database.yml file, so different environments can use different accounts:
@@ -26,9 +26,21 @@ module Paperclip
     #   put your bucket name in this file, instead of adding it to the code directly.
     #   This is useful when you want the same account but a different bucket for
     #   development versus production.
+    #   When using a Proc it provides a single parameter which is the attachment itself. A  
+    #   method #instance is available on the attachment which will take you back to your
+    #   code. eg.
+    #     class User
+    #       has_attached_file :download,
+    #                         :storage => :s3,
+    #                         :s3_credentials => Proc.new{|a| a.instance.s3_credentials }
+    #
+    #       def s3_credentials
+    #         {:bucket => "xxx", :access_key_id => "xxx", :secret_access_key => "xxx"}
+    #       end
+    #     end
     # * +s3_permissions+: This is a String that should be one of the "canned" access
     #   policies that S3 provides (more information can be found here:
-    #   http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?RESTAccessPolicy.html)
+    #   http://docs.aws.amazon.com/AmazonS3/latest/dev/ACLOverview.html)
     #   The default for Paperclip is :public_read.
     #
     #   You can set permission on a per style bases by doing the following:
@@ -137,8 +149,8 @@ module Paperclip
             @s3_server_side_encryption = @options[:s3_server_side_encryption].to_s.upcase
           end
 
-          unless @options[:url].to_s.match(/^:s3.*url$/) || @options[:url] == ":asset_host"
-            @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public\/system/, '')
+          unless @options[:url].to_s.match(/\A:s3.*url\Z/) || @options[:url] == ":asset_host"
+            @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/\A:rails_root\/public\/system/, '')
             @options[:url]  = ":s3_path_url"
           end
           @options[:url] = @options[:url].inspect if @options[:url].is_a?(Symbol)
@@ -147,25 +159,25 @@ module Paperclip
         end
 
         Paperclip.interpolates(:s3_alias_url) do |attachment, style|
-          "#{attachment.s3_protocol(style, true)}//#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.s3_protocol(style, true)}//#{attachment.s3_host_alias}/#{attachment.path(style).gsub(%r{\A/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_alias_url
         Paperclip.interpolates(:s3_path_url) do |attachment, style|
-          "#{attachment.s3_protocol(style, true)}//#{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{\A/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_path_url
         Paperclip.interpolates(:s3_domain_url) do |attachment, style|
-          "#{attachment.s3_protocol(style, true)}//#{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{\A/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :s3_domain_url
         Paperclip.interpolates(:asset_host) do |attachment, style|
-          "#{attachment.path(style).gsub(%r{^/}, "")}"
+          "#{attachment.path(style).gsub(%r{\A/}, "")}"
         end unless Paperclip::Interpolations.respond_to? :asset_host
       end
 
       def expiring_url(time = 3600, style_name = default_style)
-        if path
+        if path(style_name)
           base_options = { :expires => time, :secure => use_secure_protocol?(style_name) }
           s3_object(style_name).url_for(:read, base_options.merge(s3_url_options)).to_s
         else
-          url
+          url(style_name)
         end
       end
 
@@ -232,7 +244,7 @@ module Paperclip
       end
 
       def s3_object style_name = default_style
-        s3_bucket.objects[path(style_name).sub(%r{^/},'')]
+        s3_bucket.objects[path(style_name).sub(%r{\A/},'')]
       end
 
       def using_http_proxy?
@@ -340,7 +352,7 @@ module Paperclip
         @queued_for_delete.each do |path|
           begin
             log("deleting #{path}")
-            s3_bucket.objects[path.sub(%r{^/},'')].delete
+            s3_bucket.objects[path.sub(%r{\A/},'')].delete
           rescue AWS::Errors::Base => e
             # Ignore this.
           end
@@ -385,10 +397,10 @@ module Paperclip
         http_headers = http_headers.call(instance) if http_headers.respond_to?(:call)
         http_headers.inject({}) do |headers,(name,value)|
           case name.to_s
-          when /^x-amz-meta-(.*)/i
+          when /\Ax-amz-meta-(.*)/i
             s3_metadata[$1.downcase] = value
           else
-            s3_headers[name.to_s.downcase.sub(/^x-amz-/,'').tr("-","_").to_sym] = value
+            s3_headers[name.to_s.downcase.sub(/\Ax-amz-/,'').tr("-","_").to_sym] = value
           end
         end
       end

data/lib/paperclip/tempfile_factory.rb

@@ -1,8 +1,6 @@
 module Paperclip
   class TempfileFactory
 
-    ILLEGAL_FILENAME_CHARACTERS = /^~/
-
     def generate(name)
       @name = name
       file = Tempfile.new([basename, extension])
@@ -15,7 +13,7 @@ module Paperclip
     end
 
     def basename
-      File.basename(@name, extension).gsub(ILLEGAL_FILENAME_CHARACTERS, '_')
+      Digest::MD5.hexdigest(File.basename(@name, extension))
     end
   end
 end

data/lib/paperclip/validators.rb

@@ -30,13 +30,15 @@ module Paperclip
         options = attributes.extract_options!.dup
 
         Paperclip::Validators.constants.each do |constant|
-          if constant.to_s =~ /^Attachment(.+)Validator$/
+          if constant.to_s =~ /\AAttachment(.+)Validator\Z/
             validator_kind = $1.underscore.to_sym
 
             if options.has_key?(validator_kind)
               validator_options = options.delete(validator_kind)
               validator_options = {} if validator_options == true
               local_options = attributes + [validator_options]
+              conditional_options = options.slice(:if, :unless)
+              local_options.last.merge!(conditional_options)
               send(:"validates_attachment_#{validator_kind}", *local_options)
             end
           end

data/lib/paperclip/version.rb

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

data/paperclip.gemspec

@@ -19,10 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  if File.exists?('UPGRADING')
-    s.post_install_message = File.read("UPGRADING")
-  end
-
   s.requirements << "ImageMagick"
   s.required_ruby_version = ">= 1.9.2"
 

data/shoulda_macros/paperclip.rb

@@ -103,7 +103,11 @@ module Paperclip
   end
 end
 
-if defined?(ActionController::Integration::Session)
+if defined?(ActionDispatch::Integration::Session)
+  class ActionDispatch::IntegrationTest::Session  #:nodoc:
+    include Paperclip::Shoulda
+  end
+elsif defined?(ActionController::Integration::Session)
   class ActionController::Integration::Session  #:nodoc:
     include Paperclip::Shoulda
   end
@@ -119,6 +123,13 @@ else
   end
 end
 
-class Test::Unit::TestCase #:nodoc:
- extend  Paperclip::Shoulda
+if defined?(Minitest)
+  class Minitest::Unit::TestCase #:nodoc:
+    extend Paperclip::Shoulda
+  end
+elsif defined?(Test)
+  class Test::Unit::TestCase #:nodoc:
+    extend Paperclip::Shoulda
+  end
 end
+

data/test/attachment_registry_test.rb

@@ -62,6 +62,17 @@ class AttachmentRegistryTest < Test::Unit::TestCase
 
       assert_equal expected_definitions, definitions
     end
+
+    should "produce defintions for subclasses" do
+      expected_definitions = { avatar: { yo: 'greeting' } }
+      Foo = Class.new
+      Bar = Class.new(Foo)
+      Paperclip::AttachmentRegistry.register(Foo, :avatar, expected_definitions[:avatar])
+
+      definitions = Paperclip::AttachmentRegistry.definitions_for(Bar)
+
+      assert_equal expected_definitions, definitions
+    end
   end
 
   context '.clear' do

data/test/attachment_test.rb

@@ -62,6 +62,26 @@ class AttachmentTest < Test::Unit::TestCase
     assert_file_exists(dummy.avatar.path(:original))
   end
 
+  context "having a not empty hash as a default option" do
+    setup do
+      @old_default_options = Paperclip::Attachment.default_options.dup
+      @new_default_options = { :convert_options => { :all => "-background white" } }
+      Paperclip::Attachment.default_options.merge!(@new_default_options)
+    end
+
+    teardown do
+      Paperclip::Attachment.default_options.merge!(@old_default_options)
+    end
+
+    should "deep merge when it is overridden" do
+      new_options = { :convert_options => { :thumb => "-thumbnailize" } }
+      attachment = Paperclip::Attachment.new(:name, :instance, new_options)
+
+      assert_equal Paperclip::Attachment.default_options.deep_merge(new_options),
+                   attachment.instance_variable_get("@options")
+    end
+  end
+
   should "handle a boolean second argument to #url" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name, :instance, :url_generator => mock_url_generator_builder)
@@ -643,7 +663,7 @@ class AttachmentTest < Test::Unit::TestCase
       rebuild_model :processors => [:thumbnail, :test], :styles => @style_params
       @dummy = Dummy.new
       @file = StringIO.new("...")
-      @file.stubs(:to_tempfile).returns(@file)
+      @file.stubs(:close)
       Paperclip::Test.stubs(:make).returns(@file)
       Paperclip::Thumbnail.stubs(:make).returns(@file)
     end
@@ -1419,6 +1439,15 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.destroy
       assert_file_not_exists(@path)
     end
+
+    should "not be deleted when transaction rollbacks after model is destroyed" do
+      ActiveRecord::Base.transaction do
+        @dummy.destroy
+        raise ActiveRecord::Rollback
+      end
+
+      assert_file_exists(@path)
+    end
   end
 
 end

data/test/content_type_detector_test.rb

@@ -8,6 +8,7 @@ class ContentTypeDetectorTest < Test::Unit::TestCase
   should 'return the empty content type when the file is empty' do
     tempfile = Tempfile.new("empty")
     assert_equal "inode/x-empty", Paperclip::ContentTypeDetector.new(tempfile.path).detect
+    tempfile.close
   end
 
   should 'return content type of file if it is an acceptable type' do

data/test/file_command_content_type_detector_test.rb

@@ -7,6 +7,8 @@ class FileCommandContentTypeDetectorTest < Test::Unit::TestCase
     tempfile.rewind
 
     assert_equal "text/plain", Paperclip::FileCommandContentTypeDetector.new(tempfile.path).detect
+
+    tempfile.close
   end
 
   should 'return a sensible default when the file command is missing' do

data/test/generator_test.rb

@@ -72,8 +72,12 @@ class GeneratorTest < Rails::Generators::TestCase
 
     context 'without required arguments' do
       should 'not create the migration' do
-        silence_stream(STDERR) { run_generator %w() }
-        assert_no_migration 'db/migrate/add_attachment_avatar_to_users.rb'
+        begin
+          silence_stream(STDERR) { run_generator %w() }
+          assert_no_migration 'db/migrate/add_attachment_avatar_to_users.rb'
+        rescue Thor::RequiredArgumentMissingError
+          # This is also OK. It happens in 1.9.2 and Rails 3.2
+        end
       end
     end
   end

data/test/has_attached_file_test.rb

@@ -35,8 +35,8 @@ class HasAttachedFileTest < Test::Unit::TestCase
       assert_adding_attachment('avatar').defines_callback('before_destroy')
     end
 
-    should 'define an after_destroy callback' do
-      assert_adding_attachment('avatar').defines_callback('after_destroy')
+    should 'define an after_commit callback' do
+      assert_adding_attachment('avatar').defines_callback('after_commit')
     end
 
     should 'define the Paperclip-specific callbacks' do
@@ -116,7 +116,7 @@ class HasAttachedFileTest < Test::Unit::TestCase
            define_method: nil,
            after_save: nil,
            before_destroy: nil,
-           after_destroy: nil,
+           after_commit: nil,
            define_paperclip_callbacks: nil,
            extend: nil,
            name: 'Billy')

data/test/helper.rb

@@ -26,12 +26,13 @@ puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 
 begin
   require 'ruby-debug'
-rescue LoadError => e
+rescue LoadError
   puts "debugger disabled"
 end
 
 ROOT = Pathname(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 
+$previous_count = 0
 class Test::Unit::TestCase
   def setup
     silence_warnings do
@@ -41,6 +42,22 @@ class Test::Unit::TestCase
       Rails.stubs(:const_defined?).with(:Railtie).returns(false)
     end
   end
+
+  def teardown
+  end
+
+  def report_files
+    files = []
+    ObjectSpace.each_object(IO){|io| files << io unless io.closed? }
+    if files.count > $previous_count
+      puts __name__
+      puts "#{files.count} files"
+      files.each do |file|
+        puts "Open IO: #{file.inspect}"
+      end
+    end
+    $previous_count = files.count
+  end
 end
 
 $LOAD_PATH << File.join(ROOT, 'lib')

data/test/integration_test.rb

@@ -17,8 +17,7 @@ class IntegrationTest < Test::Unit::TestCase
 
     should "not exceed the open file limit" do
        assert_nothing_raised do
-         dummies = Dummy.find(:all)
-         dummies.each { |dummy| dummy.avatar }
+         Dummy.all.each { |dummy| dummy.avatar }
        end
     end
   end
@@ -35,7 +34,7 @@ class IntegrationTest < Test::Unit::TestCase
     teardown { @file.close }
 
     should "create its thumbnails properly" do
-      assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
+      assert_match(/\b50x50\b/, `identify "#{@dummy.avatar.path(:thumb)}"`)
     end
 
     context 'reprocessing with unreadable original' do
@@ -70,8 +69,8 @@ class IntegrationTest < Test::Unit::TestCase
       end
 
       should "create its thumbnails properly" do
-        assert_match /\b150x25\b/, `identify "#{@dummy.avatar.path(:thumb)}"`
-        assert_match /\b50x50\b/, `identify "#{@dummy.avatar.path(:dynamic)}"`
+        assert_match(/\b150x25\b/, `identify "#{@dummy.avatar.path(:thumb)}"`)
+        assert_match(/\b50x50\b/, `identify "#{@dummy.avatar.path(:dynamic)}"`)
       end
 
       should "change the timestamp" do