Skip to content

Reduce repeated calls to node name and type #131

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions lib/creek/sheet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,14 @@ def rows_generator(include_meta_data = false, use_simple_rows_format = false)
name_v = "#{prefix}v"
name_t = "#{prefix}t"
end
if node.name == name_row && node.node_type == opener
node_name = node.name
node_type = node.node_type
if node_name == name_row && node_type == opener
row = node.attributes
row['cells'] = {}
cells = {}
y << (include_meta_data ? row : cells) if node.self_closing?
elsif node.name == name_row && node.node_type == closer
elsif node_name == name_row && node_type == closer
processed_cells = fill_in_empty_cells(cells, row['r'], cell, use_simple_rows_format)
@headers = processed_cells if with_headers && row['r'] == HEADERS_ROW_NUMBER

Expand All @@ -138,11 +140,11 @@ def rows_generator(include_meta_data = false, use_simple_rows_format = false)

row['cells'] = processed_cells
y << (include_meta_data ? row : processed_cells)
elsif node.name == name_c && node.node_type == opener
elsif node_name == name_c && node_type == opener
cell_type = node.attributes['t']
cell_style_idx = node.attributes['s']
cell = node.attributes['r']
elsif (node.name == name_v || node.name == name_t) && node.node_type == opener
elsif (node_name == name_v || node_name == name_t) && node_type == opener
unless cell.nil?
node.read
cells[cell] = convert(node.value, cell_type, cell_style_idx)
Expand Down