pp 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b437b9b1d9f113a93fc4ecda630db3c2a71ec7cb085c8637d77a57c04cda0d8c
-  data.tar.gz: 3a68f16535169d4419d41aa9b4c4d265c2d8d43b0480d7a5b17fd9f3ef3230e0
+  metadata.gz: 8ae81116a5438a08aca95879913585f76a9d96603ad30bbd5b724479ba0adeca
+  data.tar.gz: 3d5bca0ec8f49203d50cd6bb386f0666895bc9cec73f18e3fe0118c1e24bf12a
 SHA512:
-  metadata.gz: 6c00c899791aaacb3021bcab37ec02b58fa08a85352c6970ec6037a6bc7c2c01644c7c430a1e956fc569c5b2a290645e60e90e79ee4159f518d0c6491b098166
-  data.tar.gz: 7ca2e413eaea277c0f6ac84ee4cc825bc71410a951133c64b7fde8e76924519dc3919598229e3c46d6d1527204b36b75376a76641ad55a54b43c14c694e2a683
+  metadata.gz: e843b0b52ef64b1b467b131968f39e9ec643f877459752c31affeec80184dc1ade4b1ce0b0a48a0c2e78a1fc29ca9f65355ec887b6ab4a50024edab0b0c4f525
+  data.tar.gz: 610bcf764e874ff0237a551d3d2bf2d1a4627c37eb2bba45fb1d64591b111c7693549c0cf22372599a3dbbbb27701f7754e50cc0fbc01f168a8cf8cc6aded6e0

data/lib/pp.rb

@@ -64,7 +64,7 @@ require 'prettyprint'
 class PP < PrettyPrint
 
   # The version string
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 
   # Returns the usable width for +out+.
   # As the width of +out+:
@@ -145,21 +145,13 @@ class PP < PrettyPrint
     # Yields to a block
     # and preserves the previous set of objects being printed.
     def guard_inspect_key
-      if Thread.current[:__recursive_key__] == nil
-        Thread.current[:__recursive_key__] = {}.compare_by_identity
-      end
-
-      if Thread.current[:__recursive_key__][:inspect] == nil
-        Thread.current[:__recursive_key__][:inspect] = {}.compare_by_identity
-      end
-
-      save = Thread.current[:__recursive_key__][:inspect]
-
+      recursive_state = Thread.current[:__recursive_key__] ||= {}.compare_by_identity
+      save = recursive_state[:inspect] ||= {}.compare_by_identity
       begin
-        Thread.current[:__recursive_key__][:inspect] = {}.compare_by_identity
+        recursive_state[:inspect] = {}.compare_by_identity
         yield
       ensure
-        Thread.current[:__recursive_key__][:inspect] = save
+        recursive_state[:inspect] = save
       end
     end
 
@@ -167,9 +159,8 @@ class PP < PrettyPrint
     # to be pretty printed. Used to break cycles in chains of objects to be
     # pretty printed.
     def check_inspect_key(id)
-      Thread.current[:__recursive_key__] &&
-      Thread.current[:__recursive_key__][:inspect] &&
-      Thread.current[:__recursive_key__][:inspect].include?(id)
+      recursive_state = Thread.current[:__recursive_key__] or return false
+      recursive_state[:inspect]&.include?(id)
     end
 
     # Adds the object_id +id+ to the set of objects being pretty printed, so
@@ -183,6 +174,24 @@ class PP < PrettyPrint
       Thread.current[:__recursive_key__][:inspect].delete id
     end
 
+    private def guard_inspect(object)
+      recursive_state = Thread.current[:__recursive_key__]
+
+      if recursive_state&.key?(:inspect)
+        begin
+          push_inspect_key(object)
+          yield
+        ensure
+          pop_inspect_key(object) unless PP.sharing_detection
+        end
+      else
+        guard_inspect_key do
+          push_inspect_key(object)
+          yield
+        end
+      end
+    end
+
     # Adds +obj+ to the pretty printing buffer
     # using Object#pretty_print or Object#pretty_print_cycle.
     #
@@ -198,15 +207,12 @@ class PP < PrettyPrint
         return
       end
 
-      begin
-        push_inspect_key(obj)
+      guard_inspect(obj) do
         group do
           obj.pretty_print self
         rescue NoMethodError
           text Kernel.instance_method(:inspect).bind_call(obj)
         end
-      ensure
-        pop_inspect_key(obj) unless PP.sharing_detection
       end
     end
 
@@ -261,15 +267,20 @@ class PP < PrettyPrint
     def seplist(list, sep=nil, iter_method=:each) # :yield: element
       sep ||= lambda { comma_breakable }
       first = true
+      kwsplat = EMPTY_KWHASH
       list.__send__(iter_method) {|*v|
         if first
           first = false
         else
           sep.call
         end
-        RUBY_VERSION >= "3.0" ? yield(*v, **{}) : yield(*v)
+        kwsplat ? yield(*v, **kwsplat) : yield(*v)
       }
     end
+    EMPTY_KWHASH = if RUBY_VERSION >= "3.0"
+      {}.freeze
+    end
+    private_constant :EMPTY_KWHASH
 
     # A present standard failsafe for pretty printing any given Object
     def pp_object(obj)
@@ -302,12 +313,10 @@ class PP < PrettyPrint
       # A pretty print for a pair of Hash
       def pp_hash_pair(k, v)
         if Symbol === k
-          sym_s = k.inspect
-          if sym_s[1].match?(/["$@!]/) || sym_s[-1].match?(/[%&*+\-\/<=>@\]^`|~]/)
-            text "#{k.to_s.inspect}:"
-          else
-            text "#{k}:"
+          if k.inspect.match?(%r[\A:["$@!]|[%&*+\-\/<=>@\]^`|~]\z])
+            k = k.to_s.inspect
           end
+          text "#{k}:"
         else
           pp k
           text ' '
@@ -379,7 +388,8 @@ class PP < PrettyPrint
     # This method should return an array of names of instance variables as symbols or strings as:
     # +[:@a, :@b]+.
     def pretty_print_instance_variables
-      instance_variables.sort
+      ivars = respond_to?(:instance_variables_to_inspect) ? instance_variables_to_inspect : instance_variables
+      ivars.sort
     end
 
     # Is #inspect implementation using #pretty_print.
@@ -422,6 +432,28 @@ class Hash # :nodoc:
   end
 end
 
+if defined?(Set)
+  if set_pp = Set.instance_method(:initialize).source_location
+    set_pp = !set_pp.first.end_with?("/set.rb") # not defined in set.rb
+  else
+    set_pp = true               # defined in C
+  end
+end
+class Set # :nodoc:
+  def pretty_print(pp)  # :nodoc:
+    pp.group(1, "#{self.class.name}[", ']') {
+      pp.seplist(self) { |o|
+        pp.pp o
+      }
+    }
+  end
+
+  def pretty_print_cycle(pp)    # :nodoc:
+    name = self.class.name
+    pp.text(empty? ? "#{name}[]" : "#{name}[...]")
+  end
+end if set_pp
+
 class << ENV # :nodoc:
   def pretty_print(q) # :nodoc:
     h = {}
@@ -452,6 +484,13 @@ class Struct # :nodoc:
   end
 end
 
+verbose, $VERBOSE = $VERBOSE, nil
+begin
+  has_data_define = defined?(Data.define)
+ensure
+  $VERBOSE = verbose
+end
+
 class Data # :nodoc:
   def pretty_print(q) # :nodoc:
     class_name = PP.mcall(self, Kernel, :class).name
@@ -484,7 +523,7 @@ class Data # :nodoc:
   def pretty_print_cycle(q) # :nodoc:
     q.text sprintf("#<data %s:...>", PP.mcall(self, Kernel, :class).name)
   end
-end if defined?(Data.define)
+end if has_data_define
 
 class Range # :nodoc:
   def pretty_print(q) # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pp
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Tanaka Akira
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2025-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettyprint
@@ -42,7 +42,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/pp
   source_code_uri: https://github.com/ruby/pp
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.11
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Provides a PrettyPrinter for Ruby objects
 test_files: []