table_for_collection 1.0.4 → 1.0.5

data/README.rdoc

@@ -48,13 +48,16 @@ This ruby code will produce following HTML:
     <% column :name, :html => { :th => { :width => "25%" }, :td => { :class => "user-name" }} %>
     <% column :email, :width => "20%" %>
     <% column :address, :title => "Home" %>
+    <% column :created_at, :title_callback => lambda { |title| link_to(title, users_path(params.merge(:order => "desc"))) } %>
   <% end %>
   
 You can put :html hash to the options list (inside the :column method too). In this case
 table will be created with given html attributes. To assign :tr options use :tr key under :html - :class value will be added
 to the classes list, :id can be instance of the Proc class, in this it will be called for each collection element.
 For column width you can use shortcut :width, remember that :width shortcut has higher priority.
-Also :title value in the :column method will be used as column's title. It will produce HTML similar to:
+Also :title value in the :column method will be used as column's title. You can pass Proc object to the :title_callback param.
+In this case given proc will be called with title value.
+It will produce HTML similar to:
   
   <table class="simple-table" id="users" width="100%">
     <thead>
@@ -62,6 +65,7 @@ Also :title value in the :column method will be used as column's title. It will
         <th width="25%">Name</th>
         <th width="20%">Email</th>
         <th>Home</th>
+        <th><a href="/users?order=desc">Created At</a></th>
       </tr>
     </thead>
     <tbody>
@@ -69,6 +73,7 @@ Also :title value in the :column method will be used as column's title. It will
         <td class="user-name">...</td>
         <td>...</td>
         <td>...</td>
+        <td>...</td>
       </tr>
       <tr class="simple-row" id="user-row-14">
         ...

data/lib/table_for/column.rb

@@ -17,9 +17,11 @@ module TableHelper
       else
         @attr.to_s.capitalize
       end
+      
+      @title_callback = @options.delete(:title_callback)
 
       @html  = @options.delete(:html)  || {}
-      @html.merge!({:th => { :width => @options.delete(:width) }}) if @options[:width]
+      @html.merge!({:th => { :width => @options.delete(:width) }}) if @options.has_key?(:width)
     end
 
     def content_for
@@ -28,7 +30,7 @@ module TableHelper
 
     def draw_title
       content_tag :th, @html[:th] do
-        @title
+        @title_callback.is_a?(Proc) ? @title_callback.call(@title) : @title
       end
     end
   end

data/lib/table_for/version.rb

@@ -1,4 +1,4 @@
 module TableHelper
   GEM_NAME = "table_for_collection"
-  VERSION  = "1.0.4"
+  VERSION  = "1.0.5"
 end

data/spec/table_for/column_spec.rb

@@ -16,12 +16,16 @@ describe TableHelper::Column do
     it ":width method should success" do
       build_column(klass, :id, :width => '20%').draw_title.should eq('<th width="20%">Id</th>')
     end
+    
+    it "should success with :title_callback option" do
+      build_column(klass, :id, :title_callback => lambda { |t| template.link_to(t, "#") }).draw_title.should eq(%{<th><a href="#">Id</a></th>})
+    end
 
     # :content_for
     it ":content_for method should raise error" do
-      lambda do
+      expect {
         build_column(klass, :id, :title => "Test").content_for
-      end.should raise_error(NoMethodError, "Use SimpleColumn or CallbackColumn")
+      }.to raise_error(NoMethodError, "Use SimpleColumn or CallbackColumn")
     end
   end
 end

data/spec/table_for_collection_spec.rb

@@ -180,6 +180,30 @@ describe ActionView::Base do
       end
     end
     # <%= table_for @users do %>
+    #   <% column :name, :title => "User's name", :title_callback => lambda { |t| link_to(t, "#")} %>
+    # <% end %>
+    describe "with callback-titled column" do
+      before(:each) do
+        @html = template.table_for(users) do
+          column :hits, :title => "user's hits", :title_callback => lambda { |t| link_to(t, "/users/sort/id")}
+        end
+      end
+      it "should render valid HTML" do
+        @html.should have_selector("table") do |table|
+          table.should have_selector("thead/tr/th") do |th|
+            th.should have_selector("a[@href='/users/sort/id']", :content => "user's hits")
+          end
+          table.should have_selector("tbody/tr") do |tr|
+            users.each do |user|
+              tr.should have_selector("td") do |td|
+                td.should contain(user[:hits].to_s)
+              end
+            end
+          end
+        end
+      end
+    end
+    # <%= table_for @users do %>
     #   <% column :name %>
     # <% end %>
     describe "with simple column" do
@@ -414,6 +438,30 @@ describe ActionView::Base do
       end
     end
     # <%= table_for @users do %>
+    #   <% column :name, :title => "User's name", :title_callback => lambda { |t| link_to(t, "#")} %>
+    # <% end %>
+    describe "with callback-titled column" do
+      before(:each) do
+        @html = template.table_for(users) do
+          column :email, :title_callback => lambda { |t| link_to(t, "/users/sort/email")}
+        end
+      end
+      it "should render valid HTML" do
+        @html.should have_selector("table") do |table|
+          table.should have_selector("thead/tr/th") do |th|
+            th.should have_selector("a[@href='/users/sort/email']", :content => "Email")
+          end
+          table.should have_selector("tbody/tr") do |tr|
+            users.each do |user|
+              tr.should have_selector("td") do |td|
+                td.should contain(user.email)
+              end
+            end
+          end
+        end
+      end
+    end
+    # <%= table_for @users do %>
     #   <% column :name %>
     # <% end %>
     describe "with simple column" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table_for_collection
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Dima Lunich
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +02:00
+date: 2011-11-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,7 @@ rubyforge_project: ""
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: table_for_collection-1.0.4
+summary: table_for_collection-1.0.5
 test_files: 
 - spec/core_ex/array_spec.rb
 - spec/spec_helper.rb