citrusbyte-stories 0.1.1 → 0.1.2

data/lib/stories.rb

@@ -2,7 +2,7 @@ require "rubygems"
 require "contest"
 
 unless defined?(Test::Unit::AutoRunner)
-  gem "test-unit", ">= 1.2"
+  gem "test-unit", "1.2.3"
 end
 
 class Test::Unit::TestCase

data/lib/stories/runner.rb

@@ -2,40 +2,38 @@
 
 require 'test/unit/ui/console/testrunner'
 
-$stories = []
-
-class Test::Unit::TestCase
-  class << self
-    alias original_story story
-    alias original_scenario scenario
-
-    def story(name, &block)
-      story = Stories::Story.new(name)
-
-      original_story(name) do
-        @@story = story
-
-        def self.story; @@story; end
+module Stories
+  def self.all
+    @all ||= {}
+  end
 
-        class_eval(&block) if block_given?
-      end
+  module TestCase
+    def self.included(base)
+      class << base
+        def story(name, *args, &block)
+          context(name, *args) do
+            Stories.all[self] = Stories::Story.new(name)
+            class_eval(&block) if block_given?
+          end
+        end
 
-      $stories << story
-    end
+        def scenario(name, *args, &block)
+          scenario = Stories::Scenario.new(name)
 
-    def scenario(name, &block)
-      scenario = Stories::Scenario.new(name)
+          Stories.all[self].scenarios << scenario
 
-      original_scenario(name) do
-        @scenario = scenario
-        instance_eval(&block)
+          test(name) do
+            @scenario = scenario
+            instance_eval(&block)
+          end
+        end
       end
-
-      self.story.scenarios << scenario
     end
   end
 end
 
+Test::Unit::TestCase.send(:include, Stories::TestCase)
+
 module Test::Unit::Assertions
   def report(text, &block)
     @scenario.steps << text
@@ -86,7 +84,7 @@ module Stories
     def finished(elapsed_time)
       puts
 
-      $stories.each_with_index do |story,i|
+      Stories.all.values.to_a.each_with_index do |story,i|
         puts "- #{story.name}"
 
         story.scenarios.each do |scenario|
@@ -105,11 +103,11 @@ module Stories
           end
         end
 
-        puts unless i + 1 == $stories.size
+        puts unless i + 1 == Stories.all.values.size
       end
 
       super
-      puts "%d stories, %d scenarios" % [$stories.size, $stories.inject(0) {|total,s| total + s.scenarios.size }]
+      puts "%d stories, %d scenarios" % [Stories.all.values.size, Stories.all.values.inject(0) {|total,s| total + s.scenarios.size }]
     end
   end
 

data/lib/stories/runner/pdf.rb

@@ -18,7 +18,7 @@ module Stories
         
         pdf.move_down(15)
 
-        $stories.each do |story|
+        Stories.all.values.each do |story|
           pdf.text story.name, :style => :bold
 
           story.scenarios.each_with_index do |scenario,i|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrusbyte-stories
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Damian Janowski
@@ -46,6 +46,7 @@ files:
 - test/pdf_test.rb
 has_rdoc: false
 homepage: http://github.com/citrusbyte/stories
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: stories
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Write Stories and User Acceptance Tests using the minimalist testing framework Contest.