table-for 0.0.16 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

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

@@ -1,23 +1,23 @@
-<%= table.define :table do |options| %>
+<% table.define :table do |options| %>
   <%= content_tag :table, options[:table_html] do %>
     <%= table.use :thead %>
     <%= table.use :tbody %>
   <% end %>
 <% end %>
 
-<%= table.define :thead do |options| %>
+<% table.define :thead do |options| %>
   <%= content_tag :thead, options[:thead_html] do %>
     <%= table.use :header_row %>
   <% end %>
 <% end %>
 
-<%= table.define :header_row do |options| %>
+<% table.define :header_row do |options| %>
   <%= content_tag :tr, options[:header_row_html] do %>  
     <%= table.use :header_columns %>
   <% end %>
 <% end %>
 
-<%= table.define :header_columns do |options| %>
+<% table.define :header_columns do |options| %>
   <% table.columns.each do |column| %>
     <% header_html = options.merge(column.options)[:header_html] %>
     <% if options.merge(column.options)[:sortable] %>
@@ -36,7 +36,7 @@
 <% end %>
 
 <% table.columns.each do |column| %>  
-  <%= table.define "#{column.name.to_s}_header", :column => column do |options| %>
+  <% table.define "#{column.name.to_s}_header", :column => column do |options| %>
     <% if options[:sortable] %>
       <%= table.use "#{options[:column].name.to_s}_header_sortable_link", options %>
     <% else %>
@@ -44,12 +44,12 @@
     <% end %>
   <% end %>
   
-  <%= table.define "#{column.name.to_s}_header_sortable_link", :column => column do |options| %>
+  <% table.define "#{column.name.to_s}_header_sortable_link", :column => column do |options| %>
     <%= table.use :header_sortable_link, options %>
   <% end %>
 <% end %>
  
-<%= table.define :header_sortable_link do |options| %>
+<% table.define :header_sortable_link do |options| %>
   <% order = options[:order] ? options[:order].to_s : options[:column].name.to_s %>
   <% label = (options[:label] ? options[:label] : options[:column].name.to_s.titleize) %>
   <% sort_mode = ((params[:order] != order or params[:sort_mode] == "desc") ? "asc" : "desc") %>
@@ -60,25 +60,25 @@
   <%= link_to label, "#{url}?#{parameters.to_query}" %>
 <% end %>
 
-<%= table.define :tbody do |options| %>
+<% table.define :tbody do |options| %>
   <%= content_tag :tbody, options[:tbody_html] do %>
     <%= table.use :rows %>
   <% end %>
 <% end %>
 
-<%= table.define :rows do %>
+<% table.define :rows do %>
   <% records.each do |record| %>
     <%= table.use :row, record %>
   <% end %>
 <% end %>
 
-<%= table.define :row do |record, options| %>
+<% table.define :row do |record, options| %>
   <%= content_tag :tr, table_for_options(options[:row_html], options) do %>
     <%= table.use :data_columns, record, options %>
   <% end %>
 <% end %>
 
-<%= table.define :data_columns do |record, options| %>
+<% table.define :data_columns do |record, options| %>
   <% table.columns.each do |column| %>
     <%= content_tag :td, options.merge(column.options)[:column_html] do %>
       <%= table.use column, record, options.merge(:column => column) %>
@@ -86,22 +86,23 @@
   <% end %>
 <% end %>
 
-<%= table.define :edit, :action => :edit, :link_label => "Edit" do |record, options| %>
+<% table.define :edit, :action => :edit, :link_label => "Edit" do |record, options| %>
   <%= link_to options[:link_label], [options[:action], options[:scope], record].flatten, options[:link_html] %>
 <% end %>
 
-<%= table.define :show, :action => nil, :link_label => "Show" do |record, options| %>
+<% table.define :show, :action => nil, :link_label => "Show" do |record, options| %>
   <%= link_to options[:link_label], [options[:action], options[:scope], record].flatten, options[:link_html] %>
 <% end %>
 
-<%= table.define :delete, :link_html => {}, :link_label => "Delete" do |record, options| %>
+<% table.define :delete, :link_html => {}, :link_label => "Delete" do |record, options| %>
   <%= link_to options[:link_label], [options[:scope], record].flatten, {:method => "delete", :confirm => "Are you sure you want to delete this #{record.class.to_s.titleize}?"}.merge(options[:link_html]) %>
 <% end %>
 
 <% table.columns.each do |column| %>
-  <%= table.define column.name, :column => column do |record, options| %>
+  <% table.define column.name, :column => column do |record, options| %>
     <%= record.send(options[:column].name) %>
   <% end %>
 <% end %>
 
+<%# Now that all the blocks are defined, render the table %>
 <%= table.use :table %>

data/lib/table-for.rb

@@ -2,7 +2,7 @@ require "action_view"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require "table_for/table_for"
+require "table_for/base"
 require "table_for/helper_methods"
 require "table_for/engine"
 

data/lib/table_for/{table_for.rb → base.rb}

@@ -2,8 +2,8 @@ require 'building-blocks'
 
 module TableFor
   class Base < BuildingBlocks::Base
-    alias columns block_positions
-    alias column use
+    alias columns queued_blocks
+    alias column queue
     
     def header(name, options={}, &block)
       define("#{name.to_s}_header", options, &block)

data/lib/table_for/helper_methods.rb

@@ -1,6 +1,8 @@
 module TableFor
   module HelperMethods
     def table_for_options(options={}, parameters={})
+      return nil if options.nil?
+
       evaluated_options = {}
       options.each_pair { |k, v| evaluated_options[k] = (v.is_a?(Proc) ? v.call(parameters) : v)}
       evaluated_options
@@ -8,12 +10,10 @@ module TableFor
     
     def table_for(records, options={}, &block)
       options[:records] = records
-      options[:row_html] = {:class => lambda { |parameters| cycle('odd', 'even')}} if options[:row_html].nil?
       options[:template] = "table_for/table_for"
       options[:templates_folder] = "table_for"
-      options[:record_variable] = "records"
       options[:variable] = "table"
-      
+
       TableFor::Base.new(self, options, &block).render
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table-for
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -53,17 +53,45 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 8
+        version: 0.0.8
   prerelease: false
   type: :runtime
   requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id005
 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: []
@@ -78,9 +106,9 @@ files:
 - VERSION
 - app/views/table_for/_table_for.html.erb
 - lib/table-for.rb
+- lib/table_for/base.rb
 - lib/table_for/engine.rb
 - lib/table_for/helper_methods.rb
-- lib/table_for/table_for.rb
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/hunterae/table-for