Skip to content
Open
Show file tree
Hide file tree
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
14 changes: 10 additions & 4 deletions lib/text-table/cell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,20 @@ def initialize(options = {}) #:nodoc:
@colspan = options[:colspan] || 1
end

# visible width: without terminal escapes
def width #:nodoc:
value.gsub(/\033\[[^m]+m/, '').length
end

def to_s #:nodoc:
invisible = value.length - width
([' ' * table.horizontal_padding]*2).join case align
when :left
value.ljust cell_width
value.ljust cell_width+invisible
when :right
value.rjust cell_width
value.rjust cell_width+invisible
when :center
value.center cell_width
value.center cell_width+invisible
end
end

Expand All @@ -48,4 +54,4 @@ def cell_width #:nodoc:

end
end
end
end
2 changes: 1 addition & 1 deletion lib/text-table/table.rb
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def all_text_table_rows #:nodoc:
def column_widths #:nodoc:
@column_widths ||= \
all_text_table_rows.reject {|row| row.cells == :separator}.map do |row|
row.cells.map {|cell| [(cell.value.length/cell.colspan.to_f).ceil] * cell.colspan}.flatten
row.cells.map {|cell| [(cell.width/cell.colspan.to_f).ceil] * cell.colspan}.flatten
end.transpose.map(&:max)
end

Expand Down
50 changes: 50 additions & 0 deletions spec/integration/alignment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,56 @@
end
end

describe 'colorized cell alignment' do
let(:rows) { @rows.map { |row| row.map { |cell| { :value => colorize(cell, :red), :align => align } } } }
subject { decolor(table.to_s) }

context 'when left' do
let(:align) { :left }

it { should == deindent(%q{
+------+------+------+------+
| a | bb | ccc | dddd |
+------+------+------+------+
| aa | bbb | cccc | d |
| aaa | bbbb | c | dd |
+------+------+------+------+
| aaaa | b | cc | ddd |
+------+------+------+------+
}) }
end

context 'when center' do
let(:align) { :center }

it { should == deindent(%q{
+------+------+------+------+
| a | bb | ccc | dddd |
+------+------+------+------+
| aa | bbb | cccc | d |
| aaa | bbbb | c | dd |
+------+------+------+------+
| aaaa | b | cc | ddd |
+------+------+------+------+
}) }
end

context 'when right' do
let(:align) { :right }

it { should == deindent(%q{
+------+------+------+------+
| a | bb | ccc | dddd |
+------+------+------+------+
| aa | bbb | cccc | d |
| aaa | bbbb | c | dd |
+------+------+------+------+
| aaaa | b | cc | ddd |
+------+------+------+------+
}) }
end
end

describe 'cell alignment' do
let(:rows) { @rows.map { |row| row.map { |cell| { :value => cell, :align => align } } } }

Expand Down
22 changes: 22 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,25 @@
def deindent(table)
table.gsub(/^\s*/, '')
end

def decolor(table)
table.gsub(/\033\[[^m]+m/, '')
end

TERMINAL_COLOR = {
:black => 0,
:red => 1,
:green => 2,
:yellow => 3,
:blue => 4,
:magenta => 5,
:cyan => 6,
:white => 7
}

def colorize(text, foreground = nil, background = nil)
codes = [ ]
codes << 30 + TERMINAL_COLOR[foreground] if foreground
codes << 40 + TERMINAL_COLOR[background] if background
"\x1b[#{codes.join(';')}m#{text}\x1b[0m"
end