table_helper 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 == master
 
+== 0.2.2 / 2010-03-07
+
+* Fix footer failing to render when there are multiple cells [Richard Luther]
+* Fix TableHelper::RowBuilder failing on Ruby 1.9.1
+* Release gems via rake-gemcutter instead of rubyforge
+
 == 0.2.1 / 2009-04-25
 
 * Automatically determine the colspan for the last footer to match the number of headers

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Aaron Pfeifer
+Copyright (c) 2006-2010 Aaron Pfeifer
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -144,7 +144,7 @@ these types of tables by DRYing much of the html being generated.
   <tfoot>
     <tr>
       <td class="post-num_comments">0</td>
-      <td class="post-num_trackbacks">0</td>
+      <td class="post-num_trackbacks" colspan="5">0</td>
     </tr>
   </tfoot>
   </table>

data/Rakefile

@@ -1,13 +1,15 @@
+require 'rubygems'
+require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'table_helper'
-  s.version           = '0.2.1'
+  s.version           = '0.2.2'
   s.platform          = Gem::Platform::RUBY
-  s.summary           = 'Adds a helper method for generating HTML tables from collections'
+  s.summary           = 'Adds a helper method for generating HTML tables from collections in Rails'
+  s.description       = s.summary
   
   s.files             = FileList['{lib,test}/**/*'] + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc) - FileList['test/app_root/{log,log/*,script,script/*}']
   s.require_path      = 'lib'
@@ -52,20 +54,27 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG.rdoc', 'LICENSE', 'lib/**/*.rb')
 end
-  
+
+desc 'Generate a gemspec file.'
+task :gemspec do
+  File.open("#{spec.name}.gemspec", 'w') do |f|
+    f.write spec.to_ruby
+  end
+end
+
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
 end
 
 desc 'Publish the beta gem.'
 task :pgem => [:package] do
+  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new('aaron@pluginaweek.org', '/home/aaron/gems.pluginaweek.org/public/gems', 'pkg', "#{spec.name}-#{spec.version}.gem").upload
 end
 
 desc 'Publish the API documentation.'
 task :pdoc => [:rdoc] do
+  require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new('aaron@pluginaweek.org', "/home/aaron/api.pluginaweek.org/public/#{spec.name}", 'rdoc').upload
 end
 
@@ -74,15 +83,8 @@ task :publish => [:pgem, :pdoc, :release]
 
 desc 'Publish the release files to RubyForge.'
 task :release => [:gem, :package] do
-  require 'rubyforge'
-  
-  ruby_forge = RubyForge.new.configure
-  ruby_forge.login
+  require 'rake/gemcutter'
   
-  %w(gem tgz zip).each do |ext|
-    file = "pkg/#{spec.name}-#{spec.version}.#{ext}"
-    puts "Releasing #{File.basename(file)}..."
-    
-    ruby_forge.add_release(spec.rubyforge_project, spec.name, spec.version, file)
-  end
+  Rake::Gemcutter::Tasks.new(spec)
+  Rake::Task['gem:push'].invoke
 end

data/lib/table_helper.rb

@@ -197,7 +197,7 @@ module TableHelper
   #   <tfoot>
   #     <tr>
   #       <td class="post-num_comments">0</td>
-  #       <td class="post-num_trackbacks">0</td>
+  #       <td class="post-num_trackbacks" colspan="5">0</td>
   #     </tr>
   #   </tfoot>
   #   <table>

data/lib/table_helper/footer.rb

@@ -27,7 +27,7 @@ module TableHelper
     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}
+      colspan = table.header.columns.length - cells[0..-2].inject(0) {|count, cell| count += (cell[:colspan] || 1).to_i}
       cells.last[:colspan] ||= colspan if colspan > 1
       
       html_options = @html_options.dup

data/lib/table_helper/row.rb

@@ -3,7 +3,7 @@ require 'table_helper/cell'
 module TableHelper
   # Provides a blank class that can be used to build the cells for a row
   class RowBuilder < BlankSlate #:nodoc:
-    reveal :respond_to?
+    reveal :respond_to? if find_hidden_method(:respond_to?)
     
     # Creates a builder for the given row
     def initialize(row)

data/test/unit/body_test.rb

@@ -110,14 +110,14 @@ class BodyWithCollectionTest < Test::Unit::TestCase
   end
   
   def test_should_build_row_using_object_location_for_default_index
-    build_post = nil
-    index = nil
-    @body.each {|row, build_post, index|}
+    @build_post = nil
+    @index = nil
+    @body.each {|row, build_post, index| @build_post, @index = build_post, index}
     
     @collection.each do |post|
       html = @body.build_row(post) 
-      assert_equal post, build_post
-      assert_equal @collection.index(post), index
+      assert_equal post, @build_post
+      assert_equal @collection.index(post), @index
       
       expected = <<-end_str
         <tr class="post ui-collection-result">
@@ -129,13 +129,13 @@ class BodyWithCollectionTest < Test::Unit::TestCase
   end
   
   def test_should_build_row_using_custom_value_for_index
-    post = nil
-    index = nil
-    @body.each {|row, post, index|}
+    @post = nil
+    @index = nil
+    @body.each {|row, post, index| @post, @index = post, index}
     
     html = @body.build_row(@collection.first, 1)
-    assert_equal @collection.first, post
-    assert_equal 1, index
+    assert_equal @collection.first, @post
+    assert_equal 1, @index
     
     expected = <<-end_str
       <tr class="post ui-collection-result">

data/test/unit/collection_table_test.rb

@@ -62,10 +62,10 @@ end
 
 class CollectionTableTest < Test::Unit::TestCase
   def test_should_accept_block_with_self_as_argument
-    args = nil
-    table = TableHelper::CollectionTable.new([]) {|*args|}
+    @args = nil
+    table = TableHelper::CollectionTable.new([]) {|*args| @args = args}
     
-    assert_equal [table], args
+    assert_equal [table], @args
   end
 end
 

data/test/unit/footer_test.rb

@@ -76,6 +76,23 @@ class FooterWithCellsTest < Test::Unit::TestCase
     end_str
     assert_html_equal expected, @footer.html
   end
+  
+  def test_should_include_colspan_on_last_cell_if_more_headers_than_footers
+    @table.header :title, :name, :description, :value, :created_at, :updated_at
+    @footer.cell :average, 5, :colspan => 2
+    @footer.cell :stdev, 1
+    
+    expected = <<-end_str
+      <tfoot>
+        <tr>
+          <td class="object-total">20</td>
+          <td class="object-average" colspan="2">5</td>
+          <td class="object-stdev" colspan="3">1</td>
+        </tr>
+      </tfoot>
+    end_str
+    assert_html_equal expected, @footer.html
+  end
 end
 
 class FooterWithEmptyCollectionTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: table_helper
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -04:00
+date: 2010-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: 
+description: Adds a helper method for generating HTML tables from collections in Rails
 email: aaron@pluginaweek.org
 executables: []
 
@@ -22,36 +22,28 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/table_helper.rb
-- lib/table_helper
-- lib/table_helper/footer.rb
-- lib/table_helper/cell.rb
 - lib/table_helper/row.rb
-- lib/table_helper/html_element.rb
-- lib/table_helper/body.rb
+- lib/table_helper/cell.rb
 - lib/table_helper/collection_table.rb
+- lib/table_helper/footer.rb
 - lib/table_helper/body_row.rb
+- lib/table_helper/html_element.rb
+- lib/table_helper/body.rb
 - lib/table_helper/header.rb
-- test/test_helper.rb
-- test/unit
+- lib/table_helper.rb
 - test/unit/row_test.rb
-- test/unit/cell_test.rb
-- test/unit/body_row_test.rb
+- test/unit/html_element_test.rb
+- test/unit/row_builder_test.rb
 - test/unit/header_test.rb
 - test/unit/collection_table_test.rb
-- test/unit/body_test.rb
-- test/unit/html_element_test.rb
+- test/unit/cell_test.rb
 - test/unit/footer_test.rb
-- 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/unit/body_test.rb
+- test/unit/body_row_test.rb
 - 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
+- test/test_helper.rb
+- test/helpers/table_helper_test.rb
 - CHANGELOG.rdoc
 - init.rb
 - LICENSE
@@ -59,6 +51,8 @@ files:
 - README.rdoc
 has_rdoc: true
 homepage: http://www.pluginaweek.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -79,18 +73,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pluginaweek
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Adds a helper method for generating HTML tables from collections
+specification_version: 3
+summary: Adds a helper method for generating HTML tables from collections in Rails
 test_files: 
 - test/unit/row_test.rb
-- test/unit/cell_test.rb
-- test/unit/body_row_test.rb
+- test/unit/html_element_test.rb
+- test/unit/row_builder_test.rb
 - test/unit/header_test.rb
 - test/unit/collection_table_test.rb
-- test/unit/body_test.rb
-- test/unit/html_element_test.rb
+- test/unit/cell_test.rb
 - test/unit/footer_test.rb
-- test/unit/row_builder_test.rb
+- test/unit/body_test.rb
+- test/unit/body_row_test.rb
 - test/helpers/table_helper_test.rb