table-for 3.3.0 → 3.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2Q4OGZmYWRiNTc4Y2MwNDAyMmY3YzAxYmUxOGViMGVjZDg0NGFjNQ==
-  data.tar.gz: !binary |-
-    ZTY1ZGRlNTVlNjU3M2Q4NGE5ZjgxMDUxNzk5YTFhZjZiMzc5OTFkOQ==
+SHA1:
+  metadata.gz: 8719b9d60d0575d808cd0e59db4da06669581cff
+  data.tar.gz: 5365a9d7259191c5b11895eb47320663a89b68c1
 SHA512:
-  metadata.gz: !binary |-
-    YWVkYzU5MzNmOTlmZTIxZDcyOTk1MWY2NWViMDBjYmQxZDBmMjAzY2QxOGU4
-    YzJiM2M5N2NiNGM5NmQzOTQwOWViNTJhZGQ2YTgxYzRmY2E0N2YzYTA2YmFi
-    OTg3MzEyYjk0NzI5ODFlYmMxZGZkMDc2NTM3MGVhODEwMWVlYjI=
-  data.tar.gz: !binary |-
-    MThiNzAzYzg0Y2U5MGNjZmEwODQyMDcwMWU0MGQ4ZGU3YjFjYjhiOTY2OTQ4
-    ZjU5ZTAyYjU2MWUxZTliYWI0MzFlM2NiZTg1ZDUyMDhlZTFhNGY3Y2ZkMmZk
-    Y2Q4OTZjMmU0OTM5MWQyYjhjYzAxMzE5ZjE5NTRmOTUzMDAwMWQ=
+  metadata.gz: c4a894bbb863ca45c866c1710ea119cdf11abc2cf8355d907ff4f89a63e6ee83ea7495421f43fcf1a7335a9672186d4a098afec49a76ee0e94a0e2742e06d06e
+  data.tar.gz: 0a9e4f2628c39dfe85acd549ea1aee6553437b9fdc633489e377c196b63b50a35312471bff12752789392d542b5321af7503f6089351c0df66ec823e77c61309

data/.byebug_history

@@ -0,0 +1,15 @@
+continue
+html2.gsub(/\s+/, "")
+html1.gsub(/\s+/, "")
+html1.gsub(/\s+/, " ").gsub("> ", ">").
+html2.gsub(/\s+/, " ")
+html1.gsub(/\s+/, " ")
+html1
+ Nokogiri::XML(html1)
+ Nokogiri::XML(html1).to_s
+ Nokogiri::HTML(html1).to_s
+ Nokogiri::HTML(html1)
+require 'nokogiri'
+ Nokogiri::HTML(html1)
+continue
+html1

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+3.4.0
+* Links options that are applied to a column will now generate the link even if you override
+column. In haml, this example pointed out by @noctivityinc, now works:
+  = t.column link_action: :edit do
+   %i.fa.fa-pencil
+* Fixed generation of link_confirm and link_method to apply to the links data element.
+
 3.2.1
 * Added ability to configure sort_mode order, i.e. if sort links generate sort_modes in :asc, :desc order, or have different labels
 than :asc and :desc

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec

data/Rakefile

@@ -3,8 +3,6 @@ require 'bundler/gem_tasks'
 
 # Default directory to look in is `/specs`
 # Run with `rake spec`
-RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ['--color', '--format', 'nested']
-end
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => :spec

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

@@ -71,4 +71,4 @@
   <% end %>
 <% end if table.defined?(:footer_content) %>
 
-<%= table.render :table %>
+<%= table.render :table %>

data/lib/table_for/base.rb

@@ -4,7 +4,6 @@ require 'blocks'
 module TableFor
   class Base < WithTemplate::Base
     alias columns queued_blocks
-    alias column queue
 
     attr_accessor :current_record
     alias_method :current_row, :current_record
@@ -21,6 +20,31 @@ module TableFor
       define(:footer_content, options, &block)
     end
 
+    def column(*args, &block)
+      options = args.extract_options!
+      queue(*args, options, &block)
+      if options[:link_url] ||
+         options[:link_action] ||
+         options[:link_method] ||
+         options[:link_confirm] ||
+         options[:link]
+        around(columns.last.name) do |content_block, record, column, options|
+          options = options.merge(column.options)
+          url = if options[:link_url]
+            call_with_params(options[:link_url], record)
+          else
+            [options[:link_action], options[:link_namespace], record].flatten.compact
+          end
+          html_options = {data: {}}
+          html_options[:data][:method] = options[:link_method] if options[:link_method].present?
+          html_options[:data][:confirm] = options[:link_confirm] if options[:link_confirm].present?
+          html_options = html_options.deep_merge(options[:link_html] || {})
+          view.link_to content_block.call, url, html_options
+        end
+      end
+      nil
+    end
+
     def header_column_html(column, options={})
       header_column_html = call_each_hash_value_with_params(options[:header_column_html], column)
       if options[:sortable]
@@ -51,26 +75,16 @@ module TableFor
     end
 
     def cell_content(record, column, options={})
-      if options[:link_url] || options[:link_action] || options[:link_method] || options[:link_confirm] || options[:link]
-        url = options[:link_url] ? call_with_params(options[:link_url], record) : [options[:link_action], options[:link_namespace], record].flatten
-      end
-
       if options[:formatter]
         if options[:formatter].is_a?(Proc)
-          content = call_with_params(options[:formatter], record.send(column.name), options)
+          call_with_params(options[:formatter], record.send(column.name), options)
         else
-          content = record.send(column.name).try(*options[:formatter])
+          record.send(column.name).try(*options[:formatter])
         end
       elsif options[:data] || [:edit, :show, :delete].include?(column.name)
-        content = call_with_params(options[:data], record)
+        call_with_params(options[:data], record)
       else
-        content = record.send(column.name)
-      end
-
-      if content.blank? || url.blank? || options[:link] == false
-        content
-      elsif url
-        view.link_to content, url, {:method => options[:link_method], :confirm => options[:link_confirm]}.merge(options[:link_html])
+        record.send(column.name)
       end
     end
 
@@ -114,4 +128,4 @@ module TableFor
       end
     end
   end
-end
+end

data/lib/table_for/version.rb

@@ -1,3 +1,3 @@
 module TableFor
-  VERSION = "3.3.0"
+  VERSION = "3.4.0"
 end

data/spec/integration/table_for_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 describe "table_for" do
   with_model :user do
     table do |t|
+      t.integer "id"
       t.string "email"
       t.string "first_name"
       t.string "last_name"
@@ -17,11 +18,14 @@ describe "table_for" do
   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"
+    User.create! id: 1, :email => "andrew.hunter@livingsocial.com", :first_name => "Andrew", :last_name => "Hunter"
+    User.create! id: 2, :email => "todd.fisher@livingsocial.com", :first_name => "Todd", :last_name => "Fisher"
+    User.create! id: 3, :email => "jon.phillips@livingsocial.com", :first_name => "Jon", :last_name => "Phillips"
     @users = User.all
     @view = ActionView::Base.new("app/views")
+    @view.class.send(:define_method, :user_path) do |user|
+      "/users/#{user.id}"
+    end
   end
 
   it "should be able render a table with email and first and last name columns" do
@@ -59,8 +63,8 @@ describe "table_for" do
 
     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
+      xml = XmlSimple.xml_in(%%<table style="background-color: orange"><thead><tr></tr></thead><tbody><tr></tr><tr></tr><tr></tr></tbody></table>%, keeproot: true)
+      XmlSimple.xml_in(buffer, normalisespace: 2, keeproot: true).should eql xml
     end
   end
 
@@ -162,12 +166,7 @@ describe "table_for" do
         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
+      html_includes?(buffer, "<thead><tr><th>Repeated Column</th><th>Repeated Column</th></tr></thead>")
     end
 
     it "should be able to specify html attributes" do
@@ -177,7 +176,7 @@ describe "table_for" do
       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_column_html => {:class => lambda {@view.cycle("even", "odd")},
                                                               :id => lambda {|column| "#{column.name.to_s}_header"}} do |table|
@@ -201,81 +200,6 @@ describe "table_for" do
       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" 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" 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" 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
     it "should be able to override the header for a particular column" do
@@ -563,7 +487,7 @@ describe "table_for" do
       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], :data_column_html => {:class => lambda {@view.cycle("even", "odd")},
                                                               :id => lambda {|user, column| "#{column.name.to_s}_data"}} do |table|
@@ -607,358 +531,23 @@ describe "table_for" do
     end
   end
 
-  # describe "edit block" do
-  #     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")
-  # 
-  #       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, :data => "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" 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")
-  # 
-  #     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, :data => "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" 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")
-  # 
-  #     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, :data => "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 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
+    context "when passing a link param" do
+      it "render a link surrounding a table cell's content when it is true" do
+        buffer = @view.table_for @users do |table|
+          table.column :email, link: true
+        end
+        html_includes?(buffer, "<a href='/users/1'>andrew.hunter@livingsocial.com</a>")
+      end
+    end
+
+    it "should allow a link_url proc to render a link surrounding a table cell's content" do
+      buffer = @view.table_for @users do |table|
+        table.column :email, link_url: lambda {|user| "/admin/users/#{user.id}"}
+      end
+      html_includes?(buffer, "<a href='/admin/users/1'>andrew.hunter@livingsocial.com</a>")
+    end
+
     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, :header => "Email Address"
@@ -975,4 +564,4 @@ describe "table_for" do
       XmlSimple.xml_in(buffer, 'NormaliseSpace' => 2).should eql xml
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'xmlsimple'
 require 'active_record'
 require 'active_support/all'
 require 'with_model'
-require 'ruby-debug'
+require 'byebug'
 
 def print_hash(hash)
   hash.inject("") { |s, (k, v)| "#{s} #{k}: #{v}." }
@@ -19,4 +19,12 @@ RSpec.configure do |config|
   config.extend WithModel
   config.mock_with :mocha
   ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-end
+end
+
+def normalize_html(html)
+  html.gsub(/\s+/, "").gsub(/\"/, "'")
+end
+
+def html_includes?(html1, html2)
+  normalize_html(html1).should include normalize_html(html2)
+end

data/spec/table_for/base_spec.rb

@@ -4,7 +4,7 @@ describe TableFor::Base do
   before(:each) do
     @view_class = Class.new
     @view = @view_class.new
-    @view_class.send(:include, Blocks::ViewAdditions::ClassMethods)
+    @view_class.send(:include, Blocks::ViewAdditions)
     @base = TableFor::Base.new(@view)
     @records = [OpenStruct.new(:id => 1)]
     @column = stub(:name => :my_column, :anonymous => false)
@@ -61,10 +61,6 @@ describe TableFor::Base do
     end
   end
 
-  # describe "#table_html" do
-  #   
-  # end
-
   describe "#header_column_html" do
     it "should return an empty hash if header_column_html is not passed in" do
       header_column_html = @base.header_column_html(@column)
@@ -148,4 +144,4 @@ describe TableFor::Base do
       @base.header_sort_link(@column, :sortable => true) { @column.name.to_s.titleize }.should eql "my link"
     end
   end
-end
+end

data/spec/table_for/view_additions_spec.rb

@@ -6,7 +6,7 @@ describe TableFor::ViewAdditions do
     @view = @view_class.new
     @view_class.send(:include, ActionView::Helpers::TextHelper)
     @view_class.send(:include, TableFor::ViewAdditions::ClassMethods)
-    @view_class.send(:include, Blocks::ViewAdditions::ClassMethods)
+    @view_class.send(:include, Blocks::ViewAdditions)
     @records = [OpenStruct.new(:id => 1)]
     @column = stub(:name => :my_column)
   end
@@ -42,4 +42,4 @@ describe TableFor::ViewAdditions do
       @view.table_for(@records, :option1 => 1, :option2 => "2")
     end
   end
-end
+end

data/table-for.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", ">= 3.0.0"
-  spec.add_dependency "with_template", "~> 0.0.6"
+  spec.add_dependency "with_template", "~> 0.1.0"
 
   spec.add_development_dependency "rspec-rails", ">= 2.0.0.beta.20"
   spec.add_development_dependency "mocha", "0.10.3"
   spec.add_development_dependency "xml-simple", "1.1.1"
-  spec.add_development_dependency "supermodel", "0.1.4"
+  spec.add_development_dependency "supermodel"
   spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "with_model", "0.2.6"
-  spec.add_development_dependency "debugger"
+  spec.add_development_dependency "with_model"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "nokogiri"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: table-for
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Andrew Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: with_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0.beta.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0.beta.20
 - !ruby/object:Gem::Dependency
@@ -84,56 +84,70 @@ dependencies:
   name: supermodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: with_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: table-for is a table builder for an array of objects, easily allowing
@@ -144,10 +158,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".byebug_history"
+- ".gitignore"
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
@@ -178,17 +190,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: table-for is a table builder for an array of objects, easily allowing overriding

data/.rspec

@@ -1,2 +0,0 @@
---colour
---backtrace

data/.ruby-gemset

@@ -1 +0,0 @@
-table-for

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3