@@ -1,3 +1,4 @@ +* [#103] Log colors for the console are now configurable per log level. * [#102] New association method in data_factory * [#101] Update to file upload testing (build_file -> file_for_upload, and multipart support in put) * [#100] Inline routing parameters are being mutated CHANGELOG @@ -1,9 +1,11 @@ class Symbol + # See Mack::ViewHelpers::FormHelpers date_time_select for more information def date_time_select(*args) Thread.current[:view_template].date_time_select(self, *args) end - + + # See Mack::ViewHelpers::FormHelpers date_select for more information def date_select(*args) Thread.current[:view_template].date_select(self, *args) end lib/mack/core_extensions/symbol.rb @@ -81,9 +81,11 @@ module Mack "mack::default_respository_name" => "default", "mack::testing_framework" => "rspec", "log::detailed_requests" => true, - "log::db_color" => "yellow", + "log::db_color" => "cyan", "log::error_color" => "red", - "log::completed_color" => "green", + "log::fatal_color" => "red", + "log::warn_color" => "yellow", + "log::completed_color" => "purple", "log_level" => "info" }#.merge(eval("DEFAULTS_#{Mack.env.upcase}")) end lib/mack/initialization/configuration.rb @@ -1,7 +1,7 @@ #-- # Configure logging #++ - +require File.join(File.dirname(__FILE__), "..", "utils", "ansi", "ansi_color") module Mack def self.logger @@ -45,10 +45,14 @@ unless Mack.logger case data when /^(DEBUG:|INFO:|WARN:|ERROR:|FATAL:)\s\[.*\]\s(SELECT|INSERT|UPDATE|DELETE|CREATE|DROP)/ old_write(Mack::Utils::Ansi::Color.wrap(app_config.log.db_color, data)) - when /^(ERROR:|FATAL:)/ - old_write(Mack::Utils::Ansi::Color.wrap(app_config.log.error_color, data)) else - old_write(data) + level = data.match(/^\w+/).to_s + color = app_config.log.send("#{level.downcase}_color") + if color + old_write(Mack::Utils::Ansi::Color.wrap(color, data)) + else + old_write(data) + end end end lib/mack/initialization/logging.rb @@ -17,6 +17,23 @@ module Mack MINUTES << [(m < 10 ? "0#{m}" : m), m] end + # This will create a series of select boxes that compromise a time object. By default boxes will be + # created for day/month/year hour:minute. You can optionally turn on or off any of these boxes, including + # seconds by setting them to true/false. For example: + # <%= date_time_select :some_time, :days => false %> + # will not produce a select box for days, and so on... + # + # You can pass in an array of arrays to represent the options for any of the boxes like such: + # <%= date_time_select :some_time, :day_options => [[1,"one"], [2,"two"]] %> + # Will produce a day select box with only two options. Alternatively you can pass in an array of values + # and the options will be done for you. Like such: + # <%= date_time_select :some_time, :day_values => 1..60 %> + # Will produce a day select box with 60 options whose values and keys will be the same. + # + # The separators for dates and times can be set with the date_separator and time_separator options. By + # default they are: + # :date_separator => '/' + # :time_separator => ':' def date_time_select(name, *args) var = instance_variable_get("@#{name}") fe = FormElement.new(*args) @@ -27,7 +44,7 @@ module Mack years = [] (time.year - 5).upto(time.year + 5) { |y| years << [y, y]} - options = {:years => true, :months => true, :days => true, :hours => true, :minutes => true, :seconds => false, :year_options => years, :month_options => MONTHS, :day_options => DAYS, :hour_options => HOURS, :minute_options => MINUTES, :second_options => MINUTES}.merge(fe.options) + options = {:years => true, :months => true, :days => true, :hours => true, :minutes => true, :seconds => false, :year_options => years, :month_options => MONTHS, :day_options => DAYS, :hour_options => HOURS, :minute_options => MINUTES, :second_options => MINUTES, :date_separator => '/', :time_separator => ':'}.merge(fe.options) [:year, :month, :day, :hour, :minute, :second].each do |v| if options["#{v}_values".to_sym] @@ -51,18 +68,22 @@ module Mack time_boxes << dt_select(:minute, name, fe, time.min, options[:minute_options]) if options[:minutes] time_boxes << dt_select(:second, name, fe, time.sec, options[:second_options]) if options[:seconds] - boxes = date_boxes.join("/") + boxes = date_boxes.join(options[:date_separator]) unless time_boxes.empty? - boxes << " " << time_boxes.join(":") + boxes << " " << time_boxes.join(options[:time_separator]) end return label + boxes end - # Used just like date_time_select, but it has hours, minutes, and seconds turned off. - # + # Used just like date_time_select, but it has hours, minutes, and seconds turned off. See date_time_select + # for more options. # + # @user = User.new + # <%= :user.date_select :birth_date %> + # @some_time = Time.new + # <%= :date_select :some_time, :label => true %> def date_select(name, *args) fe = FormElement.new(*args) date_time_select(name, fe.calling_method, {:hours => false, :minutes => false, :seconds => false}.merge(fe.options)) lib/mack/view_helpers/date_time_helpers.rb 8410e68e7edfa7d7dbec9b8c34cb58ebdeb76ab7 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/7c790f0be79d372d6e0c8409d539bfa0c830afcd 7c790f0be79d372d6e0c8409d539bfa0c830afcd 2008-08-18T12:24:24-07:00 2008-08-18T12:24:24-07:00 Log colors for the console are now configurable per log level. [#103 state:resolved] d8b46c41a23ff5ab207c4cdb209a5792662d5d8f Mark Bates mark@markbates.com