paperclip 3.0.2 → 3.0.3

data/lib/paperclip/missing_attachment_styles.rb

@@ -1,7 +1,6 @@
 
 require 'set'
 module Paperclip
-
   class << self
     attr_accessor :classes_with_attachments
     attr_writer :registered_attachments_styles_path
@@ -12,7 +11,6 @@ module Paperclip
 
   self.classes_with_attachments = Set.new
 
-
   # Get list of styles saved on previous deploy (running rake paperclip:refresh:missing_styles)
   def self.get_registered_attachments_styles
     YAML.load_file(Paperclip.registered_attachments_styles_path)
@@ -49,9 +47,9 @@ module Paperclip
             current_styles[klass_sym][attachment_name.to_sym] ||= Array.new
             current_styles[klass_sym][attachment_name.to_sym] << style_name.to_sym
             current_styles[klass_sym][attachment_name.to_sym].map!(&:to_s).sort!.map!(&:to_sym).uniq!
-          end  
-        end  
-      end  
+          end
+        end
+      end
     end
   end
   private_class_method :current_attachments_styles
@@ -71,7 +69,7 @@ module Paperclip
       current_styles.each do |klass, attachment_definitions|
         attachment_definitions.each do |attachment_name, styles|
           registered = registered_styles[klass][attachment_name] || [] rescue []
-          missed = styles - registered 
+          missed = styles - registered
           if missed.present?
             klass_sym = klass.to_s.to_sym
             missing_styles[klass_sym] ||= Hash.new
@@ -80,8 +78,7 @@ module Paperclip
             missing_styles[klass_sym][attachment_name.to_sym].map!(&:to_s).sort!.map!(&:to_sym).uniq!
           end
         end
-      end  
+      end
     end
   end
-
 end

data/lib/paperclip/railtie.rb

@@ -3,27 +3,24 @@ require 'paperclip/schema'
 
 module Paperclip
   require 'rails'
+
   class Railtie < Rails::Railtie
     initializer 'paperclip.insert_into_active_record' do
       ActiveSupport.on_load :active_record do
         Paperclip::Railtie.insert
       end
     end
-    rake_tasks do
-      load "tasks/paperclip.rake"
-    end
+
+    rake_tasks { load "tasks/paperclip.rake" }
   end
 
   class Railtie
     def self.insert
-      Paperclip.options[:logger] = Rails.logger if defined?(Rails)
+      Paperclip.options[:logger] = Rails.logger
 
       if defined?(ActiveRecord)
         Paperclip.options[:logger] = ActiveRecord::Base.logger
         ActiveRecord::Base.send(:include, Paperclip::Glue)
-        ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Paperclip::Schema)
-        ActiveRecord::ConnectionAdapters::Table.send(:include, Paperclip::Schema)
-        ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, Paperclip::Schema)
       end
     end
   end

data/lib/paperclip/storage/fog.rb

@@ -135,6 +135,17 @@ module Paperclip
         (creds[env] || creds).symbolize_keys
       end
 
+      def copy_to_local_file(style, local_dest_path)
+        log("copying #{path(style)} to local file #{local_dest_path}")
+        local_file = ::File.open(local_dest_path, 'wb')
+        file = directory.files.get(path(style))
+        local_file.write(file.body)
+        local_file.close
+      rescue Fog::Errors::Error => e
+        warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
+        false
+      end
+
       private
 
       def find_credentials(creds)

data/lib/paperclip/storage/s3.rb

@@ -90,6 +90,21 @@ module Paperclip
           raise e
         end unless defined?(AWS::Core)
 
+        # Overriding AWS::Core::LogFormatter to make sure it return a UTF-8 string
+        if AWS::VERSION >= "1.3.9"
+          AWS::Core::LogFormatter.class_eval do
+            def summarize_hash(hash)
+              hash.map { |key, value| ":#{key}=>#{summarize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
+            end
+          end
+        else
+          AWS::Core::ClientLogging.class_eval do
+            def sanitize_hash(hash)
+              hash.map { |key, value| "#{sanitize_value(key)}=>#{sanitize_value(value)}".force_encoding('UTF-8') }.sort.join(',')
+            end
+          end
+        end
+
         base.instance_eval do
           @s3_options     = @options[:s3_options]     || {}
           @s3_permissions = set_permissions(@options[:s3_permissions])
@@ -307,6 +322,17 @@ module Paperclip
         @queued_for_delete = []
       end
 
+      def copy_to_local_file(style, local_dest_path)
+        log("copying #{path(style)} to local file #{local_dest_path}")
+        local_file = ::File.open(local_dest_path, 'wb')
+        file = s3_object(style)
+        local_file.write(file.read)
+        local_file.close
+      rescue AWS::Errors::Base => e
+        warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
+        false
+      end
+
       def find_credentials creds
         case creds
         when File

data/lib/paperclip/tempfile.rb

@@ -7,14 +7,16 @@ module Paperclip
     # taken from the comments on this blog post:
     # http://marsorange.com/archives/of-mogrify-ruby-tempfile-dynamic-class-definitions
     #
-    # This is Ruby 1.8.7's implementation.
-    def make_tmpname(basename, n)
+    # This is Ruby 1.9.3's implementation.
+    def make_tmpname(prefix_suffix, n)
       if RUBY_PLATFORM =~ /java/
-        case basename
+        case prefix_suffix
+        when String
+          prefix, suffix = prefix_suffix, ''
         when Array
-          prefix, suffix = *basename
+          prefix, suffix = *prefix_suffix
         else
-          prefix, suffix = basename, ''
+          raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
         end
 
         t = Time.now.strftime("%y%m%d")

data/lib/paperclip/validators.rb

@@ -1,3 +1,4 @@
+require 'active_model'
 require 'active_support/concern'
 require 'paperclip/validators/attachment_content_type_validator'
 require 'paperclip/validators/attachment_presence_validator'

data/lib/paperclip/validators/attachment_content_type_validator.rb

@@ -1,12 +1,19 @@
 module Paperclip
   module Validators
     class AttachmentContentTypeValidator < ActiveModel::EachValidator
+      def initialize(options)
+        options[:allow_nil] = true unless options.has_key?(:allow_nil)
+        super
+      end
+
       def validate_each(record, attribute, value)
         attribute = "#{attribute}_content_type".to_sym
         value = record.send(:read_attribute_for_validation, attribute)
         allowed_types = [options[:content_type]].flatten
 
-        if value.present? && allowed_types.none? { |type| type === value }
+        return if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
+
+        if allowed_types.none? { |type| type === value }
           record.errors.add(attribute, :invalid, options.merge(
             :types => allowed_types.join(', ')
           ))

data/lib/paperclip/version.rb

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

data/lib/tasks/paperclip.rake

@@ -10,7 +10,7 @@ module Paperclip
       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)
+      if !name.blank? && klass.attachment_definitions.keys.map(&:to_s).include?(name.to_s)
         [ name ]
       else
         klass.attachment_definitions.keys

data/paperclip.gemspec

@@ -32,14 +32,14 @@ Gem::Specification.new do |s|
   s.add_dependency('mime-types')
 
   s.add_development_dependency('shoulda')
-  s.add_development_dependency('appraisal', '~> 0.4.0')
+  s.add_development_dependency('appraisal')
   s.add_development_dependency('mocha')
-  s.add_development_dependency('aws-sdk', '~> 1.3.8')
+  s.add_development_dependency('aws-sdk')
   s.add_development_dependency('bourne')
   s.add_development_dependency('sqlite3', '~> 1.3.4')
   s.add_development_dependency('cucumber', '~> 1.1.0')
   s.add_development_dependency('aruba')
-  s.add_development_dependency('nokogiri', '~> 1.4.7')
+  s.add_development_dependency('nokogiri')
   s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
   s.add_development_dependency('cocaine', '~> 0.2')

data/test/attachment_test.rb

@@ -7,7 +7,7 @@ class Dummy; end
 class AttachmentTest < Test::Unit::TestCase
 
   should "process :original style first" do
-    file = File.new(File.join(File.dirname(__FILE__), "fixtures", "50x50.png"), 'rb')
+    file = File.new(fixture_file("50x50.png"), 'rb')
     rebuild_class :styles => { :small => '100x>', :original => '42x42#' }
     dummy = Dummy.new
     dummy.avatar = file
@@ -19,6 +19,26 @@ class AttachmentTest < Test::Unit::TestCase
     file.close
   end
 
+  should "not delete styles that don't get reprocessed" do
+    file = File.new(fixture_file("50x50.png"), 'rb')
+    rebuild_class :styles => { :small => '100x>',
+                               :large => '500x>',
+                               :original => '42x42#' }
+    dummy = Dummy.new
+    dummy.avatar = file
+    dummy.save
+
+    assert File.exists?(dummy.avatar.path(:small))
+    assert File.exists?(dummy.avatar.path(:large))
+    assert File.exists?(dummy.avatar.path(:original))
+
+    dummy.avatar.reprocess!(:small)
+
+    assert File.exists?(dummy.avatar.path(:small))
+    assert File.exists?(dummy.avatar.path(:large))
+    assert File.exists?(dummy.avatar.path(:original))
+  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)
@@ -182,9 +202,7 @@ class AttachmentTest < Test::Unit::TestCase
       rebuild_model :path => ":id.omg/:id-bbq/:idwhat/:id_partition.wtf"
       @dummy = Dummy.new
       @dummy.stubs(:id).returns(1024)
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
     end
 
@@ -398,9 +416,7 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       rebuild_model :path => lambda{ |attachment| "path/#{attachment.instance.other}.:extension" }
 
-      @file = File.new(File.join(File.dirname(__FILE__),
-                                 "fixtures",
-                                 "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummyA = Dummy.new(:other => 'a')
       @dummyA.avatar = @file
       @dummyB = Dummy.new(:other => 'b')
@@ -691,6 +707,21 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "Assigning an attachment" do
+    setup do
+      rebuild_model :styles => { :something => "100x100#" }
+      @file = StringIO.new(".")
+      @file.stubs(:original_filename).returns("5k.png\n\n")
+      @file.stubs(:content_type).returns(MIME::Type.new("image/png"))
+      @dummy = Dummy.new
+      @dummy.avatar = @file
+    end
+
+    should "make sure the content_type is a string" do
+      assert_equal "image/png", @dummy.avatar.instance.avatar_content_type
+    end
+  end
+
   context "Attachment with strange letters" do
     setup do
       rebuild_model
@@ -733,19 +764,38 @@ class AttachmentTest < Test::Unit::TestCase
     context "with specified regexp replacement" do
       setup do
         @old_defaults = Paperclip::Attachment.default_options.dup
-        Paperclip::Attachment.default_options.merge! :restricted_characters => /o/
-
-        @file.stubs(:original_filename).returns("goood.png")
-        @dummy = Dummy.new
-        @dummy.avatar = @file
       end
 
       teardown do
         Paperclip::Attachment.default_options.merge! @old_defaults
       end
 
-      should "match and convert that character" do
-        assert_equal "g___d.png", @dummy.avatar.original_filename
+      context 'as another regexp' do
+        setup do
+          Paperclip::Attachment.default_options.merge! :restricted_characters => /o/
+
+          @file.stubs(:original_filename).returns("goood.png")
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+
+        should "match and convert that character" do
+          assert_equal "g___d.png", @dummy.avatar.original_filename
+        end
+      end
+
+      context 'as nil' do
+        setup do
+          Paperclip::Attachment.default_options.merge! :restricted_characters => nil
+
+          @file.stubs(:original_filename).returns("goood.png")
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+        end
+
+        should "ignore and return the original file name" do
+          assert_equal "goood.png", @dummy.avatar.original_filename
+        end
       end
     end
   end
@@ -754,14 +804,14 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       @old_defaults = Paperclip::Attachment.default_options.dup
       Paperclip::Attachment.default_options.merge!({
-        :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+        :path => ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
       })
       FileUtils.rm_rf("tmp")
       rebuild_model
       @instance = Dummy.new
       @instance.stubs(:id).returns 123
 
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "uppercase.PNG"), 'rb')
+      @file = File.new(fixture_file("uppercase.PNG"), 'rb')
 
       styles = {:styles => { :large  => ["400x400", :jpg],
                              :medium => ["100x100", :jpg],
@@ -791,14 +841,14 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       @old_defaults = Paperclip::Attachment.default_options.dup
       Paperclip::Attachment.default_options.merge!({
-        :path => ":rails_root/tmp/:attachment/:class/:style/:id/:basename.:extension"
+        :path => ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
       })
       FileUtils.rm_rf("tmp")
       rebuild_model
       @instance = Dummy.new
       @instance.stubs(:id).returns 123
       @attachment = Paperclip::Attachment.new(:avatar, @instance)
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
     teardown do
@@ -839,12 +889,12 @@ class AttachmentTest < Test::Unit::TestCase
       end
 
       should "return the proper path when filename has a single .'s" do
-        assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.png"), File.expand_path(@attachment.path)
+        assert_equal File.expand_path("tmp/avatars/dummies/original/#{@instance.id}/5k.png"), File.expand_path(@attachment.path)
       end
 
       should "return the proper path when filename has multiple .'s" do
         @attachment.stubs(:instance_read).with(:file_name).returns("5k.old.png")
-        assert_equal File.expand_path("./test/../tmp/avatars/dummies/original/#{@instance.id}/5k.old.png"), File.expand_path(@attachment.path)
+        assert_equal File.expand_path("tmp/avatars/dummies/original/#{@instance.id}/5k.old.png"), File.expand_path(@attachment.path)
       end
 
       context "when expecting three styles" do
@@ -992,7 +1042,7 @@ class AttachmentTest < Test::Unit::TestCase
       end
       rebuild_class
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
     teardown { @file.close }
@@ -1113,13 +1163,15 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       rebuild_model :preserve_files => true
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
       @dummy.save!
       @attachment = @dummy.avatar
       @path = @attachment.path
     end
 
+    teardown { @file.close }
+
     should "not delete the files from storage when attachment is destroyed" do
       @attachment.destroy
       assert File.exists?(@path)
@@ -1135,13 +1187,15 @@ class AttachmentTest < Test::Unit::TestCase
     setup do
       rebuild_model
       @dummy = Dummy.new
-      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
       @dummy.save!
       @attachment = @dummy.avatar
       @path = @attachment.path
     end
 
+    teardown { @file.close }
+
     should "not be deleted when the model fails to destroy" do
       @dummy.stubs(:destroy).raises(Exception)
 

data/test/geometry_test.rb

@@ -101,7 +101,7 @@ class GeometryTest < Test::Unit::TestCase
     end
 
     should "be generated from a file" do
-      file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
+      file = fixture_file("5k.png")
       file = File.new(file, 'rb')
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
       assert @geo.height > 0
@@ -109,7 +109,7 @@ class GeometryTest < Test::Unit::TestCase
     end
 
     should "be generated from a file path" do
-      file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
+      file = fixture_file("5k.png")
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
       assert @geo.height > 0
       assert @geo.width > 0
@@ -141,7 +141,7 @@ class GeometryTest < Test::Unit::TestCase
       begin
         ENV['PATH'] = ''
         assert_raises(Paperclip::Errors::CommandNotFoundError) do
-          file = File.join(File.dirname(__FILE__), "fixtures", "5k.png")
+          file = fixture_file("5k.png")
           @geo = Paperclip::Geometry.from_file(file)
         end
       ensure