paperclip 2.2.1 → 2.2.2

data/lib/paperclip.rb

@@ -43,7 +43,7 @@ end
 # documentation for Paperclip::ClassMethods for more useful information.
 module Paperclip
 
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 
   class << self
     # Provides configurability to Paperclip. There are a number of options available, such as:
@@ -255,7 +255,7 @@ module Paperclip
         valid_types = [options[:content_type]].flatten
         
         unless attachment.original_filename.blank?
-          unless options[:content_type].blank?
+          unless valid_types.blank?
             content_type = attachment.instance_read(:content_type)
             unless valid_types.any?{|t| t === content_type }
               options[:message] || "is not one of the allowed file types."

data/lib/paperclip/attachment.rb

@@ -326,11 +326,13 @@ module Paperclip
       log("Post-processing #{name}")
       @styles.each do |name, args|
         begin
-          @queued_for_write[name] = @queued_for_write[:original]
-          args[:processors].each do |processor|
-            @queued_for_write[name] = Paperclip.processor(processor).make(@queued_for_write[name], args)
+          raise RuntimeError.new("Style #{name} has no processors defined.") if args[:processors].blank?
+          @queued_for_write[name] = args[:processors].inject(@queued_for_write[:original]) do |file, processor|
+            log("Processing #{name} #{file} in the #{processor} processor.")
+            Paperclip.processor(processor).make(file, args)
           end
         rescue PaperclipError => e
+          log("An error was received while processing: #{e.inspect}")
           (@errors[:processing] ||= []) << e.message if @whiny
         end
       end

data/test/attachment_test.rb

@@ -210,6 +210,17 @@ class AttachmentTest < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with no processors defined" do
+    setup do
+      rebuild_model :processors => [], :styles => {:something => 1}
+      @dummy = Dummy.new
+      @file = StringIO.new("...")
+    end
+    should "raise when assigned to" do
+      assert_raises(RuntimeError){ @dummy.avatar = @file }
+    end
+  end
+
   context "Assigning an attachment with post_process hooks" do
     setup do
       rebuild_model :styles => { :something => "100x100#" }

data/test/paperclip_test.rb

@@ -177,6 +177,21 @@ class PaperclipTest < Test::Unit::TestCase
           Dummy.send(:"validates_attachment_#{validation}", :avatar, options)
           @dummy = Dummy.new
         end
+        context "and assigning nil" do
+          setup do
+            @dummy.avatar = nil
+            @dummy.valid?
+          end
+          if validation == :presence
+            should "have an error on the attachment" do
+              assert @dummy.errors.on(:avatar)
+            end
+          else
+            should "not have an error on the attachment" do
+              assert_nil @dummy.errors.on(:avatar)
+            end
+          end
+        end
         context "and assigned a valid file" do
           setup do
             @dummy.avatar = valid_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - Jon Yurek