difftastic 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a07e5dd20bb2cd12ad616d4939db9db3398c77eae8c859c17a8ecc269b07a0
-  data.tar.gz: ed659c1c84fd0acb0f5798046d26ebb14ca07d16892b769414d76eeef0ac782a
+  metadata.gz: 31125243809498f1920e30f4c8f2dc681e6862a2c06f4c7c9314eb717f30bdfb
+  data.tar.gz: ae9612238b4267ada429d79611ec0dcbfe694b319d601dac4a402e9212b0c372
 SHA512:
-  metadata.gz: fc61ad28fe6a5981cf5a5fd15007655a8e1fddf85b937d1fbeb203197581530c42a0bd67f2bd173be9f3a455c5e2ebd31deffdab99a380d1dc5e62fd4868674c
-  data.tar.gz: 311f6717f04bc4edcbc2310bb77be7eb9b25cfda213cd7dc328fc6d44838642dde76653ecea6c9363eca1181bc6ce2989ed5a971b427748f96d8481fe300d0d4
+  metadata.gz: feef6a85bb995f6678115c0edfafc41a73b19c2927466790eb75151010c526968d1881a9e84bfe02793516028d8325eb41747219de1ac1af1363c7057533fa2a
+  data.tar.gz: a53103ffbcc0fcbf5e074c13a91b6da0c965d8a50b48304f65a42137dd3334612f90f5b3e42ea0668b37b895af4bcfdc316dcaaf78c8f8f4f6461db85a995791

data/lib/difftastic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Difftastic
-	VERSION = "0.1.2"
+	VERSION = "0.2.0"
 end

data/lib/difftastic.rb

@@ -71,57 +71,73 @@ module Difftastic
 		exe_file
 	end
 
-	def self.pretty(object, buffer: +"", indent: 0)
+	def self.pretty(object, indent: 0, indent_width: 2, max_width: 80, indentation_bytes: "\t")
 		case object
 		when Hash
-			buffer << "{\n"
+			buffer = +"{\n"
 			indent += 1
 			object.each do |key, value|
 				buffer << ("	" * indent)
-				pretty(key, buffer:, indent:)
+				buffer << pretty(key, indent:)
 				buffer << " => "
-				pretty(value, buffer:, indent:)
+				buffer << pretty(value, indent:)
 				buffer << ",\n"
 			end
 			indent -= 1
 			buffer << ("	" * indent)
 			buffer << "}"
 		when Array
-			buffer << "[\n"
-			indent += 1
-			object.each do |value|
-				buffer << ("	" * indent)
-				pretty(value, buffer:, indent:)
-				buffer << ",\n"
+			new_lines = false
+			length = 0
+			items = object.map do |item|
+				pretty_item = pretty(item, indent: indent + 1)
+				new_lines = true if pretty_item.include?("\n")
+				length += pretty_item.bytesize
+				pretty_item
+			end
+
+			if new_lines || length > max_width - (indent * indent_width)
+				"[\n#{indentation_bytes * (indent + 1)}#{items.join(",\n#{indentation_bytes * (indent + 1)}")},\n#{indentation_bytes * indent}]"
+			else
+				"[#{items.join(', ')}]"
 			end
-			indent -= 1
-			buffer << ("	" * indent)
-			buffer << "]"
 		when Set
-			buffer << "Set[\n"
-			indent += 1
-			object.to_a.sort!.each do |value|
-				buffer << ("	" * indent)
-				pretty(value, buffer:, indent:)
-				buffer << ",\n"
+			new_lines = false
+			length = 0
+			items = object.to_a.sort!.map do |item|
+				pretty_item = pretty(item, indent: indent + 1)
+				new_lines = true if pretty_item.include?("\n")
+				length += pretty_item.bytesize
+				pretty_item
 			end
-			indent -= 1
-			buffer << ("	" * indent)
-			buffer << "]"
+
+			if new_lines || length > max_width - (indent * indent_width)
+				"Set[\n#{indentation_bytes * (indent + 1)}#{items.join(",\n#{indentation_bytes * (indent + 1)}")},\n#{indentation_bytes * indent}]"
+			else
+				"Set[#{items.join(', ')}]"
+			end
+		when Module
+			object.name
 		when Symbol, String, Integer, Float, Regexp, Range, Rational, Complex, true, false, nil
-			buffer << object.inspect
+			object.inspect
 		else
-			buffer << "#{object.class.name}(\n"
-			indent += 1
-			object.instance_variables.each do |name|
+			buffer = +""
+			instance_variables = object.instance_variables
+			if instance_variables.length > 0
+				buffer << "#{object.class.name}(\n"
+				indent += 1
+				object.instance_variables.each do |name|
+					buffer << ("	" * indent)
+					buffer << ":#{name} => "
+					buffer << pretty(object.instance_variable_get(name), indent:)
+					buffer << ",\n"
+				end
+				indent -= 1
 				buffer << ("	" * indent)
-				buffer << ":#{name} => "
-				pretty(object.instance_variable_get(name), buffer:, indent:)
-				buffer << ",\n"
+				buffer << ")"
+			else
+				buffer << "#{object.class.name}()"
 			end
-			indent -= 1
-			buffer << ("	" * indent)
-			buffer << ")"
 		end
 	end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: difftastic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Joel Drapper
 bindir: exe
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies: []
 email:
 - joel@drapper.me