table_for_collection 1.0.3 → 1.0.4

data/Changelog

@@ -1,3 +1,9 @@
+== master
+
+Add option time_format for simple column
+Add shortcut for column width
+Translate column name if possible
+
 == v.1.0.3
 
 Callback column for given attribute

data/Gemfile

@@ -3,14 +3,8 @@ source :gemcutter
 gem "actionpack"
 
 group :development, :test do
-  gem "rspec", ">=2.0.0"
-  gem "autotest"
+  gem "rspec"
   gem "webrat"
-
-  case RUBY_VERSION
-  when /^1\.9/
-    gem 'ruby-debug19'
-  when /^1\.8/
-    gem 'ruby-debug'
-  end
+  #gem 'ruby-debug19', :platforms => :ruby_19
+  gem 'ruby-debug', :platforms => :ruby_18
 end

data/README.rdoc

@@ -2,6 +2,12 @@
 
 table_for_collection is a simple gem used to render tables based on the given collection.
 
+=== Install
+
+Just add to your Gemfile
+
+  gem 'table_for_collection'
+
 === Simplest examle
 
   <%= table_for @users do -%>
@@ -35,32 +41,38 @@ This ruby code will produce following HTML:
     :id => "users",
     :width => "100%",
     :tr => {
-      :class => "simple-row"
+      :class => "simple-row",
+      :id => lambda { |user| "user-row-#{user.id}" }
     }
   } do -%>
     <% column :name, :html => { :th => { :width => "25%" }, :td => { :class => "user-name" }} %>
-    <% column :email %>
+    <% column :email, :width => "20%" %>
     <% column :address, :title => "Home" %>
   <% 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. Also :title value in the :column method
-will be used as column's title. It will produce HTML similar to:
+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:
   
   <table class="simple-table" id="users" width="100%">
     <thead>
       <tr>
         <th width="25%">Name</th>
-        <th>Email</th>
+        <th width="20%">Email</th>
         <th>Home</th>
       </tr>
     </thead>
     <tbody>
-      <tr class="simple-row">
+      <tr class="simple-row" id="user-row-12">
         <td class="user-name">...</td>
         <td>...</td>
         <td>...</td>
       </tr>
+      <tr class="simple-row" id="user-row-14">
+        ...
+      </tr>
     </tbody>
   </table>
 
@@ -78,6 +90,7 @@ will be used as column's title. It will produce HTML similar to:
     <% column :title => "Actions" do |user| %>
       <% [link_to("Show", user), link_to("Delete", user, :method => :delete)].join(" | ") %>
     <% end %>
+    <% column :created_at, :time_format => "%Y-%m-%d" %>
   <% end %>
 
 === Example with colorized rows
@@ -95,6 +108,11 @@ Also class given by :stripe option will be merged with options[:html][:tr] so th
   <tr class="row even">...
   <tr class="row odd">...
   
+== I18n
+
+When column name is set, but :title is not, helper tries to find translation in standard mechanism of the ActiveModel.
+For more information visit: http://guides.rubyonrails.org/i18n.html#translations-for-active-record-models
+
 == Known issues
 
 Unfortunately it works incorrect if there is no "-" before %> in this code:

data/Rakefile

@@ -1,5 +1,7 @@
 require "rspec/core/rake_task"
 
+task :default => :spec
+
 desc "Test table_for_collection plugin."
 RSpec::Core::RakeTask.new('spec')
 

data/init.rb

@@ -1 +1 @@
-require 'table_for'
+require 'table_for_collection'

data/lib/table_for/callback_column.rb

@@ -1,12 +1,11 @@
 module TableHelper
   class CallbackColumn < Column # :nodoc:
-    def initialize(template, obj, ops)
+    def initialize(template, records, obj, ops)
       super
       @callback = @options.delete(:callback)
     end
-
     def content_for(record)
-      @attr ? @callback.call(record.send(@attr).to_s) : @callback.call(record)
+      @attr ? @callback.call(record.kind_of?(Hash) ? record[@attr] : record.send(@attr)) : @callback.call(record)
     end
   end
 end

data/lib/table_for/column.rb

@@ -3,10 +3,23 @@ module TableHelper
     attr_reader :title, :html
     delegate :content_tag, :to => :@template
 
-    def initialize(template, obj, ops)
+    def initialize(template, records, obj, ops={})
       @template, @attr, @options = template, obj, ops
-      @title = @options.delete(:title) || @attr.to_s.humanize.presence || " "
+
+      @title = if @options[:title]
+        @options.delete(:title)
+      elsif @attr.nil?
+        " "
+      elsif records.class.respond_to?(:human_attribute_name)
+        records.class.human_attribute_name(@attr.to_s)
+      elsif @attr.to_s.respond_to?(:humanize)
+        @attr.to_s.humanize
+      else
+        @attr.to_s.capitalize
+      end
+
       @html  = @options.delete(:html)  || {}
+      @html.merge!({:th => { :width => @options.delete(:width) }}) if @options[:width]
     end
 
     def content_for

data/lib/table_for/helper.rb

@@ -30,7 +30,7 @@ module TableHelper
   def table_for(records, *args, &proc)
     raise ArgumentError, "Missing block" unless block_given?
     options = args.extract_options!
-    raise ArgumentError, "Records should be array" unless records.is_a? Enumerable
+    raise ArgumentError, "Records should have #map method" unless records.respond_to?(:map)
     t = Table.new(self, records, options)
     t.instance_eval(&proc)
     t.draw

data/lib/table_for/simple_column.rb

@@ -1,7 +1,11 @@
 module TableHelper
   class SimpleColumn < Column # :nodoc:
     def content_for(record)
-      record.send(@attr).to_s
+      called_record = record.kind_of?(Hash) ? record[@attr] : record.send(@attr)
+      if @options[:time_format] and called_record.is_a? Time
+        called_record = called_record.strftime(@options[:time_format])
+      end
+      called_record.to_s
     end
   end
 end

data/lib/table_for/table.rb

@@ -2,7 +2,7 @@ require "core_ex/array"
 
 module TableHelper
   class Table # :nodoc:
-    delegate :content_tag, :to => :@template
+    delegate :content_tag, :content_tag_for, :dom_id, :dom_class, :to => :@template
     
     def initialize(template, records, options = {})
       @template, @records, @columns = template, records, []
@@ -17,7 +17,7 @@ module TableHelper
 
     def columns(*args)
       res = []
-      unless args.blank?
+      if args.present?
         args.each do |arg|
           res << self.column(arg)
         end
@@ -35,9 +35,9 @@ module TableHelper
 
       if block_given?
         col_options[:callback] = block
-        @columns << (res = CallbackColumn.new(@template, attr, col_options))
+        @columns << (res = CallbackColumn.new(@template, @records, attr, col_options))
       elsif attr
-        @columns << (res = SimpleColumn.new(@template, attr, col_options))
+        @columns << (res = SimpleColumn.new(@template, @records, attr, col_options))
       else
         raise ArgumentError, "Attribute name or block should be given"
       end
@@ -69,7 +69,7 @@ module TableHelper
     def body
       content_tag :tbody do
         @records.map do |rec|
-          content_tag(:tr, tr_options) do
+          content_tag :tr, tr_options(rec) do
             @columns.map do |col|
               content_tag :td, col.html[:td] do
                 col.content_for(rec).to_s
@@ -80,16 +80,18 @@ module TableHelper
       end
     end
     
-    def tr_options
+    def tr_options(rec)
       res = @tr_html_options.nil? ? {} : @tr_html_options.clone
       html_class = @stripes.next
       unless html_class.nil?
-        if res.has_key?(:class)
-          res[:class] += " " + html_class
-        else
-          res.merge!({ :class => html_class })
-        end
+        klasses = [res[:class], html_class]
+        klasses << dom_class(rec) if rec.respond_to?(:model_name)
+        res[:class] = klasses.compact.join(" ")
+      end
+      if res.has_key?(:id) && res[:id].respond_to?(:call)
+        res[:id] = res[:id].call(rec)
       end
+      res[:id] ||= dom_id(rec) if rec.respond_to?(:to_key)
       res
     end
 

data/lib/table_for/version.rb

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

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require "table_for_collection"
 require "webrat"
 
 def build_column(klass, arg, options = {})
-  klass.new(template, arg, options)
+  klass.new(template, mock(:test), arg, options)
 end
 
 # Column instance methods
@@ -41,6 +41,13 @@ shared_examples_for "Column class instance" do
   end
 end
 
+class User < OpenStruct
+  extend ActiveModel::Naming
+  def id
+    @table[:id]
+  end
+end
+
 RSpec.configure do |config|
   config.include(Webrat::Matchers)
 end

data/spec/table_for/callback_column_spec.rb

@@ -10,6 +10,11 @@ describe TableHelper::CallbackColumn do
   # call-proc
   let(:given_proc_without_attr) { lambda { |r| "aaa-#{r.id}" }}
   let(:given_proc_with_attr) { lambda { |r| "aaa-#{r}" }}
+  # user hash
+  let(:user_hash) { { :id => 12 } }
+  # call-proc
+  let(:given_proc_without_attr_for_hash) { lambda { |r| "aaa-#{r[:id]}" }}
+  let(:given_proc_with_attr_for_hash) { lambda { |r| "aaa-#{r}" }}
   # Instance methods
   describe "an instance" do
     it_should_behave_like "Column class instance"
@@ -28,15 +33,26 @@ describe TableHelper::CallbackColumn do
         col.title.should eq("Id")
       end
     end
-
     # :content_for
-    it ":content_for method should success without given attribute" do
-      col = build_column(klass, nil, :callback => given_proc_without_attr)
-      col.content_for(user).should == given_proc_without_attr.call(user)
+    context "user object" do
+      it ":content_for method should success without given attribute" do
+        col = build_column(klass, nil, :callback => given_proc_without_attr)
+        col.content_for(user).should == "aaa-12"
+      end
+      it ":content_for method should success with given attribute" do
+        col = build_column(klass, :id, :callback => given_proc_with_attr)
+        col.content_for(user).should == "aaa-12"
+      end
     end
-    it ":content_for method should success with given attribute" do
-      col = build_column(klass, :id, :callback => given_proc_with_attr)
-      col.content_for(user).should == given_proc_with_attr.call(user.id)
+    context "user hash" do
+      it ":content_for method should success without given attribute" do
+        col = build_column(klass, nil, :callback => given_proc_without_attr_for_hash)
+        col.content_for(user_hash).should == "aaa-12"
+      end
+      it ":content_for method should success with given attribute" do
+        col = build_column(klass, :id, :callback => given_proc_with_attr_for_hash)
+        col.content_for(user_hash).should == "aaa-12"
+      end
     end
   end
-end
+end

data/spec/table_for/column_spec.rb

@@ -12,6 +12,11 @@ describe TableHelper::Column do
     it ":title method should success" do
       build_column(klass, :id, :title => "Test").title.should eq("Test")
     end
+
+    it ":width method should success" do
+      build_column(klass, :id, :width => '20%').draw_title.should eq('<th width="20%">Id</th>')
+    end
+
     # :content_for
     it ":content_for method should raise error" do
       lambda do

data/spec/table_for/simple_column_spec.rb

@@ -6,7 +6,9 @@ describe TableHelper::SimpleColumn do
   # TableHelper::SimpleColumn
   let(:klass) { TableHelper::SimpleColumn }
   # user (stubbed data)
-  let(:user) { mock(:id => 12) }
+  let(:user) { mock(:id => 12, :created_at => Time.gm(2011, "feb", 24, 14, 23, 1)) }
+  # user (hash)
+  let(:user_hash) { { :id => 12, :created_at => Time.gm(2011, "feb", 24, 14, 23, 1) } }
   # Instance methods
   describe "an instance" do
     it_should_behave_like "Column class instance"
@@ -24,7 +26,16 @@ describe TableHelper::SimpleColumn do
     # :content_for
     it ":content_for method should success" do
       col = build_column(klass, :id)
-      col.content_for(user).should == user.id.to_s
+      col.content_for(user).should == "12"
+      col.content_for(user_hash).should == "12"
+    end
+
+    describe "format" do
+      it ":time_format should be displayed correctly" do
+        col = build_column(klass, :created_at, :time_format => '%Y-%m')
+        col.content_for(user).should == "2011-02"
+        col.content_for(user_hash).should == "2011-02"
+      end
     end
   end
 end

data/spec/table_for/table_spec.rb

@@ -8,14 +8,14 @@ describe TableHelper::Table do
   # users list (stubbed data)
   let(:users) do
     [
-      mock(:id => 1,
-           :name => "John Jackson",
-           :email => "john.jackson@example.com",
-           :address => "100, Spear Street, LA, USA"),
-      mock(:id => 2,
-           :name => "Jack Johnson",
-           :email => "jack.johnson@example.com",
-           :address => "12, Brooklin, NY, USA"),
+      User.new(:id => 1,
+               :name => "John Jackson",
+               :email => "john.jackson@example.com",
+               :address => "100, Spear Street, LA, USA"),
+      User.new(:id => 2,
+               :name => "Jack Johnson",
+               :email => "jack.johnson@example.com",
+               :address => "12, Brooklin, NY, USA"),
     ]
   end
   # table instance

data/spec/table_for_collection_spec.rb

@@ -5,66 +5,174 @@ describe ActionView::Base do
   let(:template) do
     ActionView::Base.new
   end
-  # users list (stubbed data)
-  let(:users) do
-    [
-      mock({
-        :id => 1209,
-        :name => "John Smith",
-        :email => "smith@matrix.net",
-        :address => "100, Spear Street, NY, USA",
-      }),
-      mock({
-        :id => 2123,
-        :name => "Thomas Anderson",
-        :email => "neo@matrix.net",
-        :address => "200, Spear Street, NY, USA",
-      }),
-      mock({
-        :id => 3323,
-        :name => "Trinity",
-        :email => "trinity@matrix.net",
-        :address => "300, Spear Street, NY, USA",
-      }),
-      mock({
-        :id => 4912,
-        :name => "Morpheus",
-        :email => "morpheus@matrix.net",
-        :address => "400, Spear Street, NY, USA",
-      })
-    ]
-  end
   # check if method available
   it "should respond to :table_for" do
     template.should respond_to(:table_for)
   end
-  
-  # main method
-  describe ":table_for method" do
-    # <%= table_for @users %>
-    it "should raise if no block given" do
-      lambda do
-        template.table_for(users)
-      end.should raise_error(ArgumentError)
+  # <%= table_for @users %>
+  it "should raise if no block given" do
+    lambda do
+      template.table_for([])
+    end.should raise_error(ArgumentError)
+  end
+  # users list (hashes array)
+  context "for hashes array" do
+    let(:users) do
+      [
+        { :hits => 87.0, :id => 1.0 },
+        { :hits => 86.0, :id => 5.0 },
+        { :hits => 78.0, :id => 6.0 },
+        { :hits => 78.0, :id => 3.0 },
+      ]
+    end
+    # <%= table_for @users, :html => { :id => "users", :class => "simple-table" } do %>
+    #   <% column :name %>
+    # <% end %>
+    describe "with given :html options" do
+      before(:each) do
+        @html = template.table_for(users, :html => { :id => "users", :class => "simple-table" }) do
+          column :hits
+        end
+      end
+      it "should render specialized table" do
+        @html.should have_selector("table#users.simple-table")
+      end
+    end
+    # <%= table_for @users, :stripes => ["odd", "even"] do %>
+    #   <% column :name %>
+    # <% end %>
+    describe "with cycling stripes" do
+      before(:each) do
+        @html = template.table_for(users, :stripes => %w{s-one s-two s-three}) do
+          column :name
+        end
+      end
+
+      it "should have valid classes" do
+        @html.should have_selector("tr.s-one", :count => 2)
+        @html.should have_selector("tr.s-two", :count => 1)
+        @html.should have_selector("tr.s-three", :count => 1)
+      end
+    end
+
+    # <%= table_for @users do %>
+    #   <% columns :hits, :id %>
+    # <% end %>
+    describe "with columns" do
+      before(:each) do
+        @html = template.table_for(users) do
+          columns :hits, :id
+        end
+      end
+      it "should render valid HTML" do
+        @html.should have_selector("table") do |table|
+          table.should have_selector("thead/tr") do |tr|
+            ["Id", "Hits"].each do |field|
+              tr.should have_selector("th") do |th|
+                th.should contain(field)
+              end
+            end
+          end
+        end
+      end
+    end
+    describe "with named callback column" do
+      before(:each) do
+        @html = template.table_for(users) do
+          column :id do |id|
+            mail_to id
+          end
+        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 contain("Id")
+          end
+          table.should have_selector("tbody/tr") do |tr|
+            users.each do |user|
+              tr.should have_selector("td") do |td|
+                td.should have_selector("a[@href='mailto:#{user[:id]}']")
+              end
+            end
+          end
+        end
+      end
     end
     # <%= table_for @users do %>
+    #   <% column :title => "User's name" do |user| %>
+    #     <% content_tag :div do %>
+    #       <% [user.first_name, user.last_name].join(" ") %>
+    #     <% end %>
+    #   <% end %>
+    # <% end %>
+    describe "with callback column" do
+      before(:each) do
+        @html = template.table_for(users) do
+          column :id
+          column :title => "HITS" do |user|
+            content_tag :div do
+              user[:hits].to_i.to_s
+            end
+          end
+        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 contain("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[:id].to_s)
+              end
+              tr.should have_selector("td/div") do |td|
+                td.should contain(user[:hits].to_i.to_s)
+              end
+            end
+          end
+        end
+      end
+    end
+    # <%= table_for @users, :stripes => ["odd", "even"], :html => { :tr => { :class => "table-row" } } do %>
     #   <% column :name %>
     # <% end %>
-    describe "with simple column" do
+    describe "with tr html" do
+      subject { template.table_for(users, :stripes => ["odd", "even"], :html => { :tr => { :class => "table-row", :id => lambda { |f| "user_#{f[:id].to_i}" } } }) do
+          column :hits
+        end
+      }
+      it "should have valid classes" do
+        should have_selector("tr.odd.table-row", :count => 2)
+        should have_selector("tr.even.table-row", :count => 2)
+      end
+      it "should have valid ids" do
+        users.each do |user|
+          should have_selector("tr.table-row#user_#{user[:id].to_i}") do |tr|
+            tr.should contain(user.hits.to_s)
+          end
+        end
+      end
+    end
+    # <%= table_for @users do %>
+    #   <% column :name, :title => "User's name" %>
+    # <% end %>
+    describe "with titled column" do
       before(:each) do
         @html = template.table_for(users) do
-          column :name
+          column :hits, :title => "user's hits"
         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 contain("Name")
+            th.should contain("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.name)
+                td.should contain(user[:hits].to_s)
               end
             end
           end
@@ -72,49 +180,84 @@ describe ActionView::Base do
       end
     end
     # <%= table_for @users do %>
-    #   <% column :name, :html => { :width => "50%" } %>
+    #   <% column :name %>
     # <% end %>
-    describe "with column :html options" do
+    describe "with simple column" do
       before(:each) do
         @html = template.table_for(users) do
-          column :id, :html => { :td => { :class => "user-id" }, :th => { :width => "50%" }}
+          column :hits
         end
       end
       it "should render valid HTML" do
         @html.should have_selector("table") do |table|
-          table.should have_selector("thead/tr") do |tr|
-            tr.should have_selector("th[@width='50%']")
+          table.should have_selector("thead/tr/th") do |th|
+            th.should contain("Hits")
           end
           table.should have_selector("tbody/tr") do |tr|
             users.each do |user|
-              tr.should have_selector("td.user-id")
+              tr.should have_selector("td") do |td|
+                td.should contain(user[:hits].to_s)
+              end
             end
           end
         end
       end
     end
     # <%= table_for @users do %>
-    #   <% columns :name, :email, :address %>
+    #   <% column :name, :html => { :width => "50%" } %>
     # <% end %>
-    describe "with columns" do
+    describe "with column :html options" do
       before(:each) do
         @html = template.table_for(users) do
-          columns :id, :name, :email, :address
+          column :id, :html => { :td => { :class => "user-id" }, :th => { :width => "50%" }}
         end
       end
       it "should render valid HTML" do
         @html.should have_selector("table") do |table|
           table.should have_selector("thead/tr") do |tr|
-            ["Id", "Name", "Email", "Address"].each do |field|
-              tr.should have_selector("th") do |th|
-                th.should contain(field)
+            tr.should have_selector("th[@width='50%']")
+          end
+          table.should have_selector("tbody/tr") do |tr|
+            users.each do |user|
+              tr.should have_selector("td.user-id") do |td|
+                td.should contain(user[:id].to_s)
               end
             end
           end
         end
       end
     end
-    
+  end
+  # users list (objects array)
+  context "for objects array" do
+    let(:users) do
+      [
+        User.new({
+          :id => 1209,
+          :name => "John Smith",
+          :email => "smith@matrix.net",
+          :address => "100, Spear Street, NY, USA"
+        }),
+        User.new({
+          :id => 2123,
+          :name => "Thomas Anderson",
+          :email => "neo@matrix.net",
+          :address => "200, Spear Street, NY, USA"
+        }),
+        User.new({
+          :id => 3323,
+          :name => "Trinity",
+          :email => "trinity@matrix.net",
+          :address => "300, Spear Street, NY, USA"
+        }),
+        User.new({
+          :id => 4912,
+          :name => "Morpheus",
+          :email => "morpheus@matrix.net",
+          :address => "400, Spear Street, NY, USA"
+        })
+      ]
+    end
     # <%= table_for @users, :html => { :id => "users", :class => "simple-table" } do %>
     #   <% column :name %>
     # <% end %>
@@ -128,30 +271,68 @@ describe ActionView::Base do
         @html.should have_selector("table#users.simple-table")
       end
     end
+    # <%= table_for @users, :stripes => ["odd", "even"] do %>
+    #   <% column :name %>
+    # <% end %>
+    describe "with cycling stripes" do
+      before(:each) do
+        @html = template.table_for(users, :stripes => %w{s-one s-two s-three}) do
+          column :name
+        end
+      end
+
+      it "should have valid classes" do
+        @html.should have_selector("tr.s-one", :count => 2)
+        @html.should have_selector("tr.s-two", :count => 1)
+        @html.should have_selector("tr.s-three", :count => 1)
+      end
+    end
+
     # <%= table_for @users do %>
-    #   <% column :name, :title => "User's name" %>
+    #   <% columns :name, :email, :address %>
     # <% end %>
-    describe "with titled column" do
+    describe "with columns" do
       before(:each) do
         @html = template.table_for(users) do
-          column :email, :title => "Email address"
+          columns :id, :name, :email, :address
+        end
+      end
+      it "should render valid HTML" do
+        @html.should have_selector("table") do |table|
+          table.should have_selector("thead/tr") do |tr|
+            ["Id", "Name", "Email", "Address"].each do |field|
+              tr.should have_selector("th") do |th|
+                th.should contain(field)
+              end
+            end
+          end
+        end
+      end
+    end
+    describe "with named callback column" do
+      before(:each) do
+        @html = template.table_for(users) do
+          column :email do |email|
+            mail_to email
+          end
         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 contain("Email address")
+            th.should contain("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)
+                td.should have_selector("a[@href='mailto:#{user.email}']")
               end
             end
           end
         end
       end
     end
+
     # <%= table_for @users do %>
     #   <% column :title => "User's name" do |user| %>
     #     <% content_tag :div do %>
@@ -188,62 +369,96 @@ describe ActionView::Base do
         end
       end
     end
-
-    describe "with named callback column" do
+    # <%= table_for @users, :stripes => ["odd", "even"], :html => { :tr => { :class => "table-row" } } do %>
+    #   <% column :name %>
+    # <% end %>
+    describe "with tr html" do
+      subject { template.table_for(users, :stripes => ["odd", "even"], :html => { :tr => { :class => "table-row", :id => lambda { |f| "user_#{f.id}" } } }) do
+          column :name
+        end
+      }
+      it "should have valid classes" do
+        should have_selector("tr.odd.table-row", :count => 2)
+        should have_selector("tr.even.table-row", :count => 2)
+      end
+      it "should have valid ids" do
+        users.each do |user|
+          should have_selector("tr.table-row#user_#{user.id}") do |tr|
+            tr.should contain(user.name)
+          end
+        end
+      end
+    end
+    # <%= table_for @users do %>
+    #   <% column :name, :title => "User's name" %>
+    # <% end %>
+    describe "with titled column" do
       before(:each) do
         @html = template.table_for(users) do
-          column :email do |email|
-            mail_to email
-          end
+          column :email, :title => "Email address"
         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 contain("Email")
+            th.should contain("Email address")
           end
           table.should have_selector("tbody/tr") do |tr|
             users.each do |user|
               tr.should have_selector("td") do |td|
-                td.should have_selector("a[@href='mailto:#{user.email}']")
+                td.should contain(user.email)
               end
             end
           end
         end
       end
     end
-
-    # <%= table_for @users, :stripes => ["odd", "even"] do %>
+    # <%= table_for @users do %>
     #   <% column :name %>
     # <% end %>
-    describe "with cycling stripes" do
+    describe "with simple column" do
       before(:each) do
-        @html = template.table_for(users, :stripes => %w{s-one s-two s-three}) do
+        @html = template.table_for(users) do
           column :name
         end
       end
-
-      it "should have valid classes" do
-        @html.should have_selector("tr.s-one", :count => 2)
-        @html.should have_selector("tr.s-two", :count => 1)
-        @html.should have_selector("tr.s-three", :count => 1)
+      it "should render valid HTML" do
+        @html.should have_selector("table") do |table|
+          table.should have_selector("thead/tr/th") do |th|
+            th.should contain("Name")
+          end
+          table.should have_selector("tbody/tr") do |tr|
+            users.each do |user|
+              tr.should have_selector("td") do |td|
+                td.should contain(user.name)
+              end
+            end
+          end
+        end
       end
     end
-    
-    # <%= table_for @users, :stripes => ["odd", "even"], :html => { :tr => { :class => "table-row" } } do %>
-    #   <% column :name %>
+    # <%= table_for @users do %>
+    #   <% column :name, :html => { :width => "50%" } %>
     # <% end %>
-    describe "with tr html" do
+    describe "with column :html options" do
       before(:each) do
-        @html = template.table_for(users, :stripes => ["odd", "even"], :html => { :tr => { :class => "table-row" } }) do
-          column :name
+        @html = template.table_for(users) do
+          column :id, :html => { :td => { :class => "user-id" }, :th => { :width => "50%" }}
         end
       end
-
-      it "should have valid classes" do
-        @html.should have_selector("tr.odd.table-row", :count => 2)
-        @html.should have_selector("tr.even.table-row", :count => 2)
+      it "should render valid HTML" do
+        @html.should have_selector("table") do |table|
+          table.should have_selector("thead/tr") do |tr|
+            tr.should have_selector("th[@width='50%']")
+          end
+          table.should have_selector("tbody/tr") do |tr|
+            users.each do |user|
+              tr.should have_selector("td.user-id") do |td|
+                td.should contain(user.id.to_s)
+              end
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table_for_collection
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Dima Lunich
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +02:00
+date: 2011-11-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -42,6 +44,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -94,6 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -102,6 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -111,7 +116,7 @@ rubyforge_project: ""
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: table_for_collection-1.0.3
+summary: table_for_collection-1.0.4
 test_files: 
 - spec/core_ex/array_spec.rb
 - spec/spec_helper.rb