cucumber 1.1.7 → 1.1.8

data/History.md

@@ -1,8 +1,16 @@
-## [v1.1.7](https://github.com/cucumber/cucumber/compare/v1.1.5...v1.1.7)
+## [v1.1.8](https://github.com/cucumber/cucumber/compare/v1.1.7...v1.1.8)
+
+## Bugfixes
+* Column mapping dangerously applied twice to the same cell! ([#202](https://github.com/cucumber/cucumber/issues/202), [#208](https://github.com/cucumber/cucumber/pull/208) Brian Dunn)
+
+## New Features
+* Don't pollute RbWorld with the AnsiEscapes methods ([#219](https://github.com/cucumber/cucumber/issues/219), [#221](https://github.com/cucumber/cucumber/pull/221) Ben Woosley)
+
+## [v1.1.7](https://github.com/cucumber/cucumber/compare/v1.1.6...v1.1.7)
 
 ### Bugfixes
 
-* Finish off backwards compatability fix for Capybara #229 (Cezary Baginski)
+* Finish off backwards compatability fix for Capybara ([#229](https://github.com/cucumber/cucumber/pull/229) Cezary Baginski)
 
 ## [v1.1.6](https://github.com/cucumber/cucumber/compare/v1.1.5...v1.1.6)
 
@@ -21,7 +29,7 @@
 
 ### New Features
 
-* Upgraded to gherkin 2.3.8 (Aslak Hellesøy)
+* Upgraded to gherkin 2.8.0 (Aslak Hellesøy)
 
 ### Bugfixes
 

data/lib/cucumber/ast/background.rb

@@ -104,7 +104,8 @@ module Cucumber
       end
 
       def source_tag_names
-        source_tags.map{|tag| tag.name}
+        warn("Deprecated: please use #source_tags instead.")
+        source_tags.map { |tag| tag.name }
       end
 
     end

data/lib/cucumber/ast/feature.rb

@@ -58,7 +58,8 @@ module Cucumber
       end
 
       def source_tag_names
-        source_tags.map{|tag| tag.name}
+        warn("Deprecated: please use #source_tags instead.")
+        source_tags.map { |tag| tag.name }
       end
 
       def accept_hook?(hook)

data/lib/cucumber/ast/feature_element.rb

@@ -75,10 +75,6 @@ module Cucumber
         (@tags.tags.to_a + (@feature ? @feature.source_tags.to_a : [])).uniq
       end
 
-      def source_tag_names
-        source_tags.map{|tag| tag.name}
-      end
-
       def language
         @feature.language if @feature
       end

data/lib/cucumber/ast/outline_table.rb

@@ -39,7 +39,8 @@ module Cucumber
       end
 
       def source_tag_names
-        source_tags.map{|tag| tag.name}
+        warn("Deprecated: please use #source_tags instead.")
+        source_tags.map { |tag| tag.name }
       end
 
       def skip_invoke!
@@ -92,10 +93,6 @@ module Cucumber
           @table.source_tags
         end
 
-        def source_tag_names
-          source_tags.map{|tag| tag.name}
-        end
-
         def create_step_invocations!(scenario_outline)
           @scenario_outline = scenario_outline
           @step_invocations = scenario_outline.step_invocations(self)

data/lib/cucumber/ast/table.rb

@@ -374,9 +374,7 @@ module Cucumber
           hash[key.to_s] if key.is_a?(Symbol)
         end
         column_names.each_with_index do |column_name, column_index|
-          verify_column(column_name) if @conversion_procs[column_name][:strict]
-          value = @conversion_procs[column_name][:proc].call(cells.value(column_index))
-          hash[column_name] = value
+          hash[column_name] = cells.value(column_index)
         end
         hash
       end

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '1.1.7'
+  VERSION       = '1.1.8'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/rb_support/rb_world.rb

@@ -4,7 +4,7 @@ module Cucumber
   module RbSupport
     # All steps are run in the context of an object that extends this module.
     module RbWorld
-      include Gherkin::Formatter::AnsiEscapes
+      AnsiEscapes = Gherkin::Formatter::AnsiEscapes
 
       class << self
         def alias_adverb(adverb)
@@ -21,7 +21,7 @@ module Cucumber
       attr_writer :__cucumber_step_mother, :__natural_language
 
       def __cucumber_invoke(name, multiline_argument=nil) #:nodoc:
-        STDERR.puts failed + "WARNING: Using 'Given/When/Then' in step definitions is deprecated, use 'step' to call other steps instead:" + caller[0] + reset
+        STDERR.puts AnsiEscapes.failed + "WARNING: Using 'Given/When/Then' in step definitions is deprecated, use 'step' to call other steps instead:" + caller[0] + AnsiEscapes.reset
         @__cucumber_step_mother.invoke(name, multiline_argument)
       end
 
@@ -46,7 +46,7 @@ module Cucumber
       end
 
       def announce(*messages)
-        STDERR.puts failed + "WARNING: #announce is deprecated. Use #puts instead:" + caller[0] + reset
+        STDERR.puts AnsiEscapes.failed + "WARNING: #announce is deprecated. Use #puts instead:" + caller[0] + AnsiEscapes.reset
         puts(*messages)
       end
 

data/spec/cucumber/ast/table_spec.rb

@@ -45,42 +45,54 @@ module Cucumber
         @table.hashes.first[:one].should == '4444'
       end
 
-      it "should allow mapping columns" do
-        @table.map_column!('one') { |v| v.to_i }
-        @table.hashes.first['one'].should == 4444
+      it "should return the row values in order" do
+        @table.rows.first.should == %w{4444 55555 666666}
       end
 
-      it "should allow mapping columns and take a symbol as the column name" do
-        @table.map_column!(:one) { |v| v.to_i }
-        @table.hashes.first['one'].should == 4444
-      end
+      describe '#map_column!' do
+        it "should allow mapping columns" do
+          @table.map_column!('one') { |v| v.to_i }
+          @table.hashes.first['one'].should == 4444
+        end
 
-      it "should allow mapping columns and modify the rows as well" do
-        @table.map_column!(:one) { |v| v.to_i }
-        @table.rows.first.should include(4444)
-        @table.rows.first.should_not include('4444')
-      end
+        it "applies the block once to each value" do
+          headers = ['header']
+          rows = ['value']
+          table = Table.new [headers, rows]
+          count = 0
+          table.map_column!('header') { |value| count +=1 }
+          table.rows
+          count.should eq rows.size
+        end
 
-      it "should return the row values in order" do
-        @table.rows.first.should == %w{4444 55555 666666}
-      end
+        it "should allow mapping columns and take a symbol as the column name" do
+          @table.map_column!(:one) { |v| v.to_i }
+          @table.hashes.first['one'].should == 4444
+        end
 
-      it "should pass silently if a mapped column does not exist in non-strict mode" do
-        lambda {
-          @table.map_column!('two', false) { |v| v.to_i }
-          @table.hashes
-        }.should_not raise_error
-      end
+        it "should allow mapping columns and modify the rows as well" do
+          @table.map_column!(:one) { |v| v.to_i }
+          @table.rows.first.should include(4444)
+          @table.rows.first.should_not include('4444')
+        end
 
-      it "should fail if a mapped column does not exist in strict mode" do
-        lambda {
-          @table.map_column!('two', true) { |v| v.to_i }
-          @table.hashes
-        }.should raise_error('The column named "two" does not exist')
-      end
+        it "should pass silently if a mapped column does not exist in non-strict mode" do
+          lambda {
+            @table.map_column!('two', false) { |v| v.to_i }
+            @table.hashes
+          }.should_not raise_error
+        end
 
-      it "should return the table" do
-        (@table.map_column!(:one) { |v| v.to_i }).should == @table
+        it "should fail if a mapped column does not exist in strict mode" do
+          lambda {
+            @table.map_column!('two', true) { |v| v.to_i }
+            @table.hashes
+          }.should raise_error('The column named "two" does not exist')
+        end
+
+        it "should return the table" do
+          (@table.map_column!(:one) { |v| v.to_i }).should == @table
+        end
       end
 
       describe "#match" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &2152507920 !ruby/object:Gem::Requirement
+  requirement: &2157523080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152507920
+  version_requirements: *2157523080
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2152506920 !ruby/object:Gem::Requirement
+  requirement: &2157522580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152506920
+  version_requirements: *2157522580
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2152506100 !ruby/object:Gem::Requirement
+  requirement: &2157538500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152506100
+  version_requirements: *2157538500
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &2152505380 !ruby/object:Gem::Requirement
+  requirement: &2157538040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152505380
+  version_requirements: *2157538040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152504420 !ruby/object:Gem::Requirement
+  requirement: &2157537580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152504420
+  version_requirements: *2157537580
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2152503780 !ruby/object:Gem::Requirement
+  requirement: &2157537120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.11
   type: :development
   prerelease: false
-  version_requirements: *2152503780
+  version_requirements: *2157537120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152503180 !ruby/object:Gem::Requirement
+  requirement: &2157536660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2152503180
+  version_requirements: *2157536660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152502540 !ruby/object:Gem::Requirement
+  requirement: &2157536200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2152502540
+  version_requirements: *2157536200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152501940 !ruby/object:Gem::Requirement
+  requirement: &2157535740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2152501940
+  version_requirements: *2157535740
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &2152501080 !ruby/object:Gem::Requirement
+  requirement: &2157535280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *2152501080
+  version_requirements: *2157535280
 - !ruby/object:Gem::Dependency
   name: prawn-layout
-  requirement: &2152500160 !ruby/object:Gem::Requirement
+  requirement: &2157534820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *2152500160
+  version_requirements: *2157534820
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &2152499660 !ruby/object:Gem::Requirement
+  requirement: &2157534360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152499660
+  version_requirements: *2157534360
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &2152498960 !ruby/object:Gem::Requirement
+  requirement: &2157533900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :development
   prerelease: false
-  version_requirements: *2152498960
+  version_requirements: *2157533900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152497480 !ruby/object:Gem::Requirement
+  requirement: &2157533440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2152497480
+  version_requirements: *2157533440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152496180 !ruby/object:Gem::Requirement
+  requirement: &2157532980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *2152496180
+  version_requirements: *2157532980
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2152494460 !ruby/object:Gem::Requirement
+  requirement: &2157532520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2152494460
+  version_requirements: *2157532520
 - !ruby/object:Gem::Dependency
   name: bcat
-  requirement: &2152493200 !ruby/object:Gem::Requirement
+  requirement: &2157532060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *2152493200
+  version_requirements: *2157532060
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2152492180 !ruby/object:Gem::Requirement
+  requirement: &2157531680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152492180
+  version_requirements: *2157531680
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152490680 !ruby/object:Gem::Requirement
+  requirement: &2157531140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2152490680
+  version_requirements: *2157531140
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &2152489620 !ruby/object:Gem::Requirement
+  requirement: &2157530640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2152489620
+  version_requirements: *2157530640
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152489020 !ruby/object:Gem::Requirement
+  requirement: &2157546540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2152489020
+  version_requirements: *2157546540
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152488360 !ruby/object:Gem::Requirement
+  requirement: &2157546080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,7 +252,7 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2152488360
+  version_requirements: *2157546080
 description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables:
@@ -819,7 +819,7 @@ post_install_message: ! '
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
 
 
-  Thank you for installing cucumber-1.1.7.
+  Thank you for installing cucumber-1.1.8.
 
   Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading
 
@@ -851,7 +851,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: cucumber-1.1.7
+summary: cucumber-1.1.8
 test_files:
 - features/background.feature
 - features/bootstrap.feature