lib/assert/view_helpers.rb in assert-2.19.2 vs lib/assert/view_helpers.rb in assert-2.19.3
- old
+ new
@@ -14,11 +14,11 @@
module ClassMethods
def option(name, *default_vals)
default = default_vals.size > 1 ? default_vals : default_vals.first
define_method(name) do |*args|
- if !(value = args.size > 1 ? args : args.first).nil?
+ unless (value = args.size > 1 ? args : args.first).nil?
instance_variable_set("@#{name}", value)
end
(val = instance_variable_get("@#{name}")).nil? ? default : val
end
end
@@ -36,15 +36,15 @@
def re_run_test_cmd(test_id)
"assert -t #{test_id.gsub(Dir.pwd, ".")}"
end
def tests_to_run_count_statement
- "#{self.tests_to_run_count} test#{"s" if self.tests_to_run_count != 1}"
+ "#{tests_to_run_count} test#{"s" if tests_to_run_count != 1}"
end
def result_count_statement
- "#{self.result_count} result#{"s" if self.result_count != 1}"
+ "#{result_count} result#{"s" if result_count != 1}"
end
# generate a comma-seperated sentence fragment given a list of items
def to_sentence(items)
if items.size <= 2
@@ -54,126 +54,134 @@
end
end
# generate an appropriate result summary msg for all tests passing
def all_pass_result_summary_msg
- if self.result_count < 1
+ if result_count < 1
"uhh..."
- elsif self.result_count == 1
+ elsif result_count == 1
"pass"
else
"all pass"
end
end
# print a result summary message for a given result type
def result_summary_msg(result_type)
- if result_type == :pass && self.all_pass?
- self.all_pass_result_summary_msg
+ if result_type == :pass && all_pass?
+ all_pass_result_summary_msg
else
- "#{self.send("#{result_type}_result_count")} #{result_type}"
+ "#{send("#{result_type}_result_count")} #{result_type}"
end
end
# generate a sentence fragment describing the breakdown of test results
- # if a block is given, yield each msg in the breakdown for custom formatting
+ # if a block is given, yield each msg in the breakdown for custom
+ # formatting.
def results_summary_sentence
- summaries = self.ocurring_result_types.map do |result_type|
- summary_msg = self.result_summary_msg(result_type)
+ summaries = ocurring_result_types.map do |result_type|
+ summary_msg = result_summary_msg(result_type)
block_given? ? yield(summary_msg, result_type) : summary_msg
end
- self.to_sentence(summaries)
+ to_sentence(summaries)
end
end
module Ansi
- # Table of supported styles/codes (http://en.wikipedia.org/wiki/ANSI_escape_code)
+ # Table of supported styles/codes
+ # (http://en.wikipedia.org/wiki/ANSI_escape_code).
CODES = {
- :clear => 0,
- :reset => 0,
- :bright => 1,
- :bold => 1,
- :faint => 2,
- :dark => 2,
- :italic => 3,
- :underline => 4,
- :underscore => 4,
- :blink => 5,
- :slow_blink => 5,
- :rapid => 6,
- :rapid_blink => 6,
- :invert => 7,
- :inverse => 7,
- :reverse => 7,
- :negative => 7,
- :swap => 7,
- :conceal => 8,
- :concealed => 8,
- :hide => 9,
- :strike => 9,
+ clear: 0,
+ reset: 0,
+ bright: 1,
+ bold: 1,
+ faint: 2,
+ dark: 2,
+ italic: 3,
+ underline: 4,
+ underscore: 4,
+ blink: 5,
+ slow_blink: 5,
+ rapid: 6,
+ rapid_blink: 6,
+ invert: 7,
+ inverse: 7,
+ reverse: 7,
+ negative: 7,
+ swap: 7,
+ conceal: 8,
+ concealed: 8,
+ hide: 9,
+ strike: 9,
- :default_font => 10,
- :font_default => 10,
- :font0 => 10,
- :font1 => 11,
- :font2 => 12,
- :font3 => 13,
- :font4 => 14,
- :font5 => 15,
- :font6 => 16,
- :font7 => 17,
- :font8 => 18,
- :font9 => 19,
- :fraktur => 20,
- :bright_off => 21,
- :bold_off => 21,
- :double_underline => 21,
- :clean => 22,
- :italic_off => 23,
- :fraktur_off => 23,
- :underline_off => 24,
- :blink_off => 25,
- :inverse_off => 26,
- :positive => 26,
- :conceal_off => 27,
- :show => 27,
- :reveal => 27,
- :crossed_off => 29,
- :crossed_out_off => 29,
+ default_font: 10,
+ font_default: 10,
+ font0: 10,
+ font1: 11,
+ font2: 12,
+ font3: 13,
+ font4: 14,
+ font5: 15,
+ font6: 16,
+ font7: 17,
+ font8: 18,
+ font9: 19,
+ fraktur: 20,
+ bright_off: 21,
+ bold_off: 21,
+ double_underline: 21,
+ clean: 22,
+ italic_off: 23,
+ fraktur_off: 23,
+ underline_off: 24,
+ blink_off: 25,
+ inverse_off: 26,
+ positive: 26,
+ conceal_off: 27,
+ show: 27,
+ reveal: 27,
+ crossed_off: 29,
+ crossed_out_off: 29,
- :black => 30,
- :red => 31,
- :green => 32,
- :yellow => 33,
- :blue => 34,
- :magenta => 35,
- :cyan => 36,
- :white => 37,
+ black: 30,
+ red: 31,
+ green: 32,
+ yellow: 33,
+ blue: 34,
+ magenta: 35,
+ cyan: 36,
+ white: 37,
- :on_black => 40,
- :on_red => 41,
- :on_green => 42,
- :on_yellow => 43,
- :on_blue => 44,
- :on_magenta => 45,
- :on_cyan => 46,
- :on_white => 47,
+ on_black: 40,
+ on_red: 41,
+ on_green: 42,
+ on_yellow: 43,
+ on_blue: 44,
+ on_magenta: 45,
+ on_cyan: 46,
+ on_white: 47,
- :frame => 51,
- :encircle => 52,
- :overline => 53,
- :frame_off => 54,
- :encircle_off => 54,
- :overline_off => 55,
+ frame: 51,
+ encircle: 52,
+ overline: 53,
+ frame_off: 54,
+ encircle_off: 54,
+ overline_off: 55,
}
def self.code_for(*style_names)
- style_names.map{ |n| "\e[#{CODES[n]}m" if CODES.key?(n) }.compact.join("")
+ style_names
+ .map{ |n| "\e[#{CODES[n]}m" if CODES.key?(n) }
+ .compact
+ .join("")
end
def ansi_styled_msg(msg, result_type)
- return msg if !self.is_tty? || !self.styled
- code = Assert::ViewHelpers::Ansi.code_for(*self.send("#{result_type}_styles"))
+ return msg if !is_tty? || !styled
+ code =
+ Assert::ViewHelpers::Ansi.code_for(
+ *send("#{result_type}_styles"),
+ )
return msg if code.empty?
code + msg + Assert::ViewHelpers::Ansi.code_for(:reset)
end
end
end