activejob-cancel 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d2bba860770d4be5139149e0069cbb365c89759a
-  data.tar.gz: f5c3be4e786cef71c20449657dd3b8033ff0d44f
+SHA256:
+  metadata.gz: f81d11a74b8a9d2f1bfda80748cab75db80f75b244c454a5223581d875fadb64
+  data.tar.gz: a0850dcd4a2222471e5d2ec302bb9300612d8acde7ec925d62e9740d397e7d98
 SHA512:
-  metadata.gz: db5990d551d0e973b8646b898d2c4a924d3b6724a0ded9eb7ab40b6ccb6d28baa8e994ce10926e73564ceba40b0c9ea6d342b877f36e1cb951852b9a2d88e0a0
-  data.tar.gz: 50024aa15719cc7e313186bbbc734eadbfee1b90297febc889ed68f6c583cae5af18059a05515f1b68756fd7ab1c0d9edfdf459ae0620fb44f86aac32055fad4
+  metadata.gz: b24713bfee0841e68cb9e63a4c65c3b9a1e72962aed41eb2380ce7063d4d30a29873b8d3c8b12d3da0e2915850ae313fd7ec40164fab8d4a326a67f0baeef639
+  data.tar.gz: b740c1f3e5862c6e4ee6a0fcf7a77f01c81c7f6af6ece88a4de1cb8b887a2c5add245cd9b52824e6497cccea9bba79d76c4d4816a5fba1a7521a55ea12e85dd4

data/.github/workflows/ci.yml

@@ -0,0 +1,46 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    name: Ruby ${{ matrix.ruby }}, Rails ${{ matrix.gemfile }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ "2.7", "2.3" ]
+        gemfile: [ "active_job_60.gemfile", "active_job_52.gemfile", "active_job_51.gemfile", "active_job_50.gemfile", "active_job_42.gemfile" ]
+        exclude:
+          - ruby: "2.3"
+            gemfile: "active_job_60.gemfile"
+          - ruby: "2.7"
+            gemfile: "active_job_42.gemfile"
+          - ruby: "2.6"
+            gemfile: "active_job_42.gemfile"
+
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        # Wait for starting Redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile}}
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        gem install bundler --no-document
+        bundle install
+    - name: Run test
+      run: bundle exec rake

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Nothing
 
+## 0.3.1
+
+* Fix `NoMethodError` when using the cancel methods with the default queue name
+
 ## 0.3.0
 
 * Add support for Active Job `TestAdapter` #19 [Hermann Mayer]

data/activejob-cancel.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activejob', '>= 4.2.0'
   spec.add_dependency 'activesupport', '>= 4.2.0'
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "sidekiq"
   spec.add_development_dependency "activerecord", '>= 4.2.0'
   spec.add_development_dependency "delayed_job"

data/gemfiles/active_job_42.gemfile

@@ -7,7 +7,7 @@ gem 'delayed_job'
 gem 'delayed_job_active_record'
 gem 'resque'
 gem 'resque-scheduler'
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 gem 'activesupport', '~> 4.2.0'
 gem 'activejob', '~> 4.2.0'
 gem 'activerecord', '~> 4.2.0'

data/gemfiles/active_job_50.gemfile

@@ -7,7 +7,7 @@ gem 'delayed_job'
 gem 'delayed_job_active_record'
 gem 'resque'
 gem 'resque-scheduler'
-gem 'sqlite3'
-gem 'activesupport', '5.0.1'
-gem 'activejob', '5.0.1'
-gem 'activerecord', '5.0.1'
+gem 'sqlite3', '~> 1.3.6'
+gem 'activesupport', '~> 5.0.0'
+gem 'activejob', '~> 5.0.0'
+gem 'activerecord', '~> 5.0.0'

data/gemfiles/active_job_51.gemfile

@@ -7,7 +7,7 @@ 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'
+gem 'sqlite3', '~> 1.3.6'
+gem 'activesupport', '~> 5.1.0'
+gem 'activejob', '~> 5.1.0'
+gem 'activerecord', '~> 5.1.0'

data/gemfiles/active_job_52.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', '~> 1.3.6'
+gem 'activesupport', '~> 5.2.0'
+gem 'activejob', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0'

data/gemfiles/active_job_60.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', '~> 6.0.0'
+gem 'activejob', '~> 6.0.0'
+gem 'activerecord', '~> 6.0.0'

data/lib/active_job/cancel.rb

@@ -21,7 +21,7 @@ module ActiveJob
     module ClassMethods
       def cancel(job_id)
         if can_cancel?
-          cancel_adapter_class.new.cancel(job_id, self.queue_name)
+          cancel_adapter_class.new.cancel(job_id, self.new.queue_name)
         else
           raise NotImplementedError, 'This queueing backend does not support cancel.'
         end
@@ -29,7 +29,7 @@ module ActiveJob
 
       def cancel_by(opts)
         if can_cancel?
-          cancel_adapter_class.new.cancel_by(opts, self.queue_name)
+          cancel_adapter_class.new.cancel_by(opts, self.new.queue_name)
         else
           raise NotImplementedError, 'This queueing backend does not support cancel_by.'
         end

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

@@ -7,8 +7,8 @@ module ActiveJob
     # on a persisted id to fulfill the canceling of any given job id.
     class TestAdapter
       def initialize
-        if Gem::Requirement.new('~> 5.0').satisfied_by? ActiveJob.version
-          require 'active_job/cancel/queue_adapters/test_adapter/rails_5'
+        if Gem::Requirement.new('>= 5.0').satisfied_by? ActiveJob.version
+          require 'active_job/cancel/queue_adapters/test_adapter/rails'
         elsif Gem::Requirement.new('~> 4.2').satisfied_by? ActiveJob.version
           require 'active_job/cancel/queue_adapters/test_adapter/rails_4'
         end

data/lib/active_job/cancel/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module Cancel
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-cancel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yuji Yaginuma
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -42,44 +42,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -199,8 +199,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -213,6 +213,8 @@ files:
 - gemfiles/active_job_42.gemfile
 - gemfiles/active_job_50.gemfile
 - gemfiles/active_job_51.gemfile
+- gemfiles/active_job_52.gemfile
+- gemfiles/active_job_60.gemfile
 - gemfiles/active_job_master.gemfile
 - lib/active_job/cancel.rb
 - lib/active_job/cancel/queue_adapters.rb
@@ -220,8 +222,8 @@ files:
 - lib/active_job/cancel/queue_adapters/resque_adapter.rb
 - lib/active_job/cancel/queue_adapters/sidekiq_adapter.rb
 - lib/active_job/cancel/queue_adapters/test_adapter.rb
+- lib/active_job/cancel/queue_adapters/test_adapter/rails.rb
 - lib/active_job/cancel/queue_adapters/test_adapter/rails_4.rb
-- lib/active_job/cancel/queue_adapters/test_adapter/rails_5.rb
 - lib/active_job/cancel/version.rb
 - lib/activejob/cancel.rb
 homepage: https://github.com/y-yagi/activejob-cancel
@@ -243,8 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: activejob-cancel provides cancel method to Active Job

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-rvm:
-  - 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
-
-matrix:
-  allow_failures:
-  - gemfile: gemfiles/active_job_master.gemfile
-
-services:
-  - redis