pretty_debug 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6fef9338276578fa99842e75229d0603199b534
-  data.tar.gz: 16419c3856e68720c6f6174113ce23e9e81801fc
+  metadata.gz: 586a6a3bbcec2fd560dec4af52d338f2f8276b92
+  data.tar.gz: 29a97950744e70acaf157ea78a7d949d231cd7a0
 SHA512:
-  metadata.gz: 6103195bfab4700a63c8ee4d933ad3fe2c73f84cd31830ce337daa6cfb6a11dd65bfd19fde2cd77839305cc8362c6dc3bf36668fe026a0fac97c4e90b2a4ced1
-  data.tar.gz: ace06c28be584d84879e2623b03a4568c7a0ea9e7b749da977fd89ac4cc65845dc963a90444cda6aac35b56fa5b215ada0db8d36c4b387696513568a2a7ad417
+  metadata.gz: 2c85006d3881f2b1ae1d4b5c767e64b9fdaa3f1f6426bf6ae64171be88292c5ddf97ce763ba1118dabf6d3e488a9e722f62c7dc3b1af85a01d456ef764ea0f12
+  data.tar.gz: ac303b059e31df106d595778a220477705d86c76bc4a51eb7c6b19fca0b7c3bf661ad1d26bbdd509108531d3ed0c0832c34d6844a69d40bd7f292d52c9ba0094

data/lib/pretty_debug.rb

@@ -1,7 +1,6 @@
 #!ruby
 require "tmpdir"
 require "compact_time"
-require "utility"
 
 #############################################
 # File
@@ -86,8 +85,8 @@ class Thread::Backtrace::PseudoLocation
 	attr_accessor :to_s, :absolute_path, :lineno, :label, :path, :base_label
 	def initialize to_s
 		@to_s = to_s
-		@absolute_path, @lineno, @label =
-		@to_s.match(Pattern).chain{|m| [m[:f], m[:l].chain{|l| l.to_i if l}, m[:m].to_s]}
+		m = @to_s.match(Pattern)
+		@absolute_path, @lineno, @label = m[:f], m[:l] ? m[:l].to_i : nil, m[:m].to_s
 		@path = File.basename(@absolute_path)
 		@base_label = @label
 	end
@@ -212,16 +211,16 @@ class UnboundMethod; def inspect; "#{owner}##{name}" end end
 class Array
 	SingleLength = 50
 	def inspect
-		map(&:inspect)
-		.chain{|s| length < 2 || s.map(&:length).inject(:+) < SingleLength ?
-			"[#{s.join(", ".freeze)}]" : "[#$/#{s.join(",#$/".freeze).indent}#$/]"}
+		s = map(&:inspect)
+		length < 2 || s.map(&:length).inject(:+) < SingleLength ?
+			"[#{s.join(", ".freeze)}]" : "[#$/#{s.join(",#$/".freeze).indent}#$/]"
 	end
 	def align ellipsis_limit = nil
 		transpose.map do |col|
 			just = case col.first; when Numeric then :rjust; else :ljust end
 			width = col.map{|cell| cell.to_s.length}.max
 			max = ellipsis_limit || width
-			col.map{|cell| cell.to_s.ellipsis(max).__send__(just, width.at_most(max))}
+			col.map{|cell| cell.to_s.ellipsis(max).__send__(just, width > max ? max : width)}
 		end.transpose
 	end
 	def common_prefix
@@ -246,17 +245,19 @@ class Hash
 	def inspect
 		keys = self.keys.map(&:inspect)
 		# When `self == empty?`, `...max` becomes `nil`. `to_i` turns it to `0`.
-		w = keys.map(&:length).max.to_i.at_most(KeyLengthMax)
-		[keys, values].transpose.map{|k, v| "#{k.ljust(w)} => #{v.inspect}"}
-		.chain{|s| length < 2 || s.map(&:length).inject(:+) < SingleLength ?
-			"{#{s.join(", ".freeze)}}" :  "{#$/#{s.join(",#$/".freeze).indent}#$/}"}
+		w = keys.map(&:length).max.to_i
+		w = w > KeyLengthMax ? KeyLengthMax : w
+		s = [keys, values].transpose.map{|k, v| "#{k.ljust(w)} => #{v.inspect}"}
+		length < 2 || s.map(&:length).inject(:+) < SingleLength ?
+			"{#{s.join(", ".freeze)}}" :  "{#$/#{s.join(",#$/".freeze).indent}#$/}"
 	end
 end
 
 class Object
 	def intercept &pr
+		l = caller_location(3)
 		tap do |x| puts \
-			"[Debug] #{caller_location(3).chain{|l| "#{l.path}:#{l.lineno}"}}".color(:yellow),
+			"[Debug] #{"#{l.path}:#{l.lineno}"}".color(:yellow),
 			(pr ? pr.call(x) : x).inspect.verbatim.unchomp
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pretty_debug
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - sawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: []