debugtrace 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d449ce280e070de6b2606264a7df4247bf2949788dbcf9e537b8ca7191cd91ba
-  data.tar.gz: 347ca320e082e30a706b8309cdb86876daa4779c7d0be8179576856c6d7a58e0
+  metadata.gz: 67184688a8a3f8b4a4ff9de1ef04799cf6957d9e94907c86073c083e3b6c1b98
+  data.tar.gz: c410dcd81f2aa49f307b20200fe487a335871bbec830c15ba2a900a022d9a309
 SHA512:
-  metadata.gz: f35b455465fa17bef9ce031a122d9f9695384a746c9eca1cbd8d838829f6837a010661e1594c62a58912d182d75144505cf935e37eaf4dfb5edef368c7554818
-  data.tar.gz: 07af66161e9949dad056316a405607ad435c115a65d46c6b33bc46196aebbf563b94345f92c29fa03b36a788929430a525ff90a87bb3de2e9558dd0846be4ac5
+  metadata.gz: 1fea6b71189147084795ad686aaca7c9621382a3516167f40a1811a4a7b889f4bd3a2d44823ed8a252a156ec42dc29f6f88919cd229ca287ea893f77ea35dc44
+  data.tar.gz: 625c317abee13df3c3e67bf2a2250f2d3685f341e9a2370b936f6c853b325f46571c47851d79827e96de4a850c196d0d308a912f23eae4f15e25bab15d6d4470

data/debugtrace.yml

@@ -1,2 +1,3 @@
 logger: file
 log_path: logs/debugtrace.log
+maximum_data_output_width: 100

data/lib/debugtrace/log_buffer.rb

@@ -86,17 +86,14 @@ class LogBuffer
 
   # Appends lines of another LogBuffer.
   #
-  # @param separator [String] the separator string to append if not ''
   # @param buff [LogBuffer] another LogBuffer
   # @return [LogBuffer] this object
-  def append_buffer(separator, buff)
-    Common.check_type('separator', separator, String)
+  def append_buffer(buff)
     Common.check_type('buff', buff, LogBuffer)
-    append(separator, 0, true) if separator != ''
     index = 0
     for line in buff.lines
       line_feed if index > 0
-      append(line.log, line.nest_level, index == 0 && separator != '')
+      append(line.log, line.nest_level, true)
       index += 1
     end
     return self

data/lib/debugtrace/version.rb

@@ -2,5 +2,5 @@
 # (C) 2025 Masato Kokubo
 
 module DebugTrace
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/debugtrace.rb

@@ -15,6 +15,10 @@ require_relative 'debugtrace/state'
 
 # The main module of DebugTrace-rb.
 module DebugTrace
+  @@no_reflection_classes = [
+    FalseClass, TrueClass, Integer, Float, Rational, Complex, Range, Regexp,
+  ]
+
   # Configuration values
   @@config = nil
 
@@ -139,54 +143,58 @@ module DebugTrace
   def self.to_string(name, value, print_options)
     buff = LogBuffer.new(@@config.maximum_data_output_width)
 
-    separator = ''
     unless name.empty?
-      buff.append(name)
-      separator = @@config.varname_value_separator
+      buff.append(name).no_break_append(@@config.varname_value_separator)
     end
 
-    case value
-    when nil
-      buff.no_break_append(separator).append('nil')
-    when FalseClass, TrueClass, Integer, Float
-      buff.no_break_append(separator).append(value.to_s)
-    when Symbol
-      buff.no_break_append(separator).append(':').no_break_append(value.name)
-    when Class
-      buff.no_break_append(separator).append(value.name).no_break_append(' class')
-    when Module
-      buff.no_break_append(separator).append(value.name).no_break_append(' module')
-    when String
-      value_buff = value.encoding == Encoding::ASCII_8BIT ?
-          to_string_bytes(value, print_options) : to_string_str(value, print_options)
-      buff.append_buffer(separator, value_buff)
-    when DateTime
-      buff.no_break_append(separator).append(value.strftime('%Y-%m-%d %H:%M-%S.%L%:z'))
-    when Date
-      buff.no_break_append(separator).append(value.strftime('%Y-%m-%d'))
-    when Time
-      buff.no_break_append(separator).append(value.strftime('%H:%M-%S.%L%:z'))
-    when Array, Set, Hash
-      value_buff = to_string_enumerable(value, print_options)
-      buff.append_buffer(separator, value_buff)
+    if @@no_reflection_classes.include?(value.class)
+      buff.append(value.to_s)
     else
-      if print_options.reflection
-        # use reflection
-        value_buff = LogBuffer.new(@@config.maximum_data_output_width)
-        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)
+      case value
+      when nil
+        buff.append('nil')
+      when Symbol
+        buff.append(':').no_break_append(value.name)
+      when Class
+        buff.append(value.name).no_break_append(' class')
+      when Module
+        buff.append(value.name).no_break_append(' module')
+      when String
+        value_buff = value.encoding == Encoding::ASCII_8BIT ?
+            to_string_bytes(value, print_options) : to_string_str(value, print_options)
+        buff.append_buffer(value_buff)
+      when DateTime, Time
+        buff.append(value.strftime('%Y-%m-%d %H:%M:%S.%L%:z'))
+      when Date
+        buff.append(value.strftime('%Y-%m-%d'))
+      when Dir, File
+        buff.append(value.class.name)
+        buff.append_buffer(to_string_str(value.path, print_options))
+      when Array, Set, Hash
+        value_buff = to_string_enumerable(value, print_options)
+        buff.append_buffer(value_buff)
+      else
+        reflection = print_options.reflection || value.class.superclass == Struct
+        
+        to_s_string = reflection ? '' : value.to_s 
+        if reflection || to_s_string.start_with?('#<')
+          # use reflection
+          value_buff = LogBuffer.new(@@config.maximum_data_output_width)
+          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
+            @@reflected_objects.push(value)
+            value_buff = to_string_reflection(value, print_options)
+            @@reflected_objects.pop
+          end
+          buff.append_buffer(value_buff)
         else
-          @@reflected_objects.push(value)
-          value_buff = to_string_reflection(value, print_options)
-          @@reflected_objects.pop
+          buff.append(to_s_string)
         end
-        buff.append_buffer(separator, value_buff)
-      else
-        buff.no_break_append(separator).append(value.to_s)
       end
     end
 
@@ -202,7 +210,7 @@ module DebugTrace
     single_quote_buff = LogBuffer.new(@@config.maximum_data_output_width)
     double_quote_buff = LogBuffer.new(@@config.maximum_data_output_width)
 
-    if value.length >= @@config.minimum_output_length
+    if value.length >= print_options.minimum_output_length
       single_quote_buff.no_break_append(format(@@config.length_format, value.length))
       double_quote_buff.no_break_append(format(@@config.length_format, value.length))
     end
@@ -264,8 +272,8 @@ module DebugTrace
     bytes_length = value.length
     buff = LogBuffer.new(@@config.maximum_data_output_width)
 
-    if bytes_length >= @@config.minimum_output_length
-      buff.no_break_append(format(@@config.size_format, bytes_length))
+    if bytes_length >= print_options.minimum_output_length
+      buff.no_break_append(format(@@config.length_format, bytes_length))
     end
 
     buff.no_break_append('[')
@@ -321,7 +329,7 @@ module DebugTrace
   def self.to_string_reflection(value, print_options)
     buff = LogBuffer.new(@@config.maximum_data_output_width)
 
-    buff.append(get_type_name(value))
+    buff.append(get_type_name(value, -1, print_options))
 
     body_buff = to_string_reflection_body(value, print_options)
 
@@ -333,7 +341,7 @@ module DebugTrace
       buff.up_nest
     end
 
-    buff.append_buffer('', body_buff)
+    buff.append_buffer(body_buff)
 
     if multi_lines
       buff.line_feed if buff.length > 0
@@ -350,25 +358,42 @@ module DebugTrace
   # @param print_options [PrintOptions] the print options
   def self.to_string_reflection_body(value, print_options)
     buff = LogBuffer.new(@@config.maximum_data_output_width)
-
-    variables = value.instance_variables
-
     multi_lines = false
     index = 0
+
+    variables = value.instance_variables
     variables.each do |variable|
       buff.no_break_append(', ') if index > 0
 
       var_value = value.instance_variable_get(variable)
       member_buff = LogBuffer.new(@@config.maximum_data_output_width)
-      member_buff.append(variable)
-      member_buff.append_buffer(@@config.key_value_separator, to_string('', var_value, print_options))
+      member_buff.append(variable).no_break_append(@@config.key_value_separator)
+      member_buff.append_buffer(to_string('', var_value, print_options))
       buff.line_feed if index > 0 && (multi_lines || member_buff.multi_lines?)
-      buff.append_buffer('', member_buff)
+      buff.append_buffer(member_buff)
 
       multi_lines = member_buff.multi_lines?
       index += 1
     end
 
+    if value.class.superclass == Struct
+      members = value.members
+      hash = value.to_h
+      members.each do |member|
+        buff.no_break_append(', ') if index > 0
+
+        var_value = hash[member]
+        member_buff = LogBuffer.new(@@config.maximum_data_output_width)
+        member_buff.append(member).no_break_append(@@config.key_value_separator)
+        member_buff.append_buffer(to_string('', var_value, print_options))
+        buff.line_feed if index > 0 && (multi_lines || member_buff.multi_lines?)
+        buff.append_buffer(member_buff)
+
+        multi_lines = member_buff.multi_lines?
+        index += 1
+      end
+    end
+
     return buff
   end
 
@@ -391,7 +416,7 @@ module DebugTrace
     end
 
     buff = LogBuffer.new(@@config.maximum_data_output_width)
-    buff.append(get_type_name(values, values.length))
+    buff.append(get_type_name(values, values.size, print_options))
     buff.no_break_append(open_char)
 
     body_buff = to_string_enumerable_body(values, print_options)
@@ -403,7 +428,7 @@ module DebugTrace
       buff.up_nest
     end
 
-    buff.append_buffer('', body_buff)
+    buff.append_buffer(body_buff)
 
     if multi_lines
       buff.line_feed
@@ -442,7 +467,7 @@ module DebugTrace
         end
 
       buff.line_feed if index > 0 && (multi_lines || element_buff.multi_lines?)
-      buff.append_buffer('', element_buff)
+      buff.append_buffer(element_buff)
 
       multi_lines = element_buff.multi_lines?
       index += 1
@@ -462,19 +487,20 @@ module DebugTrace
     buff = LogBuffer.new(@@config.maximum_data_output_width)
     key_buff = to_string('', key, print_options)
     value_buff = to_string('', value, print_options)
-    buff.append_buffer('', key_buff).append_buffer(@@config.key_value_separator, value_buff)
+    buff.append_buffer(key_buff).no_break_append(@@config.key_value_separator).append_buffer(value_buff)
     buff
   end
 
   # Returns the type name.
   #
   # @param value [Object] the value
-  # @option size [Object] the size of Array, Set or Hash
-  def self.get_type_name(value, size = -1)
+  # @param size [Object] the size of Array, Set or Hash
+  # @param print_options [PrintOptions] the print options
+  def self.get_type_name(value, size, print_options)
     type_name = value.class.to_s
     type_name = '' if %w[Array Hash Set].include?(type_name)
 
-    if size >= @@config.minimum_output_size
+    if size >= print_options.minimum_output_size
       type_name += @@config.size_format % size
     end
 

metadata

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