table-for 1.1.0 → 1.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
 1.1.0 (February 4, 2012)
 
-* Removed dependency on rails 3.1, switched to >= 3.0.0
+* Removed dependency on rails 3.1, switched to >= 3.0.0
+
+1.2.0 (February 5, 2012)
+
+* Upgraded dependency on BuildingBlocks to at least version 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

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

@@ -1,31 +1,31 @@
 <% table.define :table do |options| %>
   <%= content_tag :table, options[:table_html] do %>
-    <%= table.use :thead %>
-    <%= table.use :tbody %>
+    <%= table.render :thead %>
+    <%= table.render :tbody %>
   <% end %>
 <% end %>
 
 <% table.define :thead do |options| %>
   <%= content_tag :thead, options[:thead_html] do %>
-    <%= table.use :header_row %>
+    <%= table.render :header_row %>
   <% end %>
 <% end %>
 
 <% table.define :header_row do |options| %>
   <%= content_tag :tr, options[:header_row_html] do %>
-    <%= table.use :header_columns %>
+    <%= table.render :header_columns %>
   <% end %>
 <% end %>
 
 <% table.define :header_columns do |options| %>
   <% table.columns.each do |column| %>
-    <%= table.use :header_column, column, column.options %>
+    <%= table.render :header_column, column, column.options %>
   <% end %>
 <% end %>
 
 <% table.define :header_column do |column, options| %>
   <%= content_tag :th, table_for_header_html(column, options) do %>
-    <%= table.use "#{column.name}_header", column, column.options %>
+    <%= table.render "#{column.name}_header", column, column.options %>
   <% end %>
 <% end %>
 
@@ -47,31 +47,31 @@
 
 <% table.define :tbody do |options| %>
   <%= content_tag :tbody, options[:tbody_html] do %>
-    <%= table.use :rows %>
+    <%= table.render :rows %>
   <% end %>
 <% end %>
 
 <% table.define :rows do |options| %>
   <% records.each do |record| %>
-    <%= table.use :row, record %>
+    <%= table.render :row, record %>
   <% end %>
 <% end %>
 
 <% table.define :row do |record, options| %>
   <%= content_tag :tr, table_for_evaluated_options(record, options[:row_html]) do %>
-    <%= table.use :columns, record %>
+    <%= table.render :columns, record %>
   <% end %>
 <% end %>
 
 <% table.define :columns do |record, options| %>
   <% table.columns.each do |column| %>
-    <%= table.use :column, record, column, column.options %>
+    <%= table.render :column, record, column, column.options %>
   <% end %>
 <% end %>
 
 <% table.define :column do |record, column, options| %>
   <%= content_tag :td, table_for_evaluated_options(record, column, options[:column_html]) do %>
-    <%= table.use column.name, record, column, column.options %>
+    <%= table.render column.name, record, column, column.options %>
   <% end %>
 <% end %>
 
@@ -95,4 +95,4 @@
   <% end %>
 <% end %>
 
-<%= table.use :table %>
+<%= table.render :table %>

data/lib/table_for/view_additions.rb

@@ -2,11 +2,7 @@ module TableFor
   module ViewAdditions
     module ClassMethods
       def table_for(records, options={}, &block)
-        options[:records] = records
-        options[:template] = "table_for/table_for"
-        options[:variable] = "table"
-
-        TableFor::Base.new(self, options, &block).render
+        TableFor::Base.new(self, options.merge(:variable => "table", :records => records)).render_template("table_for/table_for", &block)
       end
 
       def table_for_evaluated_options(*args)

data/spec/table_for/view_additions_spec.rb

@@ -11,33 +11,33 @@ describe TableFor::ViewAdditions do
   end
 
   describe "table_for method" do
-    it "should call render on the TableFor::Base instance" do
-      TableFor::Base.expects(:new).returns(mock(:render => ""))
+    it "should call render_template on the TableFor::Base instance" do
+      TableFor::Base.expects(:new).returns(mock(:render_template => ""))
       @view.table_for(@records)
     end
 
     it "should pass the view as the first parameter to TableFor::Base initialization" do
-      TableFor::Base.expects(:new).with {|view, options| view == @view}.returns(mock(:render => ""))
+      TableFor::Base.expects(:new).with {|view, options| view == @view}.returns(mock(:render_template => ""))
       @view.table_for(@records)
     end
 
     it "should default the template to render" do
-      TableFor::Base.expects(:new).with {|view, options| options[:template] == "table_for/table_for"}.returns(mock(:render => ""))
+      TableFor::Base.any_instance.expects(:render_template).with {|template| template == "table_for/table_for"}.returns("")
       @view.table_for(@records)
     end
 
     it "should default the variable to 'table' to render" do
-      TableFor::Base.expects(:new).with {|view, options| options[:variable] == "table"}.returns(mock(:render => ""))
+      TableFor::Base.expects(:new).with {|view, options| options[:variable] == "table"}.returns(mock(:render_template => ""))
       @view.table_for(@records)
     end
 
     it "should default the records to the collection passed in" do
-      TableFor::Base.expects(:new).with {|view, options| options[:records] == @records}.returns(mock(:render => ""))
+      TableFor::Base.expects(:new).with {|view, options| options[:records] == @records}.returns(mock(:render_template => ""))
       @view.table_for(@records)
     end
 
     it "should add any runtime options to the options initialized for TableFor::Base" do
-      TableFor::Base.expects(:new).with {|view, options| options[:option1] == 1 && options[:option2] == "2"}.returns(mock(:render => ""))
+      TableFor::Base.expects(:new).with {|view, options| options[:option1] == 1 && options[:option2] == "2"}.returns(mock(:render_template => ""))
       @view.table_for(@records, :option1 => 1, :option2 => "2")
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table-for
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Andrew Hunter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 -05:00
+date: 2012-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 1
+        - 2
         - 0
-        - 0
-        version: 1.0.0
+        version: 1.2.0
   prerelease: false
   type: :runtime
   requirement: *id003
@@ -79,21 +79,25 @@ dependencies:
   type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rspec-rails
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: -1271655756
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
   prerelease: false
   type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: mocha
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -107,7 +111,7 @@ dependencies:
   type: :development
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: xml-simple
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,7 +125,7 @@ dependencies:
   type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: supermodel
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -135,7 +139,7 @@ dependencies:
   type: :development
   requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: sqlite3
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -148,6 +152,224 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id009
+- !ruby/object:Gem::Dependency 
+  name: with_model
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -1271655756
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  prerelease: false
+  type: :development
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id013
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id014
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id015
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id016
+- !ruby/object:Gem::Dependency 
+  name: with_model
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id017
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id018
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -1271655756
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  prerelease: false
+  type: :development
+  requirement: *id019
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id020
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id021
+- !ruby/object:Gem::Dependency 
+  name: supermodel
+  version_requirements: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id022
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id023
+- !ruby/object:Gem::Dependency 
+  name: with_model
+  version_requirements: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id024
 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: []