action_trace 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182fd04b0f3e966ecc924f62325b816114084b5fa6fc4b726718421f0b0f8b40
-  data.tar.gz: f86112724bb6802802e7e29491655f40365103c07fcc904647ea939870af0721
+  metadata.gz: 87cdc0bf9fdd706f3281fea43d22c6ae6bbeb75a49aa595dc3b0da237003c2f8
+  data.tar.gz: bc9f95661a4d297ea5d0a604eac591e20008c66b53523d720fcabff254c5b651
 SHA512:
-  metadata.gz: 6a073a53162b28c8483a37bfb4270fbb085ce2880f27e8bdca5fc2a5d03c3b2abf77e8b53b01711c2f98c56d5f7d3ebb9333c38d042fe7663036c4012475240a
-  data.tar.gz: 83de77162cf7b55ad76a002757e11daa334066191f2b8228e922c32515015fe91b9d76cb8fba57c76f1ecfc532d1d605a89674dd5dc71b51ecc87220fd0dff42
+  metadata.gz: 27a038ca8bd66c44e59eb57e7208fb19d1241877b6238bc4c3736f3a85c7ad62ac85f677dd6cbb7cffbe3122e1cd1d7f6763a3a0e7afad4f751ba63c7e35fdf3
+  data.tar.gz: dee5ead60152d867fac30d4bfb42f48ec143deb7c37f3222f4496d349a8f48eda852ff0dbfc5f069a465776a099dadb8742ca18c935eec1e0f55af872eb57722

data/app/interactors/concerns/activity_log_fetchable.rb

@@ -39,16 +39,16 @@ module ActivityLogFetchable
   def apply_activity_type_filter(scope)
     return scope if context.source.blank?
 
-    case context.source
-    when ActionTrace::ActivityLog::SOURCES[:data_destroy]
-      scope.where('activities.`key` LIKE ?', '%.destroy')
-    when ActionTrace::ActivityLog::SOURCES[:data_change]
-      scope.where('activities.`key` LIKE ?', '%.update')
-    when ActionTrace::ActivityLog::SOURCES[:data_create]
-      scope.where('activities.`key` LIKE ?', '%.create')
-    else
-      scope
-    end
+    key_column = PublicActivity::Activity.arel_table[:key]
+
+    suffix = case context.source
+             when ActionTrace::ActivityLog::SOURCES[:data_destroy] then '%.destroy'
+             when ActionTrace::ActivityLog::SOURCES[:data_change]  then '%.update'
+             when ActionTrace::ActivityLog::SOURCES[:data_create]  then '%.create'
+             else return scope
+             end
+
+    scope.where(key_column.matches(suffix))
   end
 
   def apply_date_filters(scope, model_class)

data/lib/action_trace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionTrace
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
 end

data/lib/generators/action_trace/install/templates/initializers/action_trace.rb.tt

@@ -14,3 +14,17 @@ end
 PublicActivity::Config.set do
   enabled true
 end
+
+class Ahoy::Store < Ahoy::DatabaseStore
+  def track_event(data)
+    props  = data[:properties] || {}
+    ctrl   = props["controller"]
+    action = props["action"]
+
+    excluded =
+      ActionTrace.configuration.excluded_controllers.include?(ctrl) ||
+      ActionTrace.configuration.excluded_actions.include?(action)
+
+    super unless excluded
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_trace
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - gimbaro