turnip 0.3.0 → 0.3.1

data/.travis.yml

@@ -2,4 +2,5 @@ rvm:
  - 1.9.2
  - 1.9.3
  - ruby-head
- - rbx-2.0
+ - rbx-19mode
+

data/README.md

@@ -246,6 +246,25 @@ Feature: Red Dragons are deadly
     Then the knight is dead
 ```
 
+### Calling steps from other steps
+You can also call steps from other steps. This is done by just calling `step
+"name_of_the_step"`, so for instance if you have:
+
+``` ruby
+step "a random step" do
+  @value = 1
+end
+
+step "calling a step" do
+  step "a random step"
+  @value += 1
+end
+```
+
+Now if you use the step `calling a step` in any Scenario, then the value of
+`@value` will be 2 afterwards as it first executes the code defined for the step
+`a random step`. You can think of it as a simple method call.
+
 ### Auto-included steps
 By default, Turnip will automatically make available any steps defined in
 a `steps_for` block with the same name as the feature file being run.  For
@@ -263,6 +282,7 @@ steps_for :user_signup do
   end
 
   step "I should see a welcome message" do
+    ...
   end
 end
 ```
@@ -328,6 +348,32 @@ end
 These regular expressions must not use anchors, e.g. `^` or `$`. They may not
 contain named capture groups, e.g. `(?<color>blue|green)`.
 
+## Table Steps
+Turnip also supports steps that take a table as a parameter similar to Cucumber:
+
+``` cucumber
+Scenario: This is a feature with a table
+  Given there are the following monsters:
+    | Name    | Hitpoints |
+    | Blaaarg | 23        |
+    | Moorg   | 12        |
+  Then "Blaaarg" should have 23 hitpoints
+  And "Moorg" should have 12 hitpoints
+```
+The table is a `Turnip::Table` object which works in much the same way as Cucumber's
+`Cucumber::Ast::Table` obects.
+
+E.g. converting the `Turnip::Table` to an array of hashes:
+
+``` ruby
+step "there are the following monsters:" do |table|
+  @monsters = {}
+  table.hashes.each do |hash|
+    @monsters[hash['Name']] = hash['Hitpoints'].to_i
+  end
+end
+```
+
 ## Using with Capybara
 
 Just require `turnip/capybara` in your `spec_helper`. You can now use the
@@ -360,3 +406,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/examples/backtick_steps.rb

@@ -0,0 +1,4 @@
+step "I run `:cmd`" do |cmd|
+  step('I attack it') if cmd == 'killall monsters'
+end
+

data/examples/interpolation.feature

@@ -3,10 +3,19 @@ Feature: A simple feature
     Given there is a monster called "John Smith"
     Then it should be called "John Smith"
 
+  Scenario: Interpolation with empty quotes
+    Given there is a monster called "John Smith"
+    When I change its name to ""
+    Then it should be nameless
+
   Scenario: Interpolation without quotes
     Given there is a monster called John
     Then it should be called "John"
 
+  Scenario: Interpolation with mixed quotes
+    Given there is a monster called "O'Flannahan"
+    Then it should be called "O'Flannahan"
+
   Scenario: Interpolation with customer regexp
     Given there are 3 monkeys with blue hair
     Then there should be 3 monkeys with blue hair

data/examples/steps.rb

@@ -32,6 +32,18 @@ step 'it should be called "John"' do
   @monster_name.should == "John"
 end
 
+step 'it should be called "O\'Flannahan"' do
+  @monster_name.should == "O'Flannahan"
+end
+
+step "I change its name to :empty_string" do |empty_string|
+  @monster_name = empty_string
+end
+
+step "it should be nameless" do
+  @monster_name.should == ""
+end
+
 step "there is a monster with :count hitpoints" do |count|
   @monster = count
 end

data/examples/with_backticks.feature

@@ -0,0 +1,5 @@
+Feature: A feature with backticks
+  Scenario: This is a feature with backticks
+    Given there is a monster
+    When I run `killall monsters`
+    Then it should die

data/lib/turnip/placeholder.rb

@@ -27,8 +27,8 @@ module Turnip
 
       def default
         @default ||= new(:default) do
-          match %r((?:["']([^["']]+)["']|([a-zA-Z0-9_-]+))) do |first, second|
-            first or second
+          match %r((?:"([^"]*)"|'([^']*)'|([a-zA-Z0-9_-]+))) do |first, second, third|
+            first or second or third
           end
         end
       end

data/lib/turnip/step_definition.rb

@@ -54,9 +54,13 @@ module Turnip
     OPTIONAL_WORD_REGEXP = /(\\\s)?\\\(([^)]+)\\\)(\\\s)?/
     PLACEHOLDER_REGEXP = /:([\w]+)/
     ALTERNATIVE_WORD_REGEXP = /(\w+)((\/\w+)+)/
+    COMMAND_REGEXP = /`([^`]+)`/
 
     def compile_regexp
       regexp = Regexp.escape(expression)
+      regexp.gsub!(COMMAND_REGEXP) do |_|
+        "(?:[`]([^`]+)[`])"
+      end
       regexp.gsub!(OPTIONAL_WORD_REGEXP) do |_|
         [$1, $2, $3].compact.map { |m| "(#{m})?" }.join
       end

data/lib/turnip/table.rb

@@ -10,31 +10,40 @@ module Turnip
     end
 
     def headers
-      @raw.first
+      raw.first
     end
 
     def rows
-      @raw.drop(1)
+      raw.drop(1)
     end
 
     def hashes
       rows.map { |row| Hash[headers.zip(row)] }
     end
-    
+
     def rows_hash
-      return @rows_hash if @rows_hash
-      verify_table_width(2)
-      @rows_hash = self.class.new(raw.transpose).hashes[0]
+      raise WidthMismatch.new(2, width) unless width == 2
+      transpose.hashes.first
+    end
+
+    def transpose
+      self.class.new(raw.transpose)
     end
 
     def each
-      @raw.each { |row| yield(row) }
+      raw.each { |row| yield(row) }
     end
-    
+
     private
-    
-    def verify_table_width(width)
-      raise %{The table must have exactly #{width} columns} unless raw[0].size == width
+
+    def width
+      raw[0].size
+    end
+
+    class WidthMismatch < StandardError
+      def initialize(expected, actual)
+        super("Expected the table to be #{expected} columns wide, got #{actual}")
+      end
     end
   end
 end

data/lib/turnip/version.rb

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

data/spec/integration_spec.rb

@@ -11,6 +11,6 @@ describe 'The CLI', :type => :integration do
   end
 
   it "prints out failures and successes" do
-    @result.should include('23 examples, 1 failure, 2 pending')
+    @result.should include('26 examples, 1 failure, 2 pending')
   end
 end

data/spec/step_definition_spec.rb

@@ -67,6 +67,12 @@ describe Turnip::StepDefinition do
       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")

data/spec/table_spec.rb

@@ -1,54 +1,73 @@
 require 'spec_helper'
 
 describe Turnip::Table do
+  let(:table) { described_class.new( raw ) }
+  let(:raw) { [['foo', 'bar'], ['quox', '42']] }
+
   describe '#raw' do
     it 'returns the raw table' do
-      table = Turnip::Table.new([['foo', 'bar'], ['quox', '42']])
       table.raw.should == [['foo', 'bar'], ['quox', '42']]
     end
   end
 
   describe '#to_a' do
     it 'returns the raw table' do
-      table = Turnip::Table.new([['foo', 'bar'], ['quox', '42']])
       table.to_a.should == [['foo', 'bar'], ['quox', '42']]
     end
   end
 
   describe '#headers' do
     it 'returns the first row' do
-      table = Turnip::Table.new([['foo', 'bar'], ['quox', '42']])
       table.headers.should == ['foo', 'bar']
     end
   end
 
   describe '#rows' do
+    let(:raw) { [['foo', 'bar'], ['moo', '55'], ['quox', '42']] }
     it 'returns the rows beyond the first' do
-      table = Turnip::Table.new([['foo', 'bar'], ['moo', '55'], ['quox', '42']])
       table.rows.should == [['moo', '55'], ['quox', '42']]
     end
   end
 
   describe '#hashes' do
+    let(:raw) { [['foo', 'bar'], ['moo', '55'], ['quox', '42']] }
     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'},
         {'foo' => 'quox', 'bar' => '42'}
       ]
     end
   end
-  
+
+  describe '#transpose' do
+    context "when table is 2 columns wide" do
+
+      let(:raw) { [["Name", "Dave"], ["Age", "99"], ["Height", "6ft"]] }
+      it 'transposes the raw table' do
+        table.transpose.hashes.should == [{ "Name" => "Dave", "Age" => "99", "Height" => "6ft" }]
+      end
+    end
+  end
+
   describe '#rows_hash' do
+    let(:raw) { [['foo', 'moo'], ['bar', '55']] }
     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
+
+    context "when table is greater than 2 columns wide" do
+
+      let(:raw) { [["a", "b", "c"], ["1", "2", "3"]] }
+
+      it 'raises an error' do
+        expect { table.rows_hash }.to raise_error Turnip::Table::WidthMismatch
+      end
+    end
   end
 
   describe '#map' do
+    let(:raw) { [['moo', '55'], ['quox', '42']] }
     it 'iterates over the raw table' do
-      table = Turnip::Table.new([['moo', '55'], ['quox', '42']])
       table.map(&:first).should == ['moo', 'quox']
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turnip
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160891520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160891520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &2160890740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '2.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2160890740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160890120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160890120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides the ability to define steps and run Gherkin files from with
   RSpec
 email:
@@ -63,6 +78,7 @@ files:
 - examples/autoload_steps.feature
 - examples/autoload_steps.rb
 - examples/backgrounds.feature
+- examples/backtick_steps.rb
 - examples/dragon_steps.rb
 - examples/evil_steps.rb
 - examples/interpolation.feature
@@ -81,6 +97,7 @@ files:
 - examples/steps_for_super.feature
 - examples/table.feature
 - examples/tags.feature
+- examples/with_backticks.feature
 - examples/with_comments.feature
 - lib/turnip.rb
 - lib/turnip/builder.rb
@@ -132,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: turnip
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Gherkin extension for RSpec
@@ -150,4 +167,3 @@ test_files:
 - spec/step_loader_spec.rb
 - spec/step_module_spec.rb
 - spec/table_spec.rb
-has_rdoc: