corn 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cc6871550ffd52bc9016143f8eac2ef5d0f78c4
-  data.tar.gz: e51b371d3fbd0ef91c10f7fefe759207d093e542
+  metadata.gz: 885902f5a77dd01b2e1ad5d50bd2466359f9390a
+  data.tar.gz: 812a743f03f5cce869e4bb8f47edb5ebb290c4d5
 SHA512:
-  metadata.gz: 9db883303d9b5b38b9952b9cb851f437490236dd5735be51b4e80505decbf69a9962ef7f5a99a4760ceb99c3ab61625b7969aa7fdaceb32cb80023dd78585b1d
-  data.tar.gz: 54e826a75871535d535a1f1a151a00d6a4796c33b2b13cc45edd1cb78e89e9f9e06ec5a33d4a831dea92b38db34f989c1a44165ee44d8390c42a9453e6d4de48
+  metadata.gz: 201f2d5083ba0bb47d553bd879b6d2834878fd5e4087c7eaac1d6571e6ad51df78b53de93c8a61c4de2311f75c1f7a4f1c37818ade0c1d22d0a3f407eb0c9197
+  data.tar.gz: e76a9cf28cf57458ee7e93bd8f72aa6d292983a3780c8beb3641e692ca5c5a646a4347594c72ad61603df48c6f0467004467eca22e086a084a636967d5775fa4

data/lib/corn.rb

@@ -39,9 +39,13 @@ module Corn
     end
   end
 
-  def report(label, &block)
+  def report(label=nil, &block)
     @report ||= Report.new
-    @report.record(label, &block)
+    if label
+      @report.record(label, &block)
+    else
+      @report
+    end
   end
 
   def submit

data/lib/corn/mini_test.rb

@@ -7,28 +7,27 @@ module Corn
 
     def run_with_corn(runner, &block)
       label = "#{self.class.name}.#{__name__}"
-      Corn.report(label) do |report|
-        @corn_report = report
+      Corn.report(label) do
         run_without_corn(runner, &block)
       end
     end
 
     def before_setup
-      @corn_report.record_start(:setup)
+      Corn.report.record_start(:setup)
     end
 
     def after_setup
-      @corn_report.record_end
-      @corn_report.record_start(:run_test)
+      Corn.report.record_end
+      Corn.report.record_start(:run_test)
     end
 
     def before_teardown
-      @corn_report.record_end
-      @corn_report.record_start(:teardown)
+      Corn.report.record_end
+      Corn.report.record_start(:teardown)
     end
 
     def after_teardown
-      @corn_report.record_end
+      Corn.report.record_end
     end
   end
 end

data/lib/corn/report.rb

@@ -3,64 +3,79 @@ require 'csv'
 module Corn
   class Report
 
+    class RecordNotStartError < StandardError
+    end
+
+    class Record
+      attr_reader :data
+
+      def initialize(label, parent=nil)
+        @label = label
+        @parent = parent
+        @data = []
+        @start = Time.now
+      end
+
+      def push(label)
+        Record.new(label, self)
+      end
+
+      def pop
+        return if @parent.nil?
+        @parent.record(@label, @start, Time.now - @start)
+        @data.each { |d| @parent.record(*d) }
+        @parent
+      end
+
+      def record(label, start, time)
+        @data << [record_label(label), start, time]
+      end
+
+      private
+      def record_label(label)
+        [@label, label].compact.join('.').to_sym
+      end
+    end
+
     def initialize(prefix=nil)
-      @prefix = prefix
-      @records = []
+      @record = Record.new(prefix, nil)
     end
 
     def record(label, &block)
       record_start(label)
-      yield(sub_report)
+      yield
     ensure
       record_end
     end
 
-    # start record a benchmark time by label
     def record_start(label)
-      @record = [record_label(label), Time.now]
+      @record = @record.push(label)
     end
 
-    # should only be called between record_start and record_end to generate
-    # sub report for current report
-    def sub_report
-      @sub_report ||= Report.new(@record[0])
-    end
-
-    # should only be called after record_start
     def record_end
-      @record << Time.now - @record[1]
-      @records << @record
-      if @sub_report
-        @records.concat @sub_report.to_a
-        @sub_report = nil
-      end
+      @record = @record.pop || raise(RecordNotStartError)
     end
 
     def empty?
-      @records.empty?
+      to_a.empty?
     end
 
     def to_a
-      @records
+      @record.data
     end
 
     def to_csv
       if RUBY_VERSION =~ /1.8/
         buf = ''
-        @records.each do |r|
+        self.to_a.each do |r|
           CSV.generate_row(r, r.size, buf)
         end
         buf
       else
         CSV.generate do |csv|
-          @records.each { |r| csv << r }
+          self.to_a.each { |r| csv << r }
         end
       end
     end
-
-    private
-    def record_label(label)
-      [@prefix, label].compact.join('.').to_sym
-    end
   end
 end

data/lib/corn/test_unit.rb

@@ -9,17 +9,17 @@ module Corn
 
     def run_with_corn(result, &block)
       label = "#{self.class.name}.#{@method_name}"
-      Corn.report(label) do |report|
-        __run_with_corn__(report, result, &block)
+      Corn.report(label) do
+        __run_with_corn__(result, &block)
       end
     end
 
-    def __run_with_corn__(report, result, &block)
+    def __run_with_corn__(result, &block)
       yield(Test::Unit::TestCase::STARTED, name)
       @_result = result
       begin
-        report.record(:setup) { setup }
-        report.record(:run_test) { __send__(@method_name) }
+        Corn.report(:setup) { setup }
+        Corn.report(:run_test) { __send__(@method_name) }
       rescue AssertionFailedError => e
         add_failure(e.message, e.backtrace)
       rescue Exception
@@ -27,7 +27,7 @@ module Corn
         add_error($!)
       ensure
         begin
-          report.record(:teardown) { teardown }
+          Corn.report(:teardown) { teardown }
         rescue AssertionFailedError => e
           add_failure(e.message, e.backtrace)
         rescue Exception

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corn
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Xiao Li