lizarb 1.0.2 → 1.0.3

data/lib/liza/test_parts/test_assertions_part.rb

@@ -1,111 +1,109 @@
-module Liza
-  class TestAssertionsPart < Part
-    insertion do
-      # CLASS
-
-      def self.totals
-        @totals ||= {
-                      errors: [],
-                      todos: [],
-                      fails: [],
-                      passes: [],
-                    }
-      end
-
-      def self._assertion_todo msg
-        self.totals[:todos] << msg
-      end
+class Liza::TestAssertionsPart < Liza::Part
+  insertion do
+    # CLASS
+
+    def self.totals
+      @totals ||= {
+                    errors: [],
+                    todos: [],
+                    fails: [],
+                    passes: [],
+                  }
+    end
 
-      def self._assertion_passed
-        self.totals[:passes] << 1
-      end
+    def self._assertion_todo msg
+      self.totals[:todos] << msg
+    end
 
-      def self._assertion_failed msg
-        self.totals[:fails] << msg
-      end
+    def self._assertion_passed
+      self.totals[:passes] << 1
+    end
 
-      def self._assertion_errored e
-        self.totals[:errors] << e
-      end
+    def self._assertion_failed msg
+      self.totals[:fails] << msg
+    end
 
-      # INSTANCE
+    def self._assertion_errored e
+      self.totals[:errors] << e
+    end
 
-      attr_writer :assertions
+    # INSTANCE
 
-      def assertions
-        @assertions ||= 0
-      end
+    attr_writer :assertions
 
-      def _inc_assertions
-        self.assertions += 1
-      end
+    def assertions
+      @assertions ||= 0
+    end
 
-      # ASSERTIONS
+    def _inc_assertions
+      self.assertions += 1
+    end
 
-      def todo msg
-        self.class._assertion_todo msg
-        @last_result = :todo
+    # ASSERTIONS
 
-        log_test_assertion __method__, caller if _groups.empty?
-      end
+    def todo msg
+      self.class._assertion_todo msg
+      @last_result = :todo
 
-      def _groups
-        @_groups ||= []
-      end
-
-      def group kaller: nil, **_words, &block
-        block_given? || raise(ArgumentError, "No block given")
+      log_test_assertion __method__, caller if _groups.empty?
+    end
 
-        _groups << block
-        instance_exec &block
-        _groups.pop
+    def _groups
+      @_groups ||= []
+    end
 
-        kaller ||= caller
-        log_test_assertion __method__, kaller if _groups.empty?
-      end
+    def group kaller: nil, **_words, &block
+      block_given? || raise(ArgumentError, "No block given")
 
-      def assert b, msg = "it should have been true", kaller: nil
-        if b
-          self.class._assertion_passed
-          @last_result = :passed
-        else
-          self.class._assertion_failed msg
-          @last_result = :failed
-        end
+      _groups << block
+      instance_exec &block
+      _groups.pop
 
-        kaller ||= caller
-        log_test_assertion __method__, kaller if _groups.empty?
+      kaller ||= caller
+      log_test_assertion __method__, kaller if _groups.empty?
+    end
 
-        b
+    def assert b, msg = "it should have been true", kaller: nil
+      if b
+        self.class._assertion_passed
+        @last_result = :passed
+      else
+        self.class._assertion_failed msg
+        @last_result = :failed
       end
 
-      def refute b, msg = "it should have been false", kaller: nil
-        if b
-          self.class._assertion_failed msg
-          @last_result = :failed
-        else
-          self.class._assertion_passed
-          @last_result = :passed
-        end
+      kaller ||= caller
+      log_test_assertion __method__, kaller if _groups.empty?
 
-        kaller ||= caller
-        log_test_assertion __method__, kaller if _groups.empty?
+      b
+    end
 
-        b
+    def refute b, msg = "it should have been false", kaller: nil
+      if b
+        self.class._assertion_failed msg
+        @last_result = :failed
+      else
+        self.class._assertion_passed
+        @last_result = :passed
       end
 
-      def assert! b, msg = "it should have been true"
-        critical assert b, msg, kaller: caller
-      end
+      kaller ||= caller
+      log_test_assertion __method__, kaller if _groups.empty?
 
-      def refute! b, msg = "it should have been false"
-        critical refute b, msg, kaller: caller
-      end
+      b
+    end
 
-      def critical passed
-        throw :critical, :critical if not passed
-      end
+    def assert! b, msg = "it should have been true"
+      critical assert b, msg, kaller: caller
+    end
 
+    def refute! b, msg = "it should have been false"
+      critical refute b, msg, kaller: caller
     end
+
+    def critical passed
+      throw :critical, :critical if not passed
+    end
+
   end
 end

data/lib/liza/test_parts/test_dsl_part.rb

@@ -1,70 +1,68 @@
-module Liza
-  class TestDslPart < Part
-    insertion do
+class Liza::TestDslPart < Liza::Part
+  insertion do
 
-      def self.call class_index, class_count
-        counter_class = "#{class_index.to_s.rjust 3, "0"}/#{class_count.to_s.rjust 3, "0"}"
+    def self.call class_index, class_count
+      counter_class = "#{class_index.to_s.rjust 3, "0"}/#{class_count.to_s.rjust 3, "0"}"
 
-        log "+ #{counter_class} #{self} class".bold.white
+      log "+ #{counter_class} #{self} class".bold.white
 
-        array = [test_tree]
-        while array.any?
-          node = array.pop
-          i = 0
+      array = [test_tree]
+      while array.any?
+        node = array.pop
+        i = 0
 
-          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]
+        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]
 
-            log "  #{ counter_class } #{ counter_instance } #{ label.ljust(27)} #{_log_test_block test_block}"
+          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
+          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
 
-      attr_reader :test_words
+    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
+    attr_reader :test_words
 
-      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
+    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
+        @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 = @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
+        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
 
-          @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
+        @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
-        log_test_call_rescue e
-      ensure
-        puts
       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

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