coulda 0.6.3 → 0.7.1

data/Gemfile

@@ -2,3 +2,4 @@ source "http://rubygems.org"
 
 gem 'shoulda'
 gem 'rr'
+gem 'yourdsl', '~> 0.7'

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     rr (1.0.2)
     shoulda (2.11.3)
+    yourdsl (0.7.1)
 
 PLATFORMS
   ruby
@@ -10,3 +11,4 @@ PLATFORMS
 DEPENDENCIES
   rr
   shoulda
+  yourdsl (~> 0.7)

data/HISTORY

@@ -104,3 +104,7 @@ Cleanup
 -----
 - Renamed #pending to #coulda_pending to avoid conflicts with Rails 3
 - Failing test in this release as I stupidly began working on some new features in the master branch.  Don't use the new features (they're not documented outside of the new tests) and you'll be fine. ;-)
+
+0.7.0
+-----
+- Significant refactoring using my branch of lispy (https://github.com/elight/lispy)

data/README.rdoc

@@ -57,4 +57,4 @@ Thanks to
 ---------
 * David Chelimsky and Jim Weirich for turning me into the test-obsessed developer that I am.
 * Timothy King for putting up with my scotch-powered rambling while working on v0.4.0
-* We Are Titans (http://www.wearetitans.net/) for sponsoring v0.4.0 on up
+* We Are Titans (http://www.wearetitans.net/) for sponsoring v0.4.0 through 0.5.5

data/Rakefile

@@ -2,6 +2,9 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 
+require File.join(File.dirname(__FILE__), 'lib', 'coulda', 'tasks')
+
+
 gem 'shoulda'
 require 'shoulda'
 

data/coulda.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coulda}
-  s.version = "0.6.3"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan David Light"]
-  s.date = %q{2010-12-23}
+  s.date = %q{2011-08-08}
   s.description = %q{Behaviour Driven Development derived from Cucumber but as an internal DSL with methods for reuse}
-  s.email = %q{evan@tiggerpalace.com}
+  s.email = %q{evan@tripledogdare.net}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = Dir.glob('lib/**/*.rb') + Dir.glob('*') + Dir.glob('lib/tasks/**/*.rake')
   s.homepage = %q{http://coulda.tiggerpalace.com}
@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Test::Unit-based acceptance testing DSL}
   s.test_files = Dir.glob('test/**')
 
+  s.add_dependency('yourdsl', '~> 0.7')
+
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3

data/lib/coulda.rb

@@ -1,40 +1,32 @@
 require 'test/unit'
+require 'yourdsl'
 
 require File.join(File.dirname(__FILE__), 'coulda', 'world')
-require File.join(File.dirname(__FILE__), 'coulda', 'feature')
-require File.join(File.dirname(__FILE__), 'coulda', 'scenario')
 require File.join(File.dirname(__FILE__), 'coulda', 'pending')
 require File.join(File.dirname(__FILE__), 'coulda', 'vendor', 'constantize')
 require File.join(File.dirname(__FILE__), 'coulda', 'vendor', 'underscore')
 require File.join(File.dirname(__FILE__), 'coulda', 'tasks')
 
 module Coulda
-  SyntaxError = Class.new(StandardError)
+  PROC_KEYWORDS = [:Given, :When, :Then, :And]
+  KEYWORDS = [:Scenario, :Tag, :in_order_to, :as_a, :i_want_to] + PROC_KEYWORDS
 
-  def Tag(name)
-    @feature_tags ||= []
-    @feature_tags << name.to_s
-  end
+  SyntaxError = Class.new(StandardError)
 
   # Factory method for Test::Unit::TestCase subclasses
   def Feature(name, opts = {}, &block)
-    process_command_line_tags
+    test_class = Class.new(opts[:testcase_class] || Coulda.default_testcase_class || Test::Unit::TestCase)
 
-    if @requested_tags && !@requested_tags.empty?
-      if @feature_tags.nil? || !@feature_tags.any? { |f_tag| @requested_tags.include? f_tag}
-        @feature_tags = nil 
-        return
-      end
+    assign_class_to_const test_class, name
+    test_class.instance_eval do
+      extend YourDSL
+      record_your_dsl :only => Coulda::KEYWORDS, :retain_blocks_for => Coulda::PROC_KEYWORDS
     end
-    @feature_tags = nil
+    test_class.instance_eval &block if block_given?
 
-    test_class = Class.new(opts[:testcase_class] || Coulda.default_testcase_class || Test::Unit::TestCase)
-    World.register_feature(test_class, name)
-
-    Coulda::assign_class_to_const test_class, name
-    test_class.class_eval &block if block_given?
-    test_class.assert_presence_of_intent
+    World.register_feature(name, test_class.output)
 
+    generate_test_methods_from test_class
 
     test_class
   end
@@ -50,6 +42,8 @@ module Coulda
     @class
   end
 
+  private
+
   def assign_class_to_const(test_class, potential_const)
     base_name = potential_const
     if potential_const !~ /^[a-zA-Z]/
@@ -59,15 +53,40 @@ module Coulda
     Object.const_set(titleized_underscored_name, test_class)
   end
 
-  def process_command_line_tags
-    unless @processed_cmd_line_args
-      @processed_cmd_line_args = true
-      tags = ARGV.inject([]) { |m, a| m << a if a =~ /^tags=/; m }
-      @requested_tags = tags.map { |t| t.split("=")[1].split(",") }.flatten
+  def generate_test_methods_from(test_class)
+    return unless test_class.output && test_class.output.expressions
+
+    test_class.output.expressions.each do |sexp|
+      next unless sexp.symbol == :Scenario
+      generate_test_method :for_scenario => sexp, :in_class => test_class
     end
   end
-end
 
-include ::Coulda
+  def generate_test_method(args = {})
+    scenario, test_class = args[:for_scenario], args[:in_class]
+    file_name = test_class.output.file
 
+    test_class.send(:define_method,"test_#{scenario.args.downcase.super_custom_underscore}") do
+      if scenario.scope.nil?
+        coulda_pending "Scenario '#{scenario.args}' in #{file_name}:#{scenario.lineno}"
+      else
+        execute_test_steps :for_scenario => scenario, :in_class => test_class
+      end
+    end
+  end
+
+  def execute_test_steps(args = {})
+    scenario, test_class = args[:for_scenario], args[:in_class]
+    file_name = test_class.output.file
+
+    scenario.scope.expressions.each do |step_sexp|
+      if step_sexp.proc.nil?
+        coulda_pending "Scenario '#{scenario.args}': #{step_sexp.symbol} '#{step_sexp.args} in #{file_name}:#{step_sexp.lineno}"
+      else
+        instance_eval &step_sexp.proc
+      end
+    end
+  end
+end
 
+include ::Coulda

data/lib/coulda/pending.rb

@@ -2,9 +2,7 @@ module Test
   module Unit
     class TestCase
       @@pending_cases = []
-      @@error_contexts = []
-      @@pending_at_exit = false
-      @@exception_at_exit = false
+      @@at_exit = false
 
       # Loosely based upon Jeremy McAnally's pending
       
@@ -21,31 +19,6 @@ module Test
           end
         end
       end
-
-      def handle_exception(e, params = {}) 
-        stmt = params[:for_statement]
-
-        print "E"
-        @@error_contexts << params.merge(:exception => e) 
-
-        @@exception_at_exit ||= begin
-          at_exit do
-            puts
-            puts "Exceptions"
-            puts "----------"
-
-            @@error_contexts.each_with_index do |ctx, i|
-              puts
-              puts "(#{i+1}) Feature: #{stmt[:scenario].feature.name}"
-              puts "Scenario: #{stmt[:scenario].name}"
-              puts "#{stmt[:type]} '#{stmt[:text]}'"
-              puts "In #{stmt[:file]} on line #{stmt[:line]}"
-              puts e.backtrace
-            end
-          end
-        end
-
-      end
     end
   end
 end

data/lib/coulda/world.rb

@@ -1,7 +1,7 @@
 module Coulda
   class World
-    def self.register_feature(feature, name)
-      (@features ||= []) << [feature, name]
+    def self.register_feature(feature, sexp)
+      (@features ||= []) << [feature, sexp]
     end
 
     def self.features

data/lib/tasks/print_features.rake

@@ -9,32 +9,39 @@ namespace :coulda do
     require 'test/unit'
 
     # bug in test unit.  Set to true to stop from running.
-    Test::Unit.run = true
+    unless RUBY_VERSION =~ /^1.9/
+      Test::Unit.run = true
+    end
 
-    require 'coulda'
 
     test_files = Dir.glob(File.join('test', '**', '*_test.rb'))
     test_files.each do |file|
       load file
     end
 
-    Coulda::World.features.each do |feature, name|
+    Coulda::World.features.each do |name, output|
       puts "Feature: #{name}"
-      puts "  In order to #{feature.in_order_to}" if feature.in_order_to
-      puts "  As a #{feature.as_a}" if feature.as_a
-      puts "  I want to #{feature.i_want_to}" if feature.i_want_to
-      feature.scenarios.each do |scenario|
-        puts
-        print "  "
-        print "(**PENDING**) " if scenario.pending?
-        puts "Scenario: #{scenario.name}"
-        scenario.statements.each do |stmt|
-          print "    "
-          print "(**PENDING**) " unless stmt[:block]
-          puts "#{stmt[:type].to_s} #{stmt[:text]}"
+      output.expressions.each do |sexp|
+        case sexp.symbol
+        when :in_order_to
+          puts "  In order to #{sexp.args}"
+        when :as_a
+          puts "  As a #{sexp.args}"
+        when :i_want_to
+          puts "  I want to #{sexp.args}"
+        when :Scenario
+          puts
+          print "  "
+          print "(**PENDING**) " if sexp.scope.nil? || sexp.scope.expressions.any? { |step| step.proc.nil? }
+          puts "Scenario: #{sexp.args}"
+          sexp.scope.expressions.each do |step|
+            print "    "
+            print "(**PENDING**) " unless step.proc
+            puts "#{step.symbol} #{step.args}"
+          end
+          puts
         end
       end
-      puts
     end
   end
 end

data/test/feature_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class FeatureTest < Test::Unit::TestCase
-
   should "be able to specify a default TestCase class to subclass for all Features" do
     MyTestCase = Class.new(Test::Unit::TestCase)
     Coulda.default_testcase_class = MyTestCase
@@ -25,7 +24,7 @@ class FeatureTest < Test::Unit::TestCase
     @@counter = 1
     setup do
       @feature = Feature "foobarblech#{@@counter}" do
-        Scenario "" do
+        Scenario "ohai" do
           Given "" do; end
           Then "" do; end
         end
@@ -37,55 +36,8 @@ class FeatureTest < Test::Unit::TestCase
       assert @feature.ancestors.include? Test::Unit::TestCase
     end
 
-    %w[Given When Then And].each do |condition|
-      should "have a method called '#{condition}'" do
-        assert(@feature.respond_to?(condition))
-      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 
-          Feature "one" do
-            in_order_to "foo"
-            as_a "bar"
-            i_want_to "blech"
-          end
-        end
-      end
-    end
-
-    context "that calls as_a and i_want_to" do
-      should "raise syntax error because in_order_to was not called once" do
-        assert_raise Coulda::SyntaxError do 
-          Feature "two" do
-            as_a "bar"
-            i_want_to "blech"
-          end
-        end
-      end
-    end
-
-    context "that calls in_order_to and i_want_to" do
-      should "raise syntax error because as_a was not called once" do
-        assert_raise Coulda::SyntaxError do
-          Feature "three" do
-            in_order_to "foo"
-            i_want_to "blech"
-          end
-        end
-      end
-    end
-
-    context "that calls in_order_to and as_a" do
-      should "raise syntax error because i_want_to was not called once" do
-        assert_raise Coulda::SyntaxError do
-          Feature "four" do
-            in_order_to "foo"
-            as_a "bar"
-          end
-        end
-      end
+    should "have a method test_ohai" do
+      assert @feature.instance_methods.include? :test_ohai
     end
 
     context "without scenarios" do
@@ -101,35 +53,5 @@ class FeatureTest < Test::Unit::TestCase
         assert @feature_without_scenarios.instance_methods.grep(/^test_/).empty?
       end
     end
-
-    context "that does not have any errors" do
-      setup do
-        @feature_without_errors = Feature @@counter.to_s do
-          in_order_to "foo"
-          as_a "bar"
-          i_want_to "blech"
-        end
-      end
-
-      ### Integration tests
-
-      context "with a block containing a scenario" do
-        should "create a Feature instance method named 'test_<underscored_feature_name>_<underscored_scenario_name>'" do
-          @feature_without_errors.Scenario("pending scenario") {}
-          test_name = "test_pending_scenario"
-          test_name = test_name.to_sym if RUBY_VERSION =~ /^1.9/
-          assert(@feature_without_errors.instance_methods.include?(test_name), "Test is missing test method from scenario")
-        end
-
-        should "create a Scenario" do
-          @feature_without_errors.Scenario "pending scenario"
-        end
-
-        should "include the created Scenario in the return value of the 'scenarios' method" do
-          scenario = @feature_without_errors.Scenario "pending scenario"
-          assert(@feature_without_errors.scenarios.include?(scenario), "feature.scenarios doesn't contain the expected Scenario object")
-        end
-      end
-    end
   end
 end

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'rubygems' if RUBY_VERSION != "1.9.1"
 require 'shoulda'
 
-require 'coulda'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'coulda')
 
 include Coulda
 

metadata

@@ -1,42 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: coulda
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 3
-  version: 0.6.3
+version: !ruby/object:Gem::Version
+  version: 0.7.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Evan David Light
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-23 00:00:00 -05:00
+date: 2011-08-08 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: []
-
-description: Behaviour Driven Development derived from Cucumber but as an internal DSL with methods for reuse
-email: evan@tiggerpalace.com
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yourdsl
+  requirement: &2153558420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2153558420
+description: Behaviour Driven Development derived from Cucumber but as an internal
+  DSL with methods for reuse
+email: evan@tripledogdare.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
-- lib/coulda/feature.rb
+files:
 - lib/coulda/pending.rb
-- lib/coulda/scenario.rb
 - lib/coulda/tasks.rb
 - lib/coulda/vendor/constantize.rb
 - lib/coulda/vendor/underscore.rb
 - lib/coulda/world.rb
 - lib/coulda.rb
+- coulda-0.6.3.gem
 - coulda.gemspec
 - Gemfile
 - Gemfile.lock
@@ -48,43 +50,33 @@ files:
 - lib/tasks/print_features.rake
 - lib/tasks/tagged_tests.rake
 - test/feature_test.rb
-- test/scenario_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://coulda.tiggerpalace.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Test::Unit-based acceptance testing DSL
-test_files: 
+test_files:
 - test/feature_test.rb
-- test/scenario_test.rb
 - test/test_helper.rb

data/lib/coulda/feature.rb

@@ -1,65 +0,0 @@
-module Test
-  module Unit
-    class TestCase
-      include Coulda
-
-      def self.scenarios
-        @scenarios ||= []
-        @scenarios
-      end
-
-      def self.current_scenario=(scenario)
-        @current_scenario = scenario
-      end
-
-      def self.current_scenario
-        @current_scenario
-      end
-
-      %w[in_order_to as_a i_want_to].each do |intent|
-        eval <<-HERE
-          # An intent specifier
-          def self.#{intent}(val = nil)
-            val ? @#{intent} = val : @#{intent}
-          end
-        HERE
-      end
-
-      %w[Given When Then And].each do |stmt|
-        eval <<-HERE
-          # Specifies a prereqisite, event, or expectation.  May be used in any order within the spec
-          def self.#{stmt}(text, &block)
-            step = nil
-            if block_given?
-              step = block
-            end
-            caller[0] =~ (/(.*):(.*)(:in)?/)
-            stmt = { :type => :#{stmt}, :text => text, :block => step, :file => $1, :line => $2, :scenario => current_scenario }
-            if text.is_a? Symbol
-              stmt[:method] = text
-            end
-            current_scenario.statements << stmt
-          end
-        HERE
-      end
-
-      def Tag(name)
-      end
-
-      # Creates a Scenario instance and adds it to the Feature
-      def self.Scenario(scenario_name, &block)
-        @scenarios ||=[]
-        @scenarios << scenario = Scenario.new(scenario_name, self, &block)
-        scenario
-      end
-
-      # Raises an error if only some of the intent is captured (i.e., in_order_to and as_a without i_want_to)
-      def self.assert_presence_of_intent
-        presence = %w[in_order_to as_a i_want_to].map { |intent| instance_variable_get("@#{intent}") }
-        if presence.any? { |p| p } && !presence.all? { |p| p }
-          raise SyntaxError.new("Must have all or none of in_order, as_a, and i_want_to called in a Feature")
-        end
-      end
-    end
-  end
-end

data/lib/coulda/scenario.rb

@@ -1,66 +0,0 @@
-module Coulda
-  # A factory for Test::Unit::TestCase test methods
-  class Scenario
-    attr_reader :name, :test_class
-    attr_accessor :statements
-
-    def initialize(name, my_feature, &block)
-      raise Exception.new("Scenario must have a name") unless name 
-      @name = name
-      @statements = []
-      @my_feature = my_feature
-      create_and_provision_test_method_using &block
-    end
-
-    # Predicate indicating if the Scenario was provided with an example
-    def pending?
-      statements.empty? || has_pending_statements?
-    end
-
-    def feature
-      @my_feature
-    end
-    
-    private
-
-    def create_and_provision_test_method_using(&block)
-      collect_scenario_statements_from &block
-      define_test_method_using do
-        scenario = self.class.current_scenario
-        scenario.statements.each do |stmt|
-          if stmt[:method]
-            if stmt[:block]
-              raise Exception.new "Passing a block to a method called-by-name is currently unhandle"
-            else
-              self.class.__send__(stmt[:method])
-            end
-          elsif stmt[:block]
-            self.instance_eval &(stmt[:block])
-          else
-            coulda_pending "#{stmt[:file]}:#{stmt[:line]}: Scenario '#{scenario.name}': #{stmt[:type]} '#{stmt[:text]}'"
-            break
-          end
-        end
-      end
-    end
-
-    def collect_scenario_statements_from(&block)
-      @my_feature.current_scenario = self
-      if block_given?
-        @my_feature.instance_eval &block 
-      end
-    end
-
-    def define_test_method_using(&block)
-      scenario = self
-      @my_feature.send(:define_method, "test_#{@name.downcase.super_custom_underscore}") do
-        self.class.current_scenario = scenario
-        self.instance_eval &block if block
-      end
-    end
-
-    def has_pending_statements?
-      statements.find { |s| s[:block].nil? && s[:method].nil? }
-    end
-  end
-end

data/test/scenario_test.rb

@@ -1,22 +0,0 @@
-require "test_helper"
-
-class ScenarioTest < Test::Unit::TestCase
-  context "A Scenario" do
-    setup do
-      @scenario = Scenario.new("foobar", Feature("something_or_other")) {}
-    end
-
-    context "when instantiated" do 
-      context "with only a String" do
-        setup do 
-          @scenario = Scenario.new("foobar", Feature("another")) 
-        end
-
-        should "be pending" do
-          assert(@scenario.pending?)
-        end
-      end
-    end
-  end
-end
-