loggable_activity 0.5.6 → 0.5.7

data/lib/loggable_activity/concerns/current_actor.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module LoggableActivity
+  # Stores current user in a thread variable so is can be accessed from the LoggableActivity::Hook model
+  module CurrentActor
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :set_current_actor
+      after_action :clear_current_actor
+    end
+
+    private
+
+    def set_current_actor
+      return unless current_user
+
+      Thread.current[:current_actor] = current_user
+    end
+
+    def clear_current_actor
+      Thread.current[:current_actor] = nil
+    end
+  end
+end

data/lib/loggable_activity/hooks.rb

@@ -18,17 +18,17 @@ module LoggableActivity
     included do
       config = ::LoggableActivity::Configuration.for_class(name)
 
-      if config.nil?
-        raise LoggableActivity::Error, "Configuration not found for #{name}, Please add it to 'config/loggable_activity.yaml"
-      end
-
+      # if config.nil?
+      #   # logg all attributes by default.
+      #   self.loggable_attrs = attribute_names
+      # end
       # Initializes attributes based on configuration.
-      self.loggable_attrs = config&.fetch('loggable_attrs', []) || []
+      self.loggable_attrs = config&.fetch('loggable_attrs', []) || attribute_names
       self.public_attrs = config&.fetch('public_attrs', []) || []
       self.relations = config&.fetch('relations', []) || []
-      self.auto_log = config&.fetch('auto_log', []) || []
-      self.fetch_record_name_from = config&.fetch('fetch_record_name_from', nil)
+      self.auto_log = config&.fetch('auto_log', []) || %w[create update destroy]
       self.route = config&.fetch('route', nil)
+      self.fetch_record_name_from = config&.fetch('fetch_record_name_from', nil)
 
       after_create :log_create_activity
       after_update :log_update_activity
@@ -42,7 +42,7 @@ module LoggableActivity
     #   @param params [Hash] Additional parameters for the activity.
     def log(action, actor: nil, params: {})
       @action = action
-      @actor = actor || Thread.current[:current_user] || created_by_self
+      @actor = actor || Thread.current[:current_actor]
       return nil if @actor.nil?
 
       @record = self
@@ -50,8 +50,10 @@ module LoggableActivity
       @payloads = []
 
       case action
-      when :create, :show
-        log_activity
+      when :create
+        log_create
+      when :show
+        log_show
       when :destroy
         log_destroy
       when :update
@@ -73,18 +75,17 @@ module LoggableActivity
 
     private
 
-    # If the actor is the same as the record, it is created by the actor.
-    # This assumes it is a sign_up action.
-    def created_by_self
-      return unless LoggableActivity.actor_model_name == self.class.name
+    # Logs an activity for the show action.
+    def log_show
+      return nil if just_created?
+      return nil if just_updated?
 
-      @action = :sign_up
-      self
+      log_activity
     end
 
-    # Logs an activity for the current action.
-    def log_activity
-      create_activity(build_payloads)
+    # Logs an activity for the create action.
+    def log_create
+      log_activity
     end
 
     # Logs an activity for the update action.
@@ -97,6 +98,27 @@ module LoggableActivity
       create_activity(build_destroy_payload)
     end
 
+    # Logs an activity for the current action.
+    def log_activity
+      create_activity(build_payloads)
+    end
+
+    def just_created?
+      action = "#{self.class.base_action}.create"
+      activity = LoggableActivity::Activity.where(record: self, actor: @actor).last
+      return false unless activity && activity.action == action && activity.created_at > 5.seconds.ago
+
+      true
+    end
+
+    def just_updated?
+      action = "#{self.class.base_action}.update"
+      activity = LoggableActivity::Activity.where(record: self, actor: @actor).last
+      return false unless activity && activity.action == action && activity.created_at > 5.seconds.ago
+
+      true
+    end
+
     # Creates an activity with the specified payloads.
     def create_activity(payloads)
       return nil if nothing_to_log?(payloads)

data/lib/loggable_activity/version.rb

@@ -3,5 +3,5 @@
 # Version of the gem
 module LoggableActivity
   # Version
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

data/lib/loggable_activity.rb

@@ -16,7 +16,7 @@ require 'loggable_activity/services/custom_payloads_builder'
 require 'loggable_activity/services/payloads_builder'
 require 'loggable_activity/services/update_payloads_builder'
 require 'loggable_activity/services/destroy_payloads_builder'
-require 'loggable_activity/concerns/current_user'
+require 'loggable_activity/concerns/current_actor'
 require 'kaminari'
 
 # LoggableActivity

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loggable_activity
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Max Groenlund
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,6 +174,117 @@ files:
 - config/initializers/kaminari_config.rb
 - config/routes.rb
 - db/migrate/20240702092648_create_loggable_activity_tables.rb
+- docker-compose.yml
+- docs/CHANGELOG_md.html
+- docs/CHEAT_SHEET_md.html
+- docs/CODE_OF_CONDUCT_md.html
+- docs/CreateLoggableActivities.html
+- docs/CreateLoggableActivityTables.html
+- docs/GETTING-STARTED_md.html
+- docs/Gemfile.html
+- docs/Gemfile_lock.html
+- docs/LoggableActivity.html
+- docs/LoggableActivity/ActivitiesController.html
+- docs/LoggableActivity/ActivitiesHelper.html
+- docs/LoggableActivity/Activity.html
+- docs/LoggableActivity/ApplicationController.html
+- docs/LoggableActivity/ApplicationHelper.html
+- docs/LoggableActivity/ApplicationJob.html
+- docs/LoggableActivity/ApplicationMailer.html
+- docs/LoggableActivity/ApplicationRecord.html
+- docs/LoggableActivity/Configuration.html
+- docs/LoggableActivity/ConfigurationError.html
+- docs/LoggableActivity/CurrentActor.html
+- docs/LoggableActivity/DataOwner.html
+- docs/LoggableActivity/Encryption.html
+- docs/LoggableActivity/EncryptionError.html
+- docs/LoggableActivity/EncryptionKey.html
+- docs/LoggableActivity/Engine.html
+- docs/LoggableActivity/Error.html
+- docs/LoggableActivity/Generators.html
+- docs/LoggableActivity/Generators/InstallGenerator.html
+- docs/LoggableActivity/Hooks.html
+- docs/LoggableActivity/Payload.html
+- docs/LoggableActivity/Sanitizer.html
+- docs/LoggableActivity/Services.html
+- docs/LoggableActivity/Services/BasePayloadsBuilder.html
+- docs/LoggableActivity/Services/CustomPayloadsBuilder.html
+- docs/LoggableActivity/Services/DestroyPayloadsBuilder.html
+- docs/LoggableActivity/Services/PayloadsBuilder.html
+- docs/LoggableActivity/Services/UpdatePayloadsBuilder.html
+- docs/MIT-LICENSE.html
+- docs/Object.html
+- docs/README_md.html
+- docs/Rakefile.html
+- docs/app/assets/config/loggable_activity_manifest_js.html
+- docs/app/assets/javascripts/loggable_activity/application_js.html
+- docs/app/assets/stylesheets/loggable_activity/activities_scss.html
+- docs/app/assets/stylesheets/loggable_activity/application_scss.html
+- docs/app/views/layouts/loggable_activity/application_html_slim.html
+- docs/app/views/loggable_activity/activities/_activities_html_slim.html
+- docs/created.rid
+- docs/css/fonts.css
+- docs/css/rdoc.css
+- docs/fonts/Lato-Light.ttf
+- docs/fonts/Lato-LightItalic.ttf
+- docs/fonts/Lato-Regular.ttf
+- docs/fonts/Lato-RegularItalic.ttf
+- docs/fonts/SourceCodePro-Bold.ttf
+- docs/fonts/SourceCodePro-Regular.ttf
+- docs/git-org/HEAD.html
+- docs/git-org/config.html
+- docs/git-org/description.html
+- docs/git-org/hooks/applypatch-msg_sample.html
+- docs/git-org/hooks/commit-msg_sample.html
+- docs/git-org/hooks/fsmonitor-watchman_sample.html
+- docs/git-org/hooks/post-update_sample.html
+- docs/git-org/hooks/pre-applypatch_sample.html
+- docs/git-org/hooks/pre-commit_sample.html
+- docs/git-org/hooks/pre-merge-commit_sample.html
+- docs/git-org/hooks/pre-push_sample.html
+- docs/git-org/hooks/pre-rebase_sample.html
+- docs/git-org/hooks/pre-receive_sample.html
+- docs/git-org/hooks/prepare-commit-msg_sample.html
+- docs/git-org/hooks/push-to-checkout_sample.html
+- docs/git-org/hooks/update_sample.html
+- docs/git-org/info/exclude.html
+- docs/images/add.png
+- docs/images/arrow_up.png
+- docs/images/brick.png
+- docs/images/brick_link.png
+- docs/images/bug.png
+- docs/images/bullet_black.png
+- docs/images/bullet_toggle_minus.png
+- docs/images/bullet_toggle_plus.png
+- docs/images/date.png
+- docs/images/delete.png
+- docs/images/find.png
+- docs/images/loadingAnimation.gif
+- docs/images/macFFBgHack.png
+- docs/images/package.png
+- docs/images/page_green.png
+- docs/images/page_white_text.png
+- docs/images/page_white_width.png
+- docs/images/plugin.png
+- docs/images/ruby.png
+- docs/images/tag_blue.png
+- docs/images/tag_green.png
+- docs/images/transparent.png
+- docs/images/wrench.png
+- docs/images/wrench_orange.png
+- docs/images/zoom.png
+- docs/index.html
+- docs/js/darkfish.js
+- docs/js/navigation.js
+- docs/js/navigation.js.gz
+- docs/js/search.js
+- docs/js/search_index.js
+- docs/js/search_index.js.gz
+- docs/js/searcher.js
+- docs/js/searcher.js.gz
+- docs/lib/loggable_activity/config_schema_json.html
+- docs/lib/tasks/loggable_activity_tasks_rake.html
+- docs/table_of_contents.html
 - git-org/HEAD
 - git-org/config
 - git-org/description
@@ -199,7 +310,7 @@ files:
 - lib/loggable_activity.rb
 - lib/loggable_activity/.DS_Store
 - lib/loggable_activity/activity.rb
-- lib/loggable_activity/concerns/current_user.rb
+- lib/loggable_activity/concerns/current_actor.rb
 - lib/loggable_activity/config_schema.json
 - lib/loggable_activity/configuration.rb
 - lib/loggable_activity/data_owner.rb

data/lib/loggable_activity/concerns/current_user.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module LoggableActivity
-  # Stores current user in a thread variable so is can be accessed from the LoggableActivity::Hook model
-  module CurrentUser
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :set_current_user
-      after_action :clear_current_user
-    end
-
-    private
-
-    def set_current_user
-      # return if request.path == "/users/sign_out"
-      return unless current_user
-
-      Thread.current[:current_user] = current_user
-    end
-
-    def clear_current_user
-      Thread.current[:current_user] = nil
-    end
-  end
-end