table-for 0.0.17 → 1.0.0

data/README.rdoc

@@ -7,57 +7,65 @@ Table-for is a table builder for a collection of domain objects. It very easily
 In <b>Rails 3</b>, add this to your Gemfile.
 
   gem "table-for"
-  
+
+In this example, I'm going to assume the following setup:
+From the console, I have generated a user model with email, first_name, and last_name fields, and generated a scaffold on that model
+  rails g scaffold user email:string first_name:string last_name:string --no-stylesheets
+
+In seeds.rb:
+  User.create! :email => "andrew.hunter@livingsocial.com", :first_name => "Andrew", :last_name => "Hunter"
+  User.create! :email => "todd.fisher@livingsocial.com", :first_name => "Todd", :last_name => "Fisher"
+  User.create! :email => "jon.phillips@livingsocial.com", :first_name => "Jon", :last_name => "Phillips"
+
+In users_controller.rb (index action)
+  @users = User.all
+
 == Sample Usage
+  <%= table_for @users, :table_html => {:style => "border: 1px solid black"},
+                        :sortable => true,
+                        :row_html => {:class => lambda { cycle('even', 'odd')},
+                                      :id => lambda {|user| "user-#{user.id}"}} do |table| %>
+    <%= table.column :edit %>
+    <%= 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 %>
+  <% end %>
+
+== Specifying the columns to use
+  <%= table_for @users do |table| %>
+    <% table.column :email %>
+    <% table.column :first_name %>
+    <% table.column :last_name %>
+  <% end %>
 
-Say we have fetched a collection of users from the database (stored as @users), in the view we can generate a very unique table with just a few lines of code:
-
-  <%= table_for @users, 
-              :table_html => {:id => "users"}, 
-              :header_html => {:style => "color:red"},
-              :row_html => {:class => lambda { |parameters| cycle('odd', 'even')}},
-              :column_html => {:style => "color:green"} do |table| %>
-    <%= table.column :name, :column_html => {:style => "color:blue"}, :header_html => {:style => "color:orange"} %>
-    <%= table.column :email %>
-    <%= table.column :phonenumber, :column_html => {:style => "color:orange"}, :header_html => {:style => "color:blue"} do |user| %>
-      <%= phonenumber(user.phonenumber) %>
+Here, each column will send its respective column name to the user object: user.send(:email), user.send(:first_name), user.send(:last_name),
+to determine what data to output in each column
+
+== Specifying the label to use for a column
+  <%= table_for @users do |table| %>
+    <% table.column :email, :label => "Email Address" %>
+  <% end %>
+
+== Overridding the default way or rendering a column
+  <%= table_for @users do |table| %>
+    <% table.column :name do |user| %>
+      <%= "#{user.first_name} #{user.last_name}" %>
     <% end %>
-    <%= table.column :label => "???" do |user| %>
-      Some Random Column
+  <% end %>
+
+Here, since the name of the column is not used anymore to determine what data to output, this code could be changed to:
+  <%= table_for @users do |table| %>
+    <% table.column :full_name do |user| %>
+      <%= "#{user.first_name} #{user.last_name}" %>
     <% end %>
   <% end %>
-  
-Will generate the following table:
-  <table id="users">
-    <thead>
-      <tr>
-        <th style="color:orange">Name</th>    
-        <th style="color:red">Email</th>    
-        <th style="color:blue">Phonenumber</th>    
-        <th style="color:red">???</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr class="odd">
-        <td style="color:blue">USER 1'S NAME</td>    
-        <td style="color:green">USER 1'S EMAIL</td>    
-        <td style="color:orange">USER 1'S PHONENUMBER</td>    
-        <td style="color:green">Some Random Column</td>
-      </tr>
-      <tr class="even">
-        <td style="color:blue">USER 2'S NAME</td>    
-        <td style="color:green">USER 2'S </td>    
-        <td style="color:orange">USER 2'S PHONENUMBER</td>   
-        <td style="color:green">Some Random Column</td>
-      </tr>
-      ...
-      <tr class="odd">
-        <td style="color:blue">LAST USER'S NAME</td>    
-        <td style="color:green">LAST USER'S EMAIL</td>    
-        <td style="color:orange">LAST USER'S PHONENUMBER</td>    
-        <td style="color:green">Some Random Column</td>
-      </tr>
-    </tbody>
-  </table>
-  
-Notice in the above example, we were able to provide the default attributes to be applied to each column, header, and row. Then, when specifying which columns to render, the column and header attributes could be overridden on a column by column basis.
+
+Or the block name could have been removed altogether and replaced with a label as follows:
+  <%= table_for @users do |table| %>
+    <% table.column :label => "Full Name" do |user| %>
+      <%= "#{user.first_name} #{user.last_name}" %>
+    <% end %>
+  <% end %>

data/VERSION

@@ -1 +1 @@
-0.0.17
+1.0.0

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

@@ -12,52 +12,37 @@
 <% end %>
 
 <% table.define :header_row do |options| %>
-  <%= content_tag :tr, options[:header_row_html] do %>  
+  <%= content_tag :tr, options[:header_row_html] do %>
     <%= table.use :header_columns %>
   <% end %>
 <% end %>
 
 <% table.define :header_columns do |options| %>
   <% table.columns.each do |column| %>
-    <% header_html = options.merge(column.options)[:header_html] %>
-    <% if options.merge(column.options)[:sortable] %>
-      <% order = column.options[:order] ? column.options[:order].to_s : column.name.to_s %>
-    
-      <% sort_class = params[:order] != order ? "sorting" : (params[:sort_mode] == "desc" ? "sorting_desc" : "sorting_asc") %> 
-      <% header_html = {} if header_html.nil? %> 
-      <% header_html[:class] ||= "" %>
-      <% header_html[:class] += " #{sort_class}" %>
-    <% end %>
-    
-    <%= content_tag :th, header_html do %>
-      <%= table.use "#{column.name.to_s}_header", options.merge(column.options) %>
-    <% end %>
+    <%= table.use :header_column, column, column.options %>
+  <% end %>
+<% end %>
+
+<% table.define :header_column do |column, options| %>
+  <%= content_tag :th, table_for_header_html(column, options) do %>
+    <%= table.use "#{column.name}_header", column, column.options %>
   <% end %>
 <% end %>
 
-<% table.columns.each do |column| %>  
-  <% table.define "#{column.name.to_s}_header", :column => column do |options| %>
+<% 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.use "#{options[:column].name.to_s}_header_sortable_link", options %>
+      <%= table_for_sort_link(column, options) %>
     <% else %>
-      <%= options[:label] ? options[:label] : options[:column].name.to_s.titleize %>
+      <%= options[:label] ? options[:label] : column.name.to_s.titleize %>
     <% end %>
   <% end %>
-  
-  <% table.define "#{column.name.to_s}_header_sortable_link", :column => column do |options| %>
-    <%= table.use :header_sortable_link, options %>
-  <% end %>
-<% end %>
- 
-<% table.define :header_sortable_link do |options| %>
-  <% order = options[:order] ? options[:order].to_s : options[:column].name.to_s %>
-  <% label = (options[:label] ? options[:label] : options[:column].name.to_s.titleize) %>
-  <% sort_mode = ((params[:order] != order or params[:sort_mode] == "desc") ? "asc" : "desc") %>
-  <% parameters = params.merge({:order => (options[:order] ? options[:order] : options[:column].name), :sort_mode => sort_mode}) %>
-  <% parameters.delete(:action); parameters.delete(:controller) %>
-  <% url = options[:sort_url] ? options[:sort_url] : "" %>
-
-  <%= link_to label, "#{url}?#{parameters.to_query}" %>
 <% end %>
 
 <% table.define :tbody do |options| %>
@@ -66,43 +51,46 @@
   <% end %>
 <% end %>
 
-<% table.define :rows do %>
+<% table.define :rows do |options| %>
   <% records.each do |record| %>
     <%= table.use :row, record %>
   <% end %>
 <% end %>
 
 <% table.define :row do |record, options| %>
-  <%= content_tag :tr, table_for_options(options[:row_html], options) do %>
-    <%= table.use :data_columns, record, options %>
+  <%= content_tag :tr, table_for_evaluated_options(record, options[:row_html]) do %>
+    <%= table.use :columns, record %>
   <% end %>
 <% end %>
 
-<% table.define :data_columns do |record, options| %>
+<% table.define :columns do |record, options| %>
   <% table.columns.each do |column| %>
-    <%= content_tag :td, options.merge(column.options)[:column_html] do %>
-      <%= table.use column, record, options.merge(:column => column) %>
-    <% end %>
+    <%= table.use :column, record, column, column.options %>
+  <% end %>
+<% end %>
+
+<% table.define :column do |record, column, options| %>
+  <%= content_tag :td, table_for_evaluated_options(record, column, options[:column_html]) do %>
+    <%= table.use column.name, record, column, column.options %>
   <% end %>
 <% end %>
 
-<% table.define :edit, :action => :edit, :link_label => "Edit" do |record, options| %>
+<% table.define :edit, :action => :edit, :link_label => "Edit" do |record, column, options| %>
   <%= link_to options[:link_label], [options[:action], options[:scope], record].flatten, options[:link_html] %>
 <% end %>
 
-<% table.define :show, :action => nil, :link_label => "Show" do |record, options| %>
+<% table.define :show, :action => nil, :link_label => "Show" do |record, column, options| %>
   <%= link_to options[:link_label], [options[:action], options[:scope], record].flatten, options[:link_html] %>
 <% end %>
 
-<% table.define :delete, :link_html => {}, :link_label => "Delete" do |record, options| %>
-  <%= link_to options[:link_label], [options[:scope], record].flatten, {:method => "delete", :confirm => "Are you sure you want to delete this #{record.class.to_s.titleize}?"}.merge(options[:link_html]) %>
+<% table.define :delete, :action => nil, :link_html => {}, :link_label => "Delete" do |record, column, options| %>
+  <%= link_to options[:link_label], [options[:action], options[:scope], record].flatten, {:method => "delete", :confirm => "Are you sure you want to delete this #{record.class.to_s.titleize}?"}.merge(options[:link_html]) %>
 <% end %>
 
 <% table.columns.each do |column| %>
-  <% table.define column.name, :column => column do |record, options| %>
-    <%= record.send(options[:column].name) %>
+  <% table.define "#{column.name}" do |record, column, options| %>
+    <%= record.send(column.name) %>
   <% end %>
 <% end %>
 
-<%# Now that all the blocks are defined, render the table %>
-<%= table.use :table %>
+<%= table.use :table %>

data/lib/table-for.rb

@@ -1,13 +1,5 @@
 require "action_view"
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 require "table_for/base"
-require "table_for/helper_methods"
-require "table_for/engine"
-
-$LOAD_PATH.shift
-
-if defined?(ActionView::Base)
-  ActionView::Base.send :include, TableFor::HelperMethods
-end
+require "table_for/view_additions"
+require "table_for/engine"

data/lib/table_for/base.rb

@@ -4,7 +4,7 @@ module TableFor
   class Base < BuildingBlocks::Base
     alias columns queued_blocks
     alias column queue
-    
+
     def header(name, options={}, &block)
       define("#{name.to_s}_header", options, &block)
     end

data/lib/table_for/view_additions.rb

@@ -0,0 +1,44 @@
+module TableFor
+  module ViewAdditions
+    module ClassMethods
+      def table_for(records, options={}, &block)
+        options[:records] = records
+        options[:template] = "table_for/table_for"
+        options[:variable] = "table"
+
+        TableFor::Base.new(self, options, &block).render
+      end
+
+      def table_for_evaluated_options(*args)
+        options = args.extract_options!
+        options.inject({}) { |hash, (k, v)| hash[k] = (v.is_a?(Proc) ? v.call(*args) : v); hash} unless options.nil?
+      end
+
+      def table_for_header_html(column, options={})
+        header_html = table_for_evaluated_options(column, options[:header_html])
+        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")
+          header_html = {} if header_html.nil?
+          header_html[:class] = (header_html[:class] ? "#{header_html[:class]} #{sort_class}" : sort_class)
+        end
+        header_html
+      end
+
+      def table_for_sort_link(column, options={})
+        order = options[:order] ? options[:order].to_s : column.name.to_s
+        label = (options[:label] ? options[:label] : column.name.to_s.titleize)
+        sort_mode = (params[:order] != order || params[:sort_mode] == "reset") ? "asc" : (params[:sort_mode] == "desc" ? "reset" : "desc")
+        parameters = params.merge(:order => order, :sort_mode => sort_mode)
+        parameters.delete(:action)
+        parameters.delete(:controller)
+        url = options[:sort_url] ? options[:sort_url] : ""
+        link_to label, "#{url}?#{parameters.to_query}"
+      end
+    end
+  end
+end
+
+if defined?(ActionView::Base)
+  ActionView::Base.send :include, TableFor::ViewAdditions::ClassMethods
+end

data/spec/integration/table_for_spec.rb

@@ -0,0 +1,830 @@
+require "spec_helper"
+
+describe "table_for" do
+  with_model :user do
+    table do |t|
+      t.string "email"
+      t.string "first_name"
+      t.string "last_name"
+    end
+  end
+
+  before :each do
+    User.create! :email => "andrew.hunter@livingsocial.com", :first_name => "Andrew", :last_name => "Hunter"
+    User.create! :email => "todd.fisher@livingsocial.com", :first_name => "Todd", :last_name => "Fisher"
+    User.create! :email => "jon.phillips@livingsocial.com", :first_name => "Jon", :last_name => "Phillips"
+    @users = User.all
+    @view = ActionView::Base.new("app/views")
+  end
+
+  it "should be able render a table with email and first and last name columns" do
+    buffer = @view.table_for @users do |table|
+      table.column :email
+      table.column :first_name
+      table.column :last_name
+    end
+
+    xml = XmlSimple.xml_in(%%
+      <table>
+        <thead><tr><th>Email</th><th>First Name</th><th>Last Name</th></tr></thead>
+        <tbody>
+          <tr><td>andrew.hunter@livingsocial.com</td><td>Andrew</td><td>Hunter</td></tr>
+          <tr><td>todd.fisher@livingsocial.com</td><td>Todd</td><td>Fisher</td></tr>
+          <tr><td>jon.phillips@livingsocial.com</td><td>Jon</td><td>Phillips</td></tr>
+        </tbody>
+      </table>%)
+    XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+  end
+
+  describe "table block" do
+    it "should be able to replace the table block" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :table do
+          "My new table definition"
+        end
+        table.column :email
+        table.column :first_name
+        table.column :last_name
+      end
+
+      buffer.strip.should eql "My new table definition"
+    end
+
+    it "should be able to specify html attributes" do
+      buffer = @view.table_for @users, :table_html => {:style => "background-color: orange"}
+      xml = XmlSimple.xml_in(%%<table style="background-color: orange"><thead><tr></tr></thead><tbody><tr></tr><tr></tr><tr></tr></tbody></table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+
+  describe "thead 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
+        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>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify html attributes" do
+      buffer = @view.table_for @users[0,1], :thead_html => {:style => "background-color: orange"}
+      xml = XmlSimple.xml_in(%%<table><thead style="background-color: orange"><tr></tr></thead><tbody><tr></tr></tbody></table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+
+  describe "header_row block" do
+    it "should be able to replace the header_row block" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :header_row do
+          "<tr><th>My new header_row definition</th></tr>".html_safe
+        end
+        table.column :first_name
+      end
+
+      xml = XmlSimple.xml_in(%%<table><thead><tr><th>My new header_row definition</th></tr></thead><tbody><tr><td>Andrew</td></tr></tbody></table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify html attributes" do
+      buffer = @view.table_for @users[0,1], :header_row_html => {:style => "background-color: orange"} do |table|
+        table.column :first_name
+      end
+      xml = XmlSimple.xml_in(%%<table><thead><tr style="background-color: orange"><th>First Name</th></tr></thead><tbody><tr><td>Andrew</td></tr></tbody></table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    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|
+        table.define :header_column do
+          "<th>Repeated Column</th>".html_safe
+        end
+        table.column :first_name
+        table.column :last_name
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Repeated Column</th><th>Repeated Column</th></tr></thead>
+          <tbody><tr><td>Andrew</td><td>Hunter</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify html attributes" do
+      buffer = @view.table_for @users[0,1], :header_html => {:class => "sortable"} do |table|
+        table.column :first_name
+      end
+      xml = XmlSimple.xml_in(%%<table><thead><tr><th class="sortable">First Name</th></tr></thead><tbody><tr><td>Andrew</td></tr></tbody></table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+    
+    it "should be able to dynamically specify column attributes" do
+      buffer = @view.table_for @users[0, 1], :header_html => {:class => lambda {@view.cycle("even", "odd")},
+                                                              :id => lambda {|column| "#{column.name.to_s}_header"}} do |table|
+        table.column :email
+        table.column :first_name
+        table.column :last_name
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead>
+            <tr>
+              <th class="even" id="email_header">Email</th>
+              <th class="odd" id="first_name_header">First Name</th>
+              <th class="even" id="last_name_header">Last Name</th>
+            </tr></thead>
+          <tbody>
+            <tr><td>andrew.hunter@livingsocial.com</td><td>Andrew</td><td>Hunter</td></tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+  
+  describe "edit_header block" do
+    it "should be able to replace the edit_header block"
+  end
+
+  describe "delete_header block" do
+    it "should be able to replace the delete_header block"
+  end
+
+  describe "show_header block" do
+    it "should be able to replace the show_header block"
+  end
+
+  describe "column header contents block" do
+    it "should be able to override the label for a particular column" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :label => "Email Address"
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Email Address</th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to override the global defined label for all columns" do
+      buffer = @view.table_for @users[0,1], :label => "My Default Label" do |table|
+        table.column :email, :label => "Email Address"
+        table.column :first_name
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Email Address</th><th>My Default Label</th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td><td>Andrew</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to override the definition for a particular column header block" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :label => "Email Address"
+        table.define :email_header do |column, options|
+          "My Own Header (Replaced #{options[:label]})"
+        end
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>My Own Header (Replaced Email Address)</th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to override the definition for a particular column header block using the table_for 'header' method" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :label => "Email Address"
+        table.header :email do |column, options|
+          "My Own Header (Replaced #{options[:label]})"
+        end
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>My Own Header (Replaced Email Address)</th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should add a 'sorting' class to the 'th' element and a link around the header content if a column is sortable" do
+      @view.expects(:params).at_least_once.returns({})
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :sortable => true, :header_html => {:class => "email", :style => "color:red"}
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th class="email sorting" style="color:red"><a href="?order=email&sort_mode=asc">Email</a></th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should add a 'sorting_asc' class to the 'th' element and a link around the header content if a column is sortable and the column is sorted in asc order" do
+      @view.expects(:params).at_least_once.returns({:order => "email", :sort_mode => "asc"})
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :sortable => true
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th class="sorting_asc"><a href="?order=email&sort_mode=desc">Email</a></th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should add a 'sorting_asc' class to the 'th' element and a link around the header content if a column is sortable and the column is sorted in asc order and the order param matches the column order field" do
+      @view.expects(:params).at_least_once.returns({:order => "email_address", :sort_mode => "asc"})
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :sortable => true, :order => "email_address"
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th class="sorting_asc"><a href="?order=email_address&sort_mode=desc">Email</a></th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should not add a 'sorting_asc' class to the 'th' element and a link around the header content if a column is sortable and the column is sorted in asc order and the order param does not match the column order field" do
+      @view.expects(:params).at_least_once.returns({:order => "email", :sort_mode => "asc"})
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :sortable => true, :order => "email_address"
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th class="sorting"><a href="?order=email_address&sort_mode=asc">Email</a></th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should add a 'sorting_desc' class to the 'th' element and a link around the header content if a column is sortable and the column is sorted in desc order" do
+      @view.expects(:params).at_least_once.returns({:order => "email", :sort_mode => "desc"})
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :sortable => true
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th class="sorting_desc"><a href="?order=email&sort_mode=reset">Email</a></th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should add a 'sorting' class to the 'th' element and a link around the header content if a column is sortable and the sort_mode is in reset mode" do
+      @view.expects(:params).at_least_once.returns({:order => "email", :sort_mode => "reset"})
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :sortable => true
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th class="sorting"><a href="?order=email&sort_mode=asc">Email</a></th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should allow a sort_url to be specified for sortable columns" do
+      @view.expects(:params).at_least_once.returns({})
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :sortable => true, :sort_url => "/users"
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th class="sorting"><a href="/users?order=email&sort_mode=asc">Email</a></th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should allow a global sortable option for all columns and the ability to override on a column by column basis" do
+      @view.expects(:params).at_least_once.returns({})
+      buffer = @view.table_for @users[0,1], :sortable => true do |table|
+        table.column :email
+        table.column :first_name, :sortable => false
+        table.column :last_name
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead>
+            <tr>
+              <th class="sorting"><a href="?order=email&sort_mode=asc">Email</a></th>
+              <th>First Name</th>
+              <th class="sorting"><a href="?order=last_name&sort_mode=asc">Last Name</a></th>
+            </tr>
+          </thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td><td>Andrew</td><td>Hunter</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should allow a global header_html option for all columns and the ability to override on a column by column basis" do
+      buffer = @view.table_for @users[0,1], :header_html => {:class => lambda {|column| "#{column.name}_header"}} do |table|
+        @view.expects(:params).at_least_once.returns({})
+        table.column :email, :sortable => true
+        table.column :first_name, :header_html => {:class => "my_header"}
+        table.column :last_name, :header_html => {:class => "my_other_header"}, :sortable => true
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead>
+            <tr>
+              <th class="email_header sorting"><a href="?order=email&sort_mode=asc">Email</a></th>
+              <th class="my_header">First Name</th>
+              <th class="my_other_header sorting"><a href="?order=last_name&sort_mode=asc">Last Name</a></th>
+            </tr>
+          </thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td><td>Andrew</td><td>Hunter</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+
+  describe "tbody block" do
+    it "should be able to replace the tbody 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
+        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>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify html attributes" do
+      buffer = @view.table_for @users[0,1], :tbody_html => {:style => "background-color: orange"}
+      xml = XmlSimple.xml_in(%%<table><thead><tr></tr></thead><tbody style="background-color: orange"><tr></tr></tbody></table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    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|
+        table.define :row do |user|
+          "<tr><td>User #{user.first_name}</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>User Andrew</td></tr>
+            <tr><td>User Todd</td></tr>
+            <tr><td>User Jon</td></tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to dynamically specify row attributes" do
+      buffer = @view.table_for @users, :row_html => {:class => lambda {@view.cycle("even", "odd")},
+                                                     :id => lambda {|user| "user-#{user.id}"}} do |table|
+        table.column :email
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Email</th></tr></thead>
+          <tbody>
+            <tr class="even" id="user-1"><td>andrew.hunter@livingsocial.com</td></tr>
+            <tr class="odd" id="user-2"><td>todd.fisher@livingsocial.com</td></tr>
+            <tr class="even" id="user-3"><td>jon.phillips@livingsocial.com</td></tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    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|
+          "<td>#{column.name.to_s.titleize} value is #{user.send(column.name)}</td>".html_safe
+        end
+        table.column :email
+        table.column :first_name
+        table.column :last_name
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Email</th><th>First Name</th><th>Last Name</th></tr></thead>
+          <tbody>
+            <tr>
+              <td>Email value is andrew.hunter@livingsocial.com</td>
+              <td>First Name value is Andrew</td>
+              <td>Last Name value is Hunter</td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify html attributes" do
+      buffer = @view.table_for @users[0,1], :column_html => {:class => "data"} do |table|
+        table.column :first_name
+      end
+      xml = XmlSimple.xml_in(%%<table><thead><tr><th>First Name</th></tr></thead><tbody><tr><td class="data">Andrew</td></tr></tbody></table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+    
+    it "should be able to dynamically specify column attributes" do
+      buffer = @view.table_for @users[0, 1], :column_html => {:class => lambda {@view.cycle("even", "odd")},
+                                                              :id => lambda {|user, column| "#{column.name.to_s}_data"}} do |table|
+        table.column :email
+        table.column :first_name
+        table.column :last_name
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead>
+            <tr><th>Email</th><th>First Name</th><th>Last Name</th></tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td class="even" id="email_data">andrew.hunter@livingsocial.com</td>
+              <td class="odd" id="first_name_data">Andrew</td>
+              <td class="even" id="last_name_data">Hunter</td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should allow a global column_html option for all columns and the ability to override on a column by column basis" do
+      buffer = @view.table_for @users[0,1], :column_html => {:class => lambda {|record, column| "#{column.name}_data"}} do |table|
+        table.column :first_name, :column_html => {:class => "my_data"}
+        table.column :last_name
+      end
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>First Name</th><th>Last Name</th></tr></thead>
+          <tbody>
+            <tr>
+              <td class="my_data">Andrew</td>
+              <td class="last_name_data">Hunter</td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+
+  describe "edit block" do
+    it "should be able to replace the edit block"
+    it "should be able to create an edit column" do
+      @view.expects(:edit_user_path).with(User.first).returns("/users/1/edit")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :edit
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1/edit">Edit</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to update the label for an edit column" do
+      @view.expects(:edit_user_path).with(User.first).returns("/users/1/edit")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :edit, :link_label => "Modify"
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1/edit">Modify</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the action for an edit column" do
+      @view.expects(:modify_user_path).with(User.first).returns("/users/1/modify")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :edit, :action => :modify
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1/modify">Edit</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the scope for an edit column" do
+      @view.expects(:edit_user_test_user_path).with(User.last, User.first).returns("/users/3/test/users/1/edit")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :edit, :scope => [User.last, :test]
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/3/test/users/1/edit">Edit</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the html for an edit column" do
+      @view.expects(:edit_user_path).with(User.first).returns("/users/1/edit")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :edit, :link_html => {:style => "color:red"}
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1/edit" style="color:red">Edit</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+
+  describe "show block" do
+    it "should be able to replace the show block"
+    it "should be able to create a show column" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :show
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1">Show</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to update the label for an show column" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :show, :link_label => "Display"
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1">Display</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the action for an show column" do
+      @view.expects(:display_user_path).with(User.first).returns("/users/1/display")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :show, :action => :display
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1/display">Show</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the scope for an show column" do
+      @view.expects(:user_test_user_path).with(User.last, User.first).returns("/users/3/test/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :show, :scope => [User.last, :test]
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/3/test/users/1">Show</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the html for an show column" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :show, :link_html => {:style => "color:red"}
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td><a href="/users/1" style="color:red">Show</a></td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+
+  describe "delete block" do
+    it "should be able to replace the delete block"
+    it "should be able to create a delete column" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :delete
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody>
+            <tr>
+              <td>
+                <a href="/users/1" rel="nofollow" data-method="delete" data-confirm="Are you sure you want to delete this User?">Delete</a>
+              </td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to update the label for an delete column" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :delete, :link_label => "Destroy"
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody>
+            <tr>
+              <td>
+                <a href="/users/1" rel="nofollow" data-method="delete" data-confirm="Are you sure you want to delete this User?">Destroy</a>
+              </td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the action for an delete column" do
+      @view.expects(:dispose_user_path).with(User.first).returns("/users/1/dispose")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :delete, :action => :dispose
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody>
+            <tr>
+              <td>
+                <a href="/users/1/dispose" rel="nofollow" data-method="delete" data-confirm="Are you sure you want to delete this User?">Delete</a>
+              </td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the scope for a delete column" do
+      @view.expects(:user_test_user_path).with(User.last, User.first).returns("/users/3/test/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :delete, :scope => [User.last, :test]
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody>
+            <tr>
+              <td>
+                <a href="/users/3/test/users/1" rel="nofollow" data-method="delete" data-confirm="Are you sure you want to delete this User?">Delete</a>
+              </td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to specify the html for a delete column" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :delete, :link_html => {:style => "color:red"}
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody>
+            <tr>
+              <td>
+                <a href="/users/1" style="color:red" rel="nofollow" data-method="delete" data-confirm="Are you sure you want to delete this User?">Delete</a>
+              </td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to override the delete message for a delete link"
+    it "should be able to override the method for a delete link"
+  end
+
+  describe "column data contents block" do
+    it "should be able to replace an individual column data contents block" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :email, :label => "Email Address"
+        table.column :label => "Full Name" do |user|
+          "#{user.first_name} #{user.last_name}"
+        end
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Email Address</th><th>Full Name</th></tr></thead>
+          <tbody><tr><td>andrew.hunter@livingsocial.com</td><td>Andrew Hunter</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'bundler/setup'
+
+Bundler.require(:default)
+
+require 'table-for'
+require 'ostruct'
+require 'xmlsimple'
+require 'active_record'
+require 'active_support/all'
+require 'with_model'
+
+def print_hash(hash)
+  hash.inject("") { |s, (k, v)| "#{s} #{k}: #{v}." }
+end
+
+RSpec.configure do |config|
+  config.extend WithModel
+  config.mock_with :mocha
+  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table-for
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  version: 1.0.0
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 -05:00
+date: 2012-02-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,14 +37,14 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
+        version: 3.1.0
   prerelease: false
   type: :runtime
   requirement: *id002
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
+        - 1
         - 0
         - 0
-        - 8
-        version: 0.0.8
+        version: 1.0.0
   prerelease: false
   type: :runtime
   requirement: *id003
@@ -92,6 +92,34 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id007
 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: []
@@ -108,8 +136,10 @@ files:
 - lib/table-for.rb
 - lib/table_for/base.rb
 - lib/table_for/engine.rb
-- lib/table_for/helper_methods.rb
+- lib/table_for/view_additions.rb
 - rails/init.rb
+- spec/integration/table_for_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/hunterae/table-for
 licenses: []

data/lib/table_for/helper_methods.rb

@@ -1,20 +0,0 @@
-module TableFor
-  module HelperMethods
-    def table_for_options(options={}, parameters={})
-      return nil if options.nil?
-
-      evaluated_options = {}
-      options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call(parameters) : v)}
-      evaluated_options
-    end
-    
-    def table_for(records, options={}, &block)
-      options[:records] = records
-      options[:template] = "table_for/table_for"
-      options[:templates_folder] = "table_for"
-      options[:variable] = "table"
-
-      TableFor::Base.new(self, options, &block).render
-    end
-  end
-end