debugtrace 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8605af0f8e17c3dffcef132208a051bc3cda499dfb664c669ccc58fe9783055b
-  data.tar.gz: 3eb3fca8224a904ea1d9856748feb8ec3b97395ef5c1dff302827de358b0fa9d
+  metadata.gz: 5937a3c3f6b9d19ab3bb040ef763ada32e262c5046532331a7082f3edc3128cb
+  data.tar.gz: 31b5c3027993f50d06409ec9c54d55adff5e68563a8f02b66ae6e618027ec550
 SHA512:
-  metadata.gz: c77f35231079526344c403ccd7b2753cfc4a81bb656459acc4a99b69548ad46f65c9f6cf628dc3c516c2c65ceaceabace8d2325f8cb5e1d690d449d5c190c242
-  data.tar.gz: 6cee3b4fe007601cab14db3123be8e93db6841c8e95847c8e3724ad00f9ef893b9347de807f4b54764a5726f8b14b87a286cc11168be72e1f27f1f56c5c58cd7
+  metadata.gz: 33e2b5d74dcfcabfc0868652118694478e47ad5c6066e70c75090b50db7dc61008cfdfe5d4a9b438d7d7a2df91be97110d3766bfbbbd43536dfbaeacf0414c22
+  data.tar.gz: bd78a8be204cd636d3104d06e3ff777ade2458f0492c5e50fd6f115f7108d290d4348cf02454721ca2680ef6a872455122b50e95fa836e8f9ed7efb1a17e7e6b

data/lib/debugtrace/config.rb

@@ -38,7 +38,7 @@ class Config
     @collection_limit          = _get_config_value 'collection_limit'          , 128
     @bytes_limit               = _get_config_value 'bytes_limit'               , 256
     @string_limit              = _get_config_value 'string_limit'              , 256
-    @reflection_nest_limit     = _get_config_value 'reflection_nest_limit'     , 4
+    @reflection_limit          = _get_config_value 'reflection_limit'          , 4
   end
 
   attr_reader :config_path, :logger_name, :logging_destination, :logging_format, :logging_datetime_format,
@@ -47,7 +47,7 @@ class Config
               :cyclic_reference_string, :varname_value_separator, :key_value_separator,
               :print_suffix_format, :count_format, :minimum_output_count, :length_format,
               :minimum_output_length, :maximum_data_output_width, :bytes_count_in_line,
-              :collection_limit, :bytes_limit, :string_limit, :reflection_nest_limit
+              :collection_limit, :bytes_limit, :string_limit, :reflection_limit
 
   def enabled? = @enabled
 

data/lib/debugtrace/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module DebugTrace
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

data/lib/debugtrace.rb

@@ -64,27 +64,23 @@ module DebugTrace
   end
 
   class PrintOptions
-    attr_reader :force_reflection,
-              # :output_private, :output_method,
-                :minimum_output_count, :minimum_output_length,
-                :collection_limit, :bytes_limit, :string_limit, :reflection_nest_limit
+    attr_reader :minimum_output_count, :minimum_output_length,
+                :collection_limit, :bytes_limit, :string_limit, :reflection_limit
 
     def initialize(
-      force_reflection,
       minimum_output_count,
       minimum_output_length,
       collection_limit,
       bytes_limit,
       string_limit,
-      reflection_nest_limit
+      reflection_limit
     )
-      @force_reflection = force_reflection
       @minimum_output_count = minimum_output_count == -1 ? DebugTrace.config.minimum_output_count : minimum_output_count
       @minimum_output_length = minimum_output_length == -1 ? DebugTrace.config.minimum_output_length : minimum_output_length
       @collection_limit = collection_limit == -1 ? DebugTrace.config.collection_limit : collection_limit
       @bytes_limit = bytes_limit == -1 ? DebugTrace.config.bytes_limit : bytes_limit
       @string_limit = string_limit == -1 ? DebugTrace.config.string_limit : string_limit
-      @reflection_nest_limit = reflection_nest_limit == -1 ? DebugTrace.config.reflection_nest_limit : reflection_nest_limit
+      @reflection_limit = reflection_limit == -1 ? DebugTrace.config.reflection_limit : reflection_limit
     end
   end
 
@@ -118,50 +114,36 @@ module DebugTrace
 
     case value
     when nil
-      # nil
       buff.no_break_append(separator).append('nil')
-    when String # ''.class # String
-      # String
+    when FalseClass, TrueClass, Integer, Float
+      buff.no_break_append(separator).append(value.to_s)
+    when String
       value_buff = to_string_str(value, print_options)
       buff.append_buffer(separator, value_buff)
     when DateTime
-      # DateTime
       buff.no_break_append(separator).append(value.strftime('%Y-%m-%d %H:%M-%S.%L%:z'))
     when Date
-      # DateTime
       buff.no_break_append(separator).append(value.strftime('%Y-%m-%d'))
     when Time
-      # DateTime
       buff.no_break_append(separator).append(value.strftime('%H:%M-%S.%L%:z'))
-    when Integer, Float
-      # Integer, Float, Date, Time
-      buff.no_break_append(separator).append(value.to_s)
     when Array, Set, Hash
-      # Array, Set, Hash
       value_buff = to_string_enumerable(value, print_options)
       buff.append_buffer(separator, value_buff)
     else
+      # use reflection
       value_buff = LogBuffer.new(@@config.maximum_data_output_width)
-      if !print_options.force_reflection && has_to_s_method?(value)
-        # has to_s or inspect method
-        value_buff.append('to_s: ')
-        value_buff.no_break_append(value.to_s)
-        buff.append_buffer(separator, value_buff)
+      if @@reflected_objects.any? { |obj| value.equal?(obj) }
+        # cyclic reference
+        value_buff.no_break_append(@@config.cyclic_reference_string)
+      elsif @@reflected_objects.length > print_options.reflection_limit
+        # over reflection level limitation
+        value_buff.no_break_append(@@config.limit_string)
       else
-        # use reflection
-        if @@reflected_objects.any? { |obj| value.equal?(obj) }
-          # cyclic reference
-          value_buff.no_break_append(@@config.cyclic_reference_string)
-        elsif @@reflected_objects.length > print_options.reflection_nest_limit
-          # over reflection level limitation
-          value_buff.no_break_append(@@config.limit_string)
-        else
-          @@reflected_objects.push(value)
-          value_buff = to_string_reflection(value, print_options)
-          @@reflected_objects.pop
-        end
-        buff.append_buffer(separator, value_buff)
+        @@reflected_objects.push(value)
+        value_buff = to_string_reflection(value, print_options)
+        @@reflected_objects.pop
       end
+      buff.append_buffer(separator, value_buff)
     end
 
     buff
@@ -470,10 +452,10 @@ module DebugTrace
 
   @@DO_NOT_OUTPUT = 'Do not output'
 
-  def self.print(name, value = @@DO_NOT_OUTPUT, force_reflection: false,
+  def self.print(name, value = @@DO_NOT_OUTPUT,
       minimum_output_count: -1, minimum_output_length: -1,
       collection_limit: -1, bytes_limit: -1,
-      string_limit: -1, reflection_nest_limit: -1)
+      string_limit: -1, reflection_limit: -1)
     @@thread_mutex.synchronize do
       print_start
       return value unless @@config.enabled?
@@ -490,10 +472,9 @@ module DebugTrace
       else
         # with value
         print_options = PrintOptions.new(
-          force_reflection,
           minimum_output_count, minimum_output_length,
           collection_limit, bytes_limit,
-          string_limit, reflection_nest_limit
+          string_limit, reflection_limit
         )
         @@last_log_buff = to_string(name, value, print_options)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debugtrace
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Masato Kokubo