table-for 1.2.0 → 1.2.1

data/CHANGELOG.rdoc

@@ -4,4 +4,10 @@
 
 1.2.0 (February 5, 2012)
 
-* Upgraded dependency on BuildingBlocks to at least version 1.2.0
+* Upgraded dependency on BuildingBlocks to at least version 1.2.0
+
+1.2.1 (February 9, 2012)
+
+* Moved table_for_evaluated_options method into BuildingBlocks gem and renamed to evaluated_procs
+* Also now utilizing a method created in BuildingBlocks called evaluated_proc
+* The url for an edit, show, and delete link can now be a Proc that takes the current row's domain object as a paramter

data/README.rdoc

@@ -22,19 +22,19 @@ In users_controller.rb (index action)
 
 == Sample Usage
   <%= table_for @users, :table_html => {:style => "border: 1px solid black"},
-                        :sortable => true,
+                        :sortable => true, :sort_url => users_path,
                         :row_html => {:class => lambda { cycle('even', 'odd')},
                                       :id => lambda {|user| "user-#{user.id}"}} do |table| %>
-    <%= table.column :edit %>
+    <%= table.column :edit, :link_label => "Modify" %>
     <%= 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 %>
+    <%= table.column :delete, :confirm => "Are you sure?" %>
   <% end %>
 
-== Specifying the columns to use
+== Specifying the Columns to Use
   <%= table_for @users do |table| %>
     <% table.column :email %>
     <% table.column :first_name %>
@@ -42,30 +42,91 @@ In users_controller.rb (index action)
   <% end %>
 
 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
+to determine what data to output in each column.
 
-== Specifying the label to use for a 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
+== Overriding the Default Way of Rendering a Column
   <%= table_for @users do |table| %>
     <% table.column :name do |user| %>
       <%= "#{user.first_name} #{user.last_name}" %>
     <% end %>
   <% end %>
 
-Here, since the name of the column is not used anymore to determine what data to output, this code could be changed to:
+  <!-- Or, since the name of the column is no longer used to figure out what data to render: -->
   <%= table_for @users do |table| %>
     <% table.column :full_name do |user| %>
       <%= "#{user.first_name} #{user.last_name}" %>
     <% end %>
   <% end %>
 
-Or the block name could have been removed altogether and replaced with a label as follows:
+  <!-- Or the block name could be removed altogether and replaced with a label: -->
   <%= table_for @users do |table| %>
     <% table.column :label => "Full Name" do |user| %>
       <%= "#{user.first_name} #{user.last_name}" %>
     <% end %>
+  <% end %>
+
+== Specifying Sortability
+  <!-- Globally: -->
+  <%= table_for @users, :sortable => true, :sort_url => users_path do |table| %>
+    <% table.column :id, :sortable => false %>
+    <% table.column :email %>
+    <% table.column :name, :order => "first_name,last_name" do |user| %>
+      <%= "#{user.first_name} #{user.last_name}" %>
+    <% end %>
+  <% end %>
+
+  <!-- Column by column basis: -->
+  <%= table_for @users, :sort_url => users_path do |table| %>
+    <% table.column :id %>
+    <% table.column :email, :sortable => true %>
+    <% table.column :name, :order => "first_name,last_name", :sortable => true do |user| %>
+      <%= "#{user.first_name} #{user.last_name}" %>
+    <% end %>
+  <% end %>
+
+== Specifying the Table HTML
+  <%= table_for @users, :table_html => {:class => "table-for-table", :style => "border:1px solid black"} %>
+
+== Specifying the Row HTML
+  <!-- Header row -->
+  <%= table_for @users, :header_row_html => {:style => "background-color:blue", :class => "table-header"} do |table| %>
+    <% table.column :email %>
+  <% end %>
+
+  <!-- Data rows -->
+  <%= table_for @users, :row_html => {:style => "background-color:blue",
+                                      :class => lambda {"table-row #{cycle('even', 'odd')}"},
+                                      :id => lambda {|user| "user-#{user.id}"}} do |table| %>
+    <% table.column :email %>
+  <% end %>
+
+== Specifying the Column HTML
+  <!-- Header columns -->
+  <%= table_for @users, :header_html => {:class => lambda {|column| "header-column #{column.name}"} } do |table| %>
+    <!-- Override this columns' header's html -->
+    <% table.column :email, :header_html => {:style => "color: red"} %>
+
+    <% table.column :first_name %>
+    <% table.column :last_name %>
+  <% end %>
+
+  <!-- Data columns -->
+  <%= table_for @users, :column_html => {:class => lambda {|column| "data-column #{column.name}"} } do |table| %>
+    <!-- Override this column's html -->
+    <% table.column :email, :column_html => {:style => "background-color: red"} %>
+
+    <% table.column :first_name %>
+    <% table.column :last_name %>
+  <% end %>
+
+== Using Show, Edit, and Delete Columns
+  <%= table_for @users do |table| %>
+    <% table.column :edit, :url => lambda {|user| edit_user_path(user) } %>
+    <% table.column :show %>
+    <% table.column :show %>
   <% end %>

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

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

@@ -24,7 +24,7 @@
 <% end %>
 
 <% table.define :header_column do |column, options| %>
-  <%= content_tag :th, table_for_header_html(column, options) do %>
+  <%= content_tag :th, table_for_header_html(table, column, options) do %>
     <%= table.render "#{column.name}_header", column, column.options %>
   <% end %>
 <% end %>
@@ -58,7 +58,7 @@
 <% end %>
 
 <% table.define :row do |record, options| %>
-  <%= content_tag :tr, table_for_evaluated_options(record, options[:row_html]) do %>
+  <%= content_tag :tr, table.evaluated_procs(record, options[:row_html]) do %>
     <%= table.render :columns, record %>
   <% end %>
 <% end %>
@@ -70,23 +70,26 @@
 <% end %>
 
 <% table.define :column do |record, column, options| %>
-  <%= content_tag :td, table_for_evaluated_options(record, column, options[:column_html]) do %>
+  <%= content_tag :td, table.evaluated_procs(record, column, options[:column_html]) do %>
     <%= table.render column.name, record, column, column.options %>
   <% end %>
 <% end %>
 
 <% 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] %>
+  <% url = options[:url] ? table.evaluated_proc(record, options[:url]) : [options[:action], options[:scope], record].flatten %>
+  <%= link_to options[:link_label], url, options[:link_html] %>
 <% end %>
 
 <% 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] %>
+  <% url = options[:url] ? table.evaluated_proc(record, options[:url]) : [options[:action], options[:scope], record].flatten %>
+  <%= link_to options[:link_label], url, options[:link_html] %>
 <% end %>
 
 <% table.define :delete, :action => nil, :link_html => {}, :link_label => "Delete" do |record, column, options| %>
+  <% url = options[:url] ? table.evaluated_proc(record, options[:url]) : [options[:action], options[:scope], record].flatten %>
   <% 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]) %>
+  <%= link_to options[:link_label], url, {:method => method, :confirm => confirm}.merge(options[:link_html]) %>
 <% end %>
 
 <% table.columns.each do |column| %>

data/lib/table_for/view_additions.rb

@@ -2,16 +2,12 @@ module TableFor
   module ViewAdditions
     module ClassMethods
       def table_for(records, options={}, &block)
+        options[:use_partials_for_before_and_after_hooks] = false
         TableFor::Base.new(self, options.merge(:variable => "table", :records => records)).render_template("table_for/table_for", &block)
       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])
+      def table_for_header_html(table, column, options={})
+        header_html = table.evaluated_procs(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")

data/spec/table_for/view_additions_spec.rb

@@ -42,61 +42,44 @@ describe TableFor::ViewAdditions do
     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 = @view.table_for_header_html(mock(:evaluated_procs => {}), @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 = @view.table_for_header_html(mock(:evaluated_procs => {:class => "#{@column.name}_header"}), @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 = @view.table_for_header_html(mock(:evaluated_procs => {:class => "c1 c2"}), @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 = @view.table_for_header_html(mock(:evaluated_procs => {}), @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 = @view.table_for_header_html(mock(:evaluated_procs => {}), @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 = @view.table_for_header_html(mock(:evaluated_procs => {}), @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 = @view.table_for_header_html(mock(:evaluated_procs => {}), @column, :sortable => true)
       header_html[:class].should eql "sorting"
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table-for
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-05 00:00:00 -05:00
+date: 2012-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 25
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 3
+        version: 1.2.3
   prerelease: false
   type: :runtime
   requirement: *id003
@@ -85,7 +85,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1271655756
+        hash: -4164648240
         segments: 
         - 2
         - 0
@@ -187,7 +187,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1271655756
+        hash: -4164648240
         segments: 
         - 2
         - 0
@@ -289,7 +289,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1271655756
+        hash: -4164648240
         segments: 
         - 2
         - 0
@@ -370,6 +370,210 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id024
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id025
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -4164648240
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  prerelease: false
+  type: :development
+  requirement: *id026
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  version_requirements: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id027
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  version_requirements: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id028
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  version_requirements: &id029 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id029
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id030 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id030
+- !ruby/object:Gem::Dependency 
+  name: with_model
+  version_requirements: &id031 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id031
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id032 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id032
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id033 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -4164648240
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  prerelease: false
+  type: :development
+  requirement: *id033
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  version_requirements: &id034 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id034
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  version_requirements: &id035 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id035
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  version_requirements: &id036 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id036
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id037 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id037
+- !ruby/object:Gem::Dependency 
+  name: with_model
+  version_requirements: &id038 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id038
 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: []