delayed_paperclip 0.7.2 → 2.4.0.0

data/README.textile

@@ -1,4 +1,4 @@
-h1. Delayed::Paperclip
+h1. Delayed::Paperclip !https://secure.travis-ci.org/jstorimer/delayed_paperclip.png!
 
 Delayed_paperclip lets you process your "Paperclip":http://github.com/thoughtbot/paperclip attachments in a background task with "delayed_job":http://github.com/tobi/delayed_job or "Resque":http://github.com/defunkt/resque.
 
@@ -84,7 +84,7 @@ To have the missing image url be outputted by paperclip while the image is being
 
 h2. What if I'm not using images?
 
-AFAIK this library should work no matter what kind of post-processing you are doing with Paperclip.
+This library works no matter what kind of post-processing you are doing with Paperclip.
 
 h2. Does it work with s3?
 

data/Rakefile

@@ -1,10 +1,32 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'appraisal'
+
 require 'rake'
 require 'rake/testtask'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 
+
 desc 'Default: run unit tests.'
-task :default => :test
+task :default => [:clean, 'appraisal:install', :all]
+
+desc 'Test the paperclip plugin under all supported Rails versions.'
+task :all do |t|
+  exec('rake appraisal test')
+end
+
+desc 'Clean up files.'
+task :clean do |t|
+  FileUtils.rm_rf "doc"
+  FileUtils.rm_rf "tmp"
+  FileUtils.rm_rf "pkg"
+  FileUtils.rm_rf "public"
+  FileUtils.rm    "test/debug.log" rescue nil
+  FileUtils.rm    "test/paperclip.db" rescue nil
+  Dir.glob("paperclip-*.gem").each{|f| FileUtils.rm f }
+end
 
 desc 'Test the paperclip plugin.'
 Rake::TestTask.new(:test) do |t|
@@ -12,4 +34,3 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
-

data/init.rb

@@ -0,0 +1,4 @@
+require File.join(File.dirname(__FILE__), "lib", "delayed_paperclip")
+require 'delayed_paperclip/railtie'
+
+DelayedPaperclip::Railtie.insert

data/lib/delayed_paperclip/attachment.rb

@@ -0,0 +1,76 @@
+module DelayedPaperclip
+  module Attachment
+
+    def self.included(base)
+      base.send :include, InstanceMethods
+      base.send :attr_accessor, :job_is_processing
+      base.alias_method_chain :post_processing, :delay
+      base.alias_method_chain :post_processing=, :delay
+      base.alias_method_chain :save, :prepare_enqueueing
+      base.alias_method_chain :url, :processed
+      base.alias_method_chain :post_process_styles, :processing
+    end
+
+    module InstanceMethods
+
+      def post_processing_with_delay
+        !delay_processing?
+      end
+
+      def post_processing_with_delay=(value)
+        @post_processing_with_delay = value
+      end
+
+      def delay_processing?
+        if @post_processing_with_delay.nil?
+          !!@instance.class.attachment_definitions[@name][:delayed]
+        else
+           !@post_processing_with_delay
+        end
+      end
+
+      def processing?
+        @instance.send(:"#{@name}_processing?")
+      end
+
+      def process_delayed!
+        self.job_is_processing = true
+        reprocess!
+        self.job_is_processing = false
+      end
+
+      def post_process_styles_with_processing(*args)
+        post_process_styles_without_processing(*args)
+        instance.update_attribute("#{name}_processing", false) if instance.respond_to?(:"#{name}_processing?")
+      end
+
+      def save_with_prepare_enqueueing
+        was_dirty = @dirty
+        save_without_prepare_enqueueing.tap do
+          if delay_processing? && was_dirty
+            instance.prepare_enqueueing_for name
+          end
+        end
+      end
+
+      def url_with_processed style = default_style, include_updated_timestamp = @use_timestamp
+        return url_without_processed style, include_updated_timestamp if !@instance.class.attachment_definitions[@name][:delayed].try(:[], :url_with_processing) || job_is_processing
+
+        if !@instance.respond_to?(:"#{name}_processing?")
+          url_without_processed style, include_updated_timestamp
+        else
+          if !processing?
+            url_without_processed style, include_updated_timestamp
+          else
+            if dirty?
+              url_without_processed style, include_updated_timestamp
+            else
+              interpolate(@default_url, style)
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/delayed_paperclip/jobs/delayed_job.rb

@@ -1,12 +1,27 @@
+require 'delayed_job'
+
 module DelayedPaperclip
   module Jobs
     class DelayedJob < Struct.new(:instance_klass, :instance_id, :attachment_name)
 
-      def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
-        ::Delayed::Job.enqueue(
-          new(instance_klass, instance_id, attachment_name),
-          :priority => instance_klass.constantize.attachment_definitions[attachment_name][:delayed][:priority].to_i
-        )
+      if defined?(::Delayed::DeserializationError) # this is available in newer versions of DelayedJob. Using the newee Job api thus.
+
+        def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+          ::Delayed::Job.enqueue(
+            :payload_object => new(instance_klass, instance_id, attachment_name),
+            :priority => instance_klass.constantize.attachment_definitions[attachment_name][:delayed][:priority].to_i
+          )
+        end
+
+      else
+
+        def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+          ::Delayed::Job.enqueue(
+            new(instance_klass, instance_id, attachment_name),
+            instance_klass.constantize.attachment_definitions[attachment_name][:delayed][:priority].to_i
+          )
+        end
+
       end
 
       def perform

data/lib/delayed_paperclip/jobs/resque.rb

@@ -1,3 +1,5 @@
+require 'resque'
+
 module DelayedPaperclip
   module Jobs
     class Resque

data/lib/delayed_paperclip/jobs.rb

@@ -0,0 +1,6 @@
+module DelayedPaperclip
+  module Jobs
+    autoload :DelayedJob, 'delayed_paperclip/jobs/delayed_job'
+    autoload :Resque, 'delayed_paperclip/jobs/resque'
+  end
+end

data/lib/delayed_paperclip/railtie.rb

@@ -0,0 +1,21 @@
+require 'delayed_paperclip'
+
+module DelayedPaperclip
+  if defined? Rails::Railtie
+    require 'rails'
+    class Railtie < Rails::Railtie
+      initializer 'delayed_paperclip.insert_into_active_record' do
+        ActiveSupport.on_load :paperclip do
+          DelayedPaperclip::Railtie.insert
+        end
+      end
+    end
+  end
+
+  class Railtie
+    def self.insert
+      ActiveRecord::Base.send(:include, DelayedPaperclip)
+      Paperclip::Attachment.send :include, DelayedPaperclip::Attachment
+    end
+  end
+end

data/lib/delayed_paperclip.rb

@@ -1,16 +1,14 @@
-require 'paperclip'
-
-require 'delayed_paperclip'
-require 'delayed_paperclip/jobs/delayed_job'
-require 'delayed_paperclip/jobs/resque'
+require 'delayed_paperclip/jobs'
+require 'delayed_paperclip/attachment'
 
 module DelayedPaperclip
 
   class << self
 
     def options
-      options ||= {
-        :background_job_class => detect_background_task
+      @options ||= {
+        :background_job_class => detect_background_task,
+        :url_with_processing  => true
       }
     end
 
@@ -45,7 +43,12 @@ module DelayedPaperclip
       include InstanceMethods
 
       attachment_definitions[name][:delayed] = {}
-      attachment_definitions[name][:delayed][:priority] = options.key?(:priority) ? options[:priority] : 0
+      {
+        :priority => 0,
+        :url_with_processing => DelayedPaperclip.options[:url_with_processing]
+      }.each do |option, default|
+        attachment_definitions[name][:delayed][option] = options.key?(option) ? options[option] : default
+      end
 
       if respond_to?(:after_commit)
         after_commit  :enqueue_delayed_processing
@@ -60,15 +63,8 @@ module DelayedPaperclip
     # setting each inididual NAME_processing to true, skipping the ActiveModel dirty setter
     # Then immediately push the state to the database
     def mark_enqueue_delayed_processing
-      processing = []
-      (@_enqued_for_processing || []).each do |name|
-        if self.attributes.has_key? "#{name}_processing"
-          write_attribute("#{name}_processing", true)
-          processing << name
-        end
-      end
-      unless processing.empty?
-        updates = processing.collect{|n| "#{n}_processing = :true" }.join(", ")
+      unless @_enqued_for_processing_with_processing.blank? # catches nil and empy arrays
+        updates = @_enqued_for_processing_with_processing.collect{|n| "#{n}_processing = :true" }.join(", ")
         updates = ActiveRecord::Base.send(:sanitize_sql_array, [updates, {:true => true}])
         self.class.update_all(updates, "id = #{self.id}")
       end
@@ -81,6 +77,7 @@ module DelayedPaperclip
       (@_enqued_for_processing || []).each do |name|
         enqueue_post_processing_for(name)
       end
+      @_enqued_for_processing_with_processing = []
       @_enqued_for_processing = []
     end
 
@@ -88,73 +85,15 @@ module DelayedPaperclip
       DelayedPaperclip.enqueue(self.class.name, read_attribute(:id), name.to_sym)
     end
 
-    def attachment_for name
-      @_paperclip_attachments ||= {}
-      @_paperclip_attachments[name] ||= ::Paperclip::Attachment.new(name, self, self.class.attachment_definitions[name]).tap do |a|
-        a.post_processing = false if self.class.attachment_definitions[name][:delayed]
-      end
-    end
-
     def prepare_enqueueing_for name
+      if self.attributes.has_key? "#{name}_processing"
+        write_attribute("#{name}_processing", true)
+        @_enqued_for_processing_with_processing ||= []
+        @_enqued_for_processing_with_processing << name
+      end
       @_enqued_for_processing ||= []
       @_enqued_for_processing << name
     end
 
   end
 end
-
-module Paperclip
-  class Attachment
-    attr_accessor :job_is_processing
-
-    def save_with_prepare_enqueueing
-      was_dirty = @dirty
-      save_without_prepare_enqueueing.tap do
-        if delay_processing? && was_dirty
-          instance.prepare_enqueueing_for name
-        end
-      end
-    end
-    alias_method_chain :save, :prepare_enqueueing
-
-    def url_with_processed style = default_style, include_updated_timestamp = @use_timestamp
-      return url_without_processed style, include_updated_timestamp if job_is_processing
-
-      if !@instance.respond_to?(:"#{name}_processing?")
-        url_without_processed style, include_updated_timestamp
-      else
-        if !processing?
-          url_without_processed style, include_updated_timestamp
-        else
-          if dirty?
-            url_without_processed style, include_updated_timestamp
-          else
-            interpolate(@default_url, style)
-          end
-        end
-      end
-    end
-    alias_method_chain :url, :processed
-
-    def delay_processing?
-      !!@instance.class.attachment_definitions[@name][:delayed]
-    end
-
-    def processing?
-      @instance.send(:"#{@name}_processing?")
-    end
-
-    def process_delayed!
-      job_is_processing = true
-      reprocess!
-      job_is_processing = false
-      instance.update_attribute("#{name}_processing", false) if instance.attributes.has_key? "#{name}_processing"
-    end
-
-  end
-end
-
-
-if Object.const_defined?("ActiveRecord")
-  ActiveRecord::Base.send(:include, DelayedPaperclip)
-end

data/rails/init.rb

@@ -1 +1,2 @@
-require 'delayed_paperclip'
+require 'delayed_paperclip/railtie'
+DelayedPaperclip::Railtie.insert

data/test/base_delayed_paperclip_test.rb

@@ -0,0 +1,140 @@
+module BaseDelayedPaperclipTest
+  def setup
+    super
+    DelayedPaperclip.options[:url_with_processing] = true
+    reset_dummy
+  end
+
+  def test_normal_paperclip_functioning
+    reset_dummy :with_processed => false
+    Paperclip::Attachment.any_instance.expects(:post_process)
+    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
+    assert !dummy.image.delay_processing?
+    assert dummy.image.post_processing
+    assert dummy.save
+    assert File.exists?(dummy.image.path)
+  end
+
+  def test_normal_explisit_post_processing_with_delayed_paperclip
+    reset_dummy :with_processed => true
+    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
+    dummy.image.post_processing = true
+    assert !dummy.image.delay_processing?
+    assert dummy.image.post_processing, "Post processing should return true"
+    assert dummy.save
+    assert File.exists?(dummy.image.path)
+  end
+
+  def test_delayed_paperclip_functioning
+    build_dummy_table(false)
+    reset_class "Dummy", :with_processed => true
+    Paperclip::Attachment.any_instance.expects(:post_process).never
+    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
+    assert dummy.image.delay_processing?
+    assert !dummy.image.post_processing
+    assert dummy.save
+    assert File.exists?(dummy.image.path), "Path #{dummy.image.path} should exist"
+  end
+
+  def test_enqueue_job_if_source_changed
+    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
+    dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
+    original_job_count = jobs_count
+    dummy.save
+    assert_equal original_job_count + 1, jobs_count
+  end
+
+  def test_processing_column_kept_intact
+    Paperclip::Attachment.any_instance.stubs(:reprocess!).raises(StandardError.new('oops'))
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert dummy.image_processing?
+    process_jobs
+    assert dummy.image_processing?
+    assert dummy.reload.image_processing?
+  end
+
+  def test_processing_true_when_new_image_added
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    assert !dummy.image_processing?
+    assert dummy.new_record?
+    dummy.save!
+    assert dummy.reload.image_processing?
+  end
+
+  def test_processed_true_when_delayed_jobs_completed
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    process_jobs
+    dummy.reload
+    assert !dummy.image_processing?, "Image should no longer be processing"
+  end
+
+  def test_unprocessed_image_returns_missing_url
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert_equal "/images/original/missing.png", dummy.image.url
+    process_jobs
+    dummy.reload
+    assert_match /\/system\/images\/1\/original\/12k.png/, dummy.image.url
+  end
+
+  def test_unprocessed_image_not_returning_missing_url_if_turrned_of_globally
+    DelayedPaperclip.options[:url_with_processing] = false
+    reset_dummy :with_processed => false
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert_match /\/system\/images\/1\/original\/12k.png/, dummy.image.url
+    process_jobs
+    dummy.reload
+    assert_match /\/system\/images\/1\/original\/12k.png/, dummy.image.url
+  end
+
+  def test_unprocessed_image_not_returning_missing_url_if_turrned_of_on_instance
+    reset_dummy :with_processed => false, :url_with_processing => false
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert_match(/\/system\/images\/1\/original\/12k.png/, dummy.image.url)
+    process_jobs
+    dummy.reload
+    assert_match(/\/system\/images\/1\/original\/12k.png/, dummy.image.url)
+  end
+
+  def test_original_url_when_no_processing_column
+    reset_dummy :with_processed => false
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert_match(/\/system\/images\/1\/original\/12k.png/, dummy.image.url)
+  end
+
+  def test_original_url_if_image_changed
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
+    dummy.save!
+    assert_equal '/images/original/missing.png', dummy.image.url
+    process_jobs
+    assert_match(/system\/images\/.*original.*/, dummy.reload.image.url)
+  end
+
+  def test_missing_url_if_image_hasnt_changed
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    assert_match(/images\/.*missing.*/, dummy.image.url)
+  end
+
+  def test_should_not_blow_up_if_dsl_unused
+    reset_dummy :with_processed => false
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    assert dummy.image.url
+  end
+
+  def test_after_callback_is_functional
+    Dummy.send(:define_method, :done_processing) { puts 'done' }
+    Dummy.after_image_post_process :done_processing
+    Dummy.any_instance.expects(:done_processing)
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.save!
+    process_jobs
+  end
+end

data/test/delayed_paperclip_test.rb

@@ -1,137 +1,46 @@
 require 'test_helper'
+require 'base_delayed_paperclip_test'
 require 'delayed_job'
+
 Delayed::Worker.backend = :active_record
 
 class DelayedPaperclipTest < Test::Unit::TestCase
+  include BaseDelayedPaperclipTest
+
   def setup
     super
-
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::DelayedJob
     build_delayed_jobs
-    reset_dummy
   end
 
-  def test_normal_paperclip_functioning
-    build_dummy_table(false)
-    reset_class "Dummy", false
-
-    Paperclip::Attachment.any_instance.expects(:post_process)
-
-    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
-
-    assert !dummy.image.delay_processing?
-    assert dummy.image.post_processing
-    assert dummy.save
-    assert File.exists?(dummy.image.path)
+  def process_jobs
+    Delayed::Worker.new.work_off
   end
 
-  def test_delayed_paperclip_functioning
-    build_dummy_table(false)
-    reset_class "Dummy", true
-
-    Paperclip::Attachment.any_instance.expects(:post_process).never
-
-    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
-
-    assert dummy.image.delay_processing?
-    assert !dummy.image.post_processing
-    assert dummy.save
-    assert File.exists?(dummy.image.path)
-  end
-
-
-  def test_enqueue_job_if_source_changed
-    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
-
-    original_job_count = Delayed::Job.count
-    @dummy.save
-
-    assert_equal original_job_count + 1, Delayed::Job.count
+  def jobs_count
+    Delayed::Job.count
   end
 
   def test_perform_job
-    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
     Paperclip::Attachment.any_instance.expects(:reprocess!)
-
-    @dummy.save!
+    dummy.save!
     Delayed::Job.last.payload_object.perform
   end
 
-  def test_processing_column_kept_intact
-    @dummy = reset_dummy(true)
-
-    Paperclip::Attachment.any_instance.stubs(:reprocess!).raises(StandardError.new('oops'))
-
-    @dummy.save!
-    assert @dummy.image_processing?
-    Delayed::Worker.new.work_off
-    assert @dummy.reload.image_processing?
-  end
-
-  def test_after_callback_is_functional
-    @dummy_class.send(:define_method, :done_processing) { puts 'done' }
-    @dummy_class.after_image_post_process :done_processing
-    Dummy.any_instance.expects(:done_processing)
-
-    @dummy.save!
-    DelayedPaperclip::Jobs::DelayedJob.new(@dummy.class.name, @dummy.id, :image).perform
-  end
-
-  def test_processing_true_when_new_image_added
-    @dummy = reset_dummy(true)
-
-    assert !@dummy.image_processing?
-    assert @dummy.new_record?
-    @dummy.save!
-    assert @dummy.reload.image_processing?
-  end
-
-  def test_processed_true_when_delayed_jobs_completed
-    @dummy = reset_dummy(true)
-    @dummy.save!
-
-    Delayed::Worker.new.work_off
-
-    @dummy.reload
-    assert !@dummy.image_processing?
-  end
-
-  def test_unprocessed_image_returns_missing_url
-    @dummy = reset_dummy(true)
-    @dummy.save!
-
-    assert_equal "/images/original/missing.png", @dummy.image.url
-
-    Delayed::Job.first.invoke_job
-
-    @dummy.reload
-    assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
+  def build_delayed_jobs
+    ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
+      table.text     :handler                      # YAML-encoded string of the object that will do work
+      table.string   :last_error                   # reason for last failure (See Note below)
+      table.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
+      table.datetime :locked_at                    # Set when a client is working on this object
+      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                    # Who is working on this object (if locked)
+      table.timestamps
+    end
   end
 
-  def test_original_url_when_no_processing_column
-    @dummy = reset_dummy(false)
-    @dummy.save!
-
-    assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
-  end
-
-  def test_original_url_if_image_changed
-    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
-    @dummy.save!
-
-    assert_match(/system\/images\/.*original.*/, @dummy.image.url)
-  end
-
-  def test_missing_url_if_image_hasnt_changed
-    @dummy = reset_dummy(true)
-    @dummy.save!
-
-    assert_match(/images\/.*missing.*/, @dummy.image.url)
-  end
-
-  def test_should_not_blow_up_if_dsl_unused
-    reset_class "Dummy", false
-    @dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
-
-    assert @dummy.image.url
-  end
 end

data/test/resque_paperclip_test.rb

@@ -1,54 +1,32 @@
 require 'test_helper'
-gem 'resque'
+require 'base_delayed_paperclip_test'
 require 'resque'
 
 class ResquePaperclipTest < Test::Unit::TestCase
+  include BaseDelayedPaperclipTest
+
   def setup
     super
-
     # Make sure that we just test Resque in here
-    Object.send(:remove_const, :Delayed) if defined? Delayed
-
+    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     Resque.remove_queue(:paperclip)
-    reset_dummy
   end
 
-  def test_enqueue_job_if_source_changed
-    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
-
-    original_job_count = Resque.size(:paperclip)
-    @dummy.save
+  def process_jobs
+    worker = Resque::Worker.new(:paperclip)
+    worker.process
+  end
 
-    assert_equal original_job_count + 1, Resque.size(:paperclip)
+  def jobs_count
+    Resque.size(:paperclip)
   end
 
   def test_perform_job
+    dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
     Paperclip::Attachment.any_instance.expects(:reprocess!)
-    @dummy.save!
-    DelayedPaperclip::Jobs::Resque.perform(@dummy.class.name, @dummy.id, :image)
+    dummy.save!
+    DelayedPaperclip::Jobs::Resque.perform(dummy.class.name, dummy.id, :image)
   end
 
-  def test_after_callback_is_functional
-    @dummy_class.send(:define_method, :done_processing) { puts 'done' }
-    @dummy_class.after_image_post_process :done_processing
-    Dummy.any_instance.expects(:done_processing)
-
-    @dummy.save!
-    DelayedPaperclip::Jobs::Resque.perform(@dummy.class.name, @dummy.id, :image)
-  end
-
-  def test_processing_column_kept_intact
-    @dummy = reset_dummy(true)
-
-    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
-    Paperclip::Attachment.any_instance.stubs(:reprocess!).raises(StandardError.new('oops'))
-
-    @dummy.save!
-    assert @dummy.image_processing?, "image should be processing #{@dummy.inspect}"
-
-    worker = Resque::Worker.new(:paperclip)
-    worker.process
-
-    assert @dummy.reload.image_processing?, "image should be processing"
-  end
 end

data/test/test_helper.rb

@@ -11,7 +11,8 @@ ROOT       = File.join(File.dirname(__FILE__), '..')
 RAILS_ROOT = ROOT
 $LOAD_PATH << File.join(ROOT, 'lib')
 
-require 'delayed_paperclip'
+require 'delayed_paperclip/railtie'
+DelayedPaperclip::Railtie.insert
 
 class Test::Unit::TestCase
   def setup
@@ -25,46 +26,38 @@ FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
+Paperclip.logger = ActiveRecord::Base.logger
 
-def reset_dummy(with_processed = false)
-  build_dummy_table(with_processed)
+# def reset_dummy(options = {})
+#   reset_dummy(options)
+#   Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+# end
 
-  reset_class "Dummy"
-
-  @dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
-end
-
-def reset_class class_name, include_process = true
-  Object.send(:remove_const, class_name) rescue nil
-  klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
-  klass.class_eval do
-    has_attached_file     :image
-    process_in_background :image if include_process
-  end
-  @dummy_class = klass
+def reset_dummy(options = {})
+  options[:with_processed] = true unless options.key?(:with_processed)
+  build_dummy_table(options[:with_processed])
+  reset_class("Dummy", options)
 end
 
 def build_dummy_table(with_processed)
-  ActiveRecord::Base.connection.create_table :dummies, { :force => true } do |t|
+  ActiveRecord::Base.connection.create_table :dummies, :force => true do |t|
     t.string   :image_file_name
     t.string   :image_content_type
     t.integer  :image_file_size
     t.datetime :image_updated_at
-
     t.boolean(:image_processing, :default => false) if with_processed
   end
 end
 
-def build_delayed_jobs
-  ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |table|
-    table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-    table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-    table.text     :handler                      # YAML-encoded string of the object that will do work
-    table.string   :last_error                   # reason for last failure (See Note below)
-    table.datetime :run_at                       # When to run. Could be Time.now for immediately, or sometime in the future.
-    table.datetime :locked_at                    # Set when a client is working on this object
-    table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-    table.string   :locked_by                    # Who is working on this object (if locked)
-    table.timestamps
+def reset_class(class_name, options)
+  ActiveRecord::Base.send(:include, Paperclip::Glue)
+  Object.send(:remove_const, class_name) rescue nil
+  klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
+  klass.class_eval do
+    include Paperclip::Glue
+    has_attached_file     :image
+    process_in_background :image, options if options[:with_processed]
   end
+  klass.reset_column_information
+  klass
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 2.4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,23 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-01 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-11-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2172919760 !ruby/object:Gem::Requirement
+  requirement: &2153012620 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2172919760
+  version_requirements: *2153012620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2172919360 !ruby/object:Gem::Requirement
+  requirement: &2153012200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172919360
+  version_requirements: *2153012200
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &2172918900 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &2153011700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172918900
+  version_requirements: *2153011700
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &2172918480 !ruby/object:Gem::Requirement
+  requirement: &2153011200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172918480
+  version_requirements: *2153011200
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2172918060 !ruby/object:Gem::Requirement
+  requirement: &2153010740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2172918060
+  version_requirements: *2153010740
 description: Process your Paperclip attachments in the background with delayed_job,
   Resque or your own processor.
 email: jesse@jstorimer.com
@@ -75,24 +74,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
-- CONTRIBUTING
-- Gemfile
-- LICENSE
 - README.textile
+- LICENSE
 - Rakefile
-- delayed_paperclip.gemspec
-- lib/delayed_paperclip.rb
+- init.rb
+- lib/delayed_paperclip/attachment.rb
 - lib/delayed_paperclip/jobs/delayed_job.rb
 - lib/delayed_paperclip/jobs/resque.rb
-- rails/init.rb
+- lib/delayed_paperclip/jobs.rb
+- lib/delayed_paperclip/railtie.rb
+- lib/delayed_paperclip.rb
+- test/base_delayed_paperclip_test.rb
 - test/database.yml
 - test/delayed_paperclip_test.rb
 - test/fixtures/12k.png
 - test/resque_paperclip_test.rb
 - test/test_helper.rb
-has_rdoc: true
+- rails/init.rb
 homepage: http://github.com/jstorimer/delayed_paperclip
 licenses: []
 post_install_message: 
@@ -113,13 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Process your Paperclip attachments in the background.
-test_files:
-- test/database.yml
-- test/delayed_paperclip_test.rb
-- test/fixtures/12k.png
-- test/resque_paperclip_test.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-*.log
-pkg/
-public/
-Gemfile.lock

data/.rvmrc

@@ -1 +0,0 @@
-rvm gemset use delayed_paperclip --create

data/CONTRIBUTING

@@ -1,16 +0,0 @@
-Contributor Policy
-=================
-
-Commit bit. If you have a commit accepted into the project then you get full git access to the repo. If I don't give you this in a timely manner just send me a message.
-
-Testing
-======
-
-Please don't commit code without tests. You can bootstrap the development environment by running `bundle install`. After that, running `rake test` should just work. If it doesn't then file a bug.
-
-Versioning
-=========
-
-Don't bump the version in any changes you make or pull in to the project. I'll maintain rights to push the gem to rubygems.org and make releases when appropriate.
-
-And please keep the README up to date. Thank you!

data/Gemfile

@@ -1,3 +0,0 @@
-source :rubygems
-
-gemspec

data/delayed_paperclip.gemspec

@@ -1,21 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{delayed_paperclip}
-  s.version = "0.7.2"
-
-  s.authors = ["Jesse Storimer", "Bert Goethals"]
-  s.summary = %q{Process your Paperclip attachments in the background.}
-  s.description = %q{Process your Paperclip attachments in the background with delayed_job, Resque or your own processor.}
-  s.email = %q{jesse@jstorimer.com}
-  s.homepage = %q{http://github.com/jstorimer/delayed_paperclip}
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-
-  s.add_runtime_dependency 'paperclip', ["~> 2.3.0"]
-
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'sqlite3-ruby'
-  s.add_development_dependency 'delayed_job'
-  s.add_development_dependency 'resque'
-end
-