delayed_paperclip 2.10.0 → 3.0.0

data/lib/delayed_paperclip/process_job.rb

@@ -0,0 +1,14 @@
+require "active_job"
+
+module DelayedPaperclip
+  class ProcessJob < ActiveJob::Base
+    def self.enqueue_delayed_paperclip(instance_klass, instance_id, attachment_name)
+      queue_name = instance_klass.constantize.paperclip_definitions[attachment_name][:delayed][:queue]
+      set(:queue => queue_name).perform_later(instance_klass, instance_id, attachment_name.to_s)
+    end
+
+    def perform(instance_klass, instance_id, attachment_name)
+      DelayedPaperclip.process_job(instance_klass, instance_id, attachment_name.to_sym)
+    end
+  end
+end

data/lib/delayed_paperclip/railtie.rb

@@ -1,26 +1,21 @@
-require 'paperclip'
-require 'delayed_paperclip'
+require "paperclip"
+require "delayed_paperclip"
 
 module DelayedPaperclip
-  if defined? Rails::Railtie
-    require 'rails'
-
-    # On initialzation, include DelayedPaperclip
-    class Railtie < Rails::Railtie
-      initializer 'delayed_paperclip.insert_into_active_record' do |app|
-        ActiveSupport.on_load :active_record do
-          DelayedPaperclip::Railtie.insert
-        end
+  # On initialzation, include DelayedPaperclip
+  class Railtie < Rails::Railtie
+    initializer "delayed_paperclip.insert_into_active_record" do |app|
+      ActiveSupport.on_load :active_record do
+        DelayedPaperclip::Railtie.insert
+      end
 
-        if app.config.respond_to?(:delayed_paperclip_defaults)
-          DelayedPaperclip.options.merge!(app.config.delayed_paperclip_defaults)
-        end
+      if app.config.respond_to?(:delayed_paperclip_defaults)
+        DelayedPaperclip.options.merge!(app.config.delayed_paperclip_defaults)
       end
     end
   end
 
   class Railtie
-
     # Glue includes DelayedPaperclip Class Methods and Instance Methods into ActiveRecord
     # Attachment and URL Generator extends Paperclip
     def self.insert

data/lib/delayed_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DelayedPaperclip
-  VERSION = "2.10.0"
+  VERSION = "3.0.0"
 end

data/spec/delayed_paperclip/attachment_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe DelayedPaperclip::Attachment do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     reset_dummy(dummy_options)
   end
 

data/spec/delayed_paperclip/class_methods_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe DelayedPaperclip::ClassMethods do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     reset_dummy(with_processed: false)
   end
 

data/spec/delayed_paperclip/instance_methods_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe DelayedPaperclip::InstanceMethods do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     reset_dummy
   end
 

data/spec/delayed_paperclip/url_generator_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe DelayedPaperclip::UrlGenerator do
   before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
     reset_dummy(dummy_options)
   end
 

data/spec/delayed_paperclip_spec.rb

@@ -1,36 +1,29 @@
 require 'spec_helper'
-require 'resque'
 
 describe DelayedPaperclip do
   before :each do
     reset_dummy
   end
 
-  context "with Resque adapter" do
-    before :each do
-      DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
-    end
-
-    describe ".options" do
-      it ".options returns basic options" do
-        DelayedPaperclip.options.should == {:background_job_class => DelayedPaperclip::Jobs::Resque,
-                                            :url_with_processing => true,
-                                            :processing_image_url => nil,
-                                            :queue => "paperclip"}
-      end
+  describe ".options" do
+    it ".options returns basic options" do
+      DelayedPaperclip.options.should == {:background_job_class => DelayedPaperclip::ProcessJob,
+                                          :url_with_processing => true,
+                                          :processing_image_url => nil,
+                                          :queue => "paperclip"}
     end
+  end
 
-    describe ".processor" do
-      it ".processor returns processor" do
-        DelayedPaperclip.processor.should == DelayedPaperclip::Jobs::Resque
-      end
+  describe ".processor" do
+    it ".processor returns processor" do
+      DelayedPaperclip.processor.should == DelayedPaperclip::ProcessJob
     end
+  end
 
-    describe ".enqueue" do
-      it "delegates to processor" do
-        DelayedPaperclip::Jobs::Resque.expects(:enqueue_delayed_paperclip).with("Dummy", 1, :image)
-        DelayedPaperclip.enqueue("Dummy", 1, :image)
-      end
+  describe ".enqueue" do
+    it "delegates to processor" do
+      DelayedPaperclip::ProcessJob.expects(:enqueue_delayed_paperclip).with("Dummy", 1, :image)
+      DelayedPaperclip.enqueue("Dummy", 1, :image)
     end
   end
 

data/spec/integration/base_delayed_paperclip_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe "Base Delayed Paperclip Integration" do
-  before :each do
-    DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Resque
-    Resque.remove_queue(:paperclip)
-  end
-
   let(:dummy) { Dummy.create }
 
   before :each do

data/spec/integration/examples/base.rb

@@ -104,14 +104,16 @@ shared_examples "base usage" do
     end
 
     context "with error" do
-      before :each do
+      it "stays true even if errored" do
         Paperclip::Attachment.any_instance.stubs(:reprocess!).raises(StandardError.new('oops'))
-      end
 
-      it "stays true even if errored" do
         dummy.save!
         dummy.image_processing?.should be_truthy
-        process_jobs
+
+        expect do
+          process_jobs
+        end.to raise_error(StandardError)
+
         dummy.image_processing?.should be_truthy
         dummy.reload.image_processing?.should be_truthy
       end

data/spec/integration/process_job_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+RSpec.describe "DelayedJob::ProcessJob" do
+  before :each do
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.logger = nil
+  end
+
+  let(:dummy) { Dummy.new(:image => File.open("#{ROOT}/fixtures/12k.png")) }
+
+  describe "integration tests" do
+    include_examples "base usage"
+  end
+
+  def process_jobs
+    ActiveJob::Base.queue_adapter.enqueued_jobs.each do |job|
+      job[:job].send(:perform_now, *job[:args])
+    end
+  end
+
+  def jobs_count(queue = "paperclip")
+    ActiveJob::Base.queue_adapter.enqueued_jobs.count do |job|
+      job[:queue] == queue
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,10 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
+require 'rails'
 require 'active_record'
 require 'rspec'
-require 'fakeredis/rspec'
 require 'mocha/api'
-begin
-  require 'active_job'
-rescue LoadError
-end
 
 begin
   require 'pry'
@@ -28,9 +24,6 @@ if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=) && Rails::
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 
-require "active_support/deprecation"
-ActiveSupport::Deprecation.silenced = true
-
 # Connect to sqlite
 ActiveRecord::Base.establish_connection(
   "adapter" => "sqlite3",
@@ -39,8 +32,11 @@ ActiveRecord::Base.establish_connection(
 
 # Path for filesystem writing
 ROOT = Pathname.new(File.expand_path("../.", __FILE__))
-ActiveRecord::Base.logger = Logger.new(ROOT.join("tmp/debug.log"))
-Paperclip.logger = ActiveRecord::Base.logger
+
+logger = Logger.new(ROOT.join("tmp/debug.log"))
+ActiveRecord::Base.logger = logger
+ActiveJob::Base.logger = logger
+Paperclip.logger = logger
 
 RSpec.configure do |config|
   config.mock_with :mocha
@@ -57,7 +53,7 @@ end
 
 def reset_global_default_options
   DelayedPaperclip.options.merge!({
-    :background_job_class => DelayedPaperclip::Jobs::Resque,
+    :background_job_class => DelayedPaperclip::ProcessJob,
     :url_with_processing  => true,
     :processing_image_url => nil
   })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_paperclip
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jesse Storimer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -28,49 +28,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '4.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: delayed_job
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -84,21 +56,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,20 +83,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +126,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -182,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeredis
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,8 +153,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Process your Paperclip attachments in the background with DelayedJob,
-  Resque, Sidekiq or your own processor.
+description: Process your Paperclip attachments in the background with ActiveJob
 email:
 - james@jamesrgifford.com
 - scott@artsicle.com
@@ -214,23 +171,14 @@ files:
 - README.md
 - Rakefile
 - delayed_paperclip.gemspec
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
-- init.rb
 - lib/delayed_paperclip.rb
 - lib/delayed_paperclip/attachment.rb
-- lib/delayed_paperclip/jobs.rb
-- lib/delayed_paperclip/jobs/active_job.rb
-- lib/delayed_paperclip/jobs/delayed_job.rb
-- lib/delayed_paperclip/jobs/resque.rb
-- lib/delayed_paperclip/jobs/sidekiq.rb
+- lib/delayed_paperclip/process_job.rb
 - lib/delayed_paperclip/railtie.rb
 - lib/delayed_paperclip/url_generator.rb
 - lib/delayed_paperclip/version.rb
-- rails/init.rb
 - spec/delayed_paperclip/attachment_spec.rb
 - spec/delayed_paperclip/class_methods_spec.rb
 - spec/delayed_paperclip/instance_methods_spec.rb
@@ -238,17 +186,12 @@ files:
 - spec/delayed_paperclip_spec.rb
 - spec/fixtures/12k.png
 - spec/fixtures/missing.png
-- spec/integration/active_job_inline_spec.rb
-- spec/integration/active_job_resque_spec.rb
-- spec/integration/active_job_sidekiq_spec.rb
 - spec/integration/base_delayed_paperclip_spec.rb
-- spec/integration/delayed_job_spec.rb
 - spec/integration/examples/base.rb
-- spec/integration/resque_spec.rb
-- spec/integration/sidekiq_spec.rb
+- spec/integration/process_job_spec.rb
 - spec/spec_helper.rb
 - spec/tmp/.keep
-homepage: http://github.com/jrgifford/delayed_paperclip
+homepage: https://github.com/jrgifford/delayed_paperclip
 licenses: []
 metadata: {}
 post_install_message: 
@@ -259,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -270,7 +213,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Process your Paperclip attachments in the background.
+summary: Process your Paperclip attachments in the background
 test_files:
 - spec/delayed_paperclip/attachment_spec.rb
 - spec/delayed_paperclip/class_methods_spec.rb
@@ -279,13 +222,8 @@ test_files:
 - spec/delayed_paperclip_spec.rb
 - spec/fixtures/12k.png
 - spec/fixtures/missing.png
-- spec/integration/active_job_inline_spec.rb
-- spec/integration/active_job_resque_spec.rb
-- spec/integration/active_job_sidekiq_spec.rb
 - spec/integration/base_delayed_paperclip_spec.rb
-- spec/integration/delayed_job_spec.rb
 - spec/integration/examples/base.rb
-- spec/integration/resque_spec.rb
-- spec/integration/sidekiq_spec.rb
+- spec/integration/process_job_spec.rb
 - spec/spec_helper.rb
 - spec/tmp/.keep