cucumber 2.0.0.rc.1 → 2.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8832bd36266bffbfaa4d3fd708361d72485d0f70
-  data.tar.gz: 1f310aac04ddfedf7e2e7ddd7a53f6adb88aaa8a
+  metadata.gz: 0985b78183dd2c31d3b7671da6d567042ea9eb6d
+  data.tar.gz: 6237bcc06c38dba04dea5bbbf5b3bdc05c50420a
 SHA512:
-  metadata.gz: fd8670734a46685cde551f37ec2f2d9a35f19d0b280c48ee6c86aa4fca9c7144dc538229add49ec8a48b5169b09e387a134960d3984f39c93ec467c4b147e7ce
-  data.tar.gz: f672204acf7aaa53c92ef59699d9d8b37fb24ad4f5e423fea79de82a9e002184218e45d3a228cb1032341893a1f1d7f4da6e7527aa155a8c318c6d567ea09f7f
+  metadata.gz: 6af997a1ae5f1f41dab2088c00a850ad103c54a256060d2a5db82edd192e51012c8725afe4208a56932f92df907f1eae4e42d6fdd9e79ec023c959838b046c52
+  data.tar.gz: 2215dffd827dca1de84a88d14375e3540a0d6ff797a59951054dcf341e27bf3baddbebaee8359ae84c6a5b64d0649079105ffdf5770013c85b6d07ee3bbaffc7

data/History.md

@@ -1,5 +1,9 @@
 ## [In Git](https://github.com/cucumber/cucumber/compare/v2.0.0.rc.1...master)
 
+### Bugfixes
+
+  * World#table no longer creates invalid table objects when using an Array (@tooky, @mattwynne)
+
 ## [v2.0.0.rc.1](https://github.com/cucumber/cucumber/compare/v2.0.0.beta.5...v2.0.0.rc.1)
 
 ### Removed Features

data/lib/cucumber/multiline_argument/data_table.rb

@@ -46,34 +46,50 @@ module Cucumber
 
       include Enumerable
       include Core::Ast::DescribesItself
+      extend Forwardable
 
       NULL_CONVERSIONS = Hash.new({ :strict => false, :proc => lambda{ |cell_value| cell_value } }).freeze
 
       attr_accessor :file
+      def_delegator :@ast_table, :location
 
       def self.default_arg_name #:nodoc:
         "table"
       end
 
-      def self.parse(text, uri, offset)
-        builder = Builder.new
-        lexer = Gherkin::Lexer::I18nLexer.new(builder)
-        lexer.scan(text)
-        new(builder.rows)
+      class << self
+        def from(data, location = Core::Ast::Location.of_caller)
+          case data
+          when Array
+            from_array(data, location)
+          when String
+            parse(data, location)
+          else
+            raise ArgumentError, "expected data to be a String or an Array."
+          end
+        end
+
+        private
+        def parse(text, location = Core::Ast::Location.of_caller)
+          builder = Builder.new
+          lexer = Gherkin::Lexer::I18nLexer.new(builder)
+          lexer.scan(text)
+          from_array(builder.rows, location)
+        end
+
+        def from_array(data, location = Core::Ast::Location.of_caller)
+          new Core::Ast::DataTable.new(data, location)
+        end
       end
 
-      # Creates a new instance. +raw+ should be an Array of Array of String
-      # or an Array of Hash (similar to what #hashes returns).
-      # You don't typically create your own Table objects - Cucumber will do
-      # it internally and pass them to your Step Definitions.
-      #
+
+      # @param data [Core::Ast::DataTable] the data for the table
+      # @param conversion_procs [Hash] see map_columns!
+      # @param header_mappings [Hash] see map_headers!
+      # @param header_conversion_proc [Proc] see map_headers!
       def initialize(data, conversion_procs = NULL_CONVERSIONS.dup, header_mappings = {}, header_conversion_proc = nil)
-        ast_table = case data
-                    when Core::Ast::DataTable
-                      data
-                    when Array
-                      Core::Ast::DataTable.new(data, Core::Ast::Location.of_caller)
-                    end
+        raise ArgumentError, "data must be a Core::Ast::DataTable" unless data.kind_of? Core::Ast::DataTable
+        ast_table = data
         # Verify that it's square
         ast_table.transpose
         @cell_matrix = create_cell_matrix(ast_table)
@@ -95,7 +111,7 @@ module Cucumber
       # registered with #map_column! and #map_headers!.
       #
       def dup
-        self.class.new(raw.dup, @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
+        self.class.new(Core::Ast::DataTable.new(raw, location), @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
       end
 
       # Returns a new, transposed table. Example:
@@ -110,7 +126,7 @@ module Cucumber
       #   | 4 | 2 |
       #
       def transpose
-        self.class.new(raw.transpose, @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
+        self.class.new(Core::Ast::DataTable.new(raw.transpose, location), @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
       end
 
       # Converts this table into an Array of Hash where the keys of each
@@ -237,7 +253,7 @@ module Cucumber
 
       # Returns a new Table where the headers are redefined. See #map_headers!
       def map_headers(mappings={}, &block)
-        self.class.new raw.dup, @conversion_procs.dup, mappings, block
+        self.class.new(Core::Ast::DataTable.new(raw, location), @conversion_procs.dup, mappings, block)
       end
 
       # Change how #hashes converts column values. The +column_name+ argument identifies the column
@@ -262,7 +278,7 @@ module Cucumber
       def map_column(column_name, strict=true, &conversion_proc)
         conversion_procs = @conversion_procs.dup
         conversion_procs[column_name.to_s] = { :strict => strict, :proc => conversion_proc }
-        self.class.new(raw.dup, conversion_procs, @header_mappings.dup, @header_conversion_proc)
+        self.class.new(Core::Ast::DataTable.new(raw, location), conversion_procs, @header_mappings.dup, @header_conversion_proc)
       end
 
       # Compares +other_table+ to self. If +other_table+ contains columns
@@ -444,10 +460,6 @@ module Cucumber
         s
       end
 
-      def location
-        @ast_table.location
-      end
-
       def description_for_visitors
         :legacy_table
       end

data/lib/cucumber/platform.rb

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

data/lib/cucumber/runtime/for_programming_languages.rb

@@ -44,17 +44,13 @@ module Cucumber
       #     %w{ CUC-101 Peeler      22     }
       #   ])
       #
-      def table(text_or_table, file=nil, line_offset=0)
+      def table(text_or_table, file=nil, line=0)
         if !file
           location = Core::Ast::Location.of_caller
         else
           location = Core::Ast::Location.new(file, line)
         end
-        if Array === text_or_table
-          MultilineArgument::DataTable.new(text_or_table, location)
-        else
-          MultilineArgument::DataTable.parse(text_or_table, file, location)
-        end
+        MultilineArgument::DataTable.from(text_or_table, location)
       end
 
       # Returns a Cucumber::MultilineArgument::DocString for +body+.

data/spec/cucumber/multiline_argument/data_table_spec.rb

@@ -6,7 +6,7 @@ module Cucumber
   module MultilineArgument
     describe DataTable do
       before do
-        @table = DataTable.new([
+        @table = DataTable.from([
           %w{one four seven},
           %w{4444 55555 666666}
         ])
@@ -48,7 +48,7 @@ module Cucumber
         it "applies the block once to each value" do
           headers = ['header']
           rows = ['value']
-          table = DataTable.new [headers, rows]
+          table = DataTable.from [headers, rows]
           count = 0
           table.map_column!('header') { |value| count +=1 }
           table.rows
@@ -94,7 +94,7 @@ module Cucumber
         it "applies the block once to each value" do
           headers = ['header']
           rows = ['value']
-          table = DataTable.new [headers, rows]
+          table = DataTable.from [headers, rows]
           count = 0
           new_table = table.map_column('header') { |value| count +=1 }
           new_table.rows
@@ -133,7 +133,7 @@ module Cucumber
 
       describe "#match" do
         before(:each) do
-          @table = DataTable.new([
+          @table = DataTable.from([
             %w{one four seven},
             %w{4444 55555 666666}
           ])
@@ -152,7 +152,7 @@ module Cucumber
 
       describe "#transpose" do
         before(:each) do
-          @table = DataTable.new([
+          @table = DataTable.from([
             %w{one 1111},
             %w{two 22222}
           ])
@@ -166,7 +166,7 @@ module Cucumber
       describe "#rows_hash" do
 
         it "should return a hash of the rows" do
-          table = DataTable.new([
+          table = DataTable.from([
             %w{one 1111},
             %w{two 22222}
           ])
@@ -174,7 +174,7 @@ module Cucumber
         end
 
         it "should fail if the table doesn't have two columns" do
-          faulty_table = DataTable.new([
+          faulty_table = DataTable.from([
             %w{one 1111 abc},
             %w{two 22222 def}
           ])
@@ -184,7 +184,7 @@ module Cucumber
         end
 
         it "should support header and column mapping" do
-          table = DataTable.new([
+          table = DataTable.from([
             %w{one 1111},
             %w{two 22222}
           ])
@@ -196,7 +196,7 @@ module Cucumber
 
       describe '#map_headers!' do
         let(:table) do
-          DataTable.new([
+          DataTable.from([
           %w{HELLO WORLD},
           %w{4444 55555}
           ])
@@ -236,7 +236,7 @@ module Cucumber
 
       describe '#map_headers' do
         let(:table) do
-           DataTable.new([
+           DataTable.from([
           %w{HELLO WORLD},
           %w{4444 55555}
           ])
@@ -277,20 +277,20 @@ module Cucumber
 
       describe "diff!" do
         it "should detect a complex diff" do
-          t1 = table(%{
+          t1 = DataTable.from(%{
             | 1         | 22          | 333         | 4444         |
             | 55555     | 666666      | 7777777     | 88888888     |
             | 999999999 | 0000000000  | 01010101010 | 121212121212 |
             | 4000      | ABC         | DEF         | 50000        |
-          }, __FILE__, __LINE__)
+          })
 
-          t2 = table(%{
+          t2 = DataTable.from(%{
             | a     | 4444     | 1         |
             | bb    | 88888888 | 55555     |
             | ccc   | xxxxxxxx | 999999999 |
             | dddd  | 4000     | 300       |
             | e     | 50000    | 4000      |
-          }, __FILE__, __LINE__)
+          })
           expect { t1.diff!(t2) }.to raise_error
           expect( t1.to_s(:indent => 12, :color => false) ).to eq %{
             |     1         | (-) 22         | (-) 333         |     4444         | (+) a    |
@@ -303,11 +303,11 @@ module Cucumber
         end
 
         it "should not change table when diffed with identical" do
-          t = table(%{
+          t = DataTable.from(%{
             |a|b|c|
             |d|e|f|
             |g|h|i|
-          }, __FILE__, __LINE__)
+          })
           t.diff!(t.dup)
           expect( t.to_s(:indent => 12, :color => false) ).to eq %{
             |     a |     b |     c |
@@ -317,11 +317,11 @@ module Cucumber
         end
 
         it "should inspect missing and surplus cells" do
-          t1 = DataTable.new([
+          t1 = DataTable.from([
             ['name',  'male', 'lastname', 'swedish'],
             ['aslak', 'true', 'hellesøy', 'false']
           ])
-          t2 = DataTable.new([
+          t2 = DataTable.from([
             ['name',  'male', 'lastname', 'swedish'],
             ['aslak', true,   'hellesøy', false]
           ])
@@ -335,12 +335,12 @@ module Cucumber
         end
 
         it "should allow column mapping of target before diffing" do
-          t1 = DataTable.new([
+          t1 = DataTable.from([
             ['name',  'male'],
             ['aslak', 'true']
           ])
           t1.map_column!('male') { |m| m == 'true' }
-          t2 = DataTable.new([
+          t2 = DataTable.from([
             ['name',  'male'],
             ['aslak', true]
           ])
@@ -352,14 +352,14 @@ module Cucumber
         end
 
         it "should allow column mapping of argument before diffing" do
-          t1 = DataTable.new([
+          t1 = DataTable.from([
             ['name',  'male'],
             ['aslak', true]
           ])
           t1.map_column!('male') {
             'true'
           }
-          t2 = DataTable.new([
+          t2 = DataTable.from([
             ['name',  'male'],
             ['aslak', 'true']
           ])
@@ -371,13 +371,13 @@ module Cucumber
         end
 
         it "should allow header mapping before diffing" do
-          t1 = DataTable.new([
+          t1 = DataTable.from([
             ['Name',  'Male'],
             ['aslak', 'true']
           ])
           t1.map_headers!('Name' => 'name', 'Male' => 'male')
           t1.map_column!('male') { |m| m == 'true' }
-          t2 = DataTable.new([
+          t2 = DataTable.from([
             ['name',  'male'],
             ['aslak', true]
           ])
@@ -389,11 +389,11 @@ module Cucumber
         end
 
         it "should detect seemingly identical tables as different" do
-          t1 = DataTable.new([
+          t1 = DataTable.from([
             ['X',  'Y'],
             ['2', '1']
           ])
-          t2 = DataTable.new([
+          t2 = DataTable.from([
             ['X',  'Y'],
             [2, 1]
           ])
@@ -406,7 +406,7 @@ module Cucumber
         end
 
         it "should not allow mappings that match more than 1 column" do
-          t1 = DataTable.new([
+          t1 = DataTable.from([
             ['Cuke',  'Duke'],
             ['Foo', 'Bar']
           ])
@@ -418,85 +418,82 @@ module Cucumber
 
         describe "raising" do
           before do
-            @t = table(%{
+            @t = DataTable.from(%{
               | a | b |
               | c | d |
-            }, __FILE__, __LINE__)
+            })
             expect( @t ).not_to eq nil
           end
 
           it "should raise on missing rows" do
-            t = table(%{
+            t = DataTable.from(%{
               | a | b |
-            }, __FILE__, __LINE__)
+            })
             expect( lambda { @t.dup.diff!(t) } ).to raise_error
             expect { @t.dup.diff!(t, :missing_row => false) }.not_to raise_error
           end
 
           it "should not raise on surplus rows when surplus is at the end" do
-            t = table(%{
+            t = DataTable.from(%{
               | a | b |
               | c | d |
               | e | f |
-            }, __FILE__, __LINE__)
+            })
             expect { @t.dup.diff!(t) }.to raise_error
             expect { @t.dup.diff!(t, :surplus_row => false) }.not_to raise_error
           end
 
           it "should not raise on surplus rows when surplus is interleaved" do
-            t1 = table(%{
+            t1 = DataTable.from(%{
               | row_1 | row_2 |
               | four  | 4     |
-            }, __FILE__, __LINE__)
-            t2 = table(%{
+            })
+            t2 = DataTable.from(%{
               | row_1 | row_2 |
               | one   | 1     |
               | two   | 2     |
               | three | 3     |
               | four  | 4     |
               | five  | 5     |
-            }, __FILE__, __LINE__)
+            })
             expect { t1.dup.diff!(t2) }.to raise_error
 
             expect { t1.dup.diff!(t2, :surplus_row => false) }.not_to raise_error
           end
 
           it "should raise on missing columns" do
-            t = table(%{
+            t = DataTable.from(%{
               | a |
               | c |
-            }, __FILE__, __LINE__)
+            })
             expect { @t.dup.diff!(t) }.to raise_error
             expect { @t.dup.diff!(t, :missing_col => false) }.not_to raise_error
           end
 
           it "should not raise on surplus columns" do
-            t = table(%{
+            t = DataTable.from(%{
               | a | b | x |
               | c | d | y |
-            }, __FILE__, __LINE__)
+            })
             expect { @t.dup.diff!(t) }.not_to raise_error
             expect { @t.dup.diff!(t, :surplus_col => true) }.to raise_error
           end
 
           it "should not raise on misplaced columns" do
-            t = table(%{
+            t = DataTable.from(%{
               | b | a |
               | d | c |
-            }, __FILE__, __LINE__)
+            })
             expect { @t.dup.diff!(t) }.not_to raise_error
             expect { @t.dup.diff!(t, :misplaced_col => true) }.to raise_error
           end
         end
 
-        def table(text, file, offset)
-          DataTable.parse(text, file, offset)
-        end
       end
 
-      describe "#new" do
+      describe "#from" do
         it "should allow Array of Hash" do
-          t1 = DataTable.new([{'name' => 'aslak', 'male' => 'true'}])
+          t1 = DataTable.from([{'name' => 'aslak', 'male' => 'true'}])
           expect( t1.to_s(:indent => 12, :color => false) ).to eq %{
             |     male |     name  |
             |     true |     aslak |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc.1
+  version: 2.0.0.rc.2
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -818,7 +818,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: cucumber-2.0.0.rc.1
+summary: cucumber-2.0.0.rc.2
 test_files:
 - features/docs/api/list_step_defs_as_json.feature
 - features/docs/api/run_cli_main_with_existing_runtime.feature