@@ -13,6 +13,7 @@ require "paperclip/uploaded_file" require "paperclip/validations" require "paperclip/geometry" +require "paperclip/processor/thumbnail" module Paperclip VERSION = "3.0.0" lib/paperclip.rb @@ -30,8 +30,7 @@ module Paperclip processors = style_options.delete(:processors) files[style] = processors.inject(original_file) do |file, name| - processor = Processor.for(name) - processor.make(file, style_options, self) + Processor.for(name).make(file, style_options, self) end files end lib/paperclip/attachment.rb @@ -4,7 +4,7 @@ module Paperclip class Processor def self.for(processor_name) - Paperclip::Processor.const_get(constantize(processor_name)).new + Paperclip::Processor.const_get(constantize(processor_name)) rescue NameError => e raise Paperclip::ProcessorNotFound.new(e.message) end @@ -13,11 +13,22 @@ module Paperclip string.to_s.gsub(%r{(?:^|_)[a-z]}){|m| m[-1..-1].upcase } end - def make(file, options, attachment = nil) - file + def self.make(file, options, attachment = nil) + new(file, options, attachment).make + end + + attr_accessor :file, :options, :attachment + + def initialize(file, options, attachment = nil) + @file = file + @options = options + @attachment = attachment end - class Null < Processor + def make + file end + + class Null < Processor; end end end lib/paperclip/processor.rb @@ -87,7 +87,7 @@ def fake_storage end def fake_processor(file = nil) - processor = Paperclip::Processor::Null.new + processor = stub processor.stubs(:make).returns(file) processor end test/helper.rb @@ -209,15 +209,15 @@ class AttachmentTest < Test::Unit::TestCase end should "attempt to call the Thumbnail processor with :normal's parameters" do - assert_received(@thumbnail_processor, :make){|s| s.with(@file, {:geometry => "400x400", :watermark => @watermark_file}, @avatar) } + assert_received(@thumbnail_processor, :make){|s| s.with(@file, {:geometry => "400x400", :watermark => @watermark_file}, @avatar).once } end should "attempt to call the Thumbnail processor with :thumb's parameters" do - assert_received(@thumbnail_processor, :make){|s| s.with(@file, {:geometry => "32x32"}, @avatar) } + assert_received(@thumbnail_processor, :make){|s| s.with(@file, {:geometry => "32x32"}, @avatar).once } end should "attempt to call the Watermark processor with :normal's parameters" do - assert_received(@watermark_processor, :make){|s| s.with(@file, {:geometry => "400x400", :watermark => @watermark_file}, @avatar) } + assert_received(@watermark_processor, :make){|s| s.with(@file, {:geometry => "400x400", :watermark => @watermark_file}, @avatar).once } end end test/unit/attachment_test.rb @@ -8,15 +8,34 @@ class ProcessorTest < Test::Unit::TestCase should "provide a targetted Processor subclass with Processor.for" do class Paperclip::Processor; class DummyProcessor < Paperclip::Processor; end; end processor = Paperclip::Processor.for(:dummy_processor) - assert_equal Paperclip::Processor::DummyProcessor, processor.class - assert processor.class.ancestors.include?(Paperclip::Processor) + assert_equal Paperclip::Processor::DummyProcessor, processor + assert processor.ancestors.include?(Paperclip::Processor) end should "raise a Paperclip error when a processor backend is not found" do assert_raises(Paperclip::ProcessorNotFound){ Paperclip::Processor.for(:nothing) } end - should "define a make method that takes 3 arguments with 1 optional" do - assert_equal -3, Paperclip::Processor.new.method(:make).arity + should "define a make method on the class that takes 3 arguments with 1 optional" do + assert_equal -3, Paperclip::Processor.method(:make).arity + end + + should "define a make instance method that does not take any arguments" do + assert Paperclip::Processor.instance_methods.include?('make') + end + + should "define a :file accessor" do + assert Paperclip::Processor.instance_methods.include?('file') + assert Paperclip::Processor.instance_methods.include?('file=') + end + + should "define an :options accessor" do + assert Paperclip::Processor.instance_methods.include?('options') + assert Paperclip::Processor.instance_methods.include?('options=') + end + + should "define an :attachment accessor" do + assert Paperclip::Processor.instance_methods.include?('attachment') + assert Paperclip::Processor.instance_methods.include?('attachment=') end end test/unit/processor_test.rb 158192233d3dd32a9e9d939fc4a2c56f9158bd31 Jon Yurek jyurek@thoughtbot.com http://github.com/thoughtbot/paperclip/commit/322c4f44b6b343e7e6994eb616ce766a5eff023b 322c4f44b6b343e7e6994eb616ce766a5eff023b 2009-10-27T21:02:58-07:00 2009-10-27T21:02:58-07:00 Changed the interface for the processors for ease of testing 82ef50eb143346259993588d01b31e76c455c236 Jon Yurek jyurek@thoughtbot.com