specdown 0.4.0.beta.1 → 0.4.0.beta.2

data/lib/specdown.rb

@@ -2,34 +2,28 @@ require 'kramdown'
 require 'term/ansicolor'
 require 'erb'
 require 'optparse'
+require 'hook'
 require 'specdown/parser'
 require 'specdown/implicit_parser'
 require 'specdown/node'
 require 'specdown/tree'
-require 'specdown/runner'
+require 'specdown/readme'
 require 'specdown/reporter'
-require 'specdown/runner/stats'
+require 'specdown/test'
+require 'specdown/readme/stats'
 require 'specdown/command'
 require 'specdown/event_server'
-require 'specdown/event_handlers/before_test'
-require 'specdown/event_handlers/after_test'
-require 'specdown/event_handlers/command_complete'
-require 'specdown/event_handlers/run_complete'
-require 'specdown/event_handlers/run_started'
-require 'specdown/event_handlers/test_failed'
-require 'specdown/event_handlers/test_passed'
-require 'specdown/event_handlers/test_pending'
-require 'specdown/event_handlers/test_undefined'
+require 'specdown/event_handlers/test'
+require 'specdown/event_handlers/command'
+require 'specdown/event_handlers/readme'
 require 'specdown/pending'
 require 'specdown/pending_exception'
 require 'specdown/config'
 require 'specdown/specdown'
 require 'specdown/sandbox_factory'
-require 'specdown/hooks'
-require 'specdown/hook'
 require 'specdown/command/option_parser'
-require 'specdown/runner/report_summary'
-require 'specdown/runner/exception_facade'
+require 'specdown/readme/report_summary'
+require 'specdown/readme/exception_facade'
 require 'specdown/reporters/terminal_reporter'
 require 'specdown/reporters/color_terminal_reporter'
 require 'specdown/reporters/text_reporter'

data/lib/specdown/command.rb

@@ -1,9 +1,20 @@
 module Specdown
   class Command
+    include ::Hook
+    hook :execute
+
+    attr_reader :readmes
+
+    def initialize
+      @readmes = []
+    end
+
     def execute
-      load_test_environment
-      parse_options
-      run
+      with_hooks :execute do
+        load_test_environment
+        parse_options
+        run
+      end
     end
     
     private
@@ -18,15 +29,9 @@ module Specdown
     end
 
     def run
-      @results = []
-      
-      Kernel.at_exit do
-        Specdown::EventServer.event :command_complete, @results
-      end
-      
       Specdown::Config.tests.each do |markdown| 
-        @results << Runner.new(markdown)
-        @results.last.run
+        @readmes << Specdown::Readme.new(markdown)
+        @readmes.last.execute
       end
     end
   end

data/lib/specdown/event_handlers/command.rb

@@ -0,0 +1,4 @@
+Specdown::Command.after_execute do |command|
+  Specdown.reporter.print_summary command.readmes
+  Specdown.reporter.print_end
+end

data/lib/specdown/event_handlers/readme.rb

@@ -0,0 +1,7 @@
+Specdown::Readme.before_execute do |readme|
+  Specdown.reporter.print_readme_start readme if Specdown::Config.format == :condensed
+end
+
+Specdown::Readme.after_execute do |readme|
+  Specdown.reporter.print_readme_end readme if Specdown::Config.format == :condensed
+end

data/lib/specdown/event_handlers/test.rb

@@ -0,0 +1,8 @@
+Specdown::Test.after_execute do |test|
+  case test.status
+    when :passing   then Specdown.reporter.print_success   test
+    when :failing   then Specdown.reporter.print_failure   test
+    when :undefined then Specdown.reporter.print_undefined test
+    when :pending   then Specdown.reporter.print_pending   test
+  end
+end

data/lib/specdown/readme.rb

@@ -0,0 +1,58 @@
+module Specdown
+  class Readme
+    include ::Hook
+    hook :execute
+
+    attr_reader :tests, :stats, :file_path
+
+    def initialize(file_path)
+      @file_path  = file_path
+      @tests      = []
+      @stats      = Stats.new self
+      build_tests
+    end
+
+    def exceptions
+      @tests.collect(&:exception).compact
+    end
+
+    def pending_exceptions
+      exceptions.select {|e| e.exception_class == Specdown::PendingException }
+    end
+
+    def undefined_implicits
+      @tests.collect(&:undefined_implicits).flatten
+    end
+
+    def file_name
+      File.basename @file_path
+    end
+
+    def execute
+      with_hooks :execute do
+        @tests.map &:execute
+      end
+
+      self
+    end
+
+    private
+    def build_tests
+      tree = Parser.parse File.read(file_path), Specdown::Config.implicit_specs
+      depth_first_search(tree.root)
+    end
+
+    def depth_first_search(node, code=[], undefined_implicits=[])
+      if node.children.empty?
+        test = Specdown::Test.new self
+        test.code = code + [node.code]
+        test.undefined_implicits = undefined_implicits + node.undefined_implicits
+        @tests << test
+      else
+        node.children.each do |child|
+          depth_first_search(child, code + [node.code], undefined_implicits + node.undefined_implicits)
+        end
+      end
+    end
+  end
+end

data/lib/specdown/{runner → readme}/exception_facade.rb

@@ -1,8 +1,8 @@
 module Specdown
   class ExceptionFacade
-    def initialize(exception, runner)
+    def initialize(exception, readme)
       @exception = exception
-      @runner = runner
+      @readme = readme
     end
 
     def exception_class
@@ -18,7 +18,7 @@ module Specdown
     end
 
     def test_filename
-      @runner.file_name
+      @readme.file_name
     end
   end
 end

data/lib/specdown/readme/report_summary.rb

@@ -0,0 +1,37 @@
+module Specdown
+  class ReportSummary
+    attr_reader :readmes
+
+    def initialize(readmes)
+      @readmes = readmes.respond_to?(:map) ? readmes : [readmes]
+    end
+
+    def num_markdowns
+      @num_markdowns ||= @readmes.count
+    end
+
+    def num_tests
+      @num_tests ||= @readmes.map(&:stats).map(&:num_tests).inject(0, &:+)
+    end
+
+    def num_pending
+      @num_pending ||= @readmes.map(&:stats).map(&:num_pending).inject(0, &:+)
+    end
+
+    def num_undefined
+      @num_undefined ||= @readmes.map(&:stats).map(&:num_undefined).inject(0, &:+)
+    end
+
+    def num_failing
+      @num_failing ||= @readmes.map(&:stats).map(&:num_failing).inject(0, &:+)
+    end
+
+    def num_passing
+      @num_passing ||= @readmes.map(&:stats).map(&:num_passing).inject(0, &:+)
+    end
+
+    def exceptions
+      @exceptions ||= @readmes.map(&:tests).flatten.map(&:exception).compact
+    end
+  end
+end

data/lib/specdown/readme/stats.rb

@@ -0,0 +1,29 @@
+module Specdown
+  class Stats
+    attr_reader :readme
+
+    def initialize(readme=nil)
+      @readme = readme
+    end
+
+    def num_tests
+      @readme.tests.count
+    end
+
+    def num_passing
+      @readme.tests.select {|test| test.status == :passing}.count
+    end
+
+    def num_failing
+      @readme.tests.select {|test| test.status == :failing}.count
+    end
+
+    def num_pending
+      @readme.tests.select {|test| test.status == :pending}.count
+    end
+
+    def num_undefined
+      @readme.tests.select {|test| test.status == :undefined}.count
+    end
+  end
+end

data/lib/specdown/reporter.rb

@@ -1,22 +1,22 @@
 module Specdown
   module Reporter
-    def summary(runners)
-      ReportSummary.new(runners)
+    def summary(readmes)
+      ReportSummary.new(readmes)
     end
 
     def print_start
       raise NotImplementedError
     end
 
-    def print_runner_start(runner)
+    def print_readme_start(readme)
       raise NotImplementedError
     end
 
-    def print_runner_summary(runner)
+    def print_readme_summary(readme)
       raise NotImplementedError
     end
 
-    def print_runner_end(runner)
+    def print_readme_end(readme)
       raise NotImplementedError
     end
 
@@ -28,7 +28,7 @@ module Specdown
       raise NotImplementedError
     end
     
-    def print_summary(runners)
+    def print_summary(readmes)
       raise NotImplementedError
     end
 

data/lib/specdown/reporters/color_terminal_reporter.rb

@@ -16,8 +16,8 @@ module Specdown
       Term::ANSIColor.yellow super
     end
 
-    def print_runner_start(runner)
-      print Term::ANSIColor.bold("#{runner.file_name}: ")
+    def print_readme_start(readme)
+      print Term::ANSIColor.bold("#{readme.file_name}: ")
     end
 
     private

data/lib/specdown/reporters/terminal_reporter.rb

@@ -24,14 +24,14 @@ module Specdown
     def print_end
     end
 
-    def print_runner_start(runner)
-      print "#{runner.file_name}: "
+    def print_readme_start(readme)
+      print "#{readme.file_name}: "
     end
 
-    def print_runner_summary(runner)
+    def print_readme_summary(readme)
     end
 
-    def print_runner_end(runner)
+    def print_readme_end(readme)
       print "\n"
     end
 
@@ -57,8 +57,8 @@ module Specdown
       print undefined
     end
 
-    def print_summary(runners)
-      @report_summary = summary(runners)
+    def print_summary(readmes)
+      @report_summary = summary(readmes)
       bounding = binding rescue proc {}
       template.run bounding
     end

data/lib/specdown/reporters/text_reporter.rb

@@ -11,11 +11,11 @@ module Specdown
       @file.write "\n\n"
     end
 
-    def print_runner_start(runner)
-      @file.write(runner.file_name + ": ")
+    def print_readme_start(readme)
+      @file.write(readme.file_name + ": ")
     end
 
-    def print_runner_end(runner)
+    def print_readme_end(readme)
       @file.write "\n\n" 
     end
 
@@ -39,8 +39,8 @@ module Specdown
       @file.close
     end
 
-    def print_summary(runners)
-      @report_summary = summary(runners)
+    def print_summary(readmes)
+      @report_summary = summary(readmes)
       bounding = binding rescue proc {}
       @file.write template.result(bounding)
     end

data/lib/specdown/specdown.rb

@@ -3,7 +3,6 @@ module Specdown
   
   def reset!
     Config.reset!
-    Hooks.reset!
   end
 
   def sandbox
@@ -15,14 +14,26 @@ module Specdown
   end
 
   def before(*filters, &callback)
-    Hooks.before << Hook.new(*filters, &callback)
+    Specdown::Test.before_execute do |test|
+      if filters.empty? || filters.any? {|filter| filter.match test.readme.file_name}
+        callback.call
+      end
+    end
   end
 
   def after(*filters, &callback)
-    Hooks.after << Hook.new(*filters, &callback)
+    Specdown::Test.after_execute do |test|
+      if filters.empty? || filters.any? {|filter| filter.match test.readme.file_name}
+        callback.call
+      end
+    end
   end
 
   def around(*filters, &callback)
-    Hooks.around << Hook.new(*filters, &callback)
+    Specdown::Test.around_execute do |test|
+      if filters.empty? || filters.any? {|filter| filter.match test.readme.file_name}
+        callback.call
+      end
+    end
   end
 end

data/lib/specdown/templates/color_summary.erb

@@ -1,27 +1,25 @@
 
 
 ---------------------------------------------------------------------------
-<%= Term::ANSIColor.bold format_stat("markdown", @report_summary.num_markdowns)   %>
-<%= Term::ANSIColor.bold format_stat("test",     @report_summary.num_tests)       %>
-<%= Term::ANSIColor.cyan format_stat("pending test",  @report_summary.num_pendings) %>
-<%= Term::ANSIColor.green format_stat("success", @report_summary.num_successes)   %>
-<%= Term::ANSIColor.red format_stat("failure",   @report_summary.num_failures)    %>
-<%= Term::ANSIColor.yellow(@report_summary.num_undefined.to_s + " undefined") %>
+<%= Term::ANSIColor.bold format_stat("markdown", @report_summary.num_markdowns)     %>
+<%= Term::ANSIColor.bold format_stat("test",     @report_summary.num_tests)         %>
+<%= Term::ANSIColor.cyan format_stat("pending test",  @report_summary.num_pending) %>
+<%= Term::ANSIColor.green format_stat("success", @report_summary.num_passing)       %>
+<%= Term::ANSIColor.red format_stat("failure",   @report_summary.num_failing)       %>
+<%= Term::ANSIColor.yellow(@report_summary.num_undefined.to_s + " undefined")       %>
 ---------------------------------------------------------------------------
-<% runners.map(&:stats).each do |stat| %>
-<% stat.exceptions.each do |e| %>
+<% readmes.collect(&:exceptions).flatten.each do |e| %>
 <%= Term::ANSIColor.bold(Term::ANSIColor.cyan "In #{e.test_filename}") %>: <%= Term::ANSIColor.bold(Term::ANSIColor.red "#<#{e.exception_class}>:") %> <%=e.exception_message%>
 <%= Term::ANSIColor.red e.exception_backtrace.join("\n") %>
 <% end %>
-<% end %>
-<% runners.collect(&:stats).collect(&:pending_exceptions).flatten.each do |pending_exception| %>
+<% readmes.collect(&:pending_exceptions).flatten.each do |pending_exception| %>
 <%= Term::ANSIColor.bold(Term::ANSIColor.cyan "In #{pending_exception.test_filename}") %>: <%= Term::ANSIColor.bold(Term::ANSIColor.red "#<#{pending_exception.exception_class}>:") %> <%=pending_exception.exception_message%>
 <%= Term::ANSIColor.red pending_exception.exception_backtrace.join("\n") %>
 <% end %>
 <% if @report_summary.num_undefined > 0 %>
 <%= Term::ANSIColor.yellow 'Now add the following implicit spec definition to a file suffixed with ".specdown":'%>
 <% end %>
-<% runners.collect(&:stats).collect(&:undefined_implicits).flatten.each do |implicit_key| %>
+<% readmes.collect(&:undefined_implicits).flatten.each do |implicit_key| %>
 <%= Term::ANSIColor.yellow implicit_key %>
 <%= Term::ANSIColor.yellow("-" * implicit_key.length) %>
 

data/lib/specdown/templates/summary.erb

@@ -1,27 +1,25 @@
 
 
 ---------------------------------------------------------------------------
-<%= format_stat("markdown", @report_summary.num_markdowns)    %>
-<%= format_stat("test",     @report_summary.num_tests)        %>
-<%= format_stat("pending test",  @report_summary.num_pendings)%>
-<%= format_stat("success",  @report_summary.num_successes)    %>
-<%= format_stat("failure",  @report_summary.num_failures)     %>
+<%= format_stat("markdown",       @report_summary.num_markdowns)  %>
+<%= format_stat("test",           @report_summary.num_tests)      %>
+<%= format_stat("pending test",   @report_summary.num_pending)    %>
+<%= format_stat("success",        @report_summary.num_passing)    %>
+<%= format_stat("failure",        @report_summary.num_failing)    %>
 <%= @report_summary.num_undefined %> undefined
 ---------------------------------------------------------------------------
-<% runners.map(&:stats).each do |stat| %>
-<% stat.exceptions.each do |e| %>
+<% readmes.collect(&:exceptions).flatten.each do |e| %>
 In <%=e.test_filename%>: <#<%=e.exception_class%>> <%=e.exception_message%>
 <%= e.exception_backtrace.join "\n" %>
 <% end %>
-<% stat.pending_exceptions.each do |e| %>
+<% readmes.collect(&:pending_exceptions).flatten.each do |e| %>
 In <%=e.test_filename%>: <#<%=e.exception_class%>> <%=e.exception_message%>
 <%= e.exception_backtrace.join "\n" %>
 <% end %>
-<% end %>
 <% if @report_summary.num_undefined > 0 %>
 Now add the following implicit spec definition to a file suffixed with ".specdown":
 <% end %>
-<% runners.collect(&:stats).collect(&:undefined_implicits).flatten.each do |implicit_key| %>
+<% readmes.collect(&:undefined_implicits).flatten.each do |implicit_key| %>
 <%= implicit_key %>
 <%= "-" * implicit_key.length %>