Experimenting with moving output to erb templates.

lib/micro_test/formatters/default_formatter.rb

@@ -12,8 +12,6 @@ def before_class(test_class)
     end
 
     def after_test(test)
-      print_duration test.duration
-
       if test.passed?
         print_test_pass test
       else

lib/micro_test/formatters/default_printer.rb

@@ -1,13 +1,11 @@
+require_relative "template"
+require_relative "./helpers/default_helper"
+
 module MicroTest
   module DefaultPrinter
 
     protected
 
-    def print_duration(duration)
-      color = duration < 0.01 ? :yellow : :red
-      print send(color, "  #{duration.to_s.ljust(6, "0")}")
-    end
-
     def print_line
       puts "".ljust(80, "-")
     end
@@ -17,43 +15,40 @@ def print_with_line(value)
     end
 
     def print_test_pass(test)
-      print green(" #{test.desc}")
+      Template.new(test, DefaultHelper).render(:_test_pass)
     end
 
     def print_test_fail(test)
-      puts red(" #{test.desc}")
-      test.failed_asserts.each do |assert|
-        print_assert_fail assert
-      end
+      Template.new(test, DefaultHelper).render(:_test_fail)
     end
 
-    def print_assert_fail(assert)
-      puts
-      print "".ljust(9)
-      puts "#{assert[:file_path]}:#{red(assert[:line_num])}"
-      puts "".ljust(9) + "".rjust(71, "-")
-      index = assert[:line_num] - 1
-      start = index - 2
-      start = 0 if start <= 0
-      finish = index + 2
-      finish = assert[:lines].length - 1 if finish >= assert[:lines].length
-      print_assert_fail_lines assert, start, finish, index
-    end
-
-    def print_assert_fail_lines(assert, start, finish, index)
-      (start..finish).each do |i|
-        print "".ljust(9)
-        if i == index
-          print red((i + 1).to_s.rjust(3, "0"))
-          print red("|")
-          print red(assert[:lines][i])
-        else
-          print (i + 1).to_s.rjust(3, "0")
-          print "|"
-          print assert[:lines][i]
-        end
-      end
-    end
+    #def print_assert_fail(assert)
+    #  puts
+    #  print "".ljust(9)
+    #  puts "#{assert[:file_path]}:#{red(assert[:line_num])}"
+    #  puts "".ljust(9) + "".rjust(71, "-")
+    #  index = assert[:line_num] - 1
+    #  start = index - 2
+    #  start = 0 if start <= 0
+    #  finish = index + 2
+    #  finish = assert[:lines].length - 1 if finish >= assert[:lines].length
+    #  print_assert_fail_lines assert, start, finish, index
+    #end
+
+    #def print_assert_fail_lines(assert, start, finish, index)
+    #  (start..finish).each do |i|
+    #    print "".ljust(9)
+    #    if i == index
+    #      print red((i + 1).to_s.rjust(3, "0"))
+    #      print red("|")
+    #      print red(assert[:lines][i])
+    #    else
+    #      print (i + 1).to_s.rjust(3, "0")
+    #      print "|"
+    #      print assert[:lines][i]
+    #    end
+    #  end
+    #end
 
   end
 end

lib/micro_test/formatters/helpers/default_helper.rb

@@ -0,0 +1,10 @@
+module MicroTest
+  module DefaultHelper
+
+    def duration_color(duration)
+      return :yellow if @context.duration <= 0.01
+      :red
+    end
+
+  end
+end

lib/micro_test/formatters/template.rb

@@ -0,0 +1,29 @@
+module MicroTest
+  class Template
+    include Color
+
+    def self.view(name)
+      @views ||= {}
+      @views[name] ||= File.read(File.expand_path("../views/default/#{name}.txt.erb", __FILE__))
+    end
+
+    def initialize(object, *helpers)
+      @context = object
+      helpers.each { |helper| extend helper }
+    end
+
+    def render(name)
+      instance_eval do
+        print ERB.new(self.class.view(name), nil, ">").result(binding)
+      end
+    end
+
+    def partial(name, options={})
+      return render(name) if options[:collection].nil?
+      options[:collection].each do |item|
+        Template.new(item).render(name)
+      end
+    end
+
+  end
+end

lib/micro_test/formatters/views/default/_assert_fail.txt.erb

@@ -0,0 +1,2 @@
+         <%= @context[:file_path] %>:<%= red @context[:line_num] %>
+         -------------------------------------------------------------

lib/micro_test/formatters/views/default/_test_fail.txt.erb

@@ -0,0 +1,3 @@
+  <%= send duration_color(@context.duration), @context.duration %>
+ <%= red @context.desc %>
+ <%= partial :_assert_fail, :collection => @context.failed_asserts %>

lib/micro_test/formatters/views/default/_test_pass.txt.erb

@@ -0,0 +1,2 @@
+  <%= send duration_color(@context.duration), @context.duration %>
+ <%= green @context.desc %>

lib/micro_test/test_wrapper.rb

@@ -98,10 +98,10 @@ def reset
       @duration = nil
     end
 
-    # Rounded duration with 4 decimal places.
+    # Rounded duration.
     def duration
       return nil if @duration.nil?
-      (@duration.to_f * 10**4).round / 10**4
+      (@duration * 10**4).ceil.to_f / 10**4
     end
 
     private

test/color_test.rb

@@ -8,6 +8,7 @@ class Crayon
     CRAYON = Crayon.new
 
     test "red" do
+      assert false
       assert MicroTest::Color.red("foo") == "\e[31mfoo\e[0m"
       assert ColorTest::CRAYON.red("foo") == "\e[31mfoo\e[0m"
     end