cucumber 1.1.2 → 1.1.3

data/lib/cucumber/step_match.rb

@@ -60,7 +60,7 @@ module Cucumber
       s = string.dup
       offset = past_offset = 0
       step_arguments.each do |step_argument|
-        next if step_argument.byte_offset.nil? || step_argument.byte_offset < past_offset
+        next if step_argument.offset.nil? || step_argument.offset < past_offset
         
         replacement = if block_given?
           proc.call(step_argument.val)
@@ -70,9 +70,9 @@ module Cucumber
           format % step_argument.val
         end
 
-        s[step_argument.byte_offset + offset, step_argument.val.length] = replacement
+        s[step_argument.offset + offset, step_argument.val.length] = replacement
         offset += replacement.unpack('U*').length - step_argument.val.unpack('U*').length
-        past_offset = step_argument.byte_offset + step_argument.val.length
+        past_offset = step_argument.offset + step_argument.val.length
       end
       s
     end

data/lib/cucumber/wire_support/wire_protocol.rb

@@ -1,4 +1,3 @@
-require 'cucumber/step_argument'
 require 'cucumber/wire_support/wire_protocol/requests'
 
 module Cucumber

data/lib/cucumber/wire_support/wire_protocol/requests.rb

@@ -1,4 +1,6 @@
 require 'cucumber/wire_support/request_handler'
+require 'gherkin/formatter/argument'
+
 module Cucumber
   module WireSupport
     module WireProtocol
@@ -25,7 +27,7 @@ module Cucumber
           def create_step_match(raw_step_match)
             step_definition = WireStepDefinition.new(@connection, raw_step_match)
             step_args = raw_step_match['args'].map do |raw_arg|
-              StepArgument.new(raw_arg['val'], raw_arg['pos'])
+              Gherkin::Formatter::Argument.new(raw_arg['pos'], raw_arg['val'])
             end
             step_match(step_definition, step_args)
           end

data/spec/cucumber/ast/table_spec.rb

@@ -68,12 +68,14 @@ module Cucumber
       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 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
 
@@ -132,6 +134,16 @@ module Cucumber
             faulty_table.rows_hash
           }.should raise_error('The table must have exactly 2 columns')
         end
+
+        it "should support header and column mapping" do
+          table = Table.new([
+            %w{one 1111},
+            %w{two 22222}
+          ])
+          table.map_headers!({ 'two' => 'Two' }) { |header| header.upcase }
+          table.map_column!('two', false) { |val| val.to_i }
+          table.rows_hash.should == { 'ONE' => '1111', 'Two' => 22222 }
+        end
       end
 
       describe '#map_headers' do
@@ -378,6 +390,7 @@ module Cucumber
           ])
           lambda do
             t1.map_headers!(/uk/ => 'u')
+            t1.hashes
           end.should raise_error(%{2 headers matched /uk/: ["Cuke", "Duke"]})
         end
         

data/spec/cucumber/cli/main_spec.rb

@@ -95,7 +95,7 @@ module Cucumber
 
       context "--drb" do
         before(:each) do
-          @configuration = mock('Configuration', :drb? => true).as_null_object
+          @configuration = mock('Configuration', :drb? => true, :dotcucumber => false).as_null_object
           Configuration.stub!(:new).and_return(@configuration)
 
           @args = ['features']

data/spec/cucumber/constantize_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+module Cucumber
+  describe Constantize do
+    include Constantize
+
+    it "loads html formatter" do
+      clazz = constantize('Cucumber::Formatter::Html')
+      clazz.name.should == 'Cucumber::Formatter::Html'
+    end
+  end
+end

data/spec/cucumber/rb_support/regexp_argument_matcher_spec.rb

@@ -6,12 +6,12 @@ module Cucumber
     describe RegexpArgumentMatcher do
       it "should create 2 arguments" do
         arguments = RegexpArgumentMatcher.arguments_from(/I (\w+) (\w+)/, "I like fish")
-        arguments.map{|argument| [argument.val, argument.byte_offset]}.should == [["like", 2], ["fish", 7]]
+        arguments.map{|argument| [argument.val, argument.offset]}.should == [["like", 2], ["fish", 7]]
       end
 
       it "should create 2 arguments when first group is optional" do
         arguments = RegexpArgumentMatcher.arguments_from(/should( not)? be flashed '([^']*?)'$/, "I should be flashed 'Login failed.'")
-        arguments.map{|argument| [argument.val, argument.byte_offset]}.should == [[nil, nil], ["Login failed.", 21]]
+        arguments.map{|argument| [argument.val, argument.offset]}.should == [[nil, nil], ["Login failed.", 21]]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &2157630140 !ruby/object:Gem::Requirement
+  requirement: &2160950420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 2.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *2157630140
+  version_requirements: *2160950420
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2157629640 !ruby/object:Gem::Requirement
+  requirement: &2160949840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157629640
+  version_requirements: *2160949840
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2157629180 !ruby/object:Gem::Requirement
+  requirement: &2160949280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157629180
+  version_requirements: *2160949280
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &2157628720 !ruby/object:Gem::Requirement
+  requirement: &2160948700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157628720
+  version_requirements: *2160948700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2157628260 !ruby/object:Gem::Requirement
+  requirement: &2160948060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2157628260
+  version_requirements: *2160948060
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2157627800 !ruby/object:Gem::Requirement
+  requirement: &2160946960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.7
   type: :development
   prerelease: false
-  version_requirements: *2157627800
+  version_requirements: *2160946960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157627340 !ruby/object:Gem::Requirement
+  requirement: &2160946500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2157627340
+  version_requirements: *2160946500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151937020 !ruby/object:Gem::Requirement
+  requirement: &2160945860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2151937020
+  version_requirements: *2160945860
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2157650660 !ruby/object:Gem::Requirement
+  requirement: &2160983320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *2157650660
+  version_requirements: *2160983320
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &2157650200 !ruby/object:Gem::Requirement
+  requirement: &2160982640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *2157650200
+  version_requirements: *2160982640
 - !ruby/object:Gem::Dependency
   name: prawn-layout
-  requirement: &2157649740 !ruby/object:Gem::Requirement
+  requirement: &2160981980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *2157649740
+  version_requirements: *2160981980
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &2157649280 !ruby/object:Gem::Requirement
+  requirement: &2160981520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157649280
+  version_requirements: *2160981520
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &2157648820 !ruby/object:Gem::Requirement
+  requirement: &2160981060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0.rc9
   type: :development
   prerelease: false
-  version_requirements: *2157648820
+  version_requirements: *2160981060
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2157648360 !ruby/object:Gem::Requirement
+  requirement: &2160980600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2157648360
+  version_requirements: *2160980600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157647900 !ruby/object:Gem::Requirement
+  requirement: &2160980120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2157647900
+  version_requirements: *2160980120
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2157647440 !ruby/object:Gem::Requirement
+  requirement: &2160979660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2157647440
+  version_requirements: *2160979660
 - !ruby/object:Gem::Dependency
   name: bcat
-  requirement: &2157646980 !ruby/object:Gem::Requirement
+  requirement: &2160979140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2157646980
+  version_requirements: *2160979140
 - !ruby/object:Gem::Dependency
   name: ramaze
-  requirement: &2157646600 !ruby/object:Gem::Requirement
+  requirement: &2160978660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157646600
+  version_requirements: *2160978660
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2157646060 !ruby/object:Gem::Requirement
+  requirement: &2160978020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2157646060
+  version_requirements: *2160978020
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &2157645560 !ruby/object:Gem::Requirement
+  requirement: &2160977260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *2157645560
+  version_requirements: *2160977260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2157645100 !ruby/object:Gem::Requirement
+  requirement: &2160991240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *2157645100
+  version_requirements: *2160991240
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2157644640 !ruby/object:Gem::Requirement
+  requirement: &2160990660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,7 +252,7 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2157644640
+  version_requirements: *2160990660
 description: Behaviour Driven Development with elegance and joy
 email: cukes@googlegroups.com
 executables:
@@ -261,7 +261,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitattributes
-- .gitignore
 - .gitmodules
 - .rspec
 - .rvmrc
@@ -296,7 +295,6 @@ files:
 - examples/i18n/da/features/sammenlaegning.feature
 - examples/i18n/da/features/step_definitons/lommeregner_steps.rb
 - examples/i18n/da/lib/lommeregner.rb
-- examples/i18n/de/.gitignore
 - examples/i18n/de/Rakefile
 - examples/i18n/de/features/addition.feature
 - examples/i18n/de/features/division.feature
@@ -308,13 +306,11 @@ files:
 - examples/i18n/en-lol/features/support/env.rb
 - examples/i18n/en-lol/lib/basket.rb
 - examples/i18n/en-lol/lib/belly.rb
-- examples/i18n/en/.gitignore
 - examples/i18n/en/Rakefile
 - examples/i18n/en/features/addition.feature
 - examples/i18n/en/features/division.feature
 - examples/i18n/en/features/step_definitons/calculator_steps.rb
 - examples/i18n/en/lib/calculator.rb
-- examples/i18n/eo/.gitignore
 - examples/i18n/eo/Rakefile
 - examples/i18n/eo/features/adicio.feature
 - examples/i18n/eo/features/divido.feature
@@ -329,7 +325,6 @@ files:
 - examples/i18n/et/features/liitmine.feature
 - examples/i18n/et/features/step_definitions/kalkulaator_steps.rb
 - examples/i18n/et/lib/kalkulaator.rb
-- examples/i18n/fi/.gitignore
 - examples/i18n/fi/Rakefile
 - examples/i18n/fi/features/jakolasku.feature
 - examples/i18n/fi/features/step_definitons/laskin_steps.rb
@@ -346,13 +341,11 @@ files:
 - examples/i18n/he/features/division.feature
 - examples/i18n/he/features/step_definitons/calculator_steps.rb
 - examples/i18n/he/lib/calculator.rb
-- examples/i18n/hu/.gitignore
 - examples/i18n/hu/Rakefile
 - examples/i18n/hu/features/osszeadas.feature
 - examples/i18n/hu/features/osztas.feature
 - examples/i18n/hu/features/step_definitons/calculator_steps.rb
 - examples/i18n/hu/lib/calculator.rb
-- examples/i18n/id/.gitignore
 - examples/i18n/id/Rakefile
 - examples/i18n/id/features/addition.feature
 - examples/i18n/id/features/division.feature
@@ -362,20 +355,17 @@ files:
 - examples/i18n/it/features/somma.feature
 - examples/i18n/it/features/step_definitons/calcolatrice_steps.rb
 - examples/i18n/it/lib/calcolatrice.rb
-- examples/i18n/ja/.gitignore
 - examples/i18n/ja/Rakefile
 - examples/i18n/ja/features/addition.feature
 - examples/i18n/ja/features/division.feature
 - examples/i18n/ja/features/step_definitons/calculator_steps.rb
 - examples/i18n/ja/features/support/env.rb
 - examples/i18n/ja/lib/calculator.rb
-- examples/i18n/ko/.gitignore
 - examples/i18n/ko/Rakefile
 - examples/i18n/ko/features/addition.feature
 - examples/i18n/ko/features/division.feature
 - examples/i18n/ko/features/step_definitons/calculator_steps.rb
 - examples/i18n/ko/lib/calculator.rb
-- examples/i18n/lt/.gitignore
 - examples/i18n/lt/Rakefile
 - examples/i18n/lt/features/addition.feature
 - examples/i18n/lt/features/division.feature
@@ -391,7 +381,6 @@ files:
 - examples/i18n/no/features/summering.feature
 - examples/i18n/no/features/support/env.rb
 - examples/i18n/no/lib/kalkulator.rb
-- examples/i18n/pl/.gitignore
 - examples/i18n/pl/Rakefile
 - examples/i18n/pl/features/addition.feature
 - examples/i18n/pl/features/division.feature
@@ -415,7 +404,6 @@ files:
 - examples/i18n/ru/features/support/env.rb
 - examples/i18n/ru/features/support/world.rb
 - examples/i18n/ru/lib/calculator.rb
-- examples/i18n/sk/.gitignore
 - examples/i18n/sk/Rakefile
 - examples/i18n/sk/features/addition.feature
 - examples/i18n/sk/features/division.feature
@@ -434,7 +422,6 @@ files:
 - examples/i18n/sv/features/step_definitons/kalkulator_steps.rb
 - examples/i18n/sv/features/summering.feature
 - examples/i18n/sv/lib/kalkulator.rb
-- examples/i18n/tr/.gitignore
 - examples/i18n/tr/Rakefile
 - examples/i18n/tr/features/bolme.feature
 - examples/i18n/tr/features/step_definitons/hesap_makinesi_adimlari.rb
@@ -460,7 +447,6 @@ files:
 - examples/i18n/zh-CN/features/addition.feature
 - examples/i18n/zh-CN/features/step_definitons/calculator_steps.rb
 - examples/i18n/zh-CN/lib/calculator.rb
-- examples/i18n/zh-TW/.gitignore
 - examples/i18n/zh-TW/Rakefile
 - examples/i18n/zh-TW/features/addition.feature
 - examples/i18n/zh-TW/features/division.feature
@@ -470,7 +456,6 @@ files:
 - examples/python/Rakefile
 - examples/python/features/fibonacci.feature
 - examples/python/features/step_definitions/fib_steps.py
-- examples/python/lib/.gitignore
 - examples/python/lib/fib.py
 - examples/ramaze/README.textile
 - examples/ramaze/Rakefile
@@ -489,7 +474,6 @@ files:
 - examples/ruby2python/features/fibonacci.feature
 - examples/ruby2python/features/step_definitions/fib_steps.rb
 - examples/ruby2python/features/support/env.rb
-- examples/ruby2python/lib/.gitignore
 - examples/ruby2python/lib/fib.py
 - examples/sinatra/README.textile
 - examples/sinatra/Rakefile
@@ -513,7 +497,6 @@ files:
 - examples/v8/features/step_definitions/fib_steps.js
 - examples/v8/features/support/env.js
 - examples/v8/lib/fibonacci.js
-- examples/watir/.gitignore
 - examples/watir/README.textile
 - examples/watir/Rakefile
 - examples/watir/cucumber.yml
@@ -521,6 +504,7 @@ files:
 - examples/watir/features/step_definitions/search_steps.rb
 - examples/watir/features/support/env.rb
 - examples/watir/features/support/screenshots.rb
+- features/.cucumber/stepdefs.json
 - features/background.feature
 - features/bootstrap.feature
 - features/custom_formatter.feature
@@ -529,6 +513,7 @@ files:
 - features/hooks.feature
 - features/iso-8859-1.feature
 - features/issue_117.feature
+- features/issue_57.feature
 - features/json_formatter.feature
 - features/nested_steps.feature
 - features/stats_formatters.feature
@@ -550,7 +535,6 @@ files:
 - fixtures/junit/features/scenario_outline.feature
 - fixtures/junit/features/some_subdirectory/one_passing_one_failing.feature
 - fixtures/junit/features/step_definitions/steps.rb
-- fixtures/self_test/.gitignore
 - fixtures/self_test/README.textile
 - fixtures/self_test/Rakefile
 - fixtures/self_test/features/call_undefined_step_from_step_def.feature
@@ -772,7 +756,6 @@ files:
 - lib/cucumber/runtime/results.rb
 - lib/cucumber/runtime/support_code.rb
 - lib/cucumber/runtime/user_interface.rb
-- lib/cucumber/step_argument.rb
 - lib/cucumber/step_definition_light.rb
 - lib/cucumber/step_definitions.rb
 - lib/cucumber/step_match.rb
@@ -802,6 +785,7 @@ files:
 - spec/cucumber/cli/options_spec.rb
 - spec/cucumber/cli/profile_loader_spec.rb
 - spec/cucumber/configuration_spec.rb
+- spec/cucumber/constantize_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/duration_spec.rb
@@ -834,7 +818,7 @@ post_install_message: ! '
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)
 
 
-  Thank you for installing cucumber-1.1.2.
+  Thank you for installing cucumber-1.1.3.
 
   Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading
 
@@ -866,7 +850,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: cucumber-1.1.2
+summary: cucumber-1.1.3
 test_files:
 - features/background.feature
 - features/bootstrap.feature
@@ -876,6 +860,7 @@ test_files:
 - features/hooks.feature
 - features/iso-8859-1.feature
 - features/issue_117.feature
+- features/issue_57.feature
 - features/json_formatter.feature
 - features/nested_steps.feature
 - features/stats_formatters.feature
@@ -903,6 +888,7 @@ test_files:
 - spec/cucumber/cli/options_spec.rb
 - spec/cucumber/cli/profile_loader_spec.rb
 - spec/cucumber/configuration_spec.rb
+- spec/cucumber/constantize_spec.rb
 - spec/cucumber/core_ext/proc_spec.rb
 - spec/cucumber/formatter/ansicolor_spec.rb
 - spec/cucumber/formatter/duration_spec.rb