delayed_paperclip 0.1.1 → 0.5.0.pre

data/README.textile

@@ -2,35 +2,33 @@ h1. Delayed::Paperclip
 
 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.
 
-h2. Why?
+This is a fork that focuses on "Resque":http://github.com/defunkt/resque rather than Delayed::Job.  Everyone says that "they are both awesome":http://github.com/blog/542-introducing-resque, but, in my case, I'm already committed to using "Vanity":http://vanity.labnotes.org/ and, I'm no expert, but "redis and Vanity":http://groups.google.com/group/vanity-talk/browse_thread/thread/db6c106581a26c46/eccff9396bdb2fe8?show_docid=eccff9396bdb2fe8&fwc=1&pli=1# look like they're likely to go hand in hand for some time.  
 
-The most common use case for Paperclip is to easily attach image files to ActiveRecord models. Most of the time these image files will have multiple styles and will need to be resized when they are created. This is usually a pretty "slow operation":http://www.jstorimer.com/ruby/2010/01/05/speep-up-your-paperclip-tests.html and should be handled in a background task. 
+h2. Why?
 
-I'm sure that everyone knows this, this gem just makes it easy to do.
+The "original author":http://github.com/jstorimer/delayed_paperclip says:
 
-h2. Installation
+bq. The most common use case for Paperclip is to easily attach image files to ActiveRecord models. Most of the time these image files will have multiple styles and will need to be resized when they are created. This is usually a pretty "slow operation":http://www.jstorimer.com/ruby/2010/01/05/speep-up-your-paperclip-tests.html and should be handled in a background task. 
 
-Install the gem:
+bq. I'm sure that everyone knows this, this gem just makes it easy to do.
 
-<pre><code>sudo gem install delayed_paperclip</code></pre>
+I am also concerned with the "memory usage of ImageMagick":http://magick.imagemagick.org/script/architecture.php#cache and didn't want a few bad actors to be able to take down my site just by uploading some big pictures.
 
-Add it to your environment.rb:
+h2. Installation
 
-<pre><code>config.gem 'delayed_paperclip'</code></pre>
+Not only do I have no idea how I would enable some kind of "two gems" approach, but also I don't know what the future of this project is, necessarily.  But it does work, and maybe you'll find it useful.
 
-Or, even better, to your Gemfile:
+Install as a rails plugin:
 
-<pre><code>source "http://gemcutter.org"
-gem 'delayed_paperclip'
-</code></pre>
+<pre><code>script/plugin install git://github.com/bigfleet/delayed_paperclip.git</code></pre>
 
 Dependencies:
 * Paperclip
-* delayed_job
+* resque
 
 h2. Usage
 
-Make sure that you have "DJ":http://github.com/tobi/delayed_job up and running.
+Make sure that you have "Resque":http://github.com/defunkt/resque up and running.  The jobs will be dispatched to the <code>:paperclip</code> queue, so you can correctly dispatch your worker.  Configure resque and your worker exactly as you would otherwise.
 
 In your model:
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.5.0.pre

data/delayed_paperclip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_paperclip}
-  s.version = "0.1.1"
+  s.version = "0.5.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jesse Storimer"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-02-09}
   s.description = %q{Process your Paperclip attachments in the background with delayed_job.}
   s.email = %q{jesse@jstorimer.com}
   s.extra_rdoc_files = [
@@ -23,13 +23,15 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "delayed_paperclip.gemspec",
+     "lib/delayed/jobs/delayed_paperclip_job.rb",
+     "lib/delayed/jobs/resque_paperclip_job.rb",
      "lib/delayed/paperclip.rb",
-     "lib/delayed/paperclip_job.rb",
      "lib/delayed_paperclip.rb",
      "rails/init.rb",
      "test/database.yml",
      "test/delayed_paperclip_test.rb",
      "test/fixtures/12k.png",
+     "test/resque_paperclip_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/jstorimer/delayed_paperclip}
@@ -39,6 +41,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Process your Paperclip attachments in the background with delayed_job.}
   s.test_files = [
     "test/delayed_paperclip_test.rb",
+     "test/resque_paperclip_test.rb",
      "test/test_helper.rb"
   ]
 

data/lib/delayed/{paperclip_job.rb → jobs/delayed_paperclip_job.rb}

@@ -1,4 +1,4 @@
-class DelayedPaperclipJob < Struct.new(:instance_id, :instance_klass, :attachment_name)
+class DelayedPaperclipJob < Struct.new(:instance_klass, :instance_id, :attachment_name)
   def perform
     instance = instance_klass.constantize.find(instance_id)
 

data/lib/delayed/jobs/resque_paperclip_job.rb

@@ -0,0 +1,9 @@
+class ResquePaperclipJob
+  @queue = :paperclip
+  
+  def self.perform(instance_klass, instance_id, attachment_name)
+    instance = instance_klass.constantize.find(instance_id)
+
+    instance.send(attachment_name).reprocess!    
+  end
+end

data/lib/delayed/paperclip.rb

@@ -20,7 +20,11 @@ module Delayed
         
         define_method "enqueue_job_for_#{name}" do
           if self.send("#{name}_changed?")
-            Delayed::Job.enqueue DelayedPaperclipJob.new(read_attribute(:id), self.class.name, name.to_sym)
+            if delayed_job?
+              Delayed::Job.enqueue DelayedPaperclipJob.new(read_attribute(:id), self.class.name, name.to_sym)
+            elsif resque?
+              Resque.enqueue(ResquePaperclipJob, self.class.name, read_attribute(:id), name.to_sym)
+            end
           end
         end
         
@@ -42,6 +46,14 @@ module Delayed
         
         false
       end
+      
+      def delayed_job?
+        defined? Delayed::Job
+      end
+      
+      def resque?
+        defined? Resque
+      end
     end
   end
 end

data/lib/delayed_paperclip.rb

@@ -1,7 +1,6 @@
-require 'paperclip'
-require 'delayed_job'
 require 'delayed/paperclip'
-require 'delayed/paperclip_job'
+require 'delayed/jobs/resque_paperclip_job'
+require 'delayed/jobs/delayed_paperclip_job'
 
 if Object.const_defined?("ActiveRecord")
   ActiveRecord::Base.send(:include, Delayed::Paperclip)

data/test/delayed_paperclip_test.rb

@@ -1,4 +1,6 @@
 require 'test/test_helper'
+gem 'delayed_job'
+require 'delayed_job'
 
 class DelayedPaperclipTest < Test::Unit::TestCase
   def setup
@@ -44,36 +46,23 @@ class DelayedPaperclipTest < Test::Unit::TestCase
 
     original_job_count = Delayed::Job.count
     @dummy.enqueue_job_for_image
-    
+
     assert_equal original_job_count + 1, Delayed::Job.count
   end
-  
+
   def test_perform_job
     Paperclip::Attachment.any_instance.expects(:reprocess!)
-    
+
     @dummy.save!
-    DelayedPaperclipJob.new(@dummy.id, @dummy.class.name, :image).perform
+    DelayedPaperclipJob.new(@dummy.class.name, @dummy.id, :image).perform
   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!
-    DelayedPaperclipJob.new(@dummy.id, @dummy.class.name, :image).perform
-  end
-  
-  private 
-  def reset_dummy
-    reset_table("dummies") do |d|
-      d.string :image_file_name
-      d.integer :image_file_size
-    end
-    @dummy_class = reset_class "Dummy"
-    @dummy_class.has_attached_file :image
-    @dummy_class.process_in_background :image
-    
-    @dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+    DelayedPaperclipJob.new(@dummy.class.name, @dummy.id, :image).perform
   end
 end

data/test/resque_paperclip_test.rb

@@ -0,0 +1,37 @@
+require 'test/test_helper'
+gem 'resque'
+require 'resque'
+
+class ResquePaperclipTest < Test::Unit::TestCase
+  def setup
+    # Make sure that we just test Resque in here
+    Object.send(:remove_const, :Delayed) if defined? Delayed
+
+    reset_dummy
+  end
+
+  def test_enqueue_job_if_source_changed
+    @dummy.stubs(:image_changed?).returns(true)
+
+    original_job_count = Resque.size(:paperclip)
+    @dummy.enqueue_job_for_image
+
+    assert_equal original_job_count + 1, Resque.size(:paperclip)
+  end
+
+  def test_perform_job
+    Paperclip::Attachment.any_instance.expects(:reprocess!)
+
+    @dummy.save!
+    ResquePaperclipJob.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!
+    ResquePaperclipJob.perform(@dummy.class.name, @dummy.id, :image)
+  end
+end

data/test/test_helper.rb

@@ -6,10 +6,9 @@ require 'active_record'
 require 'active_support'
 
 gem 'sqlite3-ruby'
+
 gem 'paperclip'
 require 'paperclip'
-gem 'delayed_job'
-require 'delayed_job'
 
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
@@ -24,11 +23,6 @@ $LOAD_PATH << File.join(ROOT, 'lib')
 $LOAD_PATH << File.join(ROOT, 'lib', 'delayed', 'paperclip') 
 $LOAD_PATH << File.join(ROOT, 'test') 
 
-module ActiveRecord
-  class Base
-  end
-end
- 
 require File.join(ROOT, 'lib', 'delayed_paperclip.rb')
 
 def reset_class class_name
@@ -69,6 +63,18 @@ def rebuild_class options = {}
   end
 end
 
+def reset_dummy
+  reset_table("dummies") do |d|
+    d.string :image_file_name
+    d.integer :image_file_size
+  end
+  @dummy_class = reset_class "Dummy"
+  @dummy_class.has_attached_file :image
+  @dummy_class.process_in_background :image
+  
+  @dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_paperclip
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.5.0.pre
 platform: ruby
 authors: 
 - Jesse Storimer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 -05:00
+date: 2010-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,13 +38,15 @@ files:
 - Rakefile
 - VERSION
 - delayed_paperclip.gemspec
+- lib/delayed/jobs/delayed_paperclip_job.rb
+- lib/delayed/jobs/resque_paperclip_job.rb
 - lib/delayed/paperclip.rb
-- lib/delayed/paperclip_job.rb
 - lib/delayed_paperclip.rb
 - rails/init.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
 homepage: http://github.com/jstorimer/delayed_paperclip
@@ -63,9 +65,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
@@ -76,4 +78,5 @@ specification_version: 3
 summary: Process your Paperclip attachments in the background with delayed_job.
 test_files: 
 - test/delayed_paperclip_test.rb
+- test/resque_paperclip_test.rb
 - test/test_helper.rb