table_helper 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 == master
 
+== 0.2.1 / 2009-04-25
+
+* Automatically determine the colspan for the last footer to match the number of headers
+* Fix default headers including all model columns when using :select in the collection query
+
 == 0.2.0 / 2009-04-25
 
 * Reorganize documentation

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'table_helper'
-  s.version           = '0.2.0'
+  s.version           = '0.2.1'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds a helper method for generating HTML tables from collections'
   

data/lib/table_helper/footer.rb

@@ -25,6 +25,11 @@ module TableHelper
     end
     
     def html #:nodoc:
+      # Force the last cell to span the remaining columns
+      cells = row.cells.values
+      colspan = table.header.columns.length - cells[0..-2].inject(0) {|count, (name, cell)| count += (cell[:colspan] || 1).to_i}
+      cells.last[:colspan] ||= colspan if colspan > 1
+      
       html_options = @html_options.dup
       html_options[:style] = "display: none; #{html_options[:style]}".strip if table.empty? && hide_when_empty
       

data/lib/table_helper/header.rb

@@ -33,7 +33,17 @@ module TableHelper
       # pre-fill the header with those columns so that the user doesn't
       # have to
       klass = table.klass
-      column(*klass.column_names.map(&:to_sym)) if klass && klass.respond_to?(:column_names)
+      if klass && klass.respond_to?(:column_names)
+        if !table.empty? && klass < ActiveRecord::Base
+          # Make sure only the attributes that have been loaded are used
+          column_names = table.collection.first.attributes.keys
+        else
+          # Assume all attributes are loaded
+          column_names = klass.column_names
+        end
+        
+        column(*column_names.map(&:to_sym))
+      end
       
       @customized = false
     end

data/test/app_root/app/models/person.rb

@@ -0,0 +1,2 @@
+class Person < ActiveRecord::Base
+end

data/test/app_root/db/migrate/001_create_people.rb

@@ -0,0 +1,11 @@
+class CreatePeople < ActiveRecord::Migration
+  def self.up
+    create_table :people do |t|
+      t.string :first_name, :last_name
+    end
+  end
+  
+  def self.down
+    drop_table :people
+  end
+end

data/test/test_helper.rb

@@ -3,6 +3,9 @@ $:.unshift("#{File.dirname(__FILE__)}/../../plugin_test_helper/lib")
 require 'rubygems'
 require 'plugin_test_helper'
 
+# Run the migrations
+ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
+
 Test::Unit::TestCase.class_eval do
   private
     def assert_html_equal(expected, actual)

data/test/unit/footer_test.rb

@@ -44,8 +44,8 @@ end
 
 class FooterWithCellsTest < Test::Unit::TestCase
   def setup
-    table = TableHelper::CollectionTable.new([Object.new])
-    @footer = TableHelper::Footer.new(table)
+    @table = TableHelper::CollectionTable.new([Object.new])
+    @footer = TableHelper::Footer.new(@table)
     @cell = @footer.cell :total, 20
   end
   
@@ -63,6 +63,19 @@ class FooterWithCellsTest < Test::Unit::TestCase
     end_str
     assert_html_equal expected, @footer.html
   end
+  
+  def test_should_include_colspan_if_more_headers_than_footers
+    @table.header :title, :name, :value
+    
+    expected = <<-end_str
+      <tfoot>
+        <tr>
+          <td class="object-total" colspan="3">20</td>
+        </tr>
+      </tfoot>
+    end_str
+    assert_html_equal expected, @footer.html
+  end
 end
 
 class FooterWithEmptyCollectionTest < Test::Unit::TestCase

data/test/unit/header_test.rb

@@ -250,3 +250,21 @@ class HeaderWithCustomHtmlOptionsTest < Test::Unit::TestCase
     assert_html_equal expected, @header.html
   end
 end
+
+class HeaderWithModelsTest < ActiveRecord::TestCase
+  def setup
+    Person.create(:first_name => 'John', :last_name => 'Smith')
+  end
+  
+  def test_should_include_all_columns_if_not_selecting_columns
+    table = TableHelper::CollectionTable.new(Person.all)
+    @header = TableHelper::Header.new(table)
+    assert_equal %w(first_name id last_name), @header.column_names.sort
+  end
+  
+  def test_should_only_include_selected_columns_if_specified_in_query
+    table = TableHelper::CollectionTable.new(Person.all(:select => 'first_name'))
+    @header = TableHelper::Header.new(table)
+    assert_equal %w(first_name), @header.column_names.sort
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: table_helper
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -45,6 +45,13 @@ files:
 - test/unit/row_builder_test.rb
 - test/helpers
 - test/helpers/table_helper_test.rb
+- test/app_root
+- test/app_root/db
+- test/app_root/db/migrate
+- test/app_root/db/migrate/001_create_people.rb
+- test/app_root/app
+- test/app_root/app/models
+- test/app_root/app/models/person.rb
 - CHANGELOG.rdoc
 - init.rb
 - LICENSE