use pp instead of inspect for values

Author: alexch

examples.rb

@@ -97,7 +97,7 @@ def initialize(*args)
 
 example do
   hash = {:flavor => "vanilla"}
-  exception_with_newlines = Exception.new(hash.to_yaml)
+  exception_with_newlines = Exception.new(hash.to_yaml.chomp)
   assert("showing indentation of details") { rescuing { raise exception_with_newlines }.message.include?(":flavor: chocolate") }
 end
 

lib/wrong/chunk.rb

@@ -1,5 +1,6 @@
 require 'ruby_parser'
 require 'ruby2ruby'
+require 'pp'
 
 def require_optionally(library)
   begin
@@ -175,32 +176,23 @@ def details
     end
 
     def pretty_value(value, starting_col = 0, indent_wrapped_lines = 6, width = Chunk.terminal_width)
-      inspected = value.inspect
+      # inspected = value.inspect
+
+      # note that if the first line overflows due to the starting column then pp won't wrap it right
+      inspected = PP.pp(value, "", width - starting_col).chomp
+
+      # this bit might be redundant with the pp call now
       indented = indent_all(6, inspected)
       if width
-        indented.split("\n").map do |line|
-          s = ""
-          first_line = true
-          width -= starting_col
-          while line.length > width
-            s << line[0...width]
-            s << newline(indent_wrapped_lines)
-            line = line[width..-1]
-            if first_line
-              width += starting_col - indent_wrapped_lines
-              first_line = false
-            end
-          end
-          s << line
-          s
-        end.join("\n")
+        wrap_and_indent(indented, starting_col, indent_wrapped_lines, width)
       else
         indented
       end
     end    
 
     private
 
+    # todo: move to FailureMessage?
     def build_details
       require "wrong/rainbow" if Wrong.config[:color]
       s = ""
@@ -263,6 +255,25 @@ def indent_all(amount, s)
       s.gsub("\n", "\n#{indent(amount)}")
     end
 
+    def wrap_and_indent(indented, starting_col, indent_wrapped_lines, full_width)
+      first_line = true
+      width = full_width - starting_col # the first line is essentially shorter
+      indented.split("\n").map do |line|
+        s = ""
+        while line.length > width
+          s << line[0...width]
+          s << newline(indent_wrapped_lines)
+          line = line[width..-1]
+          if first_line
+            width += starting_col - indent_wrapped_lines
+            first_line = false
+          end
+        end
+        s << line
+        s
+      end.join("\n")
+    end
+
     # Returns [width, height] of terminal when detected, nil if not detected.
     # Think of this as a simpler version of Highline's Highline::SystemExtensions.terminal_size()
     # Lifted from https://github.com/cldwalker/hirb/blob/master/lib/hirb/util.rb#L59

test/chunk_test.rb

@@ -1,6 +1,7 @@
 here = File.expand_path(File.dirname(__FILE__))
 require "#{here}/test_helper"
 require "wrong/chunk"
+require 'yaml'
 
 unless Object.const_defined?(:Chunk)
   Chunk = Wrong::Chunk
@@ -256,13 +257,21 @@ def details(&block)
       assert d == "\n" + '    x is "flavor:\tvanilla"' + "\n"
     end
 
+    it "splits lower-down details correctly (bug)" do
+      hash = {:flavor => "vanilla"}
+      exception_with_newlines = Exception.new(hash.to_yaml.chomp)
+      d = details {
+        rescuing { raise exception_with_newlines }.message.include?(":flavor: chocolate")
+      }
+      assert d.include? "exception_with_newlines is #<Exception: --- \n      :flavor: vanilla>"
+    end
+
     it "skips assignments" do
       y = 14
       d = details { x = 7; y }
       assert d !~ /x = 7/
       assert d =~ /y is 14/
     end
-    
 
     class Weirdo
       def initialize(inspected_value)
@@ -335,6 +344,16 @@ def inspect
         DONE
       end
 
+      it "wraps correctly" do
+        hash = {:flavor => "vanilla"}
+        object = Weirdo.new(hash.to_yaml.chomp)
+        pretty = @chunk.pretty_value(object, 2, 3, 80)
+        assert pretty == <<-DONE.chomp
+--- 
+      :flavor: vanilla
+        DONE
+      end
+
     end
 
   end

todo.txt

@@ -1,3 +1,6 @@
 Use RSpec 2's new framework extension API for rspec adapter
 
 Switch matchers from predicated to sexp
+
+We may also want to have Wrong's assert method detect when it is passed a parameter and no block, and act like the old assert in that case rather than erroring out. I think that'll fix some other integration hassles/bugs.
+