turnip 0.3.1 → 1.0.0

data/lib/turnip/step_definition.rb

@@ -4,31 +4,8 @@ module Turnip
       def expression; step_definition.expression; end
     end
 
-    class Pending < StandardError; end
-    class Ambiguous < StandardError; end
-
     attr_reader :expression, :block
 
-    class << self
-      def execute(context, available_steps, step)
-        match = find(available_steps, step.description)
-        params = match.params
-        params << step.extra_arg if step.extra_arg
-        context.instance_exec(*params, &match.block)
-      rescue Pending
-        context.pending "the step '#{step.description}' is not implemented"
-      end
-
-      def find(available_steps, description)
-        found = available_steps.map do |step|
-          step.match(description)
-        end.compact
-        raise Pending, description if found.length == 0
-        raise Ambiguous, description if found.length > 1
-        found[0]
-      end
-    end
-
     def initialize(expression, &block)
       @expression = expression
       @block = block
@@ -42,7 +19,7 @@ module Turnip
       result = description.match(regexp)
       if result
         params = result.captures
-        result.names.each_with_index do |name, index|
+        @placeholder_names.each_with_index do |name, index|
           params[index] = Turnip::Placeholder.apply(name.to_sym, params[index])
         end
         Match.new(self, params, block)
@@ -54,21 +31,19 @@ module Turnip
     OPTIONAL_WORD_REGEXP = /(\\\s)?\\\(([^)]+)\\\)(\\\s)?/
     PLACEHOLDER_REGEXP = /:([\w]+)/
     ALTERNATIVE_WORD_REGEXP = /(\w+)((\/\w+)+)/
-    COMMAND_REGEXP = /`([^`]+)`/
 
     def compile_regexp
+      @placeholder_names = []
       regexp = Regexp.escape(expression)
-      regexp.gsub!(COMMAND_REGEXP) do |_|
-        "(?:[`]([^`]+)[`])"
+      regexp.gsub!(PLACEHOLDER_REGEXP) do |_|
+        @placeholder_names << "#{$1}"
+        "(?<#{$1}>#{Placeholder.resolve($1.to_sym)})"
       end
       regexp.gsub!(OPTIONAL_WORD_REGEXP) do |_|
-        [$1, $2, $3].compact.map { |m| "(#{m})?" }.join
+        [$1, $2, $3].compact.map { |m| "(?:#{m})?" }.join
       end
       regexp.gsub!(ALTERNATIVE_WORD_REGEXP) do |_|
-        "(#{$1}#{$2.tr('/', '|')})"
-      end
-      regexp.gsub!(PLACEHOLDER_REGEXP) do |_|
-        "(?<#{$1}>#{Placeholder.resolve($1.to_sym)})"
+        "(?:#{$1}#{$2.tr('/', '|')})"
       end
       Regexp.new("^#{regexp}$")
     end

data/lib/turnip/version.rb

@@ -1,3 +1,3 @@
 module Turnip
-  VERSION = "0.3.1"
+  VERSION = "1.0.0"
 end

data/spec/builder_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Turnip::Builder do
   context "with scenario outlines" do
-    let(:feature_file) { Turnip::FeatureFile.new(File.expand_path('../examples/scenario_outline.feature', File.dirname(__FILE__))) }
+    let(:feature_file) { File.expand_path('../examples/scenario_outline.feature', File.dirname(__FILE__)) }
     let(:builder) { Turnip::Builder.build(feature_file) }
     let(:feature) { builder.features.first }
 
@@ -27,43 +27,4 @@ describe Turnip::Builder do
       ])
     end
   end
-  
-  describe "taggings" do
-    let(:feature_file) { Turnip::FeatureFile.new(File.expand_path('../examples/autoload_steps.feature', File.dirname(__FILE__))) }
-    let(:builder) { Turnip::Builder.build(feature_file) }
-    let(:feature) { builder.features.first }
-    
-    context "for features" do
-      it 'should automatically include the :global tag for features' do
-        feature.active_tags.should include(:global)
-      end
-      
-      it 'should automatically include the feature name tag for features' do
-        feature.active_tags.should include(:autoload_steps)
-      end
-    end
-    
-    context "for scenarios" do
-      it 'should only include scenario tags' do
-        feature.scenarios.first.active_tags.should eq([:scenario_tag])
-      end
-    end
-    
-    context "autotag features disabled" do
-      before(:each) { Turnip::Config.autotag_features = false }
-      after(:each) { Turnip::Config.autotag_features = true }
-      
-      let(:feature_file) { Turnip::FeatureFile.new(File.expand_path('../examples/autoload_steps.feature', File.dirname(__FILE__))) }
-      let(:builder) { Turnip::Builder.build(feature_file) }
-      let(:feature) { builder.features.first }
-      
-      it 'should automatically include the :global tag for features' do
-        feature.active_tags.should include(:global)
-      end
-      
-      it 'should not automatically include the feature name tag for features' do
-        feature.active_tags.should_not include(:autoload_steps)
-      end
-    end
-  end
 end

data/spec/define_and_execute.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe Turnip::Execute do
+  let(:mod) { Module.new }
+  let(:obj) { Object.new.tap { |o| o.extend Turnip::Execute; o.extend mod } }
+
+  it "defines a step method and makes it callable" do
+    mod.step("a test step") { "monkey" }
+    obj.step("a test step").should == "monkey"
+  end
+
+  it "allows placeholders to be filled and passed as arguments" do
+    mod.step("a :test step") { |test| test.upcase }
+    obj.step("a cool step").should == "COOL"
+  end
+
+  it "allows step to be called as a method via `send`" do
+    mod.step("a :test step") { |test| test.upcase }
+    obj.send("a :test step", "cool").should == "COOL"
+  end
+
+  it "sends in extra arg from a builder step" do
+    mod.step("a :test step") { |test, foo| test.upcase + foo }
+    obj.step("a cool step", "foo").should == "COOLfoo"
+  end
+
+  it "can be executed with a builder step" do
+    builder_step = stub(:to_s => "a cool step", :extra_args => [])
+    mod.step("a :test step") { |test| test.upcase }
+    obj.step(builder_step).should == "COOL"
+  end
+
+  it "sends in extra arg from a builder step" do
+    builder_step = stub(:to_s => "a cool step", :extra_args => ["foo"])
+    mod.step("a :test step") { |test, foo| test.upcase + foo }
+    obj.step(builder_step).should == "COOLfoo"
+  end
+end

data/spec/dsl_spec.rb

@@ -1,33 +1,50 @@
 require 'spec_helper'
 
 describe Turnip::DSL do
-  before do
-    Turnip::StepModule.clear_module_registry
-  end
-
   let(:context) { stub.tap { |s| s.extend(Turnip::DSL) }}
-
+  let(:an_object) { Object.new.tap { |o| o.extend(Turnip::Execute) }}
   describe '.steps_for' do
-    it 'delegates to StepModule' do
-      Turnip::StepModule.should_receive(:steps_for).with(:example)
-      context.steps_for(:example) {}
+    before do
+      ::RSpec.stub(:configure)
     end
-  end
 
-  describe '.step' do
-    context 'first step defined globally' do
-      it 'creates a new global entry' do
-        context.step('this is a test') {}
-        Turnip::StepModule.should be_registered(:global)
+    it 'creates a new module and adds steps to it' do
+      mod = context.steps_for(:foo) do
+        step("foo") { "foo" }
       end
+      an_object.extend mod
+      an_object.step("foo").should == "foo"
+    end
+
+    it 'remembers the name of the module' do
+      mod = context.steps_for(:foo) {}
+      mod.tag.should == :foo
     end
 
-    context 'all other steps defined globally' do
-      it 'adds more steps to the :global step module' do
-        context.step('this is a test') {}
-        context.step('this is another test') {}
-        Turnip::StepModule.module_registry[:global].first.step_module.steps.size.should eq(2)
+    it 'tells RSpec to include the module' do
+      config = stub
+      RSpec.should_receive(:configure).and_yield(config)
+      config.should_receive(:include)
+
+      context.steps_for(:foo) {}
+    end
+
+    it 'warns of deprecation when called with :global' do
+      context.should_receive(:warn)
+      mod = context.steps_for(:global) do
+        step("foo") { "foo" }
       end
+      an_object.extend Turnip::Steps
+      an_object.step("foo").should == "foo"
+    end
+  end
+
+  describe '.step' do
+    it 'adds steps to Turnip::Steps' do
+      context.step('this is a test') { "foo" }
+      context.step('this is another test') { "bar" }
+      an_object.extend Turnip::Steps
+      an_object.step("this is a test").should == "foo"
     end
   end
 

data/spec/integration_spec.rb

@@ -11,6 +11,10 @@ describe 'The CLI', :type => :integration do
   end
 
   it "prints out failures and successes" do
-    @result.should include('26 examples, 1 failure, 2 pending')
+    @result.should include('33 examples, 3 failures, 3 pending')
+  end
+
+  it "includes features in backtraces" do
+    @result.should include('examples/errors.feature:5:in `raise error')
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1 @@
-RSpec.configure do |config|
-  Turnip::Config.step_dirs = 'examples'
-end
+Dir.glob("examples/**/*steps.rb") { |f| load f, true }

data/spec/step_definition_spec.rb

@@ -1,50 +1,6 @@
 describe Turnip::StepDefinition do
   let(:all_steps) { [] }
 
-  describe ".find" do
-    it "returns a step definition that matches the description" do
-      all_steps << Turnip::StepDefinition.new("there are :count monsters")
-      Turnip::StepDefinition.find(all_steps, "there are 23 monsters").expression.should eq("there are :count monsters")
-    end
-
-    it "raises an error if the match is ambiguous" do
-      all_steps << Turnip::StepDefinition.new("there are :count monsters")
-      all_steps << Turnip::StepDefinition.new("there are 23 monsters")
-      expect { Turnip::StepDefinition.find(all_steps, "there are 23 monsters") }.to raise_error(Turnip::StepDefinition::Ambiguous)
-    end
-
-    it "raises an error if there is no match" do
-      expect { Turnip::StepDefinition.find(all_steps, "there are 23 monsters") }.to raise_error(Turnip::StepDefinition::Pending)
-    end
-  end
-
-  describe ".execute" do
-    let(:context) { stub }
-
-    it "executes a step in the given context" do
-      all_steps << Turnip::StepDefinition.new("there are :count monsters") { @testing = 123 }
-      Turnip::StepDefinition.execute(context, all_steps, stub(:description => "there are 23 monsters", :extra_arg => nil))
-      context.instance_variable_get(:@testing).should == 123
-    end
-
-    it "tells the context that the step is pending" do
-      context.should_receive(:pending).with("the step 'there are 23 monsters' is not implemented")
-      Turnip::StepDefinition.execute(context, all_steps, stub(:description => "there are 23 monsters", :extra_arg => nil))
-    end
-
-    it "sends along arguments" do
-      all_steps << Turnip::StepDefinition.new("there are :count monsters") { |count| @testing = count.to_i }
-      Turnip::StepDefinition.execute(context, all_steps, stub(:description => "there are 23 monsters", :extra_arg => nil))
-      context.instance_variable_get(:@testing).should == 23
-    end
-
-    it "sends along extra arguments" do
-      all_steps << Turnip::StepDefinition.new("there are :count monsters") { |count, extra| @testing = extra }
-      Turnip::StepDefinition.execute(context, all_steps, stub(:description => "there are 23 monsters", :extra_arg => 'foo'))
-      context.instance_variable_get(:@testing).should == 'foo'
-    end
-  end
-
   describe "#match" do
     it "matches a simple step" do
       step = Turnip::StepDefinition.new("there are monsters") {}
@@ -60,19 +16,49 @@ describe Turnip::StepDefinition do
       step.should match("there are 324 monsters")
       step.should_not match("there are no monsters")
     end
-    
+
+    it "extracts arguments from matched steps" do
+      step = Turnip::StepDefinition.new("a :age year old monster called :name") {}
+      match = step.match("a 3 year old monster called John")
+      match.params.should eq(["3", "John"])
+    end
+
+    it "can reuse the same placeholder multiple times" do
+      step = Turnip::StepDefinition.new("a the monsters :name and :name") {}
+      match = step.match("a the monsters John and Trudy")
+      match.params.should eq(["John", "Trudy"])
+    end
+
+    it "can reuse the same custom placeholder multiple times" do
+      Turnip::Placeholder.stub(:resolve).with(:count).and_return(/\d+/)
+      step = Turnip::StepDefinition.new(":count monsters and :count knights") {}
+      match = step.match("3 monsters and 2 knights")
+      match.params.should eq(["3", "2"])
+    end
+
+    it "does search for the same custom placeholder several times" do
+      placeholder = Turnip::Placeholder.add(:count) { match(/\d/) { |count| count.to_i } }
+      Turnip::Placeholder.stub(:resolve).with(:count).and_return(/\d+/)
+      Turnip::Placeholder.should_receive(:find).with(:count).twice.and_return(placeholder)
+      step = Turnip::StepDefinition.new(":count monsters and :count knights") {}
+      match = step.match("3 monsters and 2 knights")
+      #match.params.should eq([3, 2])
+    end
+
+    it "does apply the same custom placeholder several times" do
+      placeholder = Turnip::Placeholder.add(:count) { match(/\d/) { |count| count.to_i } }
+      Turnip::Placeholder.stub(:resolve).with(:count).and_return(/\d+/)
+      placeholder.should_receive(:apply).twice
+      step = Turnip::StepDefinition.new(":count monsters and :count knights") {}
+      match = step.match("3 monsters and 2 knights")
+    end
+
     it "matches quoted placeholders" do
       step = Turnip::StepDefinition.new("there is a monster named :name") {}
       step.should match("there is a monster named 'Scary'")
       step.should match('there is a monster named "Hairy"')
     end
 
-    it "matches backticked placeholders" do
-      step = Turnip::StepDefinition.new("I run `:cmd`") {}
-      step.should match("I run `echo foo`")
-      step.should match(%q{I run `echo "foo 'bar' baz"`})
-    end
-
     it "matches alternative words" do
       step = Turnip::StepDefinition.new("there is/are monsters") {}
       step.should match("there are monsters")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turnip
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153019360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+  version_requirements: *2153019360
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153018640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.5'
+  version_requirements: *2153018640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153018120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2153018120
 description: Provides the ability to define steps and run Gherkin files from with
   RSpec
 email:
@@ -73,28 +58,27 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- examples/alignment_steps.rb
 - examples/ambiguous.feature
 - examples/autoload_steps.feature
-- examples/autoload_steps.rb
 - examples/backgrounds.feature
-- examples/backtick_steps.rb
-- examples/dragon_steps.rb
-- examples/evil_steps.rb
+- examples/errors.feature
 - examples/interpolation.feature
-- examples/knight_steps.rb
-- examples/more_steps.rb
 - examples/multiline_string.feature
-- examples/neutral_steps.rb
 - examples/pending.feature
-- examples/red_dragon_steps.rb
 - examples/scenario_outline.feature
 - examples/simple_feature.feature
 - examples/step_calling.feature
-- examples/step_calling_steps.rb
-- examples/steps.rb
+- examples/steps/alignment_steps.rb
+- examples/steps/autoload_steps.rb
+- examples/steps/backtick_steps.rb
+- examples/steps/dragon_steps.rb
+- examples/steps/knight_steps.rb
+- examples/steps/more_steps.rb
+- examples/steps/step_calling_steps.rb
+- examples/steps/steps.rb
 - examples/steps_for.feature
 - examples/steps_for_super.feature
+- examples/steps_with_variations.feature
 - examples/table.feature
 - examples/tags.feature
 - examples/with_backticks.feature
@@ -102,31 +86,21 @@ files:
 - lib/turnip.rb
 - lib/turnip/builder.rb
 - lib/turnip/capybara.rb
-- lib/turnip/config.rb
+- lib/turnip/define.rb
 - lib/turnip/dsl.rb
-- lib/turnip/feature_file.rb
-- lib/turnip/loader.rb
+- lib/turnip/execute.rb
 - lib/turnip/placeholder.rb
-- lib/turnip/runner_dsl.rb
-- lib/turnip/scenario_context.rb
-- lib/turnip/scenario_runner.rb
+- lib/turnip/rspec.rb
 - lib/turnip/step_definition.rb
-- lib/turnip/step_loader.rb
-- lib/turnip/step_module.rb
 - lib/turnip/table.rb
 - lib/turnip/version.rb
 - spec/builder_spec.rb
+- spec/define_and_execute.rb
 - spec/dsl_spec.rb
-- spec/feature_file_spec.rb
 - spec/integration_spec.rb
 - spec/placeholder_spec.rb
-- spec/runner_dsl_spec.rb
-- spec/scenario_context_spec.rb
-- spec/scenario_runner_spec.rb
 - spec/spec_helper.rb
 - spec/step_definition_spec.rb
-- spec/step_loader_spec.rb
-- spec/step_module_spec.rb
 - spec/table_spec.rb
 - turnip.gemspec
 homepage: ''
@@ -149,21 +123,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: turnip
-rubygems_version: 1.8.22
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Gherkin extension for RSpec
 test_files:
 - spec/builder_spec.rb
+- spec/define_and_execute.rb
 - spec/dsl_spec.rb
-- spec/feature_file_spec.rb
 - spec/integration_spec.rb
 - spec/placeholder_spec.rb
-- spec/runner_dsl_spec.rb
-- spec/scenario_context_spec.rb
-- spec/scenario_runner_spec.rb
 - spec/spec_helper.rb
 - spec/step_definition_spec.rb
-- spec/step_loader_spec.rb
-- spec/step_module_spec.rb
 - spec/table_spec.rb
+has_rdoc: