table-for 1.0.0 → 1.1.0

data/CHANGELOG.rdoc

@@ -0,0 +1,3 @@
+1.1.0 (February 4, 2012)
+
+* Removed dependency on rails 3.1, switched to >= 3.0.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

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

@@ -84,7 +84,9 @@
 <% end %>
 
 <% 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]) %>
+  <% 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], [options[:action], options[:scope], record].flatten, {:method => method, :confirm => confirm}.merge(options[:link_html]) %>
 <% end %>
 
 <% table.columns.each do |column| %>

data/lib/table_for/view_additions.rb

@@ -19,7 +19,6 @@ module TableFor
         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

data/spec/integration/table_for_spec.rb

@@ -164,15 +164,78 @@ describe "table_for" do
   end
   
   describe "edit_header block" do
-    it "should be able to replace the edit_header block"
+    it "should be able to replace the edit_header block" do
+      @view.expects(:edit_user_path).with(User.first).returns("/users/1/edit")
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :edit_header do
+          "Edit"
+        end
+        table.column :edit
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Edit</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
   end
 
   describe "delete_header block" do
-    it "should be able to replace the delete_header block"
+    it "should be able to replace the delete_header block" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :delete_header do
+          "Delete"
+        end
+        table.column :delete
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Delete</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
   end
 
   describe "show_header block" do
-    it "should be able to replace the show_header block"
+    it "should be able to replace the show_header block" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :show_header do
+          "Show"
+        end
+        table.column :show
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th>Show</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
   end
 
   describe "column header contents block" do
@@ -544,7 +607,22 @@ describe "table_for" do
   end
 
   describe "edit block" do
-    it "should be able to replace the edit block"
+    it "should be able to replace the edit block" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :edit do
+          "Edit Link"
+        end
+        table.column :edit
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td>Edit Link</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
     it "should be able to create an edit column" do
       @view.expects(:edit_user_path).with(User.first).returns("/users/1/edit")
 
@@ -622,7 +700,22 @@ describe "table_for" do
   end
 
   describe "show block" do
-    it "should be able to replace the show block"
+    it "should be able to replace the show block" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :show do
+          "Show Link"
+        end
+        table.column :show
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td>Show Link</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
     it "should be able to create a show column" do
       @view.expects(:user_path).with(User.first).returns("/users/1")
 
@@ -700,7 +793,22 @@ describe "table_for" do
   end
 
   describe "delete block" do
-    it "should be able to replace the delete block"
+    it "should be able to replace the delete block" do
+      buffer = @view.table_for @users[0,1] do |table|
+        table.define :delete do
+          "Delete Link"
+        end
+        table.column :delete
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody><tr><td>Delete Link</td></tr></tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
     it "should be able to create a delete column" do
       @view.expects(:user_path).with(User.first).returns("/users/1")
 
@@ -806,8 +914,47 @@ describe "table_for" do
       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"
+    it "should be able to override the delete confirmation message for a delete link" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :delete, :confirm => "Are you sure?"
+      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?">Delete</a>
+              </td>
+            </tr>
+          </tbody>
+        </table>%)
+      XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
+    end
+
+    it "should be able to override the method for a delete link" do
+      @view.expects(:user_path).with(User.first).returns("/users/1")
+
+      buffer = @view.table_for @users[0,1] do |table|
+        table.column :delete, :method => :get
+      end
+
+      xml = XmlSimple.xml_in(%%
+        <table>
+          <thead><tr><th></th></tr></thead>
+          <tbody>
+            <tr>
+              <td>
+                <a href="/users/1" data-method="get" 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
   end
 
   describe "column data contents block" do

data/spec/table_for/view_additions_spec.rb

@@ -0,0 +1,147 @@
+require "spec_helper"
+
+describe TableFor::ViewAdditions do
+  before(:each) do
+    @view_class = Class.new
+    @view = @view_class.new
+    @view_class.send(:include, ActionView::Helpers::TextHelper)
+    @view_class.send(:include, TableFor::ViewAdditions::ClassMethods)
+    @records = [OpenStruct.new(:id => 1)]
+    @column = stub(:name => :my_column)
+  end
+
+  describe "table_for method" do
+    it "should call render on the TableFor::Base instance" do
+      TableFor::Base.expects(:new).returns(mock(:render => ""))
+      @view.table_for(@records)
+    end
+
+    it "should pass the view as the first parameter to TableFor::Base initialization" do
+      TableFor::Base.expects(:new).with {|view, options| view == @view}.returns(mock(:render => ""))
+      @view.table_for(@records)
+    end
+
+    it "should default the template to render" do
+      TableFor::Base.expects(:new).with {|view, options| options[:template] == "table_for/table_for"}.returns(mock(:render => ""))
+      @view.table_for(@records)
+    end
+
+    it "should default the variable to 'table' to render" do
+      TableFor::Base.expects(:new).with {|view, options| options[:variable] == "table"}.returns(mock(:render => ""))
+      @view.table_for(@records)
+    end
+
+    it "should default the records to the collection passed in" do
+      TableFor::Base.expects(:new).with {|view, options| options[:records] == @records}.returns(mock(:render => ""))
+      @view.table_for(@records)
+    end
+
+    it "should add any runtime options to the options initialized for TableFor::Base" do
+      TableFor::Base.expects(:new).with {|view, options| options[:option1] == 1 && options[:option2] == "2"}.returns(mock(:render => ""))
+      @view.table_for(@records, :option1 => 1, :option2 => "2")
+    end
+  end
+
+  describe "table_for_evaluated_options method" do
+    it "should evaluate any proc options" do
+      proc1 = lambda {@view.cycle("even", "odd")}
+      proc2 = lambda {@view.cycle("one", "two")}
+      evaluated_options = @view.table_for_evaluated_options(:class => proc1, :id => proc2, :style => "color:red")
+      evaluated_options[:class].should eql "even"
+      evaluated_options[:id].should eql "one"
+      evaluated_options[:style].should eql "color:red"
+    end
+
+    it "should pass any additional arguments to evaluated procs" do
+      proc1 = lambda { |param1, param2| "user_#{param1}_#{param2}"}
+      evaluated_options = @view.table_for_evaluated_options(1, 2, :class => proc1)
+      evaluated_options[:class].should eql "user_1_2"
+    end
+  end
+
+  describe "table_for_header_html method" do
+    it "should return nil if header_html is not passed in" do
+      header_html = @view.table_for_header_html(@column)
+      header_html.should eql({})
+    end
+
+    it "should evaluate any procs for header_html" do
+      header_html = @view.table_for_header_html(@column, :header_html => {:class => lambda {|column| "#{column.name}_header"}})
+      header_html[:class].should eql "#{@column.name}_header"
+    end
+
+    it "should join the 'sorting' class with any other header_html class provided" do
+      @view.expects(:params).returns({})
+      header_html = @view.table_for_header_html(@column, :header_html => {:class => "c1 c2"}, :sortable => true)
+      header_html[:class].should eql "c1 c2 sorting"
+    end
+
+    it "should add a 'sorting' class to the header_html class if a column is sortable" do
+      @view.expects(:params).returns({})
+      header_html = @view.table_for_header_html(@column, :sortable => true)
+      header_html[:class].should eql "sorting"
+    end
+
+    it "should add a 'sorting_asc' class to the header_html class if a column is sortable and it is already sorted in asc order" do
+      @view.expects(:params).at_least_once.returns(:order => @column.name.to_s, :sort_mode => "asc")
+      header_html = @view.table_for_header_html(@column, :sortable => true)
+      header_html[:class].should eql "sorting_asc"
+    end
+
+    it "should add a 'sorting_desc' class to the header_html class if a column is sortable and it is already sorted in desc order" do
+      @view.expects(:params).at_least_once.returns(:order => @column.name.to_s, :sort_mode => "desc")
+      header_html = @view.table_for_header_html(@column, :sortable => true)
+      header_html[:class].should eql "sorting_desc"
+    end
+
+    it "should add a 'sorting' class to the header_html class if a column is sortable and it is reset mode" do
+      @view.expects(:params).at_least_once.returns(:order => @column.name.to_s, :sort_mode => "reset")
+      header_html = @view.table_for_header_html(@column, :sortable => true)
+      header_html[:class].should eql "sorting"
+    end
+  end
+
+  describe "table_for_sort_link method" do
+    it "should be able to generate a sort link for a column if that column is sortable" do
+      @view.expects(:params).at_least_once.returns({})
+      @view.expects(:link_to).with(@column.name.to_s.titleize, "?order=#{@column.name}&sort_mode=asc").returns "my link"
+      @view.table_for_sort_link(@column).should eql "my link"
+    end
+
+    it "should be able to generate a sort link for a column if that column is sortable and it is already sorted in asc order" do
+      @view.expects(:params).at_least_once.returns(:order => @column.name.to_s, :sort_mode => "asc")
+      @view.expects(:link_to).with(@column.name.to_s.titleize, "?order=#{@column.name}&sort_mode=desc").returns "my link"
+      @view.table_for_sort_link(@column).should eql "my link"
+    end
+
+    it "should be able to generate a sort link for a column if that column is sortable and it is already sorted in desc order" do
+      @view.expects(:params).at_least_once.returns(:order => @column.name.to_s, :sort_mode => "desc")
+      @view.expects(:link_to).with(@column.name.to_s.titleize, "?order=#{@column.name}&sort_mode=reset").returns "my link"
+      @view.table_for_sort_link(@column).should eql "my link"
+    end
+
+    it "should be able specify the label for a sort link" do
+      @view.expects(:params).at_least_once.returns({})
+      @view.expects(:link_to).with("My Label", "?order=#{@column.name}&sort_mode=asc").returns "my link"
+      @view.table_for_sort_link(@column, :label => "My Label").should eql "my link"
+    end
+
+    it "should be able specify the sort_url for a sort link" do
+      @view.expects(:params).at_least_once.returns({})
+      @view.expects(:link_to).with(@column.name.to_s.titleize, "/users?order=#{@column.name}&sort_mode=asc").returns "my link"
+      @view.table_for_sort_link(@column, :sort_url => "/users").should eql "my link"
+    end
+
+    it "should be able specify the order field for a sort link" do
+      @view.expects(:params).at_least_once.returns({})
+      @view.expects(:link_to).with(@column.name.to_s.titleize, "?order=first_name%2Clast_name&sort_mode=asc").returns "my link"
+      @view.table_for_sort_link(@column, :order => "first_name,last_name").should eql "my link"
+    end
+
+    it "should remove the action and controller params when generating the url" do
+      @view.expects(:params).at_least_once.returns(:controller => "users", :action => "show")
+      @view.expects(:link_to).with(@column.name.to_s.titleize, "?order=#{@column.name}&sort_mode=asc").returns "my link"
+      @view.table_for_sort_link(@column).should eql "my link"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table-for
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -37,14 +37,14 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 3
-        - 1
         - 0
-        version: 3.1.0
+        - 0
+        version: 3.0.0
   prerelease: false
   type: :runtime
   requirement: *id002
@@ -120,6 +120,34 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id009
 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: []
@@ -129,6 +157,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- CHANGELOG.rdoc
 - README.rdoc
 - Rakefile
 - VERSION
@@ -140,6 +169,7 @@ files:
 - rails/init.rb
 - 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: []