lizarb 1.0.1 → 1.0.3

data/lib/liza/test_parts/test_dsl_part.rb

@@ -1,122 +1,68 @@
-module Liza
-  class TestDslPart < Part
-    insertion do
-      def self.test *words, &block
-        Liza.log "#{inspect}.test #{words}, &block"
-        block_given? || raise(ArgumentError, "No block given")
+class Liza::TestDslPart < Liza::Part
+  insertion do
 
-        key = [
-          block.source_location,
-          'b',
-          context.befores.flatten.map(&:source_location),
-          'a',
-          context.afters.flatten.map(&:source_location),
-        ].flatten.join("-")
+    def self.call class_index, class_count
+      counter_class = "#{class_index.to_s.rjust 3, "0"}/#{class_count.to_s.rjust 3, "0"}"
 
-        key.gsub! Lizarb::CUR_DIR, ""
+      log "+ #{counter_class} #{self} class".bold.white
 
-        instances[key] ||= new  words,
-                                context.befores.flatten.uniq,
-                                context.afters.flatten.uniq,
-                                &block
-      end
-
-      def self.instances
-        @instances ||= {}
-      end
-
-      def self.call class_index, class_count
-        counter_class = "#{class_index.to_s.rjust 3, "0"}/#{class_count.to_s.rjust 3, "0"}"
+      array = [test_tree]
+      while array.any?
+        node = array.pop
+        i = 0
 
-        puts "- #{counter_class} #{self} (#{instances.size} tests)".cyan
+        node.tests.each do |test_words, test_block|
+          counter_instance = "#{(i+=1).to_s.rjust 2, '0'}/#{node.tests.size.to_s.rjust 2, '0'}"
+          label = test_words.to_a.flatten.join(" ")[0..25]
 
-        instances.values.each_with_index do |instance, i|
-          counter_instance = "#{(i+=1).to_s.rjust 2, '0'}/#{instances.size.to_s.rjust 2, '0'}"
-          label = instance.words_as_label
-
-          puts "  #{ counter_class } #{ counter_instance } (#{ label })".light_cyan
+          log "  #{ counter_class } #{ counter_instance } #{ label.ljust(27)} #{_log_test_block test_block}"
 
+          log_test_building node, test_block if log_test_building?
+          
+          instance = new test_words, node.before_stack, node.after_stack, &test_block
           instance.call
         end
+
+        array.concat node.children
       end
 
-      #
+    end
 
-      attr_reader :words
+    attr_reader :test_words
 
-      def initialize words, befores, afters, &block
-        @words, @befores, @afters, @block = words, befores, afters, block
-      end
+    def initialize test_words, before_stack, after_stack, &test_block
+      @test_words, @before_stack, @after_stack, @test_block = test_words, before_stack, after_stack, test_block
+    end
 
-      def call
-        catch :critical do
-          @befores.each do |bl|
-            _call_log "B&", &bl
+    def call
+      catch :critical do
+        @before_stack.each do |stack|
+          log "               calling stacked before blocks #{stack.map { |bl| _log_test_block bl }}".magenta if log_test_building?
+          stack.each do |bl|
+            log_test_call "B&", &bl if log_test_call_block?
             instance_exec &bl
           end
+        end
 
-          bl = @block
-          _call_log " &", &bl
-          instance_exec &bl
+        bl = @test_block
+        log "                         calling test block #{_log_test_block bl}".magenta if log_test_building?
+        log_test_call "T&", &bl if log_test_call_block?
+        instance_exec &bl
 
-          @afters.each do |bl|
-            _call_log "A&", &bl
+        @after_stack.each do |stack|
+          log "                calling stacked after blocks #{stack.map { |bl| _log_test_block bl }}".magenta if log_test_building?
+          stack.each do |bl|
+            log_test_call "A&", &bl if log_test_call_block?
             instance_exec &bl
           end
         end
-      rescue Exception => e
-        self.class._assertion_errored e
-        _rescue_log e
-      ensure
-        puts
-      end
-
-      def words_as_label
-        label = words.to_s
-        label = label[1..-2] if label.start_with? "["
-        label = label[1..-2] if label.start_with? "{"
-        label
-      end
-
-      def _rescue_log e
-        prefix = "error"
-
-        kaller = e.backtrace
-
-        source_location = _caller_line_split(kaller[0])[0]
-        source_location = source_location.gsub("#{Lizarb::CUR_DIR}/", "")
-
-        log "                      #{prefix}  #{source_location}"
-
-        puts "Exception!".red
-        puts e.class.to_s.red
-        puts e.message.red
-        puts
-        puts e.backtrace.join("\n").red
-      end
-
-      def _call_log prefix, &block
-        source_location = block.source_location.join(":").gsub("#{Lizarb::CUR_DIR}/", "")
-        source_location = source_location[0..-1]
-        log "          #{prefix}                 #{source_location}"
-      end
-
-      def _assertion_log method_name, kaller
-        _inc_assertions
-        method_name = method_name.to_s.ljust 6
-        prefix = "#{assertions} #{method_name} #{@last_result}"
-
-        source_location = _caller_line_split(kaller[0])[0]
-        source_location = source_location.gsub("#{Lizarb::CUR_DIR}/", "")
-
-        log "             #{prefix} #{source_location}"
-      end
-
-      def _caller_line_split s
-        x = s.split ":in `"
-        x[1] = x[1][0..-2]
-        x
       end
+    rescue Exception => e
+      self.class._assertion_errored e
+      log_test_call_rescue e
+    ensure
+      puts
     end
+
   end
 end

data/lib/liza/test_parts/test_log_part.rb

@@ -0,0 +1,122 @@
+class Liza::TestLogPart < Liza::Part
+
+  insertion do
+
+    LOG_BUILDING = false
+    LOG_ASSERTION = true
+    LOG_ASSERTION_MESSAGE = true
+    LOG_CALL_BLOCK = true
+
+    def self.log_test_building?
+      LOG_BUILDING
+    end
+
+    def log_test_building?
+      self.class.log_test_building?
+    end
+
+    def log_test_assertion?
+      LOG_ASSERTION
+    end
+
+    def log_test_assertion_message?
+      LOG_ASSERTION_MESSAGE
+    end
+
+    def log_test_call_block?
+      LOG_CALL_BLOCK
+    end
+
+    def log_test_call_rescue e
+      prefix = "error".yellow
+
+      kaller = e.backtrace
+
+      source_location = _caller_line_split(kaller[0])[0]
+      source_location = source_location.gsub("#{Lizarb::CUR_DIR}/", "")
+
+      log "                #{prefix} #{e.class.to_s.ljust 20} #{source_location}"
+
+      puts "Exception!".red
+      puts e.class.to_s.red
+      puts e.message.red
+      puts
+      puts e.backtrace.join("\n").red
+    end
+
+    def self.log_test_building node, test_block
+      log "                         the building blocks are".magenta
+
+      node.before_stack.each do |stack|
+        stack.each do |bl|
+          log "                               before block #{_log_test_block bl}".magenta
+        end
+      end
+      
+      log "                                 test block #{_log_test_block test_block}".magenta
+
+      node.after_stack.each do |stack|
+        stack.each do |bl|
+          log "                                after block #{_log_test_block bl}".magenta
+        end
+      end
+    end
+
+    def log_test_call prefix, &block
+      source_location = block.source_location.join(":").gsub("#{Lizarb::CUR_DIR}/", "")
+      source_location = source_location[0..-1]
+      log "          #{prefix}                                #{source_location}"
+    end
+
+    def log_test_assertion method_name, kaller
+      _inc_assertions
+      prefix = "#{assertions.to_s.rjust 2, "0"} #{_log_test_assertion_tag method_name}"
+
+      source_location = _caller_line_split(kaller[0])[0]
+      source_location = source_location.gsub("#{Lizarb::CUR_DIR}/", "")
+
+      log "             #{prefix} #{source_location}" if log_test_assertion?
+    end
+
+    def _log_test_assertion_tag method_name
+      "#{log_test_assertion_result} #{method_name.to_s.ljust(20).bold.white}"
+    end
+
+    def self._log_test_block test_block
+      test_block.source_location.join(":").gsub("#{Lizarb::CUR_DIR}/", "")
+    end
+
+    def _log_test_block test_block
+      self.class._log_test_block test_block
+    end
+
+    def log_test_assertion_result
+      case @last_result
+      when :todo
+        "  todo".blue
+      when :passed
+        "passed".green
+      when :failed
+        "failed".red
+      else
+        raise "Unknown result: #{@last_result}"
+      end
+    end
+
+    def log_test_assertion_message b, msg
+      if b
+        log "                passed #{msg}".green 
+      else
+        log "                failed #{msg}".red
+      end
+    end
+
+    def _caller_line_split s
+      x = s.split ":in `"
+      x[1] = x[1][0..-2]
+      x
+    end
+
+  end
+
+end

data/lib/liza/test_parts/test_subject_part.rb

@@ -1,24 +1,22 @@
-module Liza
-  class TestSubjectPart < Part
+class Liza::TestSubjectPart < Liza::Part
 
-    insertion do
-      def self.subject_class
-        @subject_class ||=
-          if first_namespace == "Liza"
-            Liza.const_get last_namespace[0..-5]
-          else
-            Object.const_get name[0..-5]
-          end
-      end
-
-      def subject_class
-        self.class.subject_class
-      end
+  insertion do
+    def self.subject_class
+      @subject_class ||=
+        if first_namespace == "Liza"
+          Liza.const_get last_namespace[0..-5]
+        else
+          Object.const_get name[0..-5]
+        end
+    end
 
-      def subject
-        @subject ||= subject_class.new
-      end
+    def subject_class
+      self.class.subject_class
     end
 
+    def subject
+      @subject ||= subject_class.new
+    end
   end
+
 end

data/lib/liza/test_parts/test_tree_part.rb

@@ -0,0 +1,137 @@
+class Liza::TestTreePart < Liza::Part
+
+  insertion do
+
+    @before_stack = []
+    @after_stack = []
+    
+    def self.before_stack; @before_stack ||= superclass.before_stack.dup end
+    def self.after_stack;  @after_stack  ||= superclass.after_stack.dup end
+    
+    def self.test_node; @test_node ||= test_tree end
+    def self.test_tree; @test_tree ||= Liza::TestTreePart::Extension.new nil, before_stack, after_stack end
+    
+    #
+
+    def self.group *words, &block
+      raise ArgumentError, "No block given" unless block_given?
+      previous = test_node
+      @test_node = test_node.branch_out words
+      instance_exec &block
+      @test_node = previous
+    end
+
+    def self.test *words, &block
+      raise ArgumentError, "No block given" unless block_given?
+      test_node.add_test words, &block
+    end
+
+    def self.before &block
+      raise ArgumentError, "No block given" unless block_given?
+      test_node.add_before &block
+    end
+
+    def self.after &block
+      raise ArgumentError, "No block given" unless block_given?
+      test_node.add_after &block
+    end
+
+  end
+
+  extension do
+    
+    def log *args
+      self.class.solder.log *args
+    end
+
+    def log_test_building?
+      Liza::Test.log_test_building?
+    end
+
+    attr_reader :tests, :parent, :children, :before_stack, :after_stack
+
+    def initialize parent, before_stack, after_stack
+      @parent = parent || self
+
+      @children, @tests = [], []
+      @before_top, @after_top = [], []
+
+      @before_stack = before_stack.push @before_top
+      @after_stack  = after_stack.unshift @after_top
+
+      @parent.children << self if @parent != self
+    end
+
+    def initialize parent, before_stack, after_stack
+      @parent = parent || self
+
+      @children, @tests, @before_top, @after_top = [], [], [], []
+
+      @before_stack = before_stack.push @before_top
+      @after_stack  = after_stack.unshift @after_top
+
+      @parent.children << self if @parent != self
+    end
+
+    def initialize parent, before_stack, after_stack
+      @parent = parent || self
+      @children, @tests = [], []
+      @parent.children << self if @parent != self
+
+      @before_top, @after_top = [], []
+      @before_stack = before_stack.push @before_top
+      @after_stack  = after_stack.unshift @after_top
+    end
+
+    def initialize parent, before_stack, after_stack
+      @tests = []
+
+      @parent = parent || self
+      @children = []
+      @parent.children << self if @parent != self
+
+      @before_top, @after_top = [], []
+      @before_stack = before_stack.push @before_top
+      @after_stack  = after_stack.unshift @after_top
+    end
+
+    def initialize parent, before_stack, after_stack
+      @tests = []
+      initialize_parenting parent
+      initialize_filters before_stack, after_stack
+    end
+
+    def initialize_parenting parent
+      @parent = parent || self
+      @children = []
+      @parent.children << self if @parent != self
+    end
+
+    def initialize_filters before_stack, after_stack
+      @before_top, @after_top = [], []
+      @before_stack = before_stack.push @before_top
+      @after_stack  = after_stack.unshift @after_top
+    end
+
+    def add_before &block
+      log "add_before to ##{object_id} #{block}" if log_test_building?
+      @before_top.push block
+    end
+
+    def add_test words, &block
+      log "add_test to ##{object_id} #{words} #{block}" if log_test_building?
+      tests << [words, block]
+    end
+
+    def add_after &block
+      log "add_after to ##{object_id} #{block}" if log_test_building?
+      @after_top.push block
+    end
+
+    def branch_out words, &block
+      self.class.new self, before_stack.dup, after_stack.dup
+    end
+
+  end
+
+end