tabletastic 0.2.0.pre4 → 0.2.0.pre5

data/CHANGELOG.rdoc

@@ -1,5 +1,6 @@
 Git (for upcoming v0.2.0 release)
 
+* [DEPRECATED] use of table.data method without = in erb or haml. See README for more information.
 * Updating to Rails3 API and idioms
 * Adding default table html options
 * Adding default lambda (table block) so that table_for can be called without passing a block

data/README.rdoc

@@ -34,11 +34,11 @@ goodness that tabular data should have, i.e. a +thead+ and +tbody+ element.
 
 == NOTICE: Rails 3 only!
 
-As of version 0.2.0, this project is <strong>no longer compatible with Rails 2</strong>.
-To use, make sure you're using the latest release of Rails 3 (beta 2 at this time).
+As of version 0.2.0, this project is <b>no longer compatible with Rails 2</b>.
+To use, make sure you're using the latest release of Rails 3.
 
-Also, the new Rails 3 idiom is for blocks in erb templates to be use <%= %>, so if you're
-upgrading, you MUST now use the <%= %> erb helpers when you call +table_for+.
+Also, the new Rails 3 idiom is for blocks in erb templates to be use <code><%= %></code>, so if you're
+upgrading, you MUST now use the <code><%= %></code> erb helpers when you call +table_for+.
 
 For example:
 
@@ -46,6 +46,33 @@ For example:
         t.data
       end %>
 
+The following would also be valid:
+
+  <%= table_for(@people) do |t| %>
+    <%= t.data %>
+  <% end %>
+
+Or in HAML:
+
+  = table_for(@people) do |t|
+    = t.data
+
+But, following the block helper conventions, the following would NOT be okay
+
+  <!-- Don't do this! -->
+  <%= table_for(@people) do |t| %>
+    <% t.data %>
+  <% end %>
+
+Or, in HAML:
+
+  -# Don't do this!
+  = table_for(@people) do |t|
+    - t.data
+
+This is because the +data+ method has output, and can optionally be called with a block.
+
+For more information about Rails 3 and Block helpers and the new conventions, check out {the Railscasts episode about ERB blocks}[http://railscasts.com/episodes/208-erb-blocks-in-rails-3]
 
 == Installation
 
@@ -55,6 +82,8 @@ In your Rails project, Gemfile:
 Or, for if you're behind the times, as a plugin:
   script/plugin install git://github.com/jgdavey/tabletastic.git
 
+Optionally, you can create an initializer at config/initializers/tabletastic.rb with the following:
+  Tabletastic.default_table_block = lambda {|table| table.data :actions => :all }
 
 == Usage
 
@@ -230,7 +259,7 @@ of your tables have a specific html +class+ or +cellspacing+, or whatever.
 If <code>Tabletastic.default_table_html</code> is set to <code>{:cellspacing => 0, :class => 'yowza'}</code>,
 then all tabletastic tables will have this html by default, unless overridden:
 
-  table_for(@posts) do |t|
+  table_for(@posts) do |t|  # body of block removed for brevity
 
 will produce:
 
@@ -248,7 +277,8 @@ will be the same as
         t.data
       end %>
 
-However, just like +default_table_html+, you can set a different block in the initializer file for your block to default to.
+However, just like +default_table_html+ , you can set a different block in the initializer file for your block to default to.
+
 For example:
 
   Tabletastic.default_table_block = lambda {|table| table.data :actions => :all }
@@ -272,7 +302,7 @@ And to omit those action links, you can just use +table_for+ the old-fashioned w
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
+* Commit, do not mess with rakefile, version, or changelog.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 

data/lib/tabletastic/helper.rb

@@ -6,8 +6,7 @@ module Tabletastic
       klass = default_class_for(collection)
       options = args.extract_options!
       initialize_html_options(options, klass)
-      result = block.call(TableBuilder.new(collection, klass, self))
-
+      result = capture { block.call(TableBuilder.new(collection, klass, self)) }
       content_tag(:table, result, options[:html])
     end
 

data/lib/tabletastic/version.rb

@@ -1,3 +1,3 @@
 module Tabletastic
-  VERSION = "0.2.0.pre4"
+  VERSION = "0.2.0.pre5"
 end

data/spec/spec_helper.rb

@@ -30,11 +30,10 @@ Spork.prefork do
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::ActiveModelHelper
-    include ActionView::Helpers::RecordIdentificationHelper
     include ActionView::Helpers::RecordTagHelper
     include ActionView::Helpers::CaptureHelper
     include ActionView::Helpers::RawOutputHelper
-    include ActionController::PolymorphicRoutes
+    include ActionDispatch::Routing::PolymorphicRoutes
 
     def self.included(base)
       base.class_eval do
@@ -42,6 +41,10 @@ Spork.prefork do
       end
     end
 
+    def reset_output_buffer!
+      @output_buffer = ActionView::OutputBuffer.new
+    end
+
     module ::RspecTagMatchers
       def have_table_with_tag(selector, inner_text_or_options = nil, options = {}, &block)
         HaveTag.new("table", nil, {}) &&

data/spec/tabletastic/table_builder_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Tabletastic::TableBuilder do
 
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
-
+    reset_output_buffer!
     mock_everything
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
     @post.stub!(:title).and_return("The title of the post")
@@ -17,7 +16,7 @@ describe Tabletastic::TableBuilder do
   context "without a block" do
     context "with no other arguments" do
       before do
-        concat table_for(@posts) { |t| t.data }
+        concat(table_for(@posts) { |t| t.data })
       end
 
       it "should output table with id of the class of the collection" do
@@ -61,19 +60,17 @@ describe Tabletastic::TableBuilder do
       end
 
       it "should cycle row classes" do
-        @output_buffer = ""
+        reset_output_buffer!
         @posts = [@post, @post]
-        table_for(@posts) do |t|
-          concat(t.data)
-        end
+        concat(
+          table_for(@posts) do |t|
+            concat(t.data)
+          end)
         output_buffer.should have_table_with_tag("tr.odd")
         output_buffer.should have_table_with_tag("tr.even")
       end
 
       context "when collection has associations" do
-        before do
-          @output_buffer = ActiveSupport::SafeBuffer.new
-        end
         it "should handle belongs_to associations" do
           ::Post.stub!(:reflect_on_all_associations).with(:belongs_to).and_return([@mock_reflection_belongs_to_author])
           @posts = [@freds_post]
@@ -92,49 +89,49 @@ describe Tabletastic::TableBuilder do
 
     context "with options[:actions]" do
       it "includes path to post for :show" do
-        table_for(@posts) do |t|
-          concat(t.data(:actions => :show))
-        end
+        concat(table_for(@posts) do |t|
+          t.data(:actions => :show)
+        end)
         output_buffer.should have_table_with_tag("a[@href=\"/posts/#{@post.id}\"]")
         output_buffer.should have_table_with_tag("th", "")
       end
 
       it "should have a cell with default class 'actions' and the action name" do
-        table_for(@posts) do |t|
-          concat(t.data(:actions => :show))
-        end
+        concat(table_for(@posts) do |t|
+          t.data(:actions => :show)
+        end)
         output_buffer.should have_tag("td.actions.show_link") do |td|
           td.should have_tag("a")
         end
       end
 
       it "includes path to post for :edit" do
-        table_for(@posts) do |t|
-          concat(t.data(:actions => :edit))
-        end
+        concat(table_for(@posts) do |t|
+          t.data(:actions => :edit)
+        end)
         output_buffer.should have_tag("a[@href=\"/posts/#{@post.id}/edit\"]", "Edit")
       end
 
       it "includes path to post for :destroy" do
-        table_for(@posts) do |t|
-          concat(t.data(:actions => :destroy))
-        end
+        concat(table_for(@posts) do |t|
+          t.data(:actions => :destroy)
+        end)
         output_buffer.should have_table_with_tag("a[@href=\"/posts/#{@post.id}\"]")
         output_buffer.should have_table_with_tag("th", "")
       end
 
       it "includes path to post for :show and :edit" do
-        table_for(@posts) do |t|
-          concat(t.data(:actions => [:show, :edit]))
-        end
+        concat(table_for(@posts) do |t|
+          t.data(:actions => [:show, :edit])
+        end)
         output_buffer.should have_tag("td:nth-child(3) a[@href=\"/posts/#{@post.id}\"]", "Show")
         output_buffer.should have_tag("td:nth-child(4) a[@href=\"/posts/#{@post.id}/edit\"]", "Edit")
       end
 
       it "includes path to post for :all" do
-        table_for(@posts) do |t|
-          concat(t.data(:actions => :all))
-        end
+        concat(table_for(@posts) do |t|
+          t.data(:actions => :all)
+        end)
         output_buffer.should have_tag("td:nth-child(3) a[@href=\"/posts/#{@post.id}\"]", "Show")
         output_buffer.should have_tag("td:nth-child(4) a[@href=\"/posts/#{@post.id}/edit\"]", "Edit")
         output_buffer.should have_tag("td:nth-child(5) a[@href=\"/posts/#{@post.id}\"]", "Destroy")
@@ -142,30 +139,30 @@ describe Tabletastic::TableBuilder do
 
       context "with options[:actions_prefix]" do
         it "includes path to admin post for :show" do
-          table_for(@posts) do |t|
-            concat(t.data(:actions => :show, :action_prefix => :admin))
-          end
+          concat(table_for(@posts) do |t|
+            t.data(:actions => :show, :action_prefix => :admin)
+          end)
           output_buffer.should have_tag("td:nth-child(3) a[@href=\"/admin/posts/#{@post.id}\"]", "Show")
         end
 
         it "includes path to admin post for :edit" do
-          table_for(@posts) do |t|
-            concat(t.data(:actions => :edit, :action_prefix => :admin))
-          end
+          concat(table_for(@posts) do |t|
+            t.data(:actions => :edit, :action_prefix => :admin)
+          end)
           output_buffer.should have_tag("td:nth-child(3) a[@href=\"/admin/posts/#{@post.id}/edit\"]", "Edit")
         end
 
         it "includes path to admin post for :destroy" do
-          table_for(@posts) do |t|
-            concat(t.data(:actions => :destroy, :action_prefix => :admin))
-          end
+          concat(table_for(@posts) do |t|
+            t.data(:actions => :destroy, :action_prefix => :admin)
+          end)
           output_buffer.should have_tag("td:nth-child(3) a[@href=\"/admin/posts/#{@post.id}\"]", "Destroy")
         end
 
         it "includes path to admin for all actions" do
-          table_for(@posts) do |t|
+          concat(table_for(@posts) do |t|
             concat(t.data(:actions => :all, :action_prefix => :admin))
-          end
+          end)
           output_buffer.should have_tag("td:nth-child(3) a[@href=\"/admin/posts/#{@post.id}\"]", "Show")
           output_buffer.should have_tag("td:nth-child(4) a[@href=\"/admin/posts/#{@post.id}/edit\"]", "Edit")
           output_buffer.should have_tag("td:nth-child(5) a[@href=\"/admin/posts/#{@post.id}\"]", "Destroy")
@@ -175,9 +172,9 @@ describe Tabletastic::TableBuilder do
 
     context "with a list of attributes" do
       before do
-        table_for(@posts) do |t|
-          concat(t.data(:title, :created_at))
-        end
+        concat(table_for(@posts) do |t|
+          t.data(:title, :created_at)
+        end)
       end
 
       it "should call each method passed in, and only those methods" do
@@ -189,9 +186,9 @@ describe Tabletastic::TableBuilder do
 
     context "with a list of attributes and options[:actions]" do
       it "includes path to post for :show" do
-        table_for(@posts) do |t|
+        concat(table_for(@posts) do |t|
           concat(t.data(:title, :created_at, :actions => :show))
-        end
+        end)
         output_buffer.should have_tag("th:nth-child(1)", "Title")
         output_buffer.should have_tag("th:nth-child(2)", "Created at")
         output_buffer.should have_tag("th:nth-child(3)", "")
@@ -317,7 +314,7 @@ describe Tabletastic::TableBuilder do
   context "when table_for is not passed a block" do
     it "the data should use the default option" do
       Tabletastic.default_table_block = lambda {|table| table.data}
-      concat table_for(@posts)
+      concat( table_for(@posts) )
       output_buffer.should have_table_with_tag("td", "The title of the post")
     end
   end

data/spec/tabletastic_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Tabletastic#table_for" do
 
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    reset_output_buffer!
   end
 
   describe "basics" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: tabletastic
 version: !ruby/object:Gem::Version 
-  hash: -1876988177
+  hash: -1876988180
   prerelease: true
   segments: 
   - 0
   - 2
   - 0
-  - pre4
-  version: 0.2.0.pre4
+  - pre5
+  version: 0.2.0.pre5
 platform: ruby
 authors: 
 - Joshua Davey
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 -05:00
+date: 2010-08-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230024
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency