logrithm 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7cc04ee6f656f889e885abb7b2fad8239812ab1
-  data.tar.gz: 2877580cfca21aad92a18e093893f7c1321ea14d
+  metadata.gz: 86cba65ebff7f5967d1adbfb48940c461ba76511
+  data.tar.gz: 7a10a6397937fa1500de32f65123776e27003ed5
 SHA512:
-  metadata.gz: d7277a5c320908ebcb6a93ec0bc9d3aecb5997772cf60acecec31506b310042a8e8282ede7bbf614058de03ad83752fa0514106342e0efcb9fd3801c645de8d4
-  data.tar.gz: ee5794ce6f162305632923a6b78804e2302bee0c80c76ee552fca830cf6f081817ba17d4f08b92326ae522cd59fe66d80e745b97cef343dccf0ab8a47cd793b6
+  metadata.gz: b5a0d7e43974711935fe2e8f5faefc7c5e9dd663fe3ff683f9c4b810cb0528c8478880841c8bf7126fcaa58a10008e0386b27ec36a46f475d0943c3040eb5054
+  data.tar.gz: 445167639261857670d8e2f72cbc55ae801d4e3abe5116410d0f935f0ef4805465780edbfd40d23bfc268544275490c5e5e0eae41d6b43f576832ddaca6ce1b3

data/lib/logrithm/formatters/pretty.rb

@@ -23,7 +23,7 @@ module Logrithm
             klazz = obj.class.ancestors.inject(nil) do |memo, k|
               memo || Utils::Helpers.constantize(k, Logrithm::Spitters)
             end || Utils::Helpers.constantize(:string, Logrithm::Spitters)
-            yield klazz.new(obj).formatted
+            yield klazz.new(obj).formatted unless empty?(obj)
           end
         end
 

data/lib/logrithm/log.rb

@@ -7,18 +7,7 @@ module Logrithm
     include Kungfuig
 
     JOINER = "#{$/} #{option(:log, :joiners, :objects) || '⮩ '}".freeze
-
-    def self.log(message)
-      if $♯
-        puts "Self: [#{$♯}], Message: [#{message}]."
-      else
-        # idx = caller.index { |s| s.include? __FILE__ } to work inside pry
-        Utils::Syringe.inject(*Utils::Helpers.dirty_lookup_class_method(*caller.first[/\A(.+):(\d+)(?=:in)/].split(/:(?=\d+\z)/)))
-        puts "Message: [#{message}]."
-      end
-    rescue
-      puts "Message: [#{message}]."
-    end
+    USE_GLOBAL_SELF = option(:log, :global_self) || false
 
     def initialize(log = nil, **params)
       [
@@ -54,6 +43,21 @@ module Logrithm
 
     %i(debug info warn error fatal).each do |m|
       define_method(m) do |*args, **extended|
+        # rubocop:disable Lint/HandleExceptions
+        # rubocop:disable Style/RescueModifier
+        if USE_GLOBAL_SELF && $♯.nil?
+          caller_line = caller.detect do |line|
+            Logrithm.rails? ? line.start_with?(Rails.root.to_s) : !line.start_with?(__dir__)
+          end
+          cf = caller_line[/\A(.+):(\d+)(?=:in)/].split(/:(?=\d+\z)/)
+          if cf.is_a?(Array) && cf.first.is_a?(String)
+            Utils::Syringe.inject(*Utils::Helpers.dirty_lookup_class_method(*cf))
+          end
+        end rescue nil # SUPPRESS
+        # rubocop:enable Style/RescueModifier
+        # rubocop:enable Lint/HandleExceptions
+        args << $♯ if $♯ # global constant storing the object
+
         logger.public_send m, (args.length == 1 && extended.empty? ? args.first : [*args, **extended])
       end
     end

data/lib/logrithm/utils/helpers.rb

@@ -12,8 +12,8 @@ module Logrithm
         def dirty_lookup_class_method(file, lineno)
           content = File.readlines(file)[0..lineno.to_i].reverse
           result = content.each_with_object(method: nil, ns: []) do |line, memo|
-            (memo[:method] ||= line[/\A\s*def\s*(?<method>\w+)/, :method]) &&
-              (memo[:ns] << line[/\A\s*(?:class|module)\s*(?<ns>\w+)/, :ns])
+            (memo[:method] ||= line[/\A\s*def\s+(?<method>\w+)/, :method]) &&
+              (memo[:ns] << line[/\A\s*(?:class|module)\s+(?<ns>\w+)/, :ns])
           end
 
           [const_get(result[:ns].compact.reverse.join('::')), result[:method]]

data/lib/logrithm/version.rb

@@ -1,3 +1,3 @@
 module Logrithm
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logrithm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Aleksei Matiushkin