active_touch 4.2.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78a4f581bd51a94ad33d816a9f8f097079bfdfc8
-  data.tar.gz: adfd8c1ba14c119df3d56036589e13002f44f2e4
+  metadata.gz: f6b70d780678e122e010326d0a35f40b196331d8
+  data.tar.gz: f2e40371296d3839fc36503a640fdb4b7b27c969
 SHA512:
-  metadata.gz: 393821f429b34722bfcfdc12d95a11daf4139a9a04a2cd9550ce15acf2ae293fd7acf5f3ea270e629a4eb815ac7dea5ae691220e48eee2c17bf45d10d0df20f7
-  data.tar.gz: a8be6d9b2dd44bfb195838235ab6345fff070d0d12414aeba494d2af34404f33ed99c97eb0579e39093b1d0a7fdc342ebec92f0fa35c0f1cc47f8bb46bb16e9f
+  metadata.gz: f5d6eb1d3eecf20ecd2d2a6ae03f2b5c44aeac06aaf304806e27df3ae6f1b438af0ecf2fb05eba58ff6a9fb9ba696f601e68245752d5b72bc43918cec1ba3c9e
+  data.tar.gz: 25526ebd8776633a2186069688da1e4aa79401c43bc0bce65d4a834d22af3b4cb7972c4792fff6525831e83a7a755a89ae03632bd2a4cfc40920a22d81b64f21

data/lib/active_touch.rb

@@ -1,13 +1,12 @@
-require 'active_touch/version'
+require 'active_support/concern'
+require 'active_job/base'
+require 'active_record/base'
+
 require 'active_touch/configuration'
 require 'active_touch/define_touch'
 require 'active_touch/network'
-require 'active_touch/touch'
 require 'active_touch/touch_job'
-
-require 'active_support/concern'
-require 'active_job/base'
-require 'active_record/base'
+require 'active_touch/version'
 
 module ActiveTouch
   extend ActiveSupport::Concern

data/lib/active_touch/define_touch.rb

@@ -41,10 +41,9 @@ module ActiveTouch
         changed_attributes = self.previous_changes.keys.map(&:to_sym)
         watched_changes = (options[:watch] & changed_attributes)
 
-        # watched values changed and conditional procs evaluate to true
         if watched_changes.any? && options[:if].call(self) && !options[:unless].call(self)
-          Rails.logger.debug "Touch Before Commit: #{self.class}(#{self.id}) => #{association} due to changes in #{watched_changes}"
           TouchJob.perform_now(self, association.to_s, touch_updates: options[:touch_updates])
+          Rails.logger.debug "Touch Before Commit: #{self.class}(#{self.id}) => #{association} due to changes in #{watched_changes}"
         end
       end
     end
@@ -57,27 +56,19 @@ module ActiveTouch
         changed_attributes = self.previous_changes.keys.map(&:to_sym)
         watched_changes = (options[:watch] & changed_attributes)
 
-        # watched values changed and conditional procs evaluate to true
         if watched_changes.any? && options[:if].call(self) && !options[:unless].call(self)
           Rails.logger.debug "Touch After Commit: #{self.class}(#{self.id}) => #{association} due to changes in #{watched_changes}"
+          options = {
+              after_touch: options[:after_touch].to_s,
+              is_destroy: false,
+              is_touched: options[:touch_in_transaction],
+              touch_updates: options[:touch_updates]
+          }
 
           if options[:async]
-            TouchJob
-                .set(queue: ActiveTouch.configuration.queue)
-                .perform_later(self, association.to_s, {
-                    after_touch: options[:after_touch].to_s,
-                    is_destroy: false,
-                    is_touched: options[:touch_in_transaction],
-                    touch_updates: options[:touch_updates]
-                })
-
+            TouchJob.set(queue: ActiveTouch.configuration.queue).perform_later(self, association.to_s, options)
           else
-            TouchJob.perform_now(self, association.to_s, {
-                after_touch: options[:after_touch].to_s,
-                is_destroy: false,
-                is_touched: options[:touch_in_transaction],
-                touch_updates: options[:touch_updates]
-            })
+            TouchJob.perform_now(self, association.to_s, options)
           end
 
         end

data/lib/active_touch/touch_job.rb

@@ -1,9 +1,42 @@
 module ActiveTouch
   class TouchJob < ActiveJob::Base
 
+    attr_accessor :record, :association, :after_touch, :is_destroy, :is_touched, :touch_updates
+
     def perform(record, association, options = {})
-      Touch.new(record, association, options).run
+      @record = record
+      @association = association
+      @after_touch = options[:after_touch]
+      @is_destroy = options[:is_destroy]
+      @is_touched = options[:is_touched]
+      @touch_updates = (options[:touch_updates] || {})
+
+      run
     end
 
+    def run
+      if !ActiveTouch.configuration.timestamp_attribute.nil?
+        touch_updates[ActiveTouch.configuration.timestamp_attribute] = record.updated_at
+      end
+
+      if associated.is_a? ActiveRecord::Base
+        associated.update_columns(touch_updates) if !touch_updates.empty? && !is_touched
+        associated.send(after_touch) unless after_touch.blank?
+
+      elsif !associated.nil?
+        associated.update_all(touch_updates) if !touch_updates.empty? && !is_touched
+        associated.each { |associate| associate.send(after_touch) } unless after_touch.blank?
+      end
+    end
+
+    def associated
+      @associated ||= begin
+        if association == 'self'
+          is_destroy || record.destroyed? ? nil : record
+        else
+          record.send(association)
+        end
+      end
+    end
   end
 end

data/lib/active_touch/version.rb

@@ -1,3 +1,3 @@
 module ActiveTouch
-  VERSION = '4.2.1'
+  VERSION = '5.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_touch
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Kevin Pheasey
@@ -80,7 +80,6 @@ files:
 - lib/active_touch/configuration.rb
 - lib/active_touch/define_touch.rb
 - lib/active_touch/network.rb
-- lib/active_touch/touch.rb
 - lib/active_touch/touch_job.rb
 - lib/active_touch/version.rb
 - lib/generators/active_touch/initializer_generator.rb

data/lib/active_touch/touch.rb

@@ -1,39 +0,0 @@
-module ActiveTouch
-  class Touch
-
-    attr_accessor :record, :association, :after_touch, :is_destroy, :is_touched, :touch_updates
-
-    def initialize(record, association, options = {})
-      @record = record
-      @association = association
-      @after_touch = options[:after_touch]
-      @is_destroy = options[:is_destroy]
-      @is_touched = options[:is_touched]
-      @touch_updates = (options[:touch_updates] || {})
-    end
-
-    def run
-      touch_updates[ActiveTouch.configuration.timestamp_attribute] = record.updated_at
-
-      if associated.is_a? ActiveRecord::Base
-        associated.update_columns(touch_updates) if !ActiveTouch.configuration.timestamp_attribute.nil? && !is_touched
-        associated.send(after_touch) unless after_touch.blank?
-
-      elsif !associated.nil?
-        associated.update_all(touch_updates) if !ActiveTouch.configuration.timestamp_attribute.nil? && !is_touched
-        associated.each { |associate| associate.send(after_touch) } unless after_touch.blank?
-      end
-    end
-
-    def associated
-      @associated ||= begin
-        if association == 'self'
-          is_destroy || record.destroyed? ? nil : record
-        else
-          record.send(association)
-        end
-      end
-    end
-
-  end
-end