markdown_logging_proxy 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 338dd4aa3a43c7cda534f2b694a44b1347e1ad7434f417aa479dc8bb4daf7f95
-  data.tar.gz: 0bcd6c0fd97df22c18495e5f68a9181a45cd4dc2997c3d2754ba99e4b9678104
+  metadata.gz: 7b7fa845a8bab9f3a70e7362c0910ff5b24c6bc95d5267e82e8d4f87f90fa2e3
+  data.tar.gz: 0c26ee702af858bc046077ebf4209f473c50e66ee14e03f45da161f1990b510a
 SHA512:
-  metadata.gz: 689b425d69ab942947a53913d1ea6b2405d334d76e31bdb25050ed89fe3eb1bc5250f95801a6da1dd7b290b700c6ae62914f3d01d17d7f21ea782135920b6f8e
-  data.tar.gz: 3c67856e0afc5c95b08a1606e0d6d1338e96ee41542e6608deca25c77fe1ea1e758f8ce479c075de5f1de769277716285c56cb0f527c4d1fc2139c2fc8115611
+  metadata.gz: 6ac27cf32075e6046405f21bec1d4bae709c9a3e91b40b461a53b8a5794ff25165efe4295183a9a0f58a1f8686a15d08b0424e79f87355887967338c85e00526
+  data.tar.gz: 927d9792258911a98117c6915288b13bb05a6596257a38504adf24d1439aa972e71868c8895ab1cd0d5afbb8e4910e463948bb0bd11cbf0e29544fc66b04685d

data/CHANGELOG.md

@@ -14,3 +14,13 @@
 
 - Add missing CHANGELOG updates
 - Commit updates to compiled `dist/` version of library
+
+## [1.0.2]
+
+- Improved log formatting
+- Fix to proxy method overwrite behavior
+
+## [1.1.0]
+
+- Don't show object IDs for args arrays. It's confusing.
+- BREAKING: Proxies most `Object` methods by default now

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdown_logging_proxy (1.0.1)
+    markdown_logging_proxy (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/dist/markdown_logging_proxy.rb

@@ -1,12 +1,17 @@
 module MarkdownLoggingProxy
   class MarkdownLogger
-    def self.inspect_object(object)
-      ['```ruby', object.pretty_inspect.chomp, '```'].join("\n")
+    def self.inspect_object(object, show_id = true)
+      [
+        '```ruby',
+        ("# #{id_object(object)}" if show_id),
+        object.pretty_inspect.chomp,
+        '```'
+      ].compact.join("\n")
     end
 
     def self.id_object(object)
       # #<Object:0x00007f5a0919e140>
-      "##{object.class}:0x#{object.object_id.to_s(16)}>"
+      "`#<#{object.class}:0x#{object.object_id.to_s(16)}>`"
     end
 
     def self.build(location, **options)
@@ -14,9 +19,10 @@ module MarkdownLoggingProxy
       new(location, **options)
     end
 
-    attr_reader :std_logger, :backtrace, :heading_level
+    attr_reader :std_logger, :backtrace, :heading_level, :created_at
 
     def initialize(location, backtrace: true)
+      @created_at = Time.now
       @std_logger = create_logger(location)
       @heading_level = 1
       @backtrace = backtrace
@@ -62,7 +68,8 @@ module MarkdownLoggingProxy
 
     def markdown_formatter
       proc do |severity, time, __exec, msg|
-        "#{'#' * heading_level} #{severity} in #{Process.pid} at #{time.iso8601} -- #{msg}\n\n"
+        elapsed = Time.now - created_at
+        "#{'#' * heading_level} #{severity} at +#{elapsed.round(5)} -- #{msg}\n\n"
       end
     end
   end
@@ -82,6 +89,13 @@ module MarkdownLoggingProxy
   require 'time'
 
   class Proxy
+    # Object methods that should be proxied but won't hit method_missing
+    DEFAULT_OVERWRITES = %i[
+      ! != !~ <=> == === =~
+      clone display dup enum_for eql? equal? freeze frozen? hash inspect
+      is_a? itself kind_of? nil? taint tainted? tap then to_enum to_s
+      trust untaint unstrust untrusted? yield_self
+    ]
 
     def initialize(
         to_proxy = nil,
@@ -90,7 +104,7 @@ module MarkdownLoggingProxy
         backtrace: true, # regex/true/false backtrace control
         ignore: [], # methods we shouldn't log/proxy
         proxy_response: [], # methods we should return a proxy for
-        overwrite: [] # methods defined on Object we should overwrite
+        overwrite: DEFAULT_OVERWRITES
       )
       @target = to_proxy || target
       raise ArgumentError, "Missing required proxy target" unless @target
@@ -107,8 +121,8 @@ module MarkdownLoggingProxy
         }
       )
       overwrite.each do |meth|
-        define_method(meth) do |*args, &blk|
-          @traceer.trace(meth, args, &blk)
+        self.class.define_method(meth) do |*args, &blk|
+          @tracer.trace(meth, args, &blk)
         end
       end
     end
@@ -121,7 +135,7 @@ end
 module MarkdownLoggingProxy
   class Tracer
     attr_reader :target, :logger, :ignore, :proxy
-    
+
     def initialize(
         target:,
         proxy:,
@@ -132,7 +146,7 @@ module MarkdownLoggingProxy
       )
       @target = target
       @logger = logger
-      @ignore = (ignore + proxy_response)
+      @ignore = ignore
       @proxy_response = proxy_response
       @proxy_options = proxy_options
     end
@@ -165,9 +179,9 @@ module MarkdownLoggingProxy
 
         Arguments:
 
-        #{MarkdownLogger.inspect_object(args)}
+        #{MarkdownLogger.inspect_object(args, false)}
 
-        Block? #{block_given? ? 'Yes' : 'No'}
+        Block given? #{block_given? ? 'Yes' : 'No'}
         #{logger.inspect_backtrace}
       MSG
     end
@@ -176,12 +190,14 @@ module MarkdownLoggingProxy
       response = target.public_send(meth, *args, &log_and_proxy_block(meth, blk))
       log_response(meth, response) unless ignore?(meth)
       return response unless proxy_response?(meth)
-      logger.log :info, 3, <<~MSG
+      logger.log :info, 3, <<~MSG.chomp
         Returning proxied response to `#{meth}`
-        
+
         Proxy from `#{meth}` on #{MarkdownLogger.id_object(target)}
-        
-        Proxy for: #{MarkdownLogger.id_object(response)}
+
+        Proxy for:
+
+        #{MarkdownLogger.inspect_object(response)}
       MSG
       Proxy.new(**@proxy_options.merge(
         target: response,
@@ -194,15 +210,15 @@ module MarkdownLoggingProxy
     def log_and_proxy_block(meth, blk)
       return if blk.nil?
       proc do |*args|
-        logger.log :info, 3, <<~MSG
+        logger.log :info, 2, <<~MSG.chomp
           Yield to block in `#{meth}` on #{MarkdownLogger.id_object(target)}
 
           Arguments:
 
-          #{MarkdownLogger.inspect_object(args)}
+          #{MarkdownLogger.inspect_object(args, false)}
         MSG
         blk.call(*args).tap do |response|
-          logger.log :info, 4, <<~MSG
+          logger.log :info, 3, <<~MSG.chomp
             Response from block in `#{meth}`
 
             #{MarkdownLogger.inspect_object(response)}
@@ -212,7 +228,7 @@ module MarkdownLoggingProxy
     end
 
     def log_and_reraise_error(meth, error)
-      logger.log :error, 2, <<~MSG
+      logger.log :error, 2, <<~MSG.chomp
         Error in `#{meth}`
 
         Type: #{error.class}

data/lib/markdown_logging_proxy/markdown_logger.rb

@@ -1,12 +1,17 @@
 module MarkdownLoggingProxy
   class MarkdownLogger
-    def self.inspect_object(object)
-      ['```ruby', object.pretty_inspect.chomp, '```'].join("\n")
+    def self.inspect_object(object, show_id = true)
+      [
+        '```ruby',
+        ("# #{id_object(object)}" if show_id),
+        object.pretty_inspect.chomp,
+        '```'
+      ].compact.join("\n")
     end
 
     def self.id_object(object)
       # #<Object:0x00007f5a0919e140>
-      "##{object.class}:0x#{object.object_id.to_s(16)}>"
+      "`#<#{object.class}:0x#{object.object_id.to_s(16)}>`"
     end
 
     def self.build(location, **options)
@@ -14,9 +19,10 @@ module MarkdownLoggingProxy
       new(location, **options)
     end
 
-    attr_reader :std_logger, :backtrace, :heading_level
+    attr_reader :std_logger, :backtrace, :heading_level, :created_at
 
     def initialize(location, backtrace: true)
+      @created_at = Time.now
       @std_logger = create_logger(location)
       @heading_level = 1
       @backtrace = backtrace
@@ -62,7 +68,8 @@ module MarkdownLoggingProxy
 
     def markdown_formatter
       proc do |severity, time, __exec, msg|
-        "#{'#' * heading_level} #{severity} in #{Process.pid} at #{time.iso8601} -- #{msg}\n\n"
+        elapsed = Time.now - created_at
+        "#{'#' * heading_level} #{severity} at +#{elapsed.round(5)} -- #{msg}\n\n"
       end
     end
   end

data/lib/markdown_logging_proxy/proxy.rb

@@ -7,6 +7,13 @@ module MarkdownLoggingProxy
   require 'time'
 
   class Proxy
+    # Object methods that should be proxied but won't hit method_missing
+    DEFAULT_OVERWRITES = %i[
+      ! != !~ <=> == === =~
+      clone display dup enum_for eql? equal? freeze frozen? hash inspect
+      is_a? itself kind_of? nil? taint tainted? tap then to_enum to_s
+      trust untaint unstrust untrusted? yield_self
+    ]
 
     def initialize(
         to_proxy = nil,
@@ -15,7 +22,7 @@ module MarkdownLoggingProxy
         backtrace: true, # regex/true/false backtrace control
         ignore: [], # methods we shouldn't log/proxy
         proxy_response: [], # methods we should return a proxy for
-        overwrite: [] # methods defined on Object we should overwrite
+        overwrite: DEFAULT_OVERWRITES
       )
       @target = to_proxy || target
       raise ArgumentError, "Missing required proxy target" unless @target
@@ -32,8 +39,8 @@ module MarkdownLoggingProxy
         }
       )
       overwrite.each do |meth|
-        define_method(meth) do |*args, &blk|
-          @traceer.trace(meth, args, &blk)
+        self.class.define_method(meth) do |*args, &blk|
+          @tracer.trace(meth, args, &blk)
         end
       end
     end

data/lib/markdown_logging_proxy/tracer.rb

@@ -1,7 +1,7 @@
 module MarkdownLoggingProxy
   class Tracer
     attr_reader :target, :logger, :ignore, :proxy
-    
+
     def initialize(
         target:,
         proxy:,
@@ -12,7 +12,7 @@ module MarkdownLoggingProxy
       )
       @target = target
       @logger = logger
-      @ignore = (ignore + proxy_response)
+      @ignore = ignore
       @proxy_response = proxy_response
       @proxy_options = proxy_options
     end
@@ -45,9 +45,9 @@ module MarkdownLoggingProxy
 
         Arguments:
 
-        #{MarkdownLogger.inspect_object(args)}
+        #{MarkdownLogger.inspect_object(args, false)}
 
-        Block? #{block_given? ? 'Yes' : 'No'}
+        Block given? #{block_given? ? 'Yes' : 'No'}
         #{logger.inspect_backtrace}
       MSG
     end
@@ -56,12 +56,14 @@ module MarkdownLoggingProxy
       response = target.public_send(meth, *args, &log_and_proxy_block(meth, blk))
       log_response(meth, response) unless ignore?(meth)
       return response unless proxy_response?(meth)
-      logger.log :info, 3, <<~MSG
+      logger.log :info, 3, <<~MSG.chomp
         Returning proxied response to `#{meth}`
-        
+
         Proxy from `#{meth}` on #{MarkdownLogger.id_object(target)}
-        
-        Proxy for: #{MarkdownLogger.id_object(response)}
+
+        Proxy for:
+
+        #{MarkdownLogger.inspect_object(response)}
       MSG
       Proxy.new(**@proxy_options.merge(
         target: response,
@@ -74,15 +76,15 @@ module MarkdownLoggingProxy
     def log_and_proxy_block(meth, blk)
       return if blk.nil?
       proc do |*args|
-        logger.log :info, 3, <<~MSG
+        logger.log :info, 2, <<~MSG.chomp
           Yield to block in `#{meth}` on #{MarkdownLogger.id_object(target)}
 
           Arguments:
 
-          #{MarkdownLogger.inspect_object(args)}
+          #{MarkdownLogger.inspect_object(args, false)}
         MSG
         blk.call(*args).tap do |response|
-          logger.log :info, 4, <<~MSG
+          logger.log :info, 3, <<~MSG.chomp
             Response from block in `#{meth}`
 
             #{MarkdownLogger.inspect_object(response)}
@@ -92,7 +94,7 @@ module MarkdownLoggingProxy
     end
 
     def log_and_reraise_error(meth, error)
-      logger.log :error, 2, <<~MSG
+      logger.log :error, 2, <<~MSG.chomp
         Error in `#{meth}`
 
         Type: #{error.class}

data/markdown_logging_proxy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "markdown_logging_proxy"
-  spec.version = "1.0.1"
+  spec.version = "1.1.0"
   spec.authors = ["Carl Zulauf"]
   spec.email = ["carl@linkleaf.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown_logging_proxy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Carl Zulauf