action_trace 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac6e3bcd7ddba0d325500935c892b7832116e9f53035b352e757e258fb5b28d4
-  data.tar.gz: ddc86843cab5355f2c08b8134048b9d2e6bb00771112570ae037b44a59ca4e4e
+  metadata.gz: 8203cf9f2490c006cca8d9ce25fd692cfe5d06c576c44837733da34ec83f22e6
+  data.tar.gz: 77310c6e8c0f072dc2714f251d0db19d968fa3edf5c8d5ace62ffd9a4393218a
 SHA512:
-  metadata.gz: 8f4a13e9befd1d7a05e99acd17cbb3521004cdc4e2ede8e2d0fc9f49f2c176f45a7d20a7a280fc017895927c6e69513b744a479350a109359537927b6067cfc2
-  data.tar.gz: ab8913e299894c6c8868384e96a1056d859ae0368e85eb214c57e745808eddad16889f1cf7290b24f0a1afc4ae578c666994461f5ccf5008fa98cd253be1ce73
+  metadata.gz: 0ec68b1545e8e87b327b2288b451ec69b8a864829341b7c6f163e17be14b0e868753c888c6dc81de3f31574eb2f6acecae17c1e806346dc07638b7f952cbcf52
+  data.tar.gz: 7152f64871c07d49360cd285f456376f6d5aeac054f7b35583249ed0f98c4ee9efc1e0fb1e89e3184a6d91fcfd81b43c486b65f2cba9f7965ab71fbf43ebe59c

data/app/interactors/action_trace/fetch_data_changes.rb

@@ -19,7 +19,7 @@ module ActionTrace
           id: "act_#{activity.id}",
           source: source_type(activity),
           occurred_at: activity.created_at,
-          user: activity.owner&.complete_name,
+          user: activity.owner,
           trackable_type: activity.trackable_type,
           details: activity.parameters || {},
           paper_trail_version: PaperTrail::Version.find_by(id: activity.version_id),

data/app/interactors/action_trace/fetch_page_visits.rb

@@ -42,7 +42,7 @@ module ActionTrace
         id: "ahoy_#{event.id}",
         source: event.name == 'session_end' ? 'session_end' : 'page_visit',
         occurred_at: event.time,
-        user: event.user&.complete_name,
+        user: event.user,
         url: props['path'],
         details: props
       }

data/app/interactors/action_trace/fetch_session_starts.rb

@@ -19,7 +19,7 @@ module ActionTrace
           id: "visit_#{visit.id}",
           source: 'session_start',
           occurred_at: visit.started_at,
-          user: visit.user&.complete_name,
+          user: visit.user,
           subject: "#{visit.browser} on #{visit.os} (#{visit.ip})",
           details: visit.attributes.slice('ip', 'browser', 'os', 'device_type', 'country', 'landing_page', 'user_agent')
         }

data/app/interactors/concerns/activity_log_fetchable.rb

@@ -21,8 +21,10 @@ module ActivityLogFetchable
     if context.company_id.present?
       scope = if model_class.respond_to?(:filter_by_company)
                 model_class.filter_by_company(scope, context.company_id)
-              else
+              elsif model_class.method_defined?(:company_id)
                 scope.where(company_id: context.company_id)
+              else
+                scope
               end
     end
 

data/app/models/action_trace/activity_log.rb

@@ -6,7 +6,7 @@ module ActionTrace
     include ActionTrace::ActivityLogPresenter
 
     attr_reader :id, :source, :occurred_at, :user, :raw_subject, :details, :url, :paper_trail_version, :trackable,
-                :trackable_type
+                :trackable_type, :company
 
     SOURCES = {
       data_create: 'data_create',
@@ -28,6 +28,7 @@ module ActionTrace
       @paper_trail_version = attributes[:paper_trail_version]
       @trackable = attributes[:trackable]
       @trackable_type = attributes[:trackable_type]
+      @company = attributes[:user]&.company if attributes[:user].respond_to?(:company)
     end
 
     def data_create?

data/lib/action_trace/engine.rb

@@ -24,13 +24,6 @@ module ActionTrace
         user_ids = user_class.where(company_id: company_id).select(:id)
         scope.where(owner_type: user_class.name, owner_id: user_ids)
       end
-
-      [Ahoy::Visit, Ahoy::Event].each do |klass|
-        klass.define_singleton_method(:filter_by_company) do |scope, company_id|
-          user_ids = user_class.where(company_id: company_id).select(:id)
-          scope.where(user_id: user_ids)
-        end
-      end
     end
   end
-end
+end

data/lib/action_trace/version.rb

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

data/lib/generators/action_trace/install/install_generator.rb

@@ -30,6 +30,7 @@ module ActionTrace
 
       def run_ahoy_install
         generate 'ahoy:install' unless options[:skip_ahoy]
+        inject_ahoy_filter_by_company
       end
 
       def run_paper_trail_install
@@ -51,6 +52,23 @@ module ActionTrace
         template 'initializers/action_trace.rb.tt', 'config/initializers/action_trace.rb'
       end
 
+      private
+
+      def inject_ahoy_filter_by_company
+        filter_method = <<~RUBY
+
+          def self.filter_by_company(scope, company_id)
+            scope.joins(:user).where(users: { company_id: company_id })
+          end
+        RUBY
+
+        %w[visit event].each do |model|
+          inject_into_file "app/models/ahoy/#{model}.rb", filter_method, before: "  end\nend\n"
+        end
+      end
+
+      public
+
       def show_post_install_message
         readme 'POST_INSTALL' if behavior == :invoke
       end

data/lib/generators/action_trace/views/views_generator.rb

@@ -15,7 +15,10 @@ module ActionTrace
       end
 
       def copy_views
-        directory 'views/action_trace', 'app/views/action_trace'
+        directory(
+          File.expand_path('../../../../app/views/action_trace', __dir__),
+          'app/views/action_trace'
+        )
       end
 
       def copy_controller

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_trace
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - gimbaro
@@ -267,8 +267,6 @@ files:
 - lib/generators/action_trace/install/install_generator.rb
 - lib/generators/action_trace/install/templates/initializers/action_trace.rb.tt
 - lib/generators/action_trace/install/templates/migrations/add_version_id_to_activities.rb.tt
-- lib/generators/action_trace/views/templates/views/action_trace/activity_logs/_index.html.erb
-- lib/generators/action_trace/views/templates/views/action_trace/activity_logs/index.html.erb
 - lib/generators/action_trace/views/views_generator.rb
 - lib/tasks/action_trace_tasks.rake
 homepage: https://github.com/Engim-eu/action_trace

data/lib/generators/action_trace/views/templates/views/action_trace/activity_logs/_index.html.erb

@@ -1,7 +0,0 @@
-<div id="activity-logs">
-  <% @activity_logs.each do |log| %>
-    <div class="activity-log">
-      <%= log %>
-    </div>
-  <% end %>
-</div>

data/lib/generators/action_trace/views/templates/views/action_trace/activity_logs/index.html.erb

@@ -1 +0,0 @@
-<%= render partial: 'index' %>