delayed_paperclip 0.6.5 → 0.7.1

data/.gitignore

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

data/.rvmrc

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

data/CONTRIBUTING

@@ -0,0 +1,16 @@
+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

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

data/README.textile

@@ -88,4 +88,8 @@ AFAIK this library should work no matter what kind of post-processing you are do
 
 h2. Does it work with s3?
 
-Yes.
+Yes.
+
+h2. Contributing
+
+Checkout out CONTRIBUTING for more info.

data/Rakefile

@@ -1,51 +1,15 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
-require 'paperclip'
 
 desc 'Default: run unit tests.'
-task :default => [:clean, :test]
+task :default => :test
 
 desc 'Test the paperclip plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
+  t.libs << 'lib:test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
 
-desc 'Generate documentation for the paperclip plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = 'Delayed::Paperclip'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc 'Clean up files.'
-task :clean do |t|
-  FileUtils.rm_rf "doc"
-  FileUtils.rm_rf "tmp"
-  FileUtils.rm_rf "pkg"
-  FileUtils.rm "test/debug.log" rescue nil
-  FileUtils.rm "test/paperclip.db" rescue nil
-  Dir.glob("paperclip-*.gem").each{|f| FileUtils.rm f }
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "delayed_paperclip"
-    gemspec.summary = "Process your Paperclip attachments in the background with delayed_job."
-    gemspec.description = "Process your Paperclip attachments in the background with delayed_job."
-    gemspec.email = "jesse@jstorimer.com"
-    gemspec.homepage = "http://github.com/jstorimer/delayed_paperclip"
-    gemspec.authors = ["Jesse Storimer"]
-    gemspec.add_dependency('paperclip', '>= 2.3.0')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
-end

data/delayed_paperclip.gemspec

@@ -1,61 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{delayed_paperclip}
-  s.version = "0.6.5"
+  s.version = "0.7.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jesse Storimer"]
-  s.date = %q{2010-03-13}
-  s.description = %q{Process your Paperclip attachments in the background with delayed_job.}
+  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.extra_rdoc_files = [
-    "LICENSE",
-     "README.textile"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "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.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}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  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"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  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"]
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.0"])
-    else
-      s.add_dependency(%q<paperclip>, [">= 2.3.0"])
-    end
-  else
-    s.add_dependency(%q<paperclip>, [">= 2.3.0"])
-  end
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'delayed_job'
+  s.add_development_dependency 'resque'
 end
 

data/lib/delayed_paperclip/jobs/delayed_job.rb

@@ -0,0 +1,17 @@
+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
+        )
+      end
+
+      def perform
+        DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name)
+      end
+    end
+  end
+end

data/lib/delayed_paperclip/jobs/resque.rb

@@ -0,0 +1,15 @@
+module DelayedPaperclip
+  module Jobs
+    class Resque
+      @queue = :paperclip
+
+      def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+        ::Resque.enqueue(self, instance_klass, instance_id, attachment_name)
+      end
+
+      def self.perform(instance_klass, instance_id, attachment_name)
+        DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name)
+      end
+    end
+  end
+end

data/lib/delayed_paperclip.rb

@@ -1,9 +1,156 @@
 require 'paperclip'
 
-require 'delayed/paperclip'
-require 'delayed/jobs/resque_paperclip_job'
-require 'delayed/jobs/delayed_paperclip_job'
+require 'delayed_paperclip'
+require 'delayed_paperclip/jobs/delayed_job'
+require 'delayed_paperclip/jobs/resque'
+
+module DelayedPaperclip
+
+  class << self
+
+    def options
+      options ||= {
+        :background_job_class => detect_background_task
+      }
+    end
+
+    def detect_background_task
+      return DelayedPaperclip::Jobs::DelayedJob if defined? ::Delayed::Job
+      return DelayedPaperclip::Jobs::Resque     if defined? ::Resque
+    end
+
+    def processor
+      options[:background_job_class]
+    end
+
+    def enqueue(instance_klass, instance_id, attachment_name)
+      processor.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+    end
+
+    def process_job(instance_klass, instance_id, attachment_name)
+      instance_klass.constantize.find(instance_id).
+        send(attachment_name).
+        process_delayed!
+    end
+
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
+
+    def process_in_background(name, options = {})
+      include InstanceMethods
+
+      attachment_definitions[name][:delayed] = {}
+      attachment_definitions[name][:delayed][:priority] = options.key?(:priority) ? options[:priority] : 0
+
+      if respond_to?(:after_commit)
+        after_commit  :enqueue_delayed_processing
+      else
+        after_save  :enqueue_delayed_processing
+      end
+    end
+  end
+
+  module InstanceMethods
+
+    # 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
+      self.class.update_all(processing.collect{|n| "#{n}_processing = 1" }.join(", "), "id = #{self.id}") unless processing.empty?
+    end
+
+    # First mark processing
+    # then create
+    def enqueue_delayed_processing
+      mark_enqueue_delayed_processing
+      (@_enqued_for_processing || []).each do |name|
+        enqueue_post_processing_for(name)
+      end
+      @_enqued_for_processing = []
+    end
+
+    def enqueue_post_processing_for name
+      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
+      @_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, Delayed::Paperclip)
-end
+  ActiveRecord::Base.send(:include, DelayedPaperclip)
+end

data/test/delayed_paperclip_test.rb

@@ -1,74 +1,69 @@
-require 'test/test_helper'
-gem 'delayed_job'
+require 'test_helper'
 require 'delayed_job'
+Delayed::Worker.backend = :active_record
 
 class DelayedPaperclipTest < Test::Unit::TestCase
   def setup
+    super
+
     build_delayed_jobs
     reset_dummy
   end
 
-  def test_attachment_changed
-    @dummy.stubs(:image_file_size_changed?).returns(false)
-    @dummy.stubs(:image_file_name_changed?).returns(false)
-    @dummy.stubs(:image_content_type_changed?).returns(false)
-    @dummy.stubs(:image_updated_at_changed?).returns(false)
+  def test_normal_paperclip_functioning
+    build_dummy_table(false)
+    reset_class "Dummy", false
 
-    assert !@dummy.image_changed?
-  end
+    Paperclip::Attachment.any_instance.expects(:post_process)
 
-  def test_attachment_changed_when_image_changes
-    @dummy.stubs(:image_file_size_changed?).returns(true)
+    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
 
-    assert @dummy.image_changed?
+    assert !dummy.image.delay_processing?
+    assert dummy.image.post_processing
+    assert dummy.save
+    assert File.exists?(dummy.image.path)
   end
 
-  def test_before_post_process
-    Dummy.expects(:before_image_post_process)
-    @dummy_class.process_in_background :image
-  end
+  def test_delayed_paperclip_functioning
+    build_dummy_table(false)
+    reset_class "Dummy", true
 
-  def test_halt_processing_if_source_changed
-    @dummy.stubs(:image_changed?).returns(true)
-    assert !@dummy.halt_processing_for_image
-  end
+    Paperclip::Attachment.any_instance.expects(:post_process).never
 
-  def test_halt_processing_if_source_has_not_changed
-    @dummy.stubs(:image_changed?).returns(false)
-    assert_not_equal false, @dummy.halt_processing_for_image
-  end
+    dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
 
-  def test_after_save
-    Dummy.expects(:after_save)
-    @dummy_class.process_in_background :image
+    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.stubs(:image_changed?).returns(true)
+    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
 
     original_job_count = Delayed::Job.count
-    @dummy.enqueue_job_for_image
+    @dummy.save
 
     assert_equal original_job_count + 1, Delayed::Job.count
   end
 
   def test_perform_job
-    @dummy.stubs(:image_changed?).returns(true)
+    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
     Paperclip::Attachment.any_instance.expects(:reprocess!)
 
     @dummy.save!
     Delayed::Job.last.payload_object.perform
   end
-  
+
   def test_processing_column_kept_intact
     @dummy = reset_dummy(true)
-    
-    @dummy.stubs(:image_changed?).returns(true)
+
     Paperclip::Attachment.any_instance.stubs(:reprocess!).raises(StandardError.new('oops'))
 
     @dummy.save!
     assert @dummy.image_processing?
-    Delayed::Job.work_off
+    Delayed::Worker.new.work_off
     assert @dummy.reload.image_processing?
   end
 
@@ -78,11 +73,7 @@ class DelayedPaperclipTest < Test::Unit::TestCase
     Dummy.any_instance.expects(:done_processing)
 
     @dummy.save!
-    DelayedPaperclipJob.new(@dummy.class.name, @dummy.id, :image).perform
-  end
-
-  def test_processed_method_returns_nil_if_column_does_not_exist
-    assert_equal nil, @dummy.image_processed!
+    DelayedPaperclip::Jobs::DelayedJob.new(@dummy.class.name, @dummy.id, :image).perform
   end
 
   def test_processing_true_when_new_image_added
@@ -95,17 +86,17 @@ class DelayedPaperclipTest < Test::Unit::TestCase
   end
 
   def test_processed_true_when_delayed_jobs_completed
-    @dummy = reset_dummy(true)    
+    @dummy = reset_dummy(true)
     @dummy.save!
 
-    Delayed::Job.work_off
+    Delayed::Worker.new.work_off
 
     @dummy.reload
     assert !@dummy.image_processing?
   end
 
   def test_unprocessed_image_returns_missing_url
-    @dummy = reset_dummy(true)    
+    @dummy = reset_dummy(true)
     @dummy.save!
 
     assert_equal "/images/original/missing.png", @dummy.image.url
@@ -114,31 +105,29 @@ class DelayedPaperclipTest < Test::Unit::TestCase
 
     @dummy.reload
     assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
-  end  
-  
+  end
+
   def test_original_url_when_no_processing_column
-    @dummy = reset_dummy(false)    
+    @dummy = reset_dummy(false)
     @dummy.save!
 
     assert_match(/\/system\/images\/1\/original\/12k.png/, @dummy.image.url)
-  end    
-  
+  end
+
   def test_original_url_if_image_changed
-    @dummy = reset_dummy(true)    
-    @dummy.image_processing!
-    @dummy.image_content_type_will_change!
+    @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.image_processing!
-    @dummy.stubs(:image_changed?).returns(false)
+    @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"))

data/test/resque_paperclip_test.rb

@@ -1,9 +1,11 @@
-require 'test/test_helper'
+require 'test_helper'
 gem 'resque'
 require 'resque'
 
 class ResquePaperclipTest < Test::Unit::TestCase
   def setup
+    super
+
     # Make sure that we just test Resque in here
     Object.send(:remove_const, :Delayed) if defined? Delayed
 
@@ -12,42 +14,41 @@ class ResquePaperclipTest < Test::Unit::TestCase
   end
 
   def test_enqueue_job_if_source_changed
-    @dummy.stubs(:image_changed?).returns(true)
+    @dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png")
 
     original_job_count = Resque.size(:paperclip)
-    @dummy.enqueue_job_for_image
+    @dummy.save
 
     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)
+    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_class.after_image_post_process :done_processing
     Dummy.any_instance.expects(:done_processing)
 
     @dummy.save!
-    ResquePaperclipJob.perform(@dummy.class.name, @dummy.id, :image)
+    DelayedPaperclip::Jobs::Resque.perform(@dummy.class.name, @dummy.id, :image)
   end
-  
+
   def test_processing_column_kept_intact
     @dummy = reset_dummy(true)
-    
-    @dummy.stubs(:image_changed?).returns(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?
-    
+    assert @dummy.image_processing?, "image should be processing #{@dummy.inspect}"
+
     worker = Resque::Worker.new(:paperclip)
     worker.process
-    
-    assert @dummy.reload.image_processing?
+
+    assert @dummy.reload.image_processing?, "image should be processing"
   end
-end
+end

data/test/test_helper.rb

@@ -1,23 +1,25 @@
-require 'test/unit'
 require 'rubygems'
+require 'test/unit'
 require 'mocha'
 require 'active_record'
+require 'logger'
+require 'sqlite3'
+require 'paperclip/railtie'
+Paperclip::Railtie.insert
 
 ROOT       = File.join(File.dirname(__FILE__), '..')
 RAILS_ROOT = ROOT
-RAILS_ENV  = "test"
-
 $LOAD_PATH << File.join(ROOT, 'lib')
-$LOAD_PATH << File.join(ROOT, 'lib', 'delayed', 'paperclip')
-$LOAD_PATH << File.join(ROOT, 'test')
-
-require File.join(ROOT, 'lib', 'delayed_paperclip.rb')
 
-require 'active_support'
-gem 'sqlite3-ruby'
+require 'delayed_paperclip'
 
-gem 'paperclip'
-require 'paperclip'
+class Test::Unit::TestCase
+  def setup
+    silence_warnings do
+      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
+    end
+  end
+end
 
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
@@ -29,7 +31,7 @@ def reset_dummy(with_processed = false)
 
   reset_class "Dummy"
 
-  @dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png"))
+  @dummy = Dummy.new(:image => File.open("#{ROOT}/test/fixtures/12k.png"))
 end
 
 def reset_class class_name, include_process = true
@@ -65,4 +67,4 @@ def build_delayed_jobs
     table.string   :locked_by                    # Who is working on this object (if locked)
     table.timestamps
   end
-end
+end

metadata

@@ -1,56 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: delayed_paperclip
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 5
-  version: 0.6.5
+version: !ruby/object:Gem::Version
+  version: 0.7.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jesse Storimer
+- Bert Goethals
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-13 00:00:00 -05:00
+date: 2011-07-27 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: paperclip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
+  requirement: &2152759240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-description: Process your Paperclip attachments in the background with delayed_job.
+  prerelease: false
+  version_requirements: *2152759240
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2152758840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152758840
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &2152758380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152758380
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: &2152757960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152757960
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: &2152757540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152757540
+description: Process your Paperclip attachments in the background with delayed_job,
+  Resque or your own processor.
 email: jesse@jstorimer.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.textile
-files: 
+extra_rdoc_files: []
+files:
 - .gitignore
+- .rvmrc
+- CONTRIBUTING
+- Gemfile
 - LICENSE
 - README.textile
 - 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.rb
+- lib/delayed_paperclip/jobs/delayed_job.rb
+- lib/delayed_paperclip/jobs/resque.rb
 - rails/init.rb
 - test/database.yml
 - test/delayed_paperclip_test.rb
@@ -60,34 +95,31 @@ files:
 has_rdoc: true
 homepage: http://github.com/jstorimer/delayed_paperclip
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Process your Paperclip attachments in the background with delayed_job.
-test_files: 
+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

data/VERSION

@@ -1 +0,0 @@
-0.6.5

data/lib/delayed/jobs/delayed_paperclip_job.rb

@@ -1,19 +0,0 @@
-class DelayedPaperclipJob < Struct.new(:instance_klass, :instance_id, :attachment_name)
-  def perform
-    process_job do
-      instance.send(attachment_name).reprocess!
-      instance.send("#{attachment_name}_processed!")
-    end
-  end
-  
-  private
-  def instance
-    @instance ||= instance_klass.constantize.find(instance_id)
-  end
-  
-  def process_job
-    instance.send(attachment_name).job_is_processing = true
-    yield
-    instance.send(attachment_name).job_is_processing = false    
-  end
-end

data/lib/delayed/jobs/resque_paperclip_job.rb

@@ -1,19 +0,0 @@
-class ResquePaperclipJob
-  @queue = :paperclip
-
-  def self.perform(instance_klass, instance_id, attachment_name)
-    instance = instance_klass.constantize.find(instance_id)
-
-    process_job(instance, attachment_name) do
-      instance.send(attachment_name).reprocess!
-      instance.send("#{attachment_name}_processed!")
-    end
-  end
-  
-  private
-  def self.process_job(instance, attachment_name)
-    instance.send(attachment_name).job_is_processing = true
-    yield
-    instance.send(attachment_name).job_is_processing = false        
-  end
-end

data/lib/delayed/paperclip.rb

@@ -1,108 +0,0 @@
-module Delayed
-  module Paperclip
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def process_in_background(name)
-        include InstanceMethods
-
-        define_method "#{name}_changed?" do
-          attachment_has_changed?(name)
-        end
-
-        define_method "halt_processing_for_#{name}" do
-          return unless self.send("#{name}_changed?")
-
-          false # halts processing
-        end
-
-        define_method "enqueue_job_for_#{name}" do
-          return unless self.send("#{name}_changed?")
-
-          if delayed_job?
-            Delayed::Job.enqueue DelayedPaperclipJob.new(self.class.name, read_attribute(:id), name.to_sym)
-          elsif resque?
-            Resque.enqueue(ResquePaperclipJob, self.class.name, read_attribute(:id), name.to_sym)
-          end
-        end
-
-        define_method "#{name}_processed!" do
-          return unless column_exists?(:"#{name}_processing")
-          return unless self.send(:"#{name}_processing?")
-
-          self.send("#{name}_processing=", false)
-          self.save(false)
-        end
-
-        define_method "#{name}_processing!" do
-          return unless column_exists?(:"#{name}_processing")
-          return if self.send(:"#{name}_processing?")
-          return unless self.send(:"#{name}_changed?")
-
-          self.send("#{name}_processing=", true)
-        end
-
-        self.send("before_#{name}_post_process", :"halt_processing_for_#{name}")
-
-        before_save :"#{name}_processing!"
-        after_save  :"enqueue_job_for_#{name}"
-      end
-    end
-
-    module InstanceMethods
-      PAPERCLIP_ATTRIBUTES = ['_file_size', '_file_name', '_content_type', '_updated_at']
-      
-      def attachment_has_changed?(name)
-        PAPERCLIP_ATTRIBUTES.each do |attribute|
-          full_attribute = "#{name}#{attribute}_changed?".to_sym
-
-          next unless self.respond_to?(full_attribute)
-          return true if self.send("#{name}#{attribute}_changed?")
-        end
-
-        false
-      end
-
-      def delayed_job?
-        defined? Delayed::Job
-      end
-
-      def resque?
-        defined? Resque
-      end
-      
-      def column_exists?(column)
-        self.class.columns_hash.has_key?(column.to_s)
-      end
-    end      
-  end
-end
-
-module Paperclip
-  class Attachment
-    attr_accessor :job_is_processing
-
-    def url_with_processed style = default_style, include_updated_timestamp = true
-      return url_without_processed style, include_updated_timestamp unless @instance.respond_to?(:column_exists?)
-      return url_without_processed style, include_updated_timestamp if job_is_processing
-
-      if !@instance.column_exists?(:"#{@name}_processing")
-        url_without_processed style, include_updated_timestamp
-      else
-        if !@instance.send(:"#{@name}_processing?")
-          url_without_processed style, include_updated_timestamp
-        else
-          if @instance.send(:"#{@name}_changed?")
-            url_without_processed style, include_updated_timestamp
-          else
-            interpolate(@default_url, style)
-          end
-        end
-      end
-    end
-    
-    alias_method_chain :url, :processed
-  end
-end