console 1.21.0 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a5fff3c1cafc8686f77440fc2dcb09d3a94d1399b15b9bf6967e4b21e6a511
-  data.tar.gz: 3c7e6218667002f2a0f745bcfddbeec1dc8b126fdd1b81cec71fa03c53c3eba5
+  metadata.gz: d9f91e3e103d4d8999923473901b90855e7c8ee5a2f1bf5fa7be4b87a435e0e2
+  data.tar.gz: 78cc14aa29facd5ef1909fc08bcd255d11c251f1075dbe92692f26a249557cbf
 SHA512:
-  metadata.gz: b4d6ebc41b6ea36a711f5f054a30a81ff4a29d06e0f4a2ef6a6554f6c94fd874439428df40e7a098f4bec25a8605452c2380987d1e275e38e6cf522254fdc3b8
-  data.tar.gz: 693ed3f6a7d6786a87aef0ff42d238a3cbd1fc267c0cafb1683b8236e0f878bb7a8dc316822f00ab84cdba7e6f58212e8474d0e85109d67ff59a65b3003548f3
+  metadata.gz: bda52b2ed24d9825905e8e929809d9629ba61755059d7e00ef8ceb693839a191d98647bc13fd2c3a7699f8f664560e4f35c316e21bb9e37c24b8d1265c31dd91
+  data.tar.gz: 22a7f6c0be0617140c608b5063c25d3dd220670afc570860f0cd54fea36f889c3b128d168f9dd6bf92c01c271e335b4d73dfd06cfe918f2360911aa8991fcfba

data/lib/console/format/safe.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require 'json'
+
+module Console
+	module Format
+		# This class is used to safely dump objects.
+		# It will attempt to dump the object using the given format, but if it fails, it will generate a safe version of the object.
+		class Safe
+			def initialize(format: ::JSON, limit: 8, encoding: ::Encoding::UTF_8)
+				@format = format
+				@limit = limit
+				@encoding = encoding
+			end
+			
+			def dump(object)
+				@format.dump(object, @limit)
+			rescue => error
+				@format.dump(safe_dump(object, error))
+			end
+			
+			private
+			
+			def default_objects
+				Hash.new.compare_by_identity
+			end
+			
+			def safe_dump(object, error)
+				object = safe_dump_recurse(object)
+				
+				object[:truncated] = true
+				object[:error] = {
+					class: safe_dump_recurse(error.class.name),
+					message: safe_dump_recurse(error.message),
+				}
+				
+				return object
+			end
+			
+			def replacement_for(object)
+				case object
+				when Array
+					"[...]"
+				when Hash
+					"{...}"
+				else
+					"..."
+				end
+			end
+			
+			# This will recursively generate a safe version of the object.
+			# Nested hashes and arrays will be transformed recursively.
+			# Strings will be encoded with the given encoding.
+			# Primitive values will be returned as-is.
+			# Other values will be converted using `as_json` if available, otherwise `to_s`.
+			def safe_dump_recurse(object, limit = @limit, objects = default_objects)
+				if limit <= 0 || objects[object]
+					return replacement_for(object)
+				end
+				
+				case object
+				when Hash
+					objects[object] = true
+					
+					object.to_h do |key, value|
+						[
+							String(key).encode(@encoding, invalid: :replace, undef: :replace),
+							safe_dump_recurse(value, limit - 1, objects)
+						]
+					end
+				when Array
+					objects[object] = true
+					
+					object.map do |value|
+						safe_dump_recurse(value, limit - 1, objects)
+					end
+				when String
+					object.encode(@encoding, invalid: :replace, undef: :replace)
+				when Numeric, TrueClass, FalseClass, NilClass
+					object
+				else
+					objects[object] = true
+					
+					# We could do something like this but the chance `as_json` will blow up.
+					# We'd need to be extremely careful about it.
+					# if object.respond_to?(:as_json)
+					# 	safe_dump_recurse(object.as_json, limit - 1, objects)
+					# else
+					
+					safe_dump_recurse(object.to_s, limit - 1, objects)
+				end
+			end
+		end
+	end
+end

data/lib/console/format.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require_relative 'format/safe'
+
+module Console
+	module Format
+		def self.default
+			Safe.new(format: ::JSON)
+		end
+		
+		def self.default_json
+			self.default
+		end
+	end
+end

data/lib/console/output/json.rb

@@ -4,16 +4,12 @@
 # Copyright, 2021-2022, by Samuel Williams.
 
 require_relative '../serialized/logger'
-require_relative 'encoder'
 
 module Console
 	module Output
 		module JSON
 			def self.new(output, **options)
-				# The output encoder can prevent encoding issues (e.g. invalid UTF-8):
-				Output::Encoder.new(
-					Serialized::Logger.new(output, format: ::JSON, **options)
-				)
+				Serialized::Logger.new(output, format: Format.default_json, **options)
 			end
 		end
 	end

data/lib/console/serialized/logger.rb

@@ -5,16 +5,16 @@
 
 require_relative '../buffer'
 require_relative '../filter'
+require_relative '../format'
 
 require 'time'
-require 'json'
 
 require 'fiber/annotation'
 
 module Console
 	module Serialized
 		class Logger
-			def initialize(io = $stderr, format: JSON, verbose: false, **options)
+			def initialize(io = $stderr, format: Format.default, verbose: false, **options)
 				@io = io
 				@start = Time.now
 				@format = format

data/lib/console/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2019-2023, by Samuel Williams.
 
 module Console
-	VERSION = "1.21.0"
+	VERSION = "1.23.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.23.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -46,7 +46,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiber-annotation
@@ -95,10 +95,11 @@ files:
 - lib/console/event/progress.rb
 - lib/console/event/spawn.rb
 - lib/console/filter.rb
+- lib/console/format.rb
+- lib/console/format/safe.rb
 - lib/console/logger.rb
 - lib/console/output.rb
 - lib/console/output/default.rb
-- lib/console/output/encoder.rb
 - lib/console/output/json.rb
 - lib/console/output/null.rb
 - lib/console/output/sensitive.rb

metadata.gz.sig

@@ -1,6 +1,3 @@
-
-��a�o[����y܈�*^�z���:
-U.":��
-��]�cf�3��^6�/>�5���*?m��N����V��{�/>��ͱ����0������D~����/�/.@��pJ��m��g�
-
yy��3�\nъ���vq�Nt9r:��A�����%d��+
-���d�o�+?���́�jC�\lj��Ѝ%وӨp��{�tr�R���b�������p��L�xH������XwTV� ��?��Wt�m�^B%���i��-//} ���k cX�^S<��寷��a�I�
�1����R�=����<��F�unZ�s�M���m��B�vE+��L���ǾI�`�ä��IX����R�`(U�Rf�k�="��Nq�5fh
+G)Q�f���&5Te����t<��ӗoⰲV��Z��#�o
+#�*O~��Ѩip&;��N��~����q%�t0�<�d��^m5�V2�fגQ�~t/��e�el�U@��m�lB�
�zWx+��\2�nτaI{�n*Go��X�(�+5���J$d7�S ���3��~w���5�{`�x�d?";'⹐��Ptпf�
��t%��
+NR��=�9΃�(Z��H'�`xI(2�Gɂa��u�d��V0�p�Y�v��Ews�����'����·���ğ���[�J��bi;q�\N�6
�5���Hc|YY�B�o�׏Lbmp؃.>{Q-��E

data/lib/console/output/encoder.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
-
-module Console
-	module Output
-		class Encoder
-			def initialize(output, encoding = ::Encoding::UTF_8)
-				@output = output
-				@encoding = encoding
-			end
-			
-			attr :output
-			
-			attr :encoding
-			
-			def call(subject = nil, *arguments, **options, &block)
-				subject = encode(subject)
-				arguments = encode(arguments)
-				options = encode(options)
-				
-				@output.call(subject, *arguments, **options, &block)
-			end
-			
-			def encode(value)
-				case value
-				when String
-					value.encode(@encoding, invalid: :replace, undef: :replace)
-				when Array
-					value.map{|item| encode(item)}
-				when Hash
-					value.transform_values{|item| encode(item)}
-				else
-					value
-				end
-			end
-		end
-	end
-end