cucumber-core 1.0.0.beta.2 → 1.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3c0bb05acd739195cf8f0bd0b70eef1b871a4db
-  data.tar.gz: d88fa3acff3893e9c35572538d6accacc315cef2
+  metadata.gz: 216ba512564acf2ba3726b04c0c8a59cee4a10fc
+  data.tar.gz: 7ce2adb926a31742c55b1e2956e6e7a4173a00a2
 SHA512:
-  metadata.gz: e1438e706683ca3f1a404eeece0ad23d693128795819e5e73902101ddd4f1152e5015683f87fe285c9fe4b0a00ea93c78245d436abf6314a57b330ed521498ec
-  data.tar.gz: f45b790ea4a0cadf37da7ccaa357582193a7a570be9df6bbaead52345c9bf37dc78828ec9aca6f53e44d8609bd5ff6b017b9eff7dea1b35efc8a22a47e3ddaa5
+  metadata.gz: 9cbfeff310db927f86e1660216fab2960e21020dc926e8279b56b860834b79351c40764f47594309137646cc1267ac115205c6b50b405f7d1528cb592b3a8709
+  data.tar.gz: ad2d596044985b3c7e7679af0933a7a4cc9e92d5f72d3509a9089b516a866bfbf2afc76e9ba1b82c482e7b096c9dde3d1f2661833856bd2bcb8ef507f6707338

data/lib/cucumber/core.rb

@@ -2,7 +2,6 @@ require 'cucumber/core/gherkin/parser'
 require 'cucumber/core/compiler'
 require 'cucumber/core/test/runner'
 require 'cucumber/core/test/mapper'
-require 'cucumber/core/test/filters/debug_filter'
 
 module Cucumber
   module Core

data/lib/cucumber/core/ast.rb

@@ -6,7 +6,6 @@ require 'cucumber/core/ast/empty_multiline_argument'
 require 'cucumber/core/ast/background'
 require 'cucumber/core/ast/scenario'
 require 'cucumber/core/ast/step'
-require 'cucumber/core/ast/multiline_argument'
 require 'cucumber/core/ast/doc_string'
 require 'cucumber/core/ast/data_table'
 require 'cucumber/core/ast/scenario_outline'

data/lib/cucumber/core/ast/data_table.rb

@@ -30,48 +30,20 @@ module Cucumber
         include DescribesItself
         include HasLocation
 
-        class Builder
-          attr_reader :rows
-
-          def initialize
-            @rows = []
-          end
-
-          def row(row, line_number)
-            @rows << row
-          end
-
-          def eof
-          end
-        end
-
         include ::Gherkin::Rubify
 
-        NULL_CONVERSIONS = Hash.new({ :strict => false, :proc => lambda{ |cell_value| cell_value } }).freeze
-
-        attr_accessor :file
-
-        def self.parse(text, uri, location)
-          builder = Builder.new
-          lexer = ::Gherkin::Lexer::I18nLexer.new(builder)
-          lexer.scan(text)
-          new(builder.rows, location)
-        end
-
         # Creates a new instance. +raw+ should be an Array of Array of String
         # or an Array of Hash
         # You don't typically create your own DataTable objects - Cucumber will do
         # it internally and pass them to your Step Definitions.
         #
         def initialize(raw, location)
-          @cells_class = Cells
-          @cell_class = Cell
           raw = ensure_array_of_array(rubify(raw))
-          # Verify that it's square
-          raw.transpose
-          create_cell_matrix(raw)
+          verify_rows_are_same_length(raw)
+          @raw = raw.freeze
           @location = location
         end
+        attr_reader :raw
 
         def to_step_definition_arg
           dup
@@ -106,108 +78,6 @@ module Cucumber
           self.class.new(new_raw, location)
         end
 
-        # Converts this table into an Array of Hash where the keys of each
-        # Hash are the headers in the table. For example, a DataTable built from
-        # the following plain text:
-        #
-        #   | a | b | sum |
-        #   | 2 | 3 | 5   |
-        #   | 7 | 9 | 16  |
-        #
-        # Gets converted into the following:
-        #
-        #   [{'a' => '2', 'b' => '3', 'sum' => '5'}, {'a' => '7', 'b' => '9', 'sum' => '16'}]
-        #
-        def hashes
-          build_hashes
-        end
-
-        # Converts this table into a Hash where the first column is
-        # used as keys and the second column is used as values
-        #
-        #   | a | 2 |
-        #   | b | 3 |
-        #
-        # Gets converted into the following:
-        #
-        #   {'a' => '2', 'b' => '3'}
-        #
-        # The table must be exactly two columns wide
-        #
-        def rows_hash
-          verify_table_width(2)
-          self.transpose.hashes[0]
-        end
-
-        # Gets the raw data of this table. For example, a DataTable built from
-        # the following plain text:
-        #
-        #   | a | b |
-        #   | c | d |
-        #
-        # gets converted into the following:
-        #
-        #   [['a', 'b'], ['c', 'd']]
-        #
-        def raw
-          cell_matrix.map do |row|
-            row.map do |cell|
-              cell.value
-            end
-          end
-        end
-
-        def column_names #:nodoc:
-          cell_matrix[0].map { |cell| cell.value }
-        end
-
-        def rows
-          hashes.map do |hash|
-            hash.values_at(*headers)
-          end
-        end
-
-        # For testing only
-        def to_sexp #:nodoc:
-          [:table, *cells_rows.map{|row| row.to_sexp}]
-        end
-
-        def to_hash(cells) #:nodoc:
-          hash = Hash.new do |the_hash, key|
-            the_hash[key.to_s] if key.is_a?(Symbol)
-          end
-          column_names.each_with_index do |column_name, column_index|
-            hash[column_name] = cells.value(column_index)
-          end
-          hash
-        end
-
-        def verify_table_width(width) #:nodoc:
-          raise %{The table must have exactly #{width} columns} unless raw[0].size == width
-        end
-
-        def cells_rows #:nodoc:
-          cell_matrix.map do |cell_row|
-            @cells_class.new(self, cell_row)
-          end
-        end
-
-        def headers #:nodoc:
-          raw.first
-        end
-
-        def cell_matrix #:nodoc:
-          @cell_matrix
-        end
-
-        def col_width(col) #:nodoc:
-          columns[col].__send__(:width)
-        end
-
-        def each_cell(&proc)
-          cell_matrix.each{ |row| row.each(&proc) }
-        end
-
         def ==(other)
           other.class == self.class && raw == other.raw
         end
@@ -218,35 +88,14 @@ module Cucumber
 
         private
 
-        TO_S_PREFIXES = Hash.new('    ')
-        TO_S_PREFIXES[:comment]   = '(+) '
-        TO_S_PREFIXES[:undefined] = '(-) '
-
-        def build_hashes
-          cells_rows[1..-1].map do |row|
-            row.to_hash
-          end
-        end
-
-        def create_cell_matrix(raw) #:nodoc:
-          @cell_matrix = raw.map do |raw_row|
-            line = raw_row.line rescue -1
-            raw_row.map do |raw_cell|
-              new_cell(raw_cell, line)
-            end
-          end
-        end
-
-        def columns #:nodoc:
-          cell_matrix.transpose.map do |cell_row|
-            @cells_class.new(self, cell_row)
+        def verify_rows_are_same_length(raw)
+          begin
+            raw.transpose
+          rescue IndexError
+            raise ArgumentError, "Rows must all be the same length"
           end
         end
 
-        def new_cell(raw_cell, line) #:nodoc:
-          @cell_class.new(raw_cell, self, line)
-        end
-
         def ensure_array_of_array(array)
           Hash === array[0] ? hashes_to_array(array) : array
         end
@@ -260,70 +109,6 @@ module Cucumber
           :data_table
         end
 
-        # Represents a row of cells or columns of cells
-        class Cells #:nodoc:
-          include Enumerable
-          include Gherkin::Formatter::Escaping
-
-          attr_reader :exception
-
-          def initialize(table, cells)
-            @table, @cells = table, cells
-          end
-
-          # For testing only
-          def to_sexp #:nodoc:
-            [:row, line, *@cells.map{|cell| cell.to_sexp}]
-          end
-
-          def to_hash #:nodoc:
-            @to_hash ||= @table.to_hash(self)
-          end
-
-          def value(n) #:nodoc:
-            self[n].value
-          end
-
-          def [](n)
-            @cells[n]
-          end
-
-          def line
-            @cells[0].line
-          end
-
-          private
-
-          def width
-            map{|cell| cell.value ? escape_cell(cell.value.to_s).unpack('U*').length : 0}.max
-          end
-
-          def each(&proc)
-            @cells.each(&proc)
-          end
-        end
-
-        class Cell #:nodoc:
-          attr_reader :line, :table
-          attr_accessor :status, :value
-
-          def initialize(value, table, line)
-            @value, @table, @line = value, table, line
-          end
-
-          def inspect!
-            @value = "(i) #{value.inspect}"
-          end
-
-          def ==(o)
-            value == o.value
-          end
-
-          # For testing only
-          def to_sexp #:nodoc:
-            [:cell, @value]
-          end
-        end
       end
     end
   end

data/lib/cucumber/core/ast/examples_table.rb

@@ -12,16 +12,12 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        attr_reader :header, :keyword, :tags, :comments, :location
+        attr_reader :header, :keyword, :tags, :comments, :location, :gherkin_statement
 
         include Cucumber.initializer(
-          :location, :comments, :tags, :keyword, :title, :description, :header, :example_rows
+          :gherkin_statement, :location, :comments, :tags, :keyword, :title, :description, :header, :example_rows
         )
 
-        def gherkin_statement(node=nil)
-          @gherkin_statement ||= node
-        end
-
         private
 
         def description_for_visitors

data/lib/cucumber/core/ast/feature.rb

@@ -12,19 +12,14 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        attr_accessor :language
-        attr_reader :feature_elements
-        attr_reader :comments, :background, :tags, :keyword, :location, :title
+        attr_reader :feature_elements, :language
+        attr_reader :comments, :background, :tags, :keyword, :location, :title, :gherkin_statement
 
-        include Cucumber.initializer(:location, :background, :comments, :tags, :keyword, :title, :description, :feature_elements)
+        include Cucumber.initializer(:gherkin_statement, :language, :location, :background, :comments, :tags, :keyword, :title, :description, :feature_elements)
         def initialize(*)
           super
         end
 
-        def gherkin_statement(node = nil)
-          @gherkin_statement ||= node
-        end
-
         def children
           [background] + @feature_elements
         end

data/lib/cucumber/core/ast/location.rb

@@ -13,10 +13,14 @@ module Cucumber
         def_delegator :filepath, :same_as?
         def_delegator :filepath, :filename, :file
 
-        def initialize(filepath, lines=WILDCARD)
+        def self.of_caller
+          file, raw_line = *caller[1].split(':')[0..1]
+          new(file, raw_line.to_i)
+        end
+
+        def initialize(filepath, raw_lines=WILDCARD)
           filepath || raise(ArgumentError, "file is mandatory")
-          lines || raise(ArgumentError, "line is mandatory")
-          super(FilePath.new(filepath), Lines.new(lines))
+          super(FilePath.new(filepath), Lines.new(raw_lines))
         end
 
         def match?(other)
@@ -58,12 +62,12 @@ module Cucumber
           protected :data
           attr_reader :line
 
-          def initialize(line)
-            if Cucumber::JRUBY && line.is_a?(::Java::GherkinFormatterModel::Range)
-              line = Range.new(line.first, line.last)
+          def initialize(raw_data)
+            if Cucumber::JRUBY && raw_data.is_a?(::Java::GherkinFormatterModel::Range)
+              raw_data = Range.new(raw_data.first, raw_data.last)
             end
-            @line = line
-            super Array(line).to_set
+            super Array(raw_data).to_set
+            @line = data.first
           end
 
           def include?(other)

data/lib/cucumber/core/ast/outline_step.rb

@@ -10,22 +10,15 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        attr_reader :language, :location, :keyword, :name, :multiline_arg
+        attr_reader :gherkin_statement, :language, :location, :keyword, :name, :multiline_arg
 
-        def initialize(language, location, keyword, name, multiline_arg)
-          @language, @location, @keyword, @name, @multiline_arg = language, location, keyword, name, multiline_arg
+        def initialize(gherkin_statement, language, location, keyword, name, multiline_arg)
+          @gherkin_statement, @language, @location, @keyword, @name, @multiline_arg = gherkin_statement, language, location, keyword, name, multiline_arg
           @language || raise("Language is required!")
-          @gherkin_statement = nil
-        end
-
-        def gherkin_statement(node = nil)
-          @gherkin_statement ||= node
         end
 
         def to_step(row)
-          step = Ast::Step.new(language, location, keyword, row.expand(name), replace_multiline_arg(row))
-          step.gherkin_statement(@gherkin_statement)
-          step
+          Ast::ExpandedOutlineStep.new(self, gherkin_statement, language, row.location, keyword, row.expand(name), replace_multiline_arg(row))
         end
 
         private

data/lib/cucumber/core/ast/scenario_outline.rb

@@ -18,13 +18,9 @@ module Cucumber
         attr_reader :line
         private :line
 
-        include Cucumber.initializer(:language, :location, :background, :comments, :tags, :feature_tags, :keyword, :title, :description, :steps, :examples_tables)
+        include Cucumber.initializer(:gherkin_statement, :language, :location, :background, :comments, :tags, :feature_tags, :keyword, :title, :description, :steps, :examples_tables)
 
-        attr_reader :comments, :tags, :keyword, :background, :location
-
-        def gherkin_statement(node = nil)
-          @gherkin_statement ||= node
-        end
+        attr_reader :comments, :tags, :keyword, :background, :location, :gherkin_statement
 
         private
 

data/lib/cucumber/core/ast/step.rb

@@ -8,20 +8,20 @@ module Cucumber
         include HasLocation
         include DescribesItself
 
-        attr_reader :keyword, :name, :language, :exception, :multiline_arg
+        attr_reader :keyword, :name, :language, :exception, :multiline_arg, :gherkin_statement
 
-        def initialize(language, location, keyword, name, multiline_arg)
-          @location, @keyword, @name, @multiline_arg = location, keyword, name, multiline_arg
-        end
-
-        def gherkin_statement(node = nil)
-          @gherkin_statement ||= node
+        def initialize(gherkin_statement, language, location, keyword, name, multiline_arg)
+          @gherkin_statement, @location, @keyword, @name, @multiline_arg = gherkin_statement, location, keyword, name, multiline_arg
         end
 
         def to_sexp
           [:step, line, keyword, name, @multiline_arg.to_sexp]
         end
 
+        def backtrace_line
+          "#{location}:in `#{keyword}#{name}'"
+        end
+
         private
 
         def children
@@ -32,6 +32,27 @@ module Cucumber
           :step
         end
       end
+
+      class ExpandedOutlineStep < Step #:nodoc:
+
+        def initialize(outline_step, gherkin_statement, language, location, keyword, name, multiline_arg)
+          @outline_step, @gherkin_statement, @location, @keyword, @name, @multiline_arg = outline_step, gherkin_statement, location, keyword, name, multiline_arg
+        end
+
+        alias :self_match_locations? :match_locations?
+
+        def match_locations?(queried_locations)
+          self_match_locations?(queried_locations) or @outline_step.match_locations?(queried_locations)
+        end
+
+        alias :step_backtrace_line :backtrace_line
+
+        def backtrace_line
+          "#{step_backtrace_line}\n" +
+          "#{@outline_step.location}:in `#{@outline_step.keyword}#{@outline_step.name}'"
+        end
+
+      end
     end
   end
 end