@@ -42,6 +42,8 @@ module Hirb # [:max_width] The maximum allowed width of all fields put together. This option is enforced except when the field_lengths option is set. # This doesn't count field borders as part of the total. # [:number] When set to true, numbers rows by adding a :hirb_number column as the first column. Default is false. + # [:change_fields] A hash to change old field names to new field names. This is useful when wanting to change auto-generated keys to + # more user-friendly names i.e. for array of arrays. # [:filters] A hash of fields and the filters that each row in the field must run through. The filter converts the cell's value by applying # a given proc or an array containing a method and optional arguments to it. # [:vertical] When set to true, renders a vertical table using Hirb::Helpers::VerticalTable. Default is false. @@ -64,7 +66,7 @@ module Hirb #:stopdoc: def initialize(rows, options={}) - @options = {:description=>true, :filters=>{}}.merge(options) + @options = {:description=>true, :filters=>{}, :change_fields=>{}}.merge(options) @fields = set_fields(rows) @rows = setup_rows(rows) @headers = @fields.inject({}) {|h,e| h[e] = e.to_s; h} @@ -79,7 +81,7 @@ module Hirb end def set_fields(rows) - if @options[:fields] + fields = if @options[:fields] @options[:fields].dup else if rows[0].is_a?(Hash) @@ -89,16 +91,22 @@ module Hirb rows[0].is_a?(Array) ? (0..rows[0].length - 1).to_a : [] end end + @options[:change_fields].each do |oldf, newf| + (index = fields.index(oldf)) ? fields[index] = newf : fields << newf + end + fields end def setup_rows(rows) - rows ||= [] - rows = [rows] unless rows.is_a?(Array) + rows = Array(rows) if rows[0].is_a?(Array) rows = rows.inject([]) {|new_rows, row| new_rows << array_to_indices_hash(row) } end + @options[:change_fields].each do |oldf, newf| + rows.each {|e| e[newf] = e.delete(oldf) if e.key?(oldf) } + end rows = filter_values(rows) rows.each_with_index {|e,i| e[:hirb_number] = (i + 1).to_s} if @options[:number] methods.grep(/_callback$/).sort.each do |meth| lib/hirb/helpers/table.rb @@ -319,6 +319,18 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase table([{:a=>1, :b=>2}, {:a=>3, :c=>4}], :all_fields=>true).should == expected_table end + test "change_fields option renders" do + expected_table = <<-TABLE.unindent + +------+-------+ + | name | value | + +------+-------+ + | 1 | 2 | + | 2 | 3 | + +------+-------+ + 2 rows in set + TABLE + table([[1,2],[2,3]], :change_fields=>{0=>'name', 1=>'value'}).should == expected_table + end end test "table can detect and run callbacks" do test/table_test.rb c6374e27d762701da50d7f05430c94e9e625727d Gabriel Horner gabriel.horner@gmail.com http://github.com/cldwalker/hirb/commit/c13cfcff459bf471938b4bcefa17d7c2fd96d6e6 c13cfcff459bf471938b4bcefa17d7c2fd96d6e6 2009-11-06T11:46:00-08:00 2009-11-06T11:46:00-08:00 added change_fields option to table 2cca2ab2ea2380bc8c716b886a6903cc4f995fbe Gabriel Horner gabriel.horner@gmail.com