Skip to content
Merged
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: 0 additions & 14 deletions lib/text_chart/designer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ def draw_bars

chart_line -= 1 unless t == bar_top
end

draw_reference_line(chart_line, ref_width + y_axis_width, bar_start)
end

@chart_canvas
Expand All @@ -71,7 +69,6 @@ def paint
next if row.gsub!(@text_chart.title, colorize(@text_chart.title, :bold))

row.gsub!(/-?\d/) { colorize($&, :cyan) }
row.gsub!(/'+/) { colorize($&, :cyan) }
row.gsub!(/#+/) { colorize($&, :blue) }
end
@chart_canvas
Expand Down Expand Up @@ -133,17 +130,6 @@ def draw_references
end
end

def draw_reference_line(chart_line, line_start, line_end)
current_position = line_start
until current_position == line_end
if @chart_canvas[chart_line][current_position] != "#"
@chart_canvas[chart_line][current_position] = "'"
end

current_position += 1
end
end

# @param string to be colorized [String]
# @param desired color/formatting [Symbol]
# @return colorized string [String]
Expand Down
76 changes: 38 additions & 38 deletions test/text_chart/designer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,67 +95,67 @@ class TextChart::DesignerTest < Test::Unit::TestCase
negative_result = negative.draw_bars.join

assert_equal sorted_result, <<-END
'''''''''''''''''''''''''''''''''''''###
'''''''''''''''''''''''''''''''''### ###
'''''''''''''''''''''''''''''### ### ###
'''''''''''''''''''''''''### ### ### ###
'''''''''''''''''''''### ### ### ### ###
'''''''''''''''''### ### ### ### ### ###
'''''''''''''### ### ### ### ### ### ###
'''''''''### ### ### ### ### ### ### ###
'''''### ### ### ### ### ### ### ### ###
'### ### ### ### ### ### ### ### ### ###
###
### ###
### ### ###
### ### ### ###
### ### ### ### ###
### ### ### ### ### ###
### ### ### ### ### ### ###
### ### ### ### ### ### ### ###
### ### ### ### ### ### ### ### ###
### ### ### ### ### ### ### ### ### ###

END

assert_equal random_order_result, <<-END
'''''###
'''''###'''''''''''''''''''''''''###
'''''###'''''''''''''''''''''### ###
'''''###'### ### ###
'''''###'###'''''''''''''''''###'###'###
'''''###'###'### ### ### ###
'''''###'###'###'''''### ### ### ###
'### ### ### ### ### ### ### ###
'###'###'###'###'''''###'### ### ### ###
'###'###'###'###'### ### ### ### ### ###
###
### ###
### ### ###
### ### ### ###
### ### ### ### ###
### ### ### ### ### ###
### ### ### ### ### ### ###
### ### ### ### ### ### ### ###
### ### ### ### ### ### ### ### ###
### ### ### ### ### ### ### ### ### ###

END

assert_equal with_zero_result, <<-END
'''''''''''''''''''''###
'''''''''### ###
'''''''''###'''''### ###
'### ### ### ###
'###'### ### ### ###
'###'###'###'### ### ###
###
### ###
### ### ###
### ### ### ###
### ### ### ### ###
### ### ### ### ### ###

END

assert_equal gaps_result, <<-END
'''''''''###
###
###
###
###
###
'''''''''###'''''###
###
### ###
### ###
### ###
'### ### ###
'###'### ### ###
'###'###'###'### ###
### ### ###
### ### ### ###
### ### ### ### ###

END

assert_equal negative_result, <<-END
'###
'###'''''''''''''''''''''###
'###'''''''''''''### ###
'###'''''''''''''###'### ###
'###'### ### ### ###
'###'###'### ### ### ###
'###'###'###'### ### ### ###
###
### ###
### ### ###
### ### ### ###
### ### ### ### ###
### ### ### ### ### ###
### ### ### ### ### ### ###

END
end
Expand Down
74 changes: 37 additions & 37 deletions test/text_chart_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,80 +36,80 @@ class TextChartTest < Test::Unit::TestCase
No sample
Testing

0|'###
0| ###
------
EXPECTED
assert_equal sorted_result, <<~EXPECTED
Sorted sample
Testing

10|'''''''''''''''''''''###
9|'''''''''''''''''### ###
8|'''''''''''''### ### ###
7|'''''''''### ### ### ###
6|'''''### ### ### ### ###
5|'### ### ### ### ### ###
10| ###
9| ### ###
8| ### ### ###
7| ### ### ### ###
6| ### ### ### ### ###
5| ### ### ### ### ### ###
--------------------------
EXPECTED
assert_equal random_order_result, <<~EXPECTED
Random order sample
Testing

10|'''''###
9|'''''###'''''''''''''''''''''''''###
8|'''''###'''''''''''''''''''''### ###
7|'''''###'### ### ###
6|'''''###'###'''''''''''''''''###'###'###
5|'''''###'###'### ### ### ###
4|'''''###'###'###'''''### ### ### ###
3|'### ### ### ### ### ### ### ###
2|'###'###'###'###'''''###'### ### ### ###
1|'###'###'###'###'### ### ### ### ### ###
10| ###
9| ### ###
8| ### ### ###
7| ### ### ### ###
6| ### ### ### ### ###
5| ### ### ### ### ### ###
4| ### ### ### ### ### ### ###
3| ### ### ### ### ### ### ### ###
2| ### ### ### ### ### ### ### ### ###
1| ### ### ### ### ### ### ### ### ### ###
------------------------------------------
EXPECTED
assert_equal duplicated_and_gaps_result, <<~EXPECTED
Duplicated and gaps sample
Testing

12|'###
12| ###
11| ###
10| ###
9| ###
8| ###
7| ###
6|'###'''''''''''''''''''''###
6| ### ###
5| ### ###
4| ### ###
3|'###'''''''''''''###'### ###
2|'###'### ### ### ###
1|'###'###'### ### ### ###
0|'###'###'###'### ### ### ###
3| ### ### ### ###
2| ### ### ### ### ###
1| ### ### ### ### ### ###
0| ### ### ### ### ### ### ###
------------------------------
EXPECTED
assert_equal with_negative_numbers_result, <<~EXPECTED
With negative numbers sample
Testing

3|'###
2|'###'''''''''''''''''''''###
1|'###'''''''''''''### ###
0|'###'''''''''''''###'### ###
-1|'###'### ### ### ###
-2|'###'###'### ### ### ###
-3|'###'###'###'### ### ### ###
3| ###
2| ### ###
1| ### ### ###
0| ### ### ### ###
-1| ### ### ### ### ###
-2| ### ### ### ### ### ###
-3| ### ### ### ### ### ### ###
------------------------------
EXPECTED
assert_equal with_colors_result, <<~EXPECTED
\e[1mWith colors\e[22m
Testing

\e[36m3\e[0m|\e[36m'\e[0m\e[34m###\e[0m
\e[36m2\e[0m|\e[36m'\e[0m\e[34m###\e[0m\e[36m'''''''''''''''''''''\e[0m\e[34m###\e[0m
\e[36m1\e[0m|\e[36m'\e[0m\e[34m###\e[0m\e[36m'''''''''''''\e[0m\e[34m###\e[0m \e[34m###\e[0m
\e[36m0\e[0m|\e[36m'\e[0m\e[34m###\e[0m\e[36m'''''''''''''\e[0m\e[34m###\e[0m\e[36m'\e[0m\e[34m###\e[0m \e[34m###\e[0m
\e[36m-1\e[0m|\e[36m'\e[0m\e[34m###\e[0m\e[36m'\e[0m\e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
\e[36m-2\e[0m|\e[36m'\e[0m\e[34m###\e[0m\e[36m'\e[0m\e[34m###\e[0m\e[36m'\e[0m\e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
\e[36m-3\e[0m|\e[36m'\e[0m\e[34m###\e[0m\e[36m'\e[0m\e[34m###\e[0m\e[36m'\e[0m\e[34m###\e[0m\e[36m'\e[0m\e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
\e[36m3\e[0m| \e[34m###\e[0m
\e[36m2\e[0m| \e[34m###\e[0m \e[34m###\e[0m
\e[36m1\e[0m| \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
\e[36m0\e[0m| \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
\e[36m-1\e[0m| \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
\e[36m-2\e[0m| \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
\e[36m-3\e[0m| \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m \e[34m###\e[0m
------------------------------
EXPECTED
end
Expand Down