active_touch 3.0.3 → 4.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2UzMGI0YmVlYTYxZjQxMzI4ZmIwZmEzMWViYTAwZjc1MjI1N2FmNA==
+    MTI4NzU0Y2UwMTAwM2ExYmE5ZjYwZmJmY2NkNzI5ZGEzNmExYjU3Nw==
   data.tar.gz: !binary |-
-    MjBkMzE1ZGIwMTJkYmRhNDZlNzkzOTAxZTMxMTVkOTdlODA5ZmJhMA==
+    MzdmMzg2MGY1ZWNjZTViYTg2OWE2ZGZlNTU4OGRiNWE0Yzc2NTA0OQ==
 SHA512:
   metadata.gz: !binary |-
-    MmFhYjkyYTAwYjIxYjNmODNkZjNiNGRhZjJiYzQ2N2EyMzVjNDAwNjUyNzFi
-    NzA4OTRmODliYjQzMWI5NWZiOGYxN2QxOGZlYjdmNWJmODdmM2U1M2ZjYjdh
-    OTg2MzA0YmE4NTA0ZmEwMmVlNWQ3MTBhN2FkYzJiYmQ5ZThlYzA=
+    ZWNkMDQ2YTFlYjE5MDdjODNhNWZjYWYyNDM2MTQ5Njg2MjIxMDQwMGU5NmNj
+    ZjMyYTJjN2YyMTI4MjkzNzI2NTRlYzUzMmU0MWNkMzI5NmY0NmQyZjI0Mzlm
+    YzY1NmJmYzQzYWI3MTE4NDRiZjk0MjkwYTA0N2NkMGRlNThkZjU=
   data.tar.gz: !binary |-
-    MTI5ZGJiZWJiZjUzYmNjOTEwNDEzMzJhMmIzMzlkYzNjOWFjNGJhYjFkZTcw
-    MWM4MjIyMzhjZmI0NWZkYTkxNGNlNWYwOTJiMWY3N2VjMTA1Y2FmZDEwMmE4
-    NDVjNWIyNDRiODQ1YzU1OTFlODBiNmYzNzQzODllZTI5NTYxNTY=
+    OGNkMTVlM2U3ZDViYmIyZjEzMmMzYjljMzUxOTdiMTRlZDI2YWUwMzcyNjY3
+    YzgzODA2YzczMDA1MzkzMmZlNzFmYTdjNmNkYzIyOGQ0NDg3MzBjMjRhZWMz
+    ZjVjNTJiYTFiNWQzZDcwZWRlM2FkMGM2ZTA3ODdlZTdiMzhjN2Q=

data/README.md

@@ -9,7 +9,7 @@ A more robust touch for ActiveRecord associations.
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'activetouch', '~> 1.4.0'
+gem 'activetouch', '~> 3.0.3'
 ```
 
 Then run the installer:

data/lib/active_touch.rb

@@ -2,6 +2,7 @@ require 'active_touch/version'
 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'

data/lib/active_touch/define_touch.rb

@@ -11,20 +11,25 @@ module ActiveTouch
       @klass = klass
       @association = association
       @options = default_options.merge(options)
-      @touch_method = "touch_#{SecureRandom.uuid}"
+      @update_touch_method = "touch_#{SecureRandom.uuid}"
+      @destroy_touch_method = "touch_#{SecureRandom.uuid}"
     end
 
     def define
-      define_touch_method
-      add_active_record_callback
+      define_update_touch_method
+      add_active_record_callback(@update_touch_method)
+
+      define_destroy_touch_method
+      add_active_record_callback(@destroy_touch_method)
+
       add_to_network
     end
 
-    def define_touch_method
+    def define_update_touch_method
       association = @association
       options = @options
 
-      @klass.send :define_method, @touch_method do |*args|
+      @klass.send :define_method, @update_touch_method do |*args|
         changed_attributes = self.previous_changes.keys.map(&:to_sym)
         watched_changes = (options[:watch] & changed_attributes)
 
@@ -35,19 +40,28 @@ module ActiveTouch
           if options[:async]
             TouchJob
                 .set(queue: ActiveTouch.configuration.queue)
-                .perform_later(self, association.to_s, options[:after_touch].to_s, true)
+                .perform_later(self, association.to_s, options[:after_touch].to_s)
 
           else
-            TouchJob.perform_now(self, association.to_s, options[:after_touch].to_s, false)
+            TouchJob.perform_now(self, association.to_s, options[:after_touch].to_s)
           end
 
         end
       end
     end
 
-    def add_active_record_callback
-      touch_method = @touch_method
-      @klass.send(:after_commit) { send(touch_method) }
+    def define_destroy_touch_method
+      association = @association
+      options = @options
+
+      @klass.send :define_method, @destroy_touch_method do |*args|
+        Rails.logger.debug "Touch: #{self.class}(#{self.id}) => #{association} due to destroy"
+        TouchJob.perform_now(self, association.to_s, options[:after_touch].to_s, true)
+      end
+    end
+
+    def add_active_record_callback(method)
+      @klass.send(:after_commit) { send(method) }
     end
 
     def add_to_network

data/lib/active_touch/touch.rb

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

data/lib/active_touch/touch_job.rb

@@ -1,23 +1,8 @@
 module ActiveTouch
   class TouchJob < ActiveJob::Base
 
-    def perform(record, association, after_touch, is_async = ActiveTouch.configuration.async)
-      associated = association == 'self' ? record : record.send(association)
-
-      if associated.is_a? ActiveRecord::Base
-        unless ActiveTouch.configuration.timestamp_attribute.nil?
-          associated.update_columns(ActiveTouch.configuration.timestamp_attribute => record.updated_at)
-        end
-
-        associated.send(after_touch) unless after_touch.blank?
-
-      elsif !associated.nil? && !associated.empty?
-        unless ActiveTouch.configuration.timestamp_attribute.nil?
-          associated.update_all(ActiveTouch.configuration.timestamp_attribute => record.updated_at)
-        end
-
-        associated.each { |associate| associate.send(after_touch) } unless after_touch.blank?
-      end
+    def perform(record, association, after_touch, is_destroy = false)
+      Touch.new(record, association, after_touch, is_destroy).run
     end
 
   end

data/lib/active_touch/version.rb

@@ -1,3 +1,3 @@
 module ActiveTouch
-  VERSION = '3.0.3'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_touch
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Kevin Pheasey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ 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