table-for 1.2.1 → 2.0.0

data/CHANGELOG.rdoc

@@ -1,13 +1,22 @@
-1.1.0 (February 4, 2012)
+2.0.0 (October 18, 2012)
+* Upgraded to BuildingBlocks 2.0.0
+* Renamed thead block to header, tbody to body, add added an empty footer block to the default table implementation
+* Utilized features from BuildingBlocks 2.0.0, such as collection declaration of blocks, and collection rendering of blocks
+* Current record being iterated over no longer needs to be passed in as a parameter to the block, but can be accessed via the table.current_record, such as:
+  <% table.column do %>
+    <%= table.current_record.name %>
+  <% end %>
+
+1.2.1 (February 9, 2012)
 
-* Removed dependency on rails 3.1, switched to >= 3.0.0
+* Moved table_for_evaluated_options method into BuildingBlocks gem and renamed to evaluated_procs
+* Also now utilizing a method created in BuildingBlocks called evaluated_proc
+* The url for an edit, show, and delete link can now be a Proc that takes the current row's domain object as a paramter
 
 1.2.0 (February 5, 2012)
 
 * Upgraded dependency on BuildingBlocks to at least version 1.2.0
 
-1.2.1 (February 9, 2012)
+1.1.0 (February 4, 2012)
 
-* Moved table_for_evaluated_options method into BuildingBlocks gem and renamed to evaluated_procs
-* Also now utilizing a method created in BuildingBlocks called evaluated_proc
-* The url for an edit, show, and delete link can now be a Proc that takes the current row's domain object as a paramter
+* Removed dependency on rails 3.1, switched to >= 3.0.0

data/README.rdoc

@@ -25,13 +25,13 @@ In users_controller.rb (index action)
                         :sortable => true, :sort_url => users_path,
                         :row_html => {:class => lambda { cycle('even', 'odd')},
                                       :id => lambda {|user| "user-#{user.id}"}} do |table| %>
-    <%= table.column :edit, :link_label => "Modify" %>
-    <%= table.column :show %>
-    <%= table.column :email, :label => "Email Address" %>
-    <%= table.column :label => "Full Name", :sortable => false, :header_html => {:style => "color:orange"} do |user| %>
+    <% table.column :edit, :link_label => "Modify" %>
+    <% table.column :show %>
+    <% table.column :email, :label => "Email Address" %>
+    <% table.column :label => "Full Name", :sortable => false, :header_html => {:style => "color:orange"} do |user| %>
       <%= "#{user.first_name} #{user.last_name}" %>
     <% end %>
-    <%= table.column :delete, :confirm => "Are you sure?" %>
+    <% table.column :delete, :confirm => "Are you sure?" %>
   <% end %>
 
 == Specifying the Columns to Use
@@ -110,7 +110,6 @@ to determine what data to output in each column.
   <%= table_for @users, :header_html => {:class => lambda {|column| "header-column #{column.name}"} } do |table| %>
     <!-- Override this columns' header's html -->
     <% table.column :email, :header_html => {:style => "color: red"} %>
-
     <% table.column :first_name %>
     <% table.column :last_name %>
   <% end %>
@@ -119,14 +118,80 @@ to determine what data to output in each column.
   <%= table_for @users, :column_html => {:class => lambda {|column| "data-column #{column.name}"} } do |table| %>
     <!-- Override this column's html -->
     <% table.column :email, :column_html => {:style => "background-color: red"} %>
-
     <% table.column :first_name %>
     <% table.column :last_name %>
   <% end %>
 
 == Using Show, Edit, and Delete Columns
   <%= table_for @users do |table| %>
-    <% table.column :edit, :url => lambda {|user| edit_user_path(user) } %>
-    <% table.column :show %>
+    <!-- Standard show link -->
     <% table.column :show %>
+
+    <!-- Specify the controller action for the show link (used for generating the link) -->
+    <% table.column :show, :action => :display %>
+
+    <!-- Standard edit link -->
+    <% table.column :edit %>
+
+    <!-- Specify the text for the edit link -->
+    <% table.column :edit, :link_label => "Modify" %>
+
+    <!-- Specify the url for the edit link -->
+    <% table.column :edit, :url => lambda {|user| edit_user_path(user) } %>
+
+    <!-- Specify the controller action for the edit link (used for generating the link) -->
+    <% table.column :edit, :action => :modify %>
+
+    <!-- Specify the scope for the edit link (i.e. for nested resources) -->
+    <% table.column :edit, :scope => :admin %>
+
+    <!-- Specify the confirmation message for the confirm link -->
+    <% table.column :delete, :confirm => "Are you sure???" %>
+  <% end %>
+
+== Using "Before" and "After" hooks
+  <!-- Adding a table footer -->
+  <%= table_for @users do |table| %>
+    <% table.column :email %>
+    <% table.define :footer do %>
+      <tfoot><tr><td colspan="<%= table.columns.length %>">My Footer</td></tr></tfoot>
+    <% end %>
+  <% end %>
+
+  <!-- Evaluating an expression before each row renders -->
+  <%= table_for @users do |table| %>
+    <% table.before :row do |user| %>
+      <!-- Perform some calculation -->
+      <% @evaluated_data = user.do_some_method %>
+    <% end %>
+    <% table.column :label => "First Column" do |user| %>
+      <!-- Use the stored value in some way -->
+      <%= @evaluated_data.method_1 %>
+    <% end %>
+    <% table.column :label => "Second Column" do |user| %>
+      <!-- Use the stored value in some other way -->
+      <%= @evaluated_data.method_2 %>
+    <% end %>
+  <% end %>
+
+  <!-- Adding a row before all the data rows -->
+  <%= table_for @users do |table| %>
+    <% table.before :rows do %>
+      <tr><td colspan="<%= table.columns.length %>">My First Row</td></tr>
+    <% end %>
+    <% table.column :email %>
+  <% end %>
+
+== Changing the Default Way table_for Renders
+  <!-- Don't render thead and tbody tags -->
+  <%= table_for @users do |table| %>
+    <% table.define :table do |options| %>
+      <%= content_tag :table, options[:table_html] do %>
+        <!-- Instead of table.render :header, do this -->
+        <%= table.render :header_row %>
+        <!-- Instead of table.render :body, do this -->
+        <%= table.render :rows %>
+      <% end %>
+    <% end %>
+    <% table.column :email %>
   <% end %>

data/VERSION

@@ -1 +1 @@
-1.2.1
+2.0.0

data/app/views/table_for/_table_for.html.erb

@@ -1,11 +1,13 @@
 <% table.define :table do |options| %>
   <%= content_tag :table, options[:table_html] do %>
-    <%= table.render :thead %>
-    <%= table.render :tbody %>
+    <%= table.render :header %>
+    <%= table.render :body %>
+    <%# Purposely no default implementation for the tfoot block given, since most tables do not have footers. Block provided to for easy hook to add a footer %>
+    <%= table.render :footer %>
   <% end %>
 <% end %>
 
-<% table.define :thead do |options| %>
+<% table.define :header do |options| %>
   <%= content_tag :thead, options[:thead_html] do %>
     <%= table.render :header_row %>
   <% end %>
@@ -13,13 +15,7 @@
 
 <% table.define :header_row do |options| %>
   <%= content_tag :tr, options[:header_row_html] do %>
-    <%= table.render :header_columns %>
-  <% end %>
-<% end %>
-
-<% table.define :header_columns do |options| %>
-  <% table.columns.each do |column| %>
-    <%= table.render :header_column, column, column.options %>
+    <%= table.render :header_column, :collection => table.columns %>
   <% end %>
 <% end %>
 
@@ -29,73 +25,59 @@
   <% end %>
 <% end %>
 
-<% table.define :edit_header do %><% end %>
-
-<% table.define :show_header do %><% end %>
-
-<% table.define :delete_header do %><% end %>
-
-<% table.columns.each do |column| %>
-  <% table.define "#{column.name}_header" do |column, options| %>
-    <% if options[:sortable] %>
-      <%= table_for_sort_link(column, options) %>
-    <% else %>
-      <%= options[:label] ? options[:label] : column.name.to_s.titleize %>
-    <% end %>
+<%# Define header blocks for the edit, show, and delete columns (i.e. we want those columns to display with a blank header) %>
+<% table.define(:edit_header) {} %>
+<% table.define(:show_header) {} %>
+<% table.define(:delete_header) {} %>
+
+<%# Define a header block for each column, named using that column's name with the word "_header" appended to it %>
+<% table.define lambda {|column| "#{column.name}_header" }, :collection => table.columns do |column, options| %>
+  <% if options[:sortable] %>
+    <%= table_for_sort_link(column, options) %>
+  <% else %>
+    <%= options[:label] ? options[:label] : column.name.to_s.titleize %>
   <% end %>
 <% end %>
 
-<% table.define :tbody do |options| %>
+<% table.define :body do |options| %>
   <%= content_tag :tbody, options[:tbody_html] do %>
-    <%= table.render :rows %>
-  <% end %>
-<% end %>
-
-<% table.define :rows do |options| %>
-  <% records.each do |record| %>
-    <%= table.render :row, record %>
+    <%= table.render :row, :collection => records %>
   <% end %>
 <% end %>
 
 <% table.define :row do |record, options| %>
-  <%= content_tag :tr, table.evaluated_procs(record, options[:row_html]) do %>
-    <%= table.render :columns, record %>
-  <% end %>
-<% end %>
-
-<% table.define :columns do |record, options| %>
-  <% table.columns.each do |column| %>
-    <%= table.render :column, record, column, column.options %>
+  <% table.set_current_record(record) %>
+  <%= content_tag :tr, table.evaluated_procs(options[:row_html], record) do %>
+    <%= table.render :column, record, :collection => table.columns %>
   <% end %>
 <% end %>
 
-<% table.define :column do |record, column, options| %>
-  <%= content_tag :td, table.evaluated_procs(record, column, options[:column_html]) do %>
+<% table.define :column do |column, record, options| %>
+  <%= content_tag :td, table.evaluated_procs(options[:column_html], record, column) do %>
     <%= table.render column.name, record, column, column.options %>
   <% end %>
 <% end %>
 
 <% table.define :edit, :action => :edit, :link_label => "Edit" do |record, column, options| %>
-  <% url = options[:url] ? table.evaluated_proc(record, options[:url]) : [options[:action], options[:scope], record].flatten %>
+  <% url = options[:url] ? table.evaluated_proc(options[:url], record) : [options[:action], options[:scope], record].flatten %>
   <%= link_to options[:link_label], url, options[:link_html] %>
 <% end %>
 
 <% table.define :show, :action => nil, :link_label => "Show" do |record, column, options| %>
-  <% url = options[:url] ? table.evaluated_proc(record, options[:url]) : [options[:action], options[:scope], record].flatten %>
+  <% url = options[:url] ? table.evaluated_proc(options[:url], record) : [options[:action], options[:scope], record].flatten %>
   <%= link_to options[:link_label], url, options[:link_html] %>
 <% end %>
 
 <% table.define :delete, :action => nil, :link_html => {}, :link_label => "Delete" do |record, column, options| %>
-  <% url = options[:url] ? table.evaluated_proc(record, options[:url]) : [options[:action], options[:scope], record].flatten %>
+  <% url = options[:url] ? table.evaluated_proc(options[:url], record) : [options[:action], options[:scope], record].flatten %>
   <% confirm = options[:confirm] ? options[:confirm] : "Are you sure you want to delete this #{record.class.to_s.titleize}?" %>
   <% method = options[:method] ? options[:method] : "delete" %>
   <%= link_to options[:link_label], url, {:method => method, :confirm => confirm}.merge(options[:link_html]) %>
 <% end %>
 
-<% table.columns.each do |column| %>
-  <% table.define "#{column.name}" do |record, column, options| %>
-    <%= record.send(column.name) %>
-  <% end %>
+<%# Define a block for each column, named using that column's name %>
+<% table.define lambda {|column| column.name }, :collection => table.columns do |record, column, options| %>
+  <%= record.send(column.name) %>
 <% end %>
 
-<%= table.render :table %>
+<%= table.render :table %>

data/lib/table-for.rb

@@ -1,5 +1 @@
-require "action_view"
-
-require "table_for/base"
-require "table_for/view_additions"
-require "table_for/engine"
+require "table_for"

data/lib/table_for.rb

@@ -0,0 +1,10 @@
+require "action_view"
+require "table_for/engine"
+require "building-blocks"
+
+module TableFor
+  autoload :Base, "table_for/base"
+  autoload :ViewAdditions, "table_for/view_additions"
+end
+
+ActionView::Base.send :include, TableFor::ViewAdditions::ClassMethods

data/lib/table_for/base.rb

@@ -5,8 +5,14 @@ module TableFor
     alias columns queued_blocks
     alias column queue
 
+    attr_accessor :current_record
+
     def header(name, options={}, &block)
       define("#{name.to_s}_header", options, &block)
     end
+
+    def set_current_record(record)
+      self.current_record = record
+    end
   end
 end

data/lib/table_for/view_additions.rb

@@ -2,12 +2,11 @@ module TableFor
   module ViewAdditions
     module ClassMethods
       def table_for(records, options={}, &block)
-        options[:use_partials_for_before_and_after_hooks] = false
-        TableFor::Base.new(self, options.merge(:variable => "table", :records => records)).render_template("table_for/table_for", &block)
+        TableFor::Base.new(self, options.merge(:variable => "table", :records => records, :use_partials => false)).render_template("table_for/table_for", &block)
       end
 
       def table_for_header_html(table, column, options={})
-        header_html = table.evaluated_procs(column, options[:header_html])
+        header_html = table.evaluated_procs(options[:header_html], column)
         if options[:sortable]
           order = options[:order] ? options[:order].to_s : column.name.to_s
           sort_class = (params[:order] != order || params[:sort_mode] == "reset") ? "sorting" : (params[:sort_mode] == "desc" ? "sorting_desc" : "sorting_asc")
@@ -29,7 +28,3 @@ module TableFor
     end
   end
 end
-
-if defined?(ActionView::Base)
-  ActionView::Base.send :include, TableFor::ViewAdditions::ClassMethods
-end

data/spec/integration/table_for_spec.rb

@@ -57,16 +57,16 @@ describe "table_for" do
     end
   end
 
-  describe "thead block" do
+  describe "header block" do
     it "should be able to replace the thead block" do
       buffer = @view.table_for @users[0,1] do |table|
-        table.define :thead do
-          "<thead><tr><th>My new thead definition</th></tr></thead>".html_safe
+        table.define :header do
+          "<thead><tr><th>My new header definition</th></tr></thead>".html_safe
         end
         table.column :first_name
       end
 
-      xml = XmlSimple.xml_in(%%<table><thead><tr><th>My new thead definition</th></tr></thead><tbody><tr><td>Andrew</td></tr></tbody></table>%)
+      xml = XmlSimple.xml_in(%%<table><thead><tr><th>My new header definition</th></tr></thead><tbody><tr><td>Andrew</td></tr></tbody></table>%)
       XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
     end
 
@@ -99,20 +99,6 @@ describe "table_for" do
     end
   end
 
-  describe "header_columns block" do
-    it "should be able to replace the header_columns block" do
-      buffer = @view.table_for @users[0,1] do |table|
-        table.define :header_columns do
-          "<th>Column 1</th><th>Column 2</th>".html_safe
-        end
-        table.column :first_name
-      end
-
-      xml = XmlSimple.xml_in(%%<table><thead><tr><th>Column 1</th><th>Column 2</th></tr></thead><tbody><tr><td>Andrew</td></tr></tbody></table>%)
-      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
-    end
-  end
-
   describe "header_column block" do
     it "should be able to replace the header_columns block" do
       buffer = @view.table_for @users[0,1] do |table|
@@ -432,16 +418,16 @@ describe "table_for" do
     end
   end
 
-  describe "tbody block" do
-    it "should be able to replace the tbody block" do
+  describe "body block" do
+    it "should be able to replace the body block" do
       buffer = @view.table_for @users[0,1] do |table|
-        table.define :tbody do
-          "<tbody><tr><td>My new tbody definition</td></tr></tbody>".html_safe
+        table.define :body do
+          "<tbody><tr><td>My new body definition</td></tr></tbody>".html_safe
         end
         table.column :first_name
       end
 
-      xml = XmlSimple.xml_in(%%<table><thead><tr><th>First Name</th></tr></thead><tbody><tr><td>My new tbody definition</td></tr></tbody></table>%)
+      xml = XmlSimple.xml_in(%%<table><thead><tr><th>First Name</th></tr></thead><tbody><tr><td>My new body definition</td></tr></tbody></table>%)
       XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
     end
 
@@ -452,24 +438,6 @@ describe "table_for" do
     end
   end
 
-  describe "rows block" do
-    it "should be able to replace the rows block" do
-      buffer = @view.table_for @users do |table|
-        table.define :rows do
-          "<tr><td>There are #{@users.length} rows</td></tr><tr><td>This is the next row</td></tr>".html_safe
-        end
-        table.column :first_name
-      end
-
-      xml = XmlSimple.xml_in(%%
-        <table>
-          <thead><tr><th>First Name</th></tr></thead>
-          <tbody><tr><td>There are 3 rows</td></tr><tr><td>This is the next row</td></tr></tbody>
-        </table>%)
-      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
-    end
-  end
-
   describe "row block" do
     it "should be able to replace the row block" do
       buffer = @view.table_for @users do |table|
@@ -510,30 +478,10 @@ describe "table_for" do
     end
   end
 
-  describe "columns block" do
-    it "should be able to replace the columns block" do
-      buffer = @view.table_for @users[0, 1] do |table|
-        table.define :columns do |user|
-          table.columns.map {|column| "<td>Value: #{user.send(column.name) if user.respond_to?(column.name)}</td>"}.join("").html_safe
-        end
-        table.column :first_name
-        table.column :last_name
-        table.column :some_random_column
-      end
-
-      xml = XmlSimple.xml_in(%%
-        <table>
-          <thead><tr><th>First Name</th><th>Last Name</th><th>Some Random Column</th></tr></thead>
-          <tbody><tr><td>Value: Andrew</td><td>Value: Hunter</td><td>Value:</td></tr></tbody>
-        </table>%)
-      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
-    end
-  end
-
   describe "column block" do
     it "should be able to replace the columns block" do
       buffer = @view.table_for @users[0, 1] do |table|
-        table.define :column do |user, column, options|
+        table.define :column do |column, user, options|
           "<td>#{column.name.to_s.titleize} value is #{user.send(column.name)}</td>".html_safe
         end
         table.column :email

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table-for
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: 
   segments: 
-  - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 -05:00
-default_executable: 
+date: 2012-10-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: table-for
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
   prerelease: false
+  name: table-for
   type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rails
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,27 +43,27 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
+  requirement: *id002
   prerelease: false
+  name: rails
   type: :runtime
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: building-blocks
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 15
         segments: 
-        - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id003
   prerelease: false
+  name: building-blocks
   type: :runtime
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,17 +73,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
   prerelease: false
+  name: jeweler
   type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4164648240
+        hash: 2118735021
         segments: 
         - 2
         - 0
@@ -93,11 +91,11 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
+  requirement: *id005
   prerelease: false
+  name: rspec-rails
   type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,11 +105,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
   prerelease: false
+  name: mocha
   type: :development
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,11 +119,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id007
   prerelease: false
+  name: xml-simple
   type: :development
-  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: supermodel
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -135,11 +133,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
   prerelease: false
+  name: supermodel
   type: :development
-  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -149,11 +147,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id009
   prerelease: false
+  name: sqlite3
   type: :development
-  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: with_model
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -163,11 +161,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id010
   prerelease: false
+  name: with_model
   type: :development
-  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -177,17 +175,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id011
   prerelease: false
+  name: jeweler
   type: :development
-  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4164648240
+        hash: 2118735021
         segments: 
         - 2
         - 0
@@ -195,11 +193,11 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
+  requirement: *id012
   prerelease: false
+  name: rspec-rails
   type: :development
-  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: mocha
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -209,11 +207,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id013
   prerelease: false
+  name: mocha
   type: :development
-  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -223,11 +221,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id014
   prerelease: false
+  name: xml-simple
   type: :development
-  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  name: supermodel
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -237,11 +235,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id015
   prerelease: false
+  name: supermodel
   type: :development
-  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -251,11 +249,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id016
   prerelease: false
+  name: sqlite3
   type: :development
-  requirement: *id016
 - !ruby/object:Gem::Dependency 
-  name: with_model
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -265,11 +263,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id017
   prerelease: false
+  name: with_model
   type: :development
-  requirement: *id017
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -279,17 +277,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id018
   prerelease: false
+  name: jeweler
   type: :development
-  requirement: *id018
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4164648240
+        hash: 2118735021
         segments: 
         - 2
         - 0
@@ -297,11 +295,11 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
+  requirement: *id019
   prerelease: false
+  name: rspec-rails
   type: :development
-  requirement: *id019
 - !ruby/object:Gem::Dependency 
-  name: mocha
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -311,11 +309,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id020
   prerelease: false
+  name: mocha
   type: :development
-  requirement: *id020
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -325,11 +323,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id021
   prerelease: false
+  name: xml-simple
   type: :development
-  requirement: *id021
 - !ruby/object:Gem::Dependency 
-  name: supermodel
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -339,11 +337,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id022
   prerelease: false
+  name: supermodel
   type: :development
-  requirement: *id022
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
   version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -353,11 +351,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id023
   prerelease: false
+  name: sqlite3
   type: :development
-  requirement: *id023
 - !ruby/object:Gem::Dependency 
-  name: with_model
   version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -367,11 +365,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id024
   prerelease: false
+  name: with_model
   type: :development
-  requirement: *id024
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -381,17 +379,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id025
   prerelease: false
+  name: jeweler
   type: :development
-  requirement: *id025
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   version_requirements: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4164648240
+        hash: 2118735021
         segments: 
         - 2
         - 0
@@ -399,11 +397,11 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
+  requirement: *id026
   prerelease: false
+  name: rspec-rails
   type: :development
-  requirement: *id026
 - !ruby/object:Gem::Dependency 
-  name: mocha
   version_requirements: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -413,11 +411,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id027
   prerelease: false
+  name: mocha
   type: :development
-  requirement: *id027
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
   version_requirements: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -427,11 +425,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id028
   prerelease: false
+  name: xml-simple
   type: :development
-  requirement: *id028
 - !ruby/object:Gem::Dependency 
-  name: supermodel
   version_requirements: &id029 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -441,11 +439,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id029
   prerelease: false
+  name: supermodel
   type: :development
-  requirement: *id029
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
   version_requirements: &id030 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -455,11 +453,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id030
   prerelease: false
+  name: sqlite3
   type: :development
-  requirement: *id030
 - !ruby/object:Gem::Dependency 
-  name: with_model
   version_requirements: &id031 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -469,11 +467,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id031
   prerelease: false
+  name: with_model
   type: :development
-  requirement: *id031
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id032 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -483,17 +481,17 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id032
   prerelease: false
+  name: jeweler
   type: :development
-  requirement: *id032
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   version_requirements: &id033 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -4164648240
+        hash: 2118735021
         segments: 
         - 2
         - 0
@@ -501,11 +499,11 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
+  requirement: *id033
   prerelease: false
+  name: rspec-rails
   type: :development
-  requirement: *id033
 - !ruby/object:Gem::Dependency 
-  name: mocha
   version_requirements: &id034 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -515,11 +513,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id034
   prerelease: false
+  name: mocha
   type: :development
-  requirement: *id034
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
   version_requirements: &id035 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -529,11 +527,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id035
   prerelease: false
+  name: xml-simple
   type: :development
-  requirement: *id035
 - !ruby/object:Gem::Dependency 
-  name: supermodel
   version_requirements: &id036 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -543,11 +541,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id036
   prerelease: false
+  name: supermodel
   type: :development
-  requirement: *id036
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
   version_requirements: &id037 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -557,11 +555,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id037
   prerelease: false
+  name: sqlite3
   type: :development
-  requirement: *id037
 - !ruby/object:Gem::Dependency 
-  name: with_model
   version_requirements: &id038 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -571,9 +569,112 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id038
   prerelease: false
+  name: with_model
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id039 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id039
+  prerelease: false
+  name: jeweler
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id040 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2118735021
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  requirement: *id040
+  prerelease: false
+  name: rspec-rails
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id041 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id041
+  prerelease: false
+  name: mocha
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id042 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id042
+  prerelease: false
+  name: xml-simple
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id043 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id043
+  prerelease: false
+  name: supermodel
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id044 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id044
+  prerelease: false
+  name: sqlite3
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id045 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id045
+  prerelease: false
+  name: with_model
   type: :development
-  requirement: *id038
 description: table-for is a table builder for an array of objects, easily allowing overriding of how any aspect of the table is generated
 email: hunterae@gmail.com
 executables: []
@@ -589,6 +690,7 @@ files:
 - VERSION
 - app/views/table_for/_table_for.html.erb
 - lib/table-for.rb
+- lib/table_for.rb
 - lib/table_for/base.rb
 - lib/table_for/engine.rb
 - lib/table_for/view_additions.rb
@@ -596,7 +698,6 @@ files:
 - spec/integration/table_for_spec.rb
 - spec/spec_helper.rb
 - spec/table_for/view_additions_spec.rb
-has_rdoc: true
 homepage: http://github.com/hunterae/table-for
 licenses: []
 
@@ -626,7 +727,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: table-for is a table builder for an array of objects, easily allowing overriding of how any aspect of the table is generated