turnip 0.2.0 → 0.3.0

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
 RSpec.configure do |config|
-  config.before(:each, :turnip => true) do
-    require File.expand_path('../examples/steps', File.dirname(__FILE__))
-  end
+  Turnip::Config.step_dirs = 'examples'
 end

data/spec/step_definition_spec.rb

@@ -1,63 +1,46 @@
 describe Turnip::StepDefinition do
-  after do
-    Turnip::StepDefinition.all.clear
-  end
-
-  describe ".add" do
-    it "adds a step definition to the list of definitions" do
-      Turnip::StepDefinition.add "this is a test"
-      Turnip::StepDefinition.all.first.expression.should eq("this is a test")
-    end
-  end
+  let(:all_steps) { [] }
 
   describe ".find" do
     it "returns a step definition that matches the description" do
-      Turnip::StepDefinition.add "there are :count monsters"
-      Turnip::StepDefinition.find("there are 23 monsters").expression.should eq("there are :count monsters")
-    end
-
-    it "respects the for option" do
-      Turnip::StepDefinition.add "alignment", :for => [:evil]
-      Turnip::StepDefinition.add "alignment", :for => [:good]
-      Turnip::StepDefinition.find("alignment", :evil => true, :bad => true).options[:for].should == [:evil]
+      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
-      Turnip::StepDefinition.add "there are :count monsters"
-      Turnip::StepDefinition.add "there are 23 monsters"
-      expect { Turnip::StepDefinition.find("there are 23 monsters") }.to raise_error(Turnip::StepDefinition::Ambiguous)
+      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("there are 23 monsters") }.to raise_error(Turnip::StepDefinition::Pending)
+      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
-      context = stub(:example => stub(:metadata => {}))
-      Turnip::StepDefinition.add("there are :count monsters") { @testing = 123 }
-      Turnip::StepDefinition.execute(context, stub(:description => "there are 23 monsters", :extra_arg => nil))
+      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 = stub(:example => stub(:metadata => {}))
       context.should_receive(:pending).with("the step 'there are 23 monsters' is not implemented")
-      Turnip::StepDefinition.execute(context, stub(:description => "there are 23 monsters", :extra_arg => nil))
+      Turnip::StepDefinition.execute(context, all_steps, stub(:description => "there are 23 monsters", :extra_arg => nil))
     end
 
     it "sends along arguments" do
-      context = stub(:example => stub(:metadata => {}))
-      Turnip::StepDefinition.add("there are :count monsters") { |count| @testing = count.to_i }
-      Turnip::StepDefinition.execute(context, stub(:description => "there are 23 monsters", :extra_arg => nil))
+      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
-      context = stub(:example => stub(:metadata => {}))
-      Turnip::StepDefinition.add("there are :count monsters") { |count, extra| @testing = extra }
-      Turnip::StepDefinition.execute(context, stub(:description => "there are 23 monsters", :extra_arg => 'foo'))
+      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
@@ -77,6 +60,12 @@ describe Turnip::StepDefinition do
       step.should match("there are 324 monsters")
       step.should_not match("there are no monsters")
     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 alternative words" do
       step = Turnip::StepDefinition.new("there is/are monsters") {}
@@ -115,4 +104,3 @@ describe Turnip::StepDefinition do
     end
   end
 end
-

data/spec/step_loader_spec.rb

@@ -0,0 +1,29 @@
+require 'turnip/step_loader'
+
+describe Turnip::StepLoader do
+  describe '.load_steps' do
+    context 'when the steps have not been loaded' do
+      before { Turnip::StepLoader.steps_loaded = false }
+
+      it 'loads all the steps' do
+        Turnip::StepLoader.should_receive :load_step_files
+        Turnip::StepLoader.load_steps
+      end
+
+      it 'marks the steps as loaded' do
+        Turnip::StepLoader.stub :load_step_files
+        Turnip::StepLoader.load_steps
+        Turnip::StepLoader.should be_steps_loaded
+      end
+    end
+
+    context 'when the steps have been loaded' do
+      before { Turnip::StepLoader.steps_loaded = true }
+
+      it 'does not reload all the steps' do
+        Turnip::StepLoader.should_not_receive :load_step_files
+        Turnip::StepLoader.load_steps
+      end
+    end
+  end
+end

data/spec/step_module_spec.rb

@@ -0,0 +1,106 @@
+describe Turnip::StepModule do
+  before(:each) do
+    Turnip::StepModule.clear_module_registry
+  end
+
+  describe '.modules_for' do
+    it 'returns the unique registered modules' do
+      Turnip::StepModule.steps_for(:first) {}
+      Turnip::StepModule.steps_for(:second) {}
+      Turnip::StepModule.modules_for(:first, :second).size.should eq(2)
+    end
+
+    it 'returns the unique registered modules with use_steps' do
+      Turnip::StepModule.steps_for(:first) {}
+      Turnip::StepModule.steps_for(:second) { use_steps :first }
+      Turnip::StepModule.steps_for(:third) { use_steps :first, :second }
+      Turnip::StepModule.modules_for(:third).size.should eq(3)
+    end
+
+    it 'ignores a circular step dependency' do
+      Turnip::StepModule.steps_for(:first) { use_steps :second }
+      Turnip::StepModule.steps_for(:second) { use_steps :first }
+      expect do
+        Turnip::StepModule.modules_for(:second)
+      end.should_not raise_error
+    end
+
+    it 'orders the step modules from use_steps before the using step module' do
+      Turnip::StepModule.steps_for(:first) {}
+      Turnip::StepModule.steps_for(:second) { use_steps :first }
+      Turnip::StepModule.modules_for(:second).first.should == Turnip::StepModule.module_registry[:first].first.step_module
+      Turnip::StepModule.modules_for(:second).last.should == Turnip::StepModule.module_registry[:second].first.step_module
+    end
+  end
+
+  describe '.steps_for' do
+    it 'registers the given tag' do
+      Turnip::StepModule.steps_for(:first) {}
+      Turnip::StepModule.should be_registered(:first)
+    end
+
+    it 'registers an anonymous modle for the given tags' do
+      Turnip::StepModule.steps_for(:first) {}
+      Turnip::StepModule.module_registry[:first].first.step_module.should be_instance_of(Module)
+    end
+
+  end
+
+  describe '.step_module' do
+    subject do
+      Turnip::StepModule.step_module do
+        def marker; end
+      end
+    end
+
+    it 'extends the steps DSL' do
+      subject.should be_kind_of(Turnip::StepModule::DSL)
+    end
+
+    it 'creates an anonymous module' do
+      # Check for empty string to allow for rbx
+      subject.name.should satisfy {|name| name.nil? || name.empty? }
+    end
+
+    it 'executes the block in the module' do
+      # Map to sym to allow for rbx
+      subject.instance_methods.map(&:to_sym).should include(:marker)
+    end
+  end
+
+  describe Turnip::StepModule::DSL do
+    describe '.step' do
+      it 'registers the step for the module' do
+        mod = Module.new do
+          extend Turnip::StepModule::DSL
+          step('example') { true }
+        end
+        mod.steps.first.expression.should eq('example')
+      end
+    end
+
+    describe '.placeholder' do
+      before { Turnip::Placeholder.send(:placeholders).clear }
+
+      it 'registers the placeholder globally' do
+        mod = Module.new do
+          extend Turnip::StepModule::DSL
+          placeholder('example') { true }
+        end
+        Turnip::Placeholder.send(:placeholders).should have_key('example')
+      end
+    end
+
+    describe '.use_steps' do
+      it "updates the list of used steps" do
+        mod = Module.new do
+          extend Turnip::StepModule::DSL
+          step('example') { true }
+
+          use_steps :other_steps
+        end
+        mod.uses_steps.should include(:other_steps)
+      end
+    end
+  end
+end

data/spec/table_spec.rb

@@ -30,7 +30,7 @@ describe Turnip::Table do
   end
 
   describe '#hashes' do
-    it 'returns a list of hashe based on the headers' do
+    it 'returns a list of hashes based on the headers' do
       table = Turnip::Table.new([['foo', 'bar'], ['moo', '55'], ['quox', '42']])
       table.hashes.should == [
         {'foo' => 'moo', 'bar' => '55'},
@@ -38,6 +38,13 @@ describe Turnip::Table do
       ]
     end
   end
+  
+  describe '#rows_hash' do
+    it 'converts this table into a Hash where the first column is used as keys and the second column is used as values' do
+      table = Turnip::Table.new([['foo', 'moo'], ['bar', '55']])
+      table.rows_hash.should == {'foo' => 'moo', 'bar' => '55'}
+    end
+  end
 
   describe '#map' do
     it 'iterates over the raw table' do

data/turnip.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "rspec", "~>2.0"
-  s.add_runtime_dependency "gherkin"
+  s.add_runtime_dependency "gherkin", ">= 2.5"
+  s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turnip
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152642360 !ruby/object:Gem::Requirement
+  requirement: &2160891520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,29 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152642360
+  version_requirements: *2160891520
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &2152641940 !ruby/object:Gem::Requirement
+  requirement: &2160890740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2152641940
+  version_requirements: *2160890740
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160890120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2160890120
 description: Provides the ability to define steps and run Gherkin files from with
   RSpec
 email:
@@ -43,36 +54,62 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
+- examples/alignment_steps.rb
 - examples/ambiguous.feature
+- examples/autoload_steps.feature
+- examples/autoload_steps.rb
 - examples/backgrounds.feature
+- examples/dragon_steps.rb
+- examples/evil_steps.rb
 - 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_for.feature
+- examples/steps_for_super.feature
 - examples/table.feature
 - examples/tags.feature
 - examples/with_comments.feature
 - lib/turnip.rb
 - lib/turnip/builder.rb
 - lib/turnip/capybara.rb
+- lib/turnip/config.rb
 - lib/turnip/dsl.rb
+- lib/turnip/feature_file.rb
 - lib/turnip/loader.rb
 - lib/turnip/placeholder.rb
+- lib/turnip/runner_dsl.rb
+- lib/turnip/scenario_context.rb
+- lib/turnip/scenario_runner.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/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: ''
@@ -102,8 +139,15 @@ summary: Gherkin extension for RSpec
 test_files:
 - spec/builder_spec.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: