Skip to content

Remove all the old Ast::Table cruft. #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattwynne merged 3 commits into from
Sep 13, 2014
Merged

Remove all the old Ast::Table cruft. #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6bb3a4
Remove all the old Ast::Table cruft.
tooky Sep 5, 2014
8d2f5d9
Consistent return type for Location#line
mattwynne Sep 12, 2014
a96105b
Tidy away multiline arg factory where it's used
mattwynne Sep 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/cucumber/core/ast.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
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'
Expand Down
231 changes: 8 additions & 223 deletions lib/cucumber/core/ast/data_table.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,48 +30,20 @@ class DataTable
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
Expand Down Expand Up @@ -106,108 +78,6 @@ def map(&block)
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
Expand All @@ -218,35 +88,14 @@ def inspect

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
Expand All @@ -260,70 +109,6 @@ def description_for_visitors
: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
Expand Down
20 changes: 12 additions & 8 deletions lib/cucumber/core/ast/location.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ class Location < Struct.new(:filepath, :lines)
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)
Expand Down Expand Up @@ -58,12 +62,12 @@ class Lines < Struct.new(:data)
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)
Expand Down
34 changes: 0 additions & 34 deletions lib/cucumber/core/ast/multiline_argument.rb
View file
Open in desktop

This file was deleted.

Loading