delayed_after_commit 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe884ac57847ecbbd9033dabd4970b30fbb7dad9
-  data.tar.gz: 8f61fc12eb6af16f1201c5732913e3193e0e293e
+SHA256:
+  metadata.gz: fa387ac4caca376c5dc5fdad9457718acf26bcdfe771bdd08bf41127f77150de
+  data.tar.gz: b50061f1bedf4f85f34d00d3cbb21491c274b7ebb3c2b021f8015c3ecc28c19f
 SHA512:
-  metadata.gz: 75ed837ffb31ead2cddd73175c13a33e4d4b04cac4f863316f186bf9a52080e612d08d976a7e2b28bc1b4167e8f13c21389750200d61446304f358c644432b64
-  data.tar.gz: 51d0a79822d46c85faaf1eb4f2e2d1272e509d61f4622c8178ad507d62c800e002f09701d5de89cb4244d50198ecbcd838330a44d185902870fbdb3cf032c93a
+  metadata.gz: 81635199e03ed5a1339234cc78d01ea2e8bab00d1b29ffa5d05e9a5512907f2583bc67daeaedfaa6415fa03f8b9caa937eae514daccaa735877e220cde17e6dc
+  data.tar.gz: '0239433c563e50766e37c6d038e129b99531745523d1530a6625ac4ce64c376f137c54bbea72eb1f70f79662d4ce6d939149067580e3cede4482b071619ce778'

data/.ruby-version

@@ -1 +1 @@
-2.3
+2.5.7

data/.travis.yml

@@ -1,7 +1,12 @@
 language: ruby
 
 rvm:
-  - 2.3.0
+  - 2.5.7
+
+install:
+  - gem uninstall bundler
+  - gem install bundler --version '2.1.4'
+  - bundle install
 
 sudo: false
 
@@ -13,8 +18,7 @@ matrix:
     - rvm: jruby-head
 
 gemfile:
-  - gemfiles/rails_42.gemfile
-  - gemfiles/rails_5.gemfile
+  - gemfiles/rails_6.gemfile
 
 script: 'bundle exec rake spec'
 

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'rails-42' do
-  gem 'activerecord', '4.2.0'
+appraise 'rails-6' do
+  gem 'activerecord', '6'
 end
-
-appraise 'rails-5' do
-  gem 'activerecord', '5'
-end

data/README.md

@@ -6,7 +6,7 @@ Exactly the same as after_commit, except it puts the job onto the Sidekiq queue.
 
 Allows you to queue active record methods, after they have been created or updated.
 
-Requires Sidekiq, and Rails >= 4.
+Requires Sidekiq, and Rails >= 6.
 
 ## Installation
 
@@ -37,13 +37,35 @@ class User < ActiveRecord::Base
     puts "Hi - I've been updated"
   end
 
-  def hi_ive_been_updated
+  def hi_im_new_around_here
     puts "Hi - I've just been created"
   end
 end
 
 ```
 
+### Notes
+
+If you want to invoke the `delayed_after_update` callback only when an attribute has changed, you must check the attribute change with `#previous_changes`. Example:
+
+```ruby
+delayed_after_update :geolocate, if: :location_changed?
+```
+
+won't invoke `geolocate` even if `#location` has changed.
+
+Instead you must do something like
+
+```ruby
+delayed_after_update :geolocate, if: :location_was_changed?
+
+def location_was_changed?
+  "location".in? previous_changes
+end
+```
+
+This is necessary because the callback is run after the transaction is committed to the database.
+
 ## Roadmap
 
 - Allow asyncronous callbacks on destroying objects

data/delayed_after_commit.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", '>= 4.2.0'
-  spec.add_development_dependency "sidekiq", "> 4.1"
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_dependency "activerecord", '>= 5.2.0'
+  spec.add_development_dependency "sidekiq", "> 5.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "byebug", '>= 0'
   spec.add_development_dependency "rspec", '>= 0'
   spec.add_development_dependency "sqlite3", '>= 0'

data/gemfiles/{rails_5.gemfile → rails_6.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "5"
+gem "activerecord", "6"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_6.gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: ..
+  specs:
+    delayed_after_commit (0.1.6)
+      activerecord (>= 5.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.7)
+    connection_pool (2.2.3)
+    diff-lcs (1.4.4)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.2)
+    rack (2.2.3)
+    rake (10.5.0)
+    redis (4.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    sidekiq (6.1.2)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.8)
+      thread_safe (~> 0.1)
+    zeitwerk (2.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 6)
+  appraisal
+  bundler (~> 2.1)
+  byebug
+  delayed_after_commit!
+  rake (~> 10.0)
+  rspec
+  sidekiq (> 5.0)
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/lib/delayed_after_commit.rb

@@ -4,11 +4,22 @@ module DelayedAfterCommit
   extend ActiveSupport::Concern
 
   class_methods do
-    def enqueue_delayed_method(method, id)
+    # If retry_max is set, the queued method will retry that number of times
+    # before finally failing. retry_count is automatically incremented with
+    # each run of the method.
+    def enqueue_delayed_method(method, id, retry_max = nil, retry_count = 0)
       # this is used as a generic method that is created to run asyncronously from within sidekiq
       # it finds the object, and runs the deferred method
-      if obj = self.find_by_id(id)
-        obj.send(method)
+      begin
+        if obj = self.find_by_id(id)
+          obj.send(method)
+        end
+      rescue => e
+        if retry_max.present? && retry_count < retry_max
+          self.delay_for(retry_count * 60, retry: false).enqueue_delayed_method(method, id, retry_max, retry_count + 1)
+        end
+
+        raise e
       end
     end
 
@@ -29,10 +40,15 @@ module DelayedAfterCommit
       # this creates a method that runs `enqueue_delayed_method`
       # it then adds that method to the after_commit callback
       opts = args.extract_options!
+      retry_max = opts.delete(:retry_max)
       method = args.first
       delayed_method_name = "delayed_after_#{opts[:on]}_#{method}"
       define_method(delayed_method_name) do |m = method|
-        self.class.delay.enqueue_delayed_method(m, self.id)
+        if retry_max.present?
+          self.class.delay(retry: false).enqueue_delayed_method(m, self.id, retry_max)
+        else
+          self.class.delay.enqueue_delayed_method(m, self.id)
+        end
       end
       self.after_commit(delayed_method_name.to_sym, opts, &block)
     end

data/lib/delayed_after_commit/version.rb

@@ -1,3 +1,3 @@
 module DelayedAfterCommit
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_after_commit
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Simon Rentzke
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -139,16 +139,14 @@ files:
 - bin/console
 - bin/setup
 - delayed_after_commit.gemspec
-- gemfiles/rails_42.gemfile
-- gemfiles/rails_42.gemfile.lock
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_5.gemfile.lock
+- gemfiles/rails_6.gemfile
+- gemfiles/rails_6.gemfile.lock
 - lib/delayed_after_commit.rb
 - lib/delayed_after_commit/version.rb
 homepage: https://github.com/intellum/delayed_after_commit
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,9 +161,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: delayed after commit
 test_files: []

data/gemfiles/rails_42.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "4.2.0"
-
-gemspec :path => "../"

data/gemfiles/rails_42.gemfile.lock

@@ -1,80 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    delayed_after_commit (0.1.0)
-      activerecord (>= 4.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
-      builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
-      arel (~> 6.0)
-    activesupport (4.2.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (6.0.3)
-    builder (3.2.2)
-    byebug (9.0.6)
-    concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.9.1)
-    rack (2.0.1)
-    rack-protection (1.5.3)
-      rack
-    rake (10.5.0)
-    redis (3.3.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sidekiq (4.2.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    sqlite3 (1.3.12)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 4.2.0)
-  appraisal
-  bundler (~> 1.12)
-  byebug
-  delayed_after_commit!
-  rake (~> 10.0)
-  rspec
-  sidekiq (> 4.1)
-  sqlite3
-
-BUNDLED WITH
-   1.12.5

data/gemfiles/rails_5.gemfile.lock

@@ -1,76 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    delayed_after_commit (0.1.0)
-      activerecord (>= 4.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activerecord (5.0.0)
-      activemodel (= 5.0.0)
-      activesupport (= 5.0.0)
-      arel (~> 7.0)
-    activesupport (5.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (7.1.4)
-    byebug (9.0.6)
-    concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    minitest (5.9.1)
-    rack (2.0.1)
-    rack-protection (1.5.3)
-      rack
-    rake (10.5.0)
-    redis (3.3.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sidekiq (4.2.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    sqlite3 (1.3.12)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 5)
-  appraisal
-  bundler (~> 1.12)
-  byebug
-  delayed_after_commit!
-  rake (~> 10.0)
-  rspec
-  sidekiq (> 4.1)
-  sqlite3
-
-BUNDLED WITH
-   1.12.5