activejob-cancel 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ba1ad25092d81d1e814585fd026fd68f813c2a
-  data.tar.gz: 272ae21271e5ddc2b5081b2de32756885dfb5352
+  metadata.gz: 5132b8b0de9b2367ec64975fd45bb3f28a6e0e9d
+  data.tar.gz: 9ed3b9b10a9bd8717421eb2054b95a93aa203e9f
 SHA512:
-  metadata.gz: 9c5f55cf87d82c363d00148021bcf08f481723f58da89c91d4f445d8289ce87eba3a0c39167c6dd355ff0830357aef3480f392f738d1cabbbb76bced0f3097d9
-  data.tar.gz: ca5b5d7aae41db84ff5d4ea694f01bebfbd155ded00073c2dac1dc591a4f436b7584b53022cc4042f35c391610c8e0ffe2282dd64475d63dad051c133a0d7c19
+  metadata.gz: 2da9918d434cc04329d3dfb0089373eac2762737f39b7b5a488dec2db45432b7412bcdf5188b7ec83d63e9b9c26cd3a02a60236719208f9c778be7d4b53825bf
+  data.tar.gz: 732622b3d8e2777ddb3f4c3126f678230579759ebe8ed35fe6d5d5331d26b9a2d962fd59cd66683e078a8e87aee18711ee2fb34f8c7fed012911a0abd0cd8605

data/.travis.yml

@@ -1,13 +1,20 @@
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 
 gemfile:
   - gemfiles/active_job_42.gemfile
   - gemfiles/active_job_50.gemfile
+  - gemfiles/active_job_51.gemfile
+  - gemfiles/active_job_master.gemfile
 
-before_install: gem install bundler -v 1.11.2
+before_install: gem install bundler
+
+matrix:
+  allow_failures:
+  - gemfile: gemfiles/active_job_master.gemfile
 
 services:
   - redis

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## master
+
+Nothing
+
+## 0.2.0
+
+* Add support for `resque`
+* Fix(SidekiqAdapter): fix case when worker's first argument is not a Hash #21 [Nguyễn Đức Long]

data/README.md

@@ -1,6 +1,6 @@
 # ActiveJob::Cancel
 
-`activejob-cancel` provides cancel method to Active Job. Currently it supports only `Sidekiq` and `Delayed Job`.
+`activejob-cancel` provides cancel method to Active Job. Currently it supports only `Sidekiq`, `Delayed Job` and `resque`.
 
 [![Build Status](https://travis-ci.org/y-yagi/activejob-cancel.svg?branch=master)](https://travis-ci.org/y-yagi/activejob-cancel)
 [![Gem Version](https://badge.fury.io/rb/activejob-cancel.svg)](http://badge.fury.io/rb/activejob-cancel)

data/Rakefile

@@ -5,6 +5,8 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+  t.warning = true
 end
 
 task :default => :test

data/activejob-cancel.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "activerecord", '>= 4.2.0'
   spec.add_development_dependency "delayed_job"
   spec.add_development_dependency "delayed_job_active_record"
+  spec.add_development_dependency "resque"
+  spec.add_development_dependency "resque-scheduler"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "byebug"
 end

data/gemfiles/active_job_42.gemfile

@@ -5,6 +5,8 @@ gem 'rake'
 gem 'sidekiq'
 gem 'delayed_job'
 gem 'delayed_job_active_record'
+gem 'resque'
+gem 'resque-scheduler'
 gem 'sqlite3'
 gem 'activesupport', '~> 4.2.0'
 gem 'activejob', '~> 4.2.0'

data/gemfiles/active_job_50.gemfile

@@ -5,7 +5,9 @@ gem 'rake'
 gem 'sidekiq'
 gem 'delayed_job'
 gem 'delayed_job_active_record'
+gem 'resque'
+gem 'resque-scheduler'
 gem 'sqlite3'
-gem 'activesupport', '~> 5.0.0'
-gem 'activejob', '~> 5.0.0'
-gem 'activerecord', '~> 5.0.0'
+gem 'activesupport', '5.0.1'
+gem 'activejob', '5.0.1'
+gem 'activerecord', '5.0.1'

data/gemfiles/active_job_51.gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gem 'coveralls', require: false
+gem 'rake'
+gem 'sidekiq'
+gem 'delayed_job'
+gem 'delayed_job_active_record', '>= 4.1.2'
+gem 'resque'
+gem 'resque-scheduler'
+gem 'sqlite3'
+gem 'activesupport', '5.1.0'
+gem 'activejob', '5.1.0'
+gem 'activerecord', '5.1.0'

data/gemfiles/active_job_master.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'coveralls', require: false
+gem 'rake'
+gem 'sidekiq'
+gem 'delayed_job'
+gem 'delayed_job_active_record'
+gem 'resque'
+gem 'resque-scheduler'
+gem 'sqlite3'
+gem 'arel', github: 'rails/arel'
+gem 'activesupport', github: 'rails/rails'
+gem 'activejob', github: 'rails/rails'
+gem 'activerecord', github: 'rails/rails'

data/lib/active_job/cancel.rb

@@ -7,7 +7,7 @@ module ActiveJob
   module Cancel
     extend ActiveSupport::Concern
 
-    SUPPORTED_ADAPTERS = %w(Sidekiq DelayedJob).freeze
+    SUPPORTED_ADAPTERS = %w(Sidekiq DelayedJob Resque).freeze
 
     def cancel
       if self.class.can_cancel?
@@ -54,4 +54,6 @@ module ActiveJob
   end
 end
 
-ActiveJob::Base.include(ActiveJob::Cancel)
+ActiveSupport.on_load(:active_job) do
+  include(ActiveJob::Cancel)
+end

data/lib/active_job/cancel/queue_adapters.rb

@@ -5,6 +5,7 @@ module ActiveJob
 
       autoload :SidekiqAdapter
       autoload :DelayedJobAdapter
+      autoload :ResqueAdapter
     end
   end
 end

data/lib/active_job/cancel/queue_adapters/delayed_job_adapter.rb

@@ -6,6 +6,7 @@ module ActiveJob
     module QueueAdapters
       class DelayedJobAdapter
         def cancel(job_id, queue_name)
+          queue_name = queue_name.call if queue_name.is_a?(Proc)
           job = find_job(job_id, queue_name)
           if job
             job.destroy

data/lib/active_job/cancel/queue_adapters/resque_adapter.rb

@@ -0,0 +1,40 @@
+require 'resque'
+
+module ActiveJob
+  module Cancel
+    module QueueAdapters
+      class ResqueAdapter
+        def cancel(job_id, queue_name)
+          queue_name = queue_name.call if queue_name.is_a?(Proc)
+          job = find_job(job_id, queue_name)
+
+          if job
+            Resque.redis.lrem(redis_key_for_queue(queue_name), 0, Resque.encode(job))
+            return true
+          else
+            if defined?(Resque.remove_delayed_selection)
+              removed_count = Resque.remove_delayed_selection { |target| target[0]["job_id"] == job_id }
+              return true if removed_count > 0
+            end
+          end
+
+          false
+        end
+
+        private
+          def find_job(job_id, queue_name)
+            jobs = Resque.list_range(redis_key_for_queue(queue_name), 0, Resque.size(queue_name))
+            jobs = [jobs] if jobs.is_a?(Hash)
+
+            jobs.find do |job|
+              job["args"][0]["job_id"] == job_id
+            end
+          end
+
+          def redis_key_for_queue(queue)
+            "queue:#{queue}"
+          end
+      end
+    end
+  end
+end

data/lib/active_job/cancel/queue_adapters/sidekiq_adapter.rb

@@ -5,6 +5,7 @@ module ActiveJob
     module QueueAdapters
       class SidekiqAdapter
         def cancel(job_id, queue_name)
+          queue_name = queue_name.call if queue_name.is_a?(Proc)
           job = find_job_by_job_id(job_id, queue_name)
 
           if job
@@ -18,6 +19,7 @@ module ActiveJob
         def cancel_by(opts, queue_name)
           raise ArgumentError, 'Please specify ":provider_job_id"' unless opts[:provider_job_id]
 
+          queue_name = queue_name.call if queue_name.is_a?(Proc)
           job = find_job_by_provider_job_id(opts[:provider_job_id], queue_name)
           if job
             job.delete
@@ -40,17 +42,17 @@ module ActiveJob
 
           def find_job_from_queue(job_id, queue_name)
             queue = Sidekiq::Queue.new(queue_name)
-            queue.detect { |j| j.args.first['job_id'] == job_id }
+            queue.detect { |j| j.args.first.is_a?(Hash) && j.args.first['job_id'] == job_id }
           end
 
           def find_job_from_scheduled_set(job_id)
             scheduled_set = Sidekiq::ScheduledSet.new
-            scheduled_set.detect { |j| j.args.first['job_id'] == job_id }
+            scheduled_set.detect { |j| j.args.first.is_a?(Hash) && j.args.first['job_id'] == job_id }
           end
 
           def find_job_from_retry_set(job_id)
             scheduled_set = Sidekiq::RetrySet.new
-            scheduled_set.detect { |j| j.args.first['job_id'] == job_id }
+            scheduled_set.detect { |j| j.args.first.is_a?(Hash) && j.args.first['job_id'] == job_id }
           end
       end
     end

data/lib/active_job/cancel/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module Cancel
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-cancel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuji Yaginuma
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque
+  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: resque-scheduler
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +201,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -183,9 +212,12 @@ files:
 - bin/setup
 - gemfiles/active_job_42.gemfile
 - gemfiles/active_job_50.gemfile
+- gemfiles/active_job_51.gemfile
+- gemfiles/active_job_master.gemfile
 - lib/active_job/cancel.rb
 - lib/active_job/cancel/queue_adapters.rb
 - lib/active_job/cancel/queue_adapters/delayed_job_adapter.rb
+- lib/active_job/cancel/queue_adapters/resque_adapter.rb
 - lib/active_job/cancel/queue_adapters/sidekiq_adapter.rb
 - lib/active_job/cancel/version.rb
 - lib/activejob/cancel.rb
@@ -209,9 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: activejob-cancel provides cancel method to Active Job
 test_files: []
-has_rdoc: