loggable_activity 0.1.55 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e2ab2f4d7ec08a5f53176ae3e3289b8470c5cc39013a1bc48e06c3b596f11ee
-  data.tar.gz: 3c5037f59fc9e408fd693afbd3208f530b52cb4f3791b91f8dfad603a66e2513
+  metadata.gz: 0026d9021dbb8d457f89aae37cefeab76c25307392f7df9bf33576ced785ab2a
+  data.tar.gz: 1a7e30aee22dad70a1d5b6cfdbc8fbc5647ed9a84acb8e1793a12342dbd2845f
 SHA512:
-  metadata.gz: 017f1f1418adb7acd44ed3af4cd08ccdcc396dc9d61c63b2b584c994b46018923832155a1ae64361a8d75c5414257591ff174e33696c356c844c241063343c14
-  data.tar.gz: 2da5d2b4981ad8470f6ed75b2710c6e75f36d19dafb99496cc0e49f1e7c2a0f008b94d234780c693e6eb841437ffa6933f7abd133526a6c9eec56b8e75fa1259
+  metadata.gz: 4207be61cc5c3fc3c9f6f8a37a6d589b92c0c5067cfc76dc8187ff94a4c8fcf4f8438c0682830bd609ff78883c3ee863985642926ddbece92a2a230c6b96e7a9
+  data.tar.gz: c770403638780d4708ef561eea6e3522dc1d16de6ac916d656db608e52ec24d88ba24a8314410f542d31a56d1f192a6869a67a0a486721dffc7d2b01dea8d7a8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+
+## [0.1.56] - 2024-03-04
+### Breaking change
+- Generate links in helpers
+
 ## [0.1.54] - 2024-02-24
 - Support for BinaryID's 
 - Updated README.md

data/lib/generators/loggable_activity/install_templates_generator.rb

@@ -10,7 +10,9 @@ module LoggableActivity
       class_option :template, type: :string, default: 'erb'
 
       def create_helper
-        copy_file 'helpers/loggable_activity_helper.rb', 'app/helpers/loggable_activity_helper.rb'
+        copy_file 'helpers/activity_helper.rb', 'app/helpers/loggable_activity/activity_helper.rb'
+        copy_file 'helpers/routes_helper.rb', 'app/helpers/loggable_activity/routes_helper.rb'
+        copy_file 'helpers/router.rb', 'app/helpers/loggable_activity/router.rb'
       end
 
       def create_views

data/lib/generators/loggable_activity/templates/helpers/activity_helper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module LoggableActivity
+  module ActivityHelper
+    # include ApplicationHelper
+    include LoggableActivity::Router
+
+    def render_activity(activity)
+      render partial: template_path(activity), locals: { activity: }
+    end
+
+    # def relation_type(relation_attrs)
+    #   title = I18n.t("loggable.activity.models.#{relation_attrs[:record_type]}")
+    #   if path = path_to_payload(relation_attrs[:path])
+    #     path
+    #   else
+    #     title
+    #   end
+    # end
+
+    private
+
+    def action_template_path(activity)
+      "loggable_activity/templates/#{activity.action.gsub('.', '/')}"
+    end
+
+    def template_path(activity)
+      template_path = action_template_path(activity)
+      if lookup_context.template_exists?(template_path, [], true)
+        template_path
+      else
+        action = activity.action.split('.').last || 'default'
+        "loggable_activity/templates/default/#{action}"
+      end
+    end
+  end
+end

data/lib/generators/loggable_activity/templates/helpers/router.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'action_view'
+
+module LoggableActivity
+  module Router
+    # include ApplicationHelper
+    include LoggableActivity::RoutesHelper
+
+    def primary_activity_text_or_link(activity)
+      route = activity.primary_route
+      text = text_for_link(route)
+      return text if route.nil?
+      return text if activity.record.nil?
+
+      url = url_to_record(route, activity.record)
+      return text unless url.present?
+
+      link_to(text, url)
+    end
+
+    def payload_type_text_or_link(attrs)
+      route = attrs[:route]
+      return model_translation(attrs) if route.nil?
+
+      record = find_record(attrs)
+      return model_translation(attrs) if record.nil?
+
+      text = text_for_link(route)
+
+      url = url_to_record(route, record)
+      return text if url.nil?
+
+      link_to(text, url)
+    end
+
+    private
+
+    def text_for_link(route)
+      I18n.t("loggable.activity.routes.#{route}")
+    end
+
+    def model_translation(attrs)
+      I18n.t("loggable.activity.models.#{attrs[:record_type]}")
+    end
+
+    def find_record(attrs)
+      record_class = attrs[:record_type].constantize
+      record_class.find(attrs[:record_id])
+    end
+  end
+end

data/lib/generators/loggable_activity/templates/helpers/routes_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module LoggableActivity
+  module RoutesHelper
+    include ApplicationHelper
+
+    def url_to_record(route, record)
+      case route
+      when 'show_doctor', 'show_patient', 'show_user', 'show_user_profile'
+        demo_user_url(record)
+      when 'show_demo_address'
+        demo_city_demo_address_url(record.demo_city, record)
+      when 'show_demo_city'
+        demo_city_url(record)
+      when 'show_demo_journal'
+        demo_journal_url(record)
+      end
+    end
+  end
+end

data/lib/loggable_activity/activity.rb

@@ -41,7 +41,7 @@ module LoggableActivity
           record_id: payload.record_id,
           payload_type: payload.payload_type,
           attrs: payload.attrs,
-          path: payload.payload_route
+          route: payload.payload_route
         }
       end
     end
@@ -75,7 +75,7 @@ module LoggableActivity
         updated_relations_attrs:
       }
     end
-
+    
     # Returns the attributes for the primary payload, without the relations.
     #
     # Example:
@@ -132,8 +132,8 @@ module LoggableActivity
     # Returns:
     #   "/path/to/activity"
     #
-    def path
-      primary_payload&.route
+    def primary_route 
+      primary_payload&.payload_route
     end
 
     # Returns the display name for a actor. what method to use if defined in '/config/loggable_activity.yaml'
@@ -176,6 +176,16 @@ module LoggableActivity
 
     private
 
+    # Returns the primary payload associated with the activity.
+    #
+    # Example usage:
+    #   payload = @activity.primary_payload
+    #   puts payload.record_type  # => 'SOMD_MODEL_NAME'
+    #
+    def primary_payload
+      ordered_payloads.find { |p| p.payload_type == 'primary_payload' }
+    end
+
     # Returns the attributes for the update+payload.
     def update_attrs
       update_payload_attrs = attrs.find { |p| p[:payload_type] == 'update_payload' }
@@ -185,10 +195,6 @@ module LoggableActivity
       update_payload_attrs
     end
 
-    # Returns the primary payload.
-    def primary_payload
-      ordered_payloads.find { |p| p.payload_type == 'primary_payload' }
-    end
 
     # Returns the attributes for the updated relations.
     def updated_relations_attrs

data/lib/loggable_activity/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loggable_activity
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.56
 platform: ruby
 authors:
 - "Max \nGroenlund"
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -208,7 +208,6 @@ files:
 - docs/js/searcher.js.gz
 - docs/table_of_contents.html
 - help/loggable_activity_help.txt
-- lib/.DS_Store
 - lib/generators/.DS_Store
 - lib/generators/loggable_activity/.DS_Store
 - lib/generators/loggable_activity/install_generator.rb
@@ -219,9 +218,10 @@ files:
 - lib/generators/loggable_activity/templates/config/loggable_activity.yaml
 - lib/generators/loggable_activity/templates/create_loggable_activities.rb
 - lib/generators/loggable_activity/templates/current_user.rb
-- lib/generators/loggable_activity/templates/helpers/loggable_activity_helper.rb
+- lib/generators/loggable_activity/templates/helpers/activity_helper.rb
+- lib/generators/loggable_activity/templates/helpers/router.rb
+- lib/generators/loggable_activity/templates/helpers/routes_helper.rb
 - lib/generators/loggable_activity/templates/loggable_activity.en.yaml
-- lib/generators/loggable_activity/templates/loggable_activity_helper.rb
 - lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_create.html.erb
 - lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_create.html.slim
 - lib/generators/loggable_activity/templates/views/loggable_activity/templates/default/_destroy.html.erb

data/lib/generators/loggable_activity/templates/helpers/loggable_activity_helper.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module LoggableActivityHelper
-  include ApplicationHelper
-
-  def render_activity(activity)
-    render partial: template_path(activity), locals: { activity: }
-  end
-
-  def primary_type(activity)
-    I18n.t("loggable.activity.models.#{activity.record_type}")
-  end
-
-  def relation_type(relation_attrs)
-    I18n.t("loggable.activity.models.#{relation_attrs[:record_type]}")
-  end
-
-  def update_relation_class(update_attrs)
-    I18n.t("loggable.activity.models.#{update_attrs[:record_type]}")
-  end
-
-  private
-
-  def action_template_path(activity)
-    "loggable_activity/templates/#{activity.action.gsub('.', '/')}"
-  end
-
-  def template_path(activity)
-    template_path = action_template_path(activity)
-    if lookup_context.template_exists?(template_path, [], true)
-      template_path
-    else
-      action = activity.action.split('.').last || 'default'
-      "loggable_activity/templates/default/#{action}"
-    end
-  end
-
-  def activity_payload(activity)
-    @activity_payload ||= build_payload(activity)
-  end
-
-  def activity_attrs(activity)
-    @activity_attrs ||= activity_payload(activity).fetch(:activity, {})
-  end
-
-  def build_payload(activity)
-    Loggable::JsonPayloadFactory.new(activity).build_payload
-  end
-end

data/lib/generators/loggable_activity/templates/loggable_activity_helper.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module LoggableActivityHelper
-  include ApplicationHelper
-  # include Rails.application.routes.url_helpers
-
-  def render_activity(activity)
-    render partial: template_path(activity), locals: { activity: }
-  end
-
-  def primary_type(activity)
-    title = I18n.t("loggable.activity.models.#{activity.record_type}")
-    if (path = activity.path)
-      link_to title, send(path, activity.record_id.to_s)
-    else
-      title
-    end
-  end
-
-  def relation_type(relation_attrs)
-    title = I18n.t("loggable.activity.models.#{relation_attrs[:record_type]}")
-    if (path = relation_attrs[:path])
-      link_to title, send(path, relation_attrs[:record_id])
-    else
-      title
-    end
-  end
-
-  def link_to_payload; end
-
-  private
-
-  def action_template_path(activity)
-    "loggable_activity/templates/#{activity.action.gsub('.', '/')}"
-  end
-
-  def template_path(activity)
-    template_path = action_template_path(activity)
-    if lookup_context.template_exists?(template_path, [], true)
-      template_path
-    else
-      action = activity.action.split('.').last || 'default'
-      "loggable_activity/templates/default/#{action}"
-    end
-  end
-
-  def activity_payload(activity)
-    @activity_payload ||= build_payload(activity)
-  end
-
-  def activity_attrs(activity)
-    @activity_attrs ||= activity_payload(activity).fetch(:activity, {})
-  end
-
-  def build_payload(activity)
-    Loggable::JsonPayloadFactory.new(activity).build_payload
-  end
-end