db_log_tag 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd902bdce242a671355a18146acde9967482666ad689a2ca51e961b08d0714de
-  data.tar.gz: 4ee6cc7a5a096829d98a1cbdc40251aa8d5c411a02ec838e9e26160a4a5b04fc
+  metadata.gz: '09522886cdba1969ddf183893c9260bde1f09b4237086d458e121127865ae217'
+  data.tar.gz: b75b3c0fb9a2a6a5702fe5f39df208542f22f20040f3bc0bf3ba22f9a87f3e24
 SHA512:
-  metadata.gz: 3f6c7db7eeffca09b74c4258e7c7f7fde486c835c124d8d63b4cf9f1b6e0c922669dbf63bce3c7d7b483c6f32568efcd49fbaae1289e18ac5f42fb08f7514928
-  data.tar.gz: cb93a42802989964abeb42441699bd02b7109e1348825f71efcf671c666b6781ee4e33f9476e99c17439bce58fdd8852a64cb07babe9aed8999a57bb4b534d5c
+  metadata.gz: 5e6521dd4f4a71f8a7cd433fa28b4ce39a39920471e2b84a7fdb5fb8d665264139f90fce46851df104618825fc5960ded8d5a1c5612082d31d5914d9f9d17967
+  data.tar.gz: 4150536f87888ec00481cc73536e36a183041acffd711ab0e36cd828d10951f9f9a18ebff756fd81464748c7c5cc19354c80453c928178f2344ed31f2ebea388

data/lib/db_log_tag/dynamic.rb

@@ -11,22 +11,24 @@ module ActiveRecord
 
     attr_accessor :log_tags
 
-    def log_tag(tag_name=nil, **options)
+    def log_tag(tag_name="", **options)
       return self unless DbLogTag.enable?
       
       if block_given?
-        tag_name = yield(
+        tag_name += yield(
           klass.connection_pool.db_config.name,
           ActiveRecord::Base.current_shard,
           ActiveRecord::Base.current_role
         )
       end
 
-      tag_color = options.dig(:color)
-      tag_font = options.dig(:font) || :bold
-      tag_name = DbLogTag::Colors.set_color(tag_name, tag_color, tag_font) unless tag_color.nil?
-      self.annotate_values += [":tag:#{tag_name}:tag:"]
-
+      if tag_name.present?
+        tag_color = options.dig(:color)
+        tag_font = options.dig(:font) || :bold
+        tag_name = DbLogTag::Colors.set_color(tag_name, tag_color, tag_font) unless tag_color.nil?
+        self.annotate_values += [":tag:#{tag_name}:tag:"]
+      end
+      
       self
     end
 

data/lib/db_log_tag/multiple_db.rb

@@ -7,7 +7,7 @@ module DbLogTag
     def db_tags
       @@db_tags ||= {
         nil => {
-          proc: lambda { |db, shard, role| "[#{db}|#{shard}|#{role}]" }
+          proc: lambda { |db, shard, role| "[shard:#{shard}|role:#{role}|db:#{db}]" }
         }
       }
     end

data/lib/db_log_tag.rb

@@ -27,10 +27,11 @@ module DbLogTag
   included do
     alias_method :origin_sql, :sql
     def sql(event)
-      if DbLogTag.enable?
+      if DbLogTag.enable? && !should_ignore_log?(event)
         begin
-          db_log_tags(event)
-          parse_annotations_as_dynamic_tags(event)
+          if tags = parse_annotations_as_dynamic_tags(event) || db_log_tags(event)
+            event.payload[:name] = "#{tags} #{event.payload[:name]}"
+          end
         rescue
         end
       end
@@ -42,14 +43,13 @@ module DbLogTag
 
       def parse_annotations_as_dynamic_tags(event)
         tags = event.payload[:sql].scan(ActiveRecord::Relation::Tags_Regex).map(&:first).join(" ")
-
-        unless should_ignore_log?(event) || tags.nil?
-          event.payload[:name] = "#{tags} #{event.payload[:name]}" 
-        end
+        return unless tags.present?
         
         event.payload[:sql] = event.payload[:sql].gsub(ActiveRecord::Relation::Tags_Regex, "")
         # still keep normal annotations
         event.payload[:sql] = event.payload[:sql].gsub(ActiveRecord::Relation::Empty_Annotation, "")
+
+        tags
       end
 
       def db_log_tags(event)
@@ -57,7 +57,6 @@ module DbLogTag
 
         clazz, _ = event.payload[:name].split(" ")
         _db_info = DbLogTag::MultipleDb.db_info(clazz)
-        event.payload[:name] = "#{_db_info} #{event.payload[:name]}"
       end
 
       def should_ignore_log?(event)

data/lib/rails/generators/db_log_tag/templates/initializer.rb

@@ -3,11 +3,11 @@ DbLogTag.config do |config|
 
   # # default for all
   # config.db_tag do |db, shard, role|
-  #   "[#{db}|#{shard}|#{role}]"
+  #   "[shard:#{shard}|role:#{role}|db:#{db}]"
   # end
 
-  # # for only User
+  # # for only User queries
   # config.db_tag :user, color: :red do |db, shard, role|
-  #   "[#{db}|#{shard}|#{role}]"
+  #   "[shard:#{shard}|role:#{role}|db:#{db}]"
   # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_log_tag
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Lam Phan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,8 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Allow to prepend prefix tags before query logs to track name, shard and
-  role of the database.
+description: Allow to prepend prefix tags to the beginning of the query logs to track
+  name, shard and role of the database
 email: theforestvn88@gmail.com
 executables: []
 extensions: []
@@ -85,7 +85,10 @@ files:
 homepage: https://github.com/theforestvn88/rails_db_log_tag
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/theforestvn88/rails_db_log_tag
+  source_code_uri: https://github.com/theforestvn88/rails_db_log_tag.git
+  changelog_uri: https://github.com/theforestvn88/rails_db_log_tag.git
 post_install_message: 
 rdoc_options: []
 require_paths: