coulda 0.3.0 → 0.3.1

data/.gitignore

@@ -1,3 +1,4 @@
 coulda*.gem
 coverage/*
 .devver/devver_opts.yml
+.devver/*.log

data/HISTORY

@@ -21,3 +21,9 @@ Cleanup
 - Adds coulda:print_features task, providing plain text output in a 
   form similar to Cucumber's Gherkin
 - Added hooks for Devver's continuous integration API
+
+0.3.1
+-----
+- Minor refactorings
+- Added more examples
+- Adds "And" support to Given, When, and Then

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/coulda.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coulda}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan David Light"]

data/lib/coulda.rb

@@ -14,7 +14,7 @@ require 'coulda/scenario'
 module Kernel
   def Feature(name, &block)
     f = Feature.for_name(name)
-    f.class_eval(&block)
+    f.class_eval(&block) if block_given?
     f.assert_description
     f
   end

data/lib/coulda/feature.rb

@@ -1,4 +1,17 @@
 module Coulda
+  Statement = Struct.new(:type, :name, :block)
+
+  module FeatureBehavior
+    %w[Given When Then And].each do |statement|
+      eval <<-HERE
+        def #{statement}(name, &block)
+          @pending = true unless block_given?
+          @statements << stmt = Statement.new(:#{statement}, name, block)
+        end
+      HERE
+    end
+  end
+
   class Feature < Test::Unit::TestCase
     class << self
       attr_accessor :description
@@ -23,6 +36,7 @@ module Coulda
 
       def for_name(name)
         klass = Class.new(Feature)
+        klass.extend(FeatureBehavior)
         klass.description = name
         class_name = feature_name_from(name)
         Object.const_set(class_name, klass)
@@ -82,10 +96,8 @@ module Coulda
 
       def extract_statements_from(&test_implementation)
         @statements ||= []
-        @extracting_metadata = true
         self.instance_eval(&test_implementation)
         statements = @statements
-        @extracting_metadata = false
         @statements = []
         statements
       end
@@ -95,20 +107,13 @@ module Coulda
     def default_test
       pending
     end
-  end
-
-  Statement = Struct.new(:type, :name, :block)
 
-  %w[Given When Then].each do |statement|
-    eval <<-HERE
-      def #{statement}(name, &block)
-        if @extracting_metadata
-          @pending = true unless block_given?
-          @statements << stmt = Statement.new(:#{statement}, name, block)
-        else
+    %w[Given When Then And].each do |statement|
+      eval <<-HERE
+        def #{statement}(name, &block)
           yield if block_given?
         end
-      end
-    HERE
+      HERE
+    end
   end
 end

data/test/feature_test.rb

@@ -1,22 +1,44 @@
 require File.join(File.dirname(__FILE__), "test_helper")
 
 class FeatureTest < Test::Unit::TestCase
+  context "A Feature instance" do
+    @@counter = 1
+    setup do
+      feature_class = Feature.for_name "foobarblech#{@@counter}"
+      @@counter += 1
+      @feature = feature_class.new("default_test")
+    end
+
+    %w[Given When Then And].each do |condition|
+      should "have a method called '#{condition}'" do
+        assert(@feature.respond_to?(condition))
+      end
+    end
+  end
+
   context "A Feature class" do
     should "have Test::Unit::TestCase as an ancestor" do
       assert(Feature.ancestors.include?(Test::Unit::TestCase))
     end
 
     context "created by name" do
+      @@counter = 1
       setup do 
-        @feature = Feature.for_name "foo"
+        @feature = Feature.for_name "foo#{@@counter}"
+        @@counter += 1
       end
 
       should "be a subclass of Feature" do
         assert(@feature.ancestors.include?(Feature))
       end
+      
+      %w[Given When Then And].each do |condition|
+        should "have a method called '#{condition}'" do
+          assert(@feature.respond_to?(condition), "does not have a method called #{condition}")
+        end
+      end
     end
 
-
     context "that calls in_order_to, as_a, and i_want_to" do
       should "not raise syntax error" do
         assert_nothing_raised do 

data/test/integration/using_coulda_test.rb

@@ -6,7 +6,6 @@ Feature "Using Coulda" do
   i_want_to "have typical Coulda usage work"
 
   def prove_methods_from_then_invokes_method_on_feature
-    # this was invoked
     assert true
   end
 
@@ -17,8 +16,8 @@ Feature "Using Coulda" do
   end
 
   Scenario "A scenario without a When" do
-    Given "this scenario" do; end
-    Then "should pass" do
+    Given "a scenario calling a Feature instance method" do; end
+    Then "should pass if the method does not fail/error" do
       prove_methods_from_then_invokes_method_on_feature
     end
   end
@@ -28,4 +27,13 @@ Feature "Using Coulda" do
     When "no events" do; end
     Then "should pass" do; end
   end
+
+  Scenario "A scenario with a lot of Ands" do
+    Given "no prerequisites" do; end
+    And "some more lack of prerequisites" do; end
+    When "something doesn't happen" do; end
+    And "something else doesn't happen" do; end
+    Then "something else" do; end
+    And "should pass" do; end
+  end
 end

data/test/scenario_test.rb

@@ -6,12 +6,6 @@ class ScenarioTest < Test::Unit::TestCase
       @scenario = Scenario.new("foobar")
     end
 
-    %w[Given When Then].each do |condition|
-      should "have a method called '#{condition}'" do
-        assert(@scenario.respond_to?(condition.to_sym))
-      end
-    end
-
     context "when instantiated" do 
       context "with only a String" do
         setup do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: coulda
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Evan David Light