tabletastic 0.1.3 → 0.2.0.pre

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+Git
+* Updating to Rails3 API and idioms
+
 v0.1.3 (Dec 28, 2009)
 * Changing destroy action to have confirmation by default
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Joshua Davey
+Copyright (c) 2010 Joshua Davey
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -24,18 +24,33 @@ This is my attempt to simplify this (the default scaffold):
 
 into this:
 
-  <% table_for(@posts) do |t| %>
-    <%= t.data :actions => :all %>
-  <% end %>
+  <%= table_for(@posts) do |t|
+        t.data :actions => :all
+      end %>
 
 and still output the same effective results, but with all the semantic
 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).
+
+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+.
+
+For example:
+
+  <%= table_for(@people) do |t|
+        t.data
+      end %>
+
+
 == Installation
 
-In your Rails project, as a gem:
-  config.gem "tabletastic", :source => "http://gemcutter.org"
+In your Rails project, Gemfile:
+  gem "tabletastic"
 
 Or, for if you're behind the times, as a plugin:
   script/plugin install git://github.com/jgdavey/tabletastic.git
@@ -49,9 +64,9 @@ you can just use the helper. It will try to detect all content fields and belong
 
 In your view, simply calling:
 
-  <% table_for(@posts) do |t| %>
-    <%= t.data %>
-  <% end %>
+  <%= table_for(@posts) do |t|
+        t.data
+      end %>
 
 will produce html like this:
 
@@ -86,9 +101,9 @@ will produce html like this:
 To limit the fields, change the order, or to include fields that are excluded by default (such as created_at),
 You can list methods to call on each resource:
 
-  <% table_for(@posts) do |t| %>
-    <%= t.data :author, :title, :created_at %>
-  <% end %>
+  <%= table_for(@posts) do |t|
+    t.data :author, :title, :created_at
+  end %>
 
 will produce html like:
 
@@ -121,13 +136,13 @@ will produce html like:
 
 For even greater flexibility, you can pass +data+ a block:
 
-  <% table_for(@posts) do |t| %>
-    <% t.data :actions => :all do %>
-      <%= t.cell(:title, :cell_html => {:class => "titlestring"}) %>
-      <%= t.cell(:body, :heading => "Content") {|p| truncate(p.body, 30)} %>
-      <%= t.cell(:author) {|p| p.author && link_to(p.author.name, p.author) } %>
-    <% end -%>
-  <% end %>
+  <%= table_for(@posts) do |t|
+    t.data :actions => :all do
+      t.cell(:title, :cell_html => {:class => "titlestring"})
+      t.cell(:body, :heading => "Content") {|p| truncate(p.body, 30)}
+      t.cell(:author) {|p| p.author && link_to(p.author.name, p.author) }
+    end
+  end %>
 
 will product html like:
 
@@ -206,4 +221,4 @@ If it _still_ isn't flexible enough for your needs, it might be time to return t
 
 == Copyright
 
-Copyright (c) 2009 Joshua Davey. See LICENSE for details.
+Copyright (c) 2010 Joshua Davey. See LICENSE for details.

data/lib/tabletastic.rb

@@ -1,14 +1,15 @@
-module Tabletastic
+require 'tabletastic/table_builder'
 
+module Tabletastic
   # returns and outputs a table for the given active record collection
-  def table_for(collection, *args)
+  def table_for(collection, *args, &block)
+    raise ArgumentError, "you must provide a block" unless block_given?
     klass = default_class_for(collection)
     options = args.extract_options!
     options[:html] ||= {}
     options[:html][:id] ||= get_id_for(klass)
-    concat(tag(:table, options[:html], true))
-    yield TableBuilder.new(collection, klass, self)
-    concat("</table>")
+    result = block.call(TableBuilder.new(collection, klass, self))
+    content_tag(:table, result, options[:html])
   end
 
   private
@@ -22,185 +23,6 @@ module Tabletastic
   end
 
   def get_id_for(klass)
-    klass.to_s.tableize
-  end
-
-  class TableBuilder
-    @@association_methods = %w[display_name full_name name title username login value to_s]
-    @@default_hidden_columns = %w[created_at updated_at created_on updated_on lock_version version]
-    @@destroy_confirm_message = "Are you sure?"
-
-    attr_accessor :field_labels
-    attr_reader   :collection, :klass, :fields
-
-    def initialize(collection, klass, template)
-      @collection, @klass, @template = collection, klass, template
-      @field_labels = []
-    end
-
-    # builds up the fields that the table will include,
-    # returns table head and body with all data
-    #
-    # Can be used one of three ways:
-    #
-    # * Alone, which will try to detect all content columns on the resource
-    # * With an array of methods to call on each element in the collection
-    # * With a block, which assumes you will use +cell+ method to build up
-    #   the table
-    #
-    #
-    def data(*args, &block) # :yields: tablebody
-      options = args.extract_options!
-      if block_given?
-        @fields = []
-        yield self
-        action_cells(options[:actions], options[:action_prefix])
-        @template.concat(head)
-        @template.concat(body)
-      else
-        @fields = args.empty? ? active_record_fields : args
-        @field_labels = fields.map { |f| f.to_s.humanize }
-        action_cells(options[:actions], options[:action_prefix])
-        [head, body].join("")
-      end
-    end
-
-    # individually specify a column, which will build up the header,
-    # and method or block to call on each resource in the array
-    #
-    # Should always be called within the block of +data+
-    #
-    # For example:
-    #
-    #   t.cell :blah
-    #
-    # will simply call +blah+ on each resource
-    #
-    # You can also provide a block, which allows for other helpers
-    # or custom formatting. Since by default erb will just call +to_s+
-    # on an any element output, you can more greatly control the output:
-    #
-    #   t.cell(:price) {|resource| number_to_currency(resource)}
-    #
-    # would output something like:
-    #
-    #   <td>$1.50</td>
-    #
-    def cell(*args, &proc)
-      options = args.extract_options!
-      method = args.first.to_sym
-      method_or_proc = block_given? ? proc : method
-
-      @fields << [method_or_proc, options.delete(:cell_html)]
-
-      @field_labels << (options.delete(:heading) || method.to_s.humanize)
-      # Since this will likely be called with <%= %> (aka 'concat'), explicitly return an empty string
-      # This suppresses unwanted output
-      return ""
-    end
-
-    def head
-      content_tag(:thead) do
-        content_tag(:tr) do
-          self.field_labels.inject("") do |result,field|
-            result += content_tag(:th, field)
-          end
-        end
-      end
-    end
-
-    def body
-      content_tag(:tbody) do
-        @collection.inject("") do |rows, record|
-          rowclass = @template.cycle("odd","even")
-          rows += @template.content_tag_for(:tr, record, :class => rowclass) do
-            cells_for_row(record)
-          end
-        end
-      end
-    end
-
-    def cells_for_row(record)
-      fields.inject("") do |cells, field_or_array|
-        field = field_or_array
-        if field_or_array.is_a?(Array)
-          field = field_or_array.first
-          html_options = field_or_array.last
-        end
-        cells += content_tag(:td, cell_data(record, field), html_options)
-      end
-    end
-
-    def cell_data(record, method_or_attribute_or_proc)
-      # Get the attribute or association in question
-      result = send_or_call(record, method_or_attribute_or_proc)
-      # If we already have a string, just return it
-      return result if result.is_a?(String)
-
-      # If we don't have a string, its likely an association
-      # Try to detect which method to use for stringifying the attribute
-      to_string = detect_string_method(result)
-      result.send(to_string) if to_string
-    end
-
-    # Used internally to build up cells for common CRUD actions
-    def action_cells(actions, prefix = nil)
-      return if actions.blank?
-      actions = [actions] if !actions.respond_to?(:each)
-      actions = [:show, :edit, :destroy] if actions == [:all]
-      actions.each do |action|
-        action_link(action.to_sym, prefix)
-      end
-    end
-
-    # Dynamically builds links for the action
-    def action_link(action, prefix)
-      html_class = "actions #{action.to_s}_link"
-      self.cell(action, :heading => "", :cell_html => {:class => html_class}) do |resource|
-        compound_resource = [prefix, resource].compact
-        case action
-        when :show
-          @template.link_to("Show", compound_resource)
-        when :destroy
-          @template.link_to("Destroy", compound_resource, :method => :delete, :confirm => @@destroy_confirm_message)
-        else # edit, other resource GET actions
-          @template.link_to(action.to_s.titleize, @template.polymorphic_path(compound_resource, :action => action))
-        end
-      end
-    end
-
-    protected
-
-    def detect_string_method(association)
-      @@association_methods.detect { |method| association.respond_to?(method) }
-    end
-
-
-    def active_record_fields
-      return [] if klass.blank?
-      fields = klass.content_columns.map(&:name)
-      fields += active_record_association_reflections
-      fields -= @@default_hidden_columns
-      fields = fields.map(&:to_sym)
-    end
-
-    def active_record_association_reflections
-      return [] unless klass.respond_to?(:reflect_on_all_associations)
-      associations = klass.reflect_on_all_associations(:belongs_to).map(&:name)
-    end
-
-    private
-
-    def content_tag(name, content = nil, options = nil, escape = true, &block)
-      @template.content_tag(name, content, options, escape, &block)
-    end
-
-    def send_or_call(object, duck)
-      if duck.respond_to?(:call)
-        duck.call(object)
-      else
-        object.send(duck)
-      end
-    end
+    klass ? klass.model_name.collection : ""
   end
 end

data/lib/tabletastic/table_builder.rb

@@ -0,0 +1,143 @@
+require File.join(File.dirname(__FILE__), 'table_field')
+
+module Tabletastic
+  class TableBuilder
+    @@default_hidden_columns = %w[created_at updated_at created_on updated_on lock_version version]
+    @@destroy_confirm_message = "Are you sure?"
+
+    attr_reader   :collection, :klass, :table_fields
+
+    def initialize(collection, klass, template)
+      @collection, @klass, @template = collection, klass, template
+      @table_fields = []
+    end
+
+    # builds up the fields that the table will include,
+    # returns table head and body with all data
+    #
+    # Can be used one of three ways:
+    #
+    # * Alone, which will try to detect all content columns on the resource
+    # * With an array of methods to call on each element in the collection
+    # * With a block, which assumes you will use +cell+ method to build up
+    #   the table
+    #
+    #
+    def data(*args, &block) # :yields: tablebody
+      options = args.extract_options!
+      if block_given?
+        yield self
+      else
+        @table_fields = args.empty? ? active_record_fields : args.collect {|f| TableField.new(f.to_sym)}
+      end
+      action_cells(options[:actions], options[:action_prefix])
+      [head, body].join("").html_safe
+    end
+
+    # individually specify a column, which will build up the header,
+    # and method or block to call on each resource in the array
+    #
+    # Should always be called within the block of +data+
+    #
+    # For example:
+    #
+    #   t.cell :blah
+    #
+    # will simply call +blah+ on each resource
+    #
+    # You can also provide a block, which allows for other helpers
+    # or custom formatting. Since by default erb will just call +to_s+
+    # on an any element output, you can more greatly control the output:
+    #
+    #   t.cell(:price) {|resource| number_to_currency(resource)}
+    #
+    # would output something like:
+    #
+    #   <td>$1.50</td>
+    #
+    def cell(*args, &proc)
+      options = args.extract_options!
+      options.merge!(:klass => klass)
+      args << options
+      @table_fields << TableField.new(*args, &proc)
+      # Since this will likely be called with <%= %> (aka 'concat'), explicitly return an empty string
+      # This suppresses unwanted output
+      return ""
+    end
+
+    def head
+      content_tag(:thead) do
+        content_tag(:tr) do
+          @table_fields.inject("") do |result,field|
+            result += content_tag(:th, field.heading)
+          end
+        end
+      end
+    end
+
+    def body
+      content_tag(:tbody) do
+        @collection.inject("") do |rows, record|
+          rowclass = @template.cycle("odd","even")
+          rows += @template.content_tag_for(:tr, record, :class => rowclass) do
+            cells_for_row(record)
+          end
+        end
+      end
+    end
+
+    def cells_for_row(record)
+      @table_fields.inject("") do |cells, field|
+        cells + content_tag(:td, field.cell_data(record), field.cell_html)
+      end
+    end
+
+    # Used internally to build up cells for common CRUD actions
+    def action_cells(actions, prefix = nil)
+      return if actions.blank?
+      actions = [actions] if !actions.respond_to?(:each)
+      actions = [:show, :edit, :destroy] if actions == [:all]
+      actions.each do |action|
+        action_link(action.to_sym, prefix)
+      end
+    end
+
+    # Dynamically builds links for the action
+    def action_link(action, prefix)
+      html_class = "actions #{action.to_s}_link"
+      proc = lambda do |resource|
+        compound_resource = [prefix, resource].compact
+        case action
+        when :show
+          @template.link_to("Show", compound_resource)
+        when :destroy
+          @template.link_to("Destroy", compound_resource, :method => :delete, :confirm => @@destroy_confirm_message)
+        else # edit, other resource GET actions
+          @template.link_to(action.to_s.titleize, @template.polymorphic_path(compound_resource, :action => action))
+        end
+      end
+      self.cell(action, :heading => "", :cell_html => {:class => html_class}, &proc)
+    end
+
+    protected
+
+    def active_record_fields
+      return [] if klass.blank?
+      fields = klass.content_columns.map(&:name)
+      fields += active_record_association_reflections
+      fields -= @@default_hidden_columns
+      fields.collect {|f| TableField.new(f.to_sym)}
+    end
+
+    private
+
+    def active_record_association_reflections
+      return [] unless klass.respond_to?(:reflect_on_all_associations)
+      associations = klass.reflect_on_all_associations(:belongs_to).map(&:name)
+    end
+
+    def content_tag(name, content = nil, options = nil, escape = true, &block)
+      @template.content_tag(name, content, options, escape, &block)
+    end
+  end
+end

data/lib/tabletastic/table_field.rb

@@ -0,0 +1,44 @@
+require 'active_support/core_ext/object'
+
+module Tabletastic
+  class TableField
+    @@association_methods = %w[to_label display_name full_name name title username login value to_str to_s]
+
+    attr_accessor :heading, :method_or_proc, :cell_html
+
+    def initialize(*args, &proc)
+      options = args.extract_options!
+      method = args.first.to_sym
+      @method_or_proc = block_given? ? proc : method
+      @cell_html = options[:cell_html]
+      @klass = options.delete(:klass)
+      @heading = options.delete(:heading) || @klass.try(:human_attribute_name, method.to_s) || method.to_s.humanize
+    end
+
+    def cell_data(record)
+      # Get the attribute or association in question
+      result = send_or_call(record, method_or_proc)
+      # If we already have a string, just return it
+      return result if result.is_a?(String)
+
+      # If we don't have a string, its likely an association
+      # Try to detect which method to use for stringifying the attribute
+      to_string = detect_string_method(result)
+      result.send(to_string) if to_string
+    end
+
+    private
+
+    def detect_string_method(association)
+      @@association_methods.detect { |method| association.respond_to?(method) }
+    end
+
+    def send_or_call(object, duck)
+      if duck.respond_to?(:call)
+        duck.call(object)
+      else
+        object.send(duck)
+      end
+    end
+  end
+end

data/lib/tabletastic/version.rb

@@ -0,0 +1,3 @@
+module Tabletastic
+  VERSION = "0.2.0.pre"
+end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rubygems'
 
-def smart_require(lib_name, gem_name, gem_version = '>= 0.0.0')
+def smart_require(gem_name, gem_version = '>= 0.0.0', lib_name = nil)
+  lib_name ||= gem_name
   begin
     require lib_name if lib_name
   rescue LoadError
@@ -12,43 +13,44 @@ def smart_require(lib_name, gem_name, gem_version = '>= 0.0.0')
   end
 end
 
-smart_require 'spec', 'spec', '>= 1.2.8'
+smart_require 'rspec', '>= 1.3.0', 'spec'
 require 'spec/autorun'
-smart_require false, 'rspec-rails', '>= 1.2.7.1'
-smart_require 'hpricot', 'hpricot', '>= 0.6.1'
-smart_require 'rspec_hpricot_matchers', 'rspec_hpricot_matchers', '>= 1.0.0'
-smart_require 'active_support', 'activesupport', '>= 2.3.4'
-smart_require 'action_controller', 'actionpack', '>= 2.3.4'
-smart_require 'action_view', 'actionpack', '>= 2.3.4'
-
+smart_require 'nokogiri'
+smart_require 'rspec_tag_matchers', '>= 1.0.0'
+smart_require 'activesupport', '>= 3.0.0.beta2', 'active_support'
+smart_require 'actionpack',    '>= 3.0.0.beta2', 'action_pack'
+smart_require 'activerecord',  '>= 3.0.0.beta2', 'active_record'
+require 'action_controller'
+require 'action_view/base'
+require 'action_view/template'
+require 'action_view/helpers'
 Spec::Runner.configure do |config|
-  config.include(RspecHpricotMatchers)
+  config.include(RspecTagMatchers)
 end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'tabletastic'
 
 module TabletasticSpecHelper
+  include ActiveSupport
+  include ActionView
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveRecordHelper
+  include ActionView::Helpers::ActiveModelHelper
   include ActionView::Helpers::RecordIdentificationHelper
   include ActionView::Helpers::RecordTagHelper
   include ActionView::Helpers::CaptureHelper
-  include ActiveSupport
+  include ActionView::Helpers::RawOutputHelper
   include ActionController::PolymorphicRoutes
 
   def self.included(base)
     base.class_eval do
       attr_accessor :output_buffer
-      def protect_against_forgery?
-        false
-      end
     end
   end
 
-  module ::RspecHpricotMatchers
+  module ::RspecTagMatchers
     def have_table_with_tag(selector, inner_text_or_options = nil, options = {}, &block)
       HaveTag.new("table", nil, {}) &&
         HaveTag.new(selector, inner_text_or_options, options, &block)
@@ -73,8 +75,9 @@ module TabletasticSpecHelper
     @post.stub!(:class).and_return(::Post)
     @post.stub!(:id).and_return(nil)
     @post.stub!(:author)
+    @post.stub!(:to_key).and_return([2])
     ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
-    ::Post.stub!(:human_name).and_return('Post')
+    ::Post.stub!(:model_name).and_return(ActiveModel::Name.new(::Post))
 
     @fred = mock('user')
     @fred.stub!(:class).and_return(::Author)
@@ -84,6 +87,7 @@ module TabletasticSpecHelper
     ::Author.stub!(:find).and_return([@fred])
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('Author')
+    ::Author.stub!(:model_name).and_return(ActiveModel::Name.new(::Author))
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
 
     @freds_post = mock('post')
@@ -91,6 +95,7 @@ module TabletasticSpecHelper
     @freds_post.stub!(:title).and_return('Fred\'s Post')
     @freds_post.stub!(:body)
     @freds_post.stub!(:id).and_return(19)
+    @freds_post.stub!(:to_key).and_return([19])
     @freds_post.stub!(:author).and_return(@fred)
     @freds_post.stub!(:author_id).and_return(@fred.id)
     @fred.stub!(:posts).and_return([@freds_post])
@@ -105,3 +110,6 @@ module TabletasticSpecHelper
     ::Post.stub!(:reflect_on_all_associations).with(:belongs_to).and_return([])
   end
 end
+
+include TabletasticSpecHelper
+include Tabletastic

data/spec/tabletastic_spec.rb

@@ -1,12 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-include TabletasticSpecHelper
-include Tabletastic
-
+require 'spec_helper'
 
 describe "Tabletastic#table_for" do
 
   before do
-    @output_buffer = ''
+    @output_buffer = ActiveSupport::SafeBuffer.new
   end
 
   describe "basics" do
@@ -15,327 +12,15 @@ describe "Tabletastic#table_for" do
     end
 
     it "should build a basic table" do
-      table_for([]) do |t|
-      end
+      concat(table_for([]) {})
       output_buffer.should have_tag("table")
     end
 
-    context "head and table body" do
-      before do
-        table_for([]) do |t|
-          concat(t.head)
-          concat(t.body)
-        end
-      end
-
-      it "should build a basic table and head" do
-        output_buffer.should have_table_with_tag("thead")
-      end
-
-      it "should build a basic table and body" do
-        output_buffer.should have_table_with_tag("tbody")
-      end
-    end
-
     context "with options" do
       it "should pass along html options" do
-        table_for([], :html => {:class => 'special'}) do |t|
-        end
+        concat(table_for([], :html => {:class => 'special'}){})
         output_buffer.should have_tag("table.special")
       end
     end
   end
-
-  describe "#data" do
-    before do
-      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")
-      @post.stub!(:body).and_return("Lorem ipsum")
-      @post.stub!(:created_at).and_return(Time.now)
-      @post.stub!(:id).and_return(2)
-      @posts = [@post]
-    end
-
-    context "without a block" do
-      context "with no other arguments" do
-        before do
-          table_for(@posts) do |t|
-            concat(t.data)
-          end
-        end
-
-        it "should output table with id of the class of the collection" do
-          output_buffer.should have_tag("table#posts")
-        end
-
-        it "should output head" do
-          output_buffer.should have_table_with_tag("thead")
-        end
-
-        it "should have a <th> for each attribute" do
-          # title and body
-          output_buffer.should have_table_with_tag("th", :count => 2)
-        end
-
-        it "should include header for Title" do
-          output_buffer.should have_table_with_tag("th", "Title")
-        end
-
-        it "should include header for Body" do
-          output_buffer.should have_table_with_tag("th", "Body")
-        end
-
-        it "should output body" do
-          output_buffer.should have_table_with_tag("tbody")
-        end
-
-        it "should include a row for each record" do
-          output_buffer.should have_table_with_tag("tbody") do |tbody|
-            tbody.should have_tag("tr", :count => 1)
-          end
-        end
-
-        it "should have data for each field" do
-          output_buffer.should have_table_with_tag("td", "The title of the post")
-          output_buffer.should have_table_with_tag("td", "Lorem ipsum")
-        end
-
-        it "should include the id for the <tr> for each record" do
-          output_buffer.should have_table_with_tag("tr#post_#{@post.id}")
-        end
-
-        it "should cycle row classes" do
-          @output_buffer = ""
-          @posts = [@post, @post]
-          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
-          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]
-            @output_buffer = ""
-            table_for(@posts) do |t|
-              concat(t.data)
-            end
-            output_buffer.should have_table_with_tag("th", "Author")
-            output_buffer.should have_table_with_tag("td", "Fred Smith")
-          end
-        end
-      end
-
-      context "with options[:actions]" do
-        it "includes path to post for :show" do
-          table_for(@posts) do |t|
-            concat(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
-          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
-          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
-          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
-          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
-          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")
-        end
-
-        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
-            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
-            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
-            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(t.data(:actions => :all, :action_prefix => :admin))
-            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")
-          end
-        end
-      end
-
-      context "with a list of attributes" do
-        before do
-          table_for(@posts) do |t|
-            concat(t.data(:title, :created_at))
-          end
-        end
-
-        it "should call each method passed in, and only those methods" do
-          output_buffer.should have_table_with_tag("th", "Title")
-          output_buffer.should have_table_with_tag("th", "Created at")
-          output_buffer.should_not have_table_with_tag("th", "Body")
-        end
-      end
-
-      context "with a list of attributes and options[:actions]" do
-        it "includes path to post for :show" do
-          table_for(@posts) do |t|
-            concat(t.data(:title, :created_at, :actions => :show))
-          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)", "")
-          output_buffer.should_not have_tag("th", "Body")
-
-          output_buffer.should have_tag("td:nth-child(3) a[@href=/posts/#{@post.id}]")
-        end
-      end
-    end
-
-    context "with a block" do
-      context "and normal columns" do
-        before do
-          table_for(@posts) do |t|
-            t.data do
-              concat(t.cell(:title))
-              concat(t.cell(:body))
-            end
-          end
-        end
-
-        it "should include the data for the fields passed in" do
-          output_buffer.should have_table_with_tag("th", "Title")
-          output_buffer.should have_tag("td", "The title of the post")
-          output_buffer.should have_tag("td", "Lorem ipsum")
-        end
-      end
-
-      context "with custom cell options" do
-        before do
-          table_for(@posts) do |t|
-            t.data do
-              concat(t.cell(:title, :heading => "FooBar"))
-              concat(t.cell(:body, :cell_html => {:class => "batquux"}))
-            end
-          end
-        end
-
-        it "should change the heading label for :heading option" do
-          output_buffer.should have_table_with_tag("th", "FooBar")
-          output_buffer.should have_table_with_tag("th", "Body")
-        end
-
-        it "should pass :cell_html to the cell" do
-          output_buffer.should have_table_with_tag("td.batquux")
-        end
-      end
-
-      context "with custom cell options" do
-        before do
-          table_for(@posts) do |t|
-            t.data do
-              concat(t.cell(:title) {|p| link_to p.title, "/" })
-              concat(t.cell(:body, :heading => "Content") {|p| p.body })
-            end
-          end
-        end
-
-        it "accepts a block as a lazy attribute" do
-          output_buffer.should have_table_with_tag("th:nth-child(1)", "Title")
-          output_buffer.should have_table_with_tag("td:nth-child(1)") do |td|
-            td.should have_tag("a", "The title of the post")
-          end
-        end
-
-        it "accepts a block as a lazy attribute (2)" do
-          output_buffer.should have_table_with_tag("th:nth-child(2)", "Content")
-          output_buffer.should have_table_with_tag("td:nth-child(2)", "Lorem ipsum")
-        end
-      end
-
-      context "with options[:actions]" do
-        it "includes path to post for :show" do
-          table_for(@posts) do |t|
-            t.data(:actions => :show) do
-              concat(t.cell(:title))
-              concat(t.cell(:body))
-            end
-          end
-          output_buffer.should have_table_with_tag("td:nth-child(3) a[@href=/posts/#{@post.id}]")
-        end
-      end
-
-      context "and normal/association columns" do
-        before do
-          ::Post.stub!(:reflect_on_all_associations).with(:belongs_to).and_return([@mock_reflection_belongs_to_author])
-          @posts = [@freds_post]
-          table_for(@posts) do |t|
-            t.data do
-              concat(t.cell(:title))
-              concat(t.cell(:author))
-            end
-          end
-        end
-
-        it "should include normal columns" do
-          output_buffer.should have_table_with_tag("th:nth-child(1)", "Title")
-          output_buffer.should have_table_with_tag("td:nth-child(1)", "Fred's Post")
-        end
-
-        it "should include belongs_to associations" do
-          output_buffer.should have_table_with_tag("th:nth-child(2)", "Author")
-          output_buffer.should have_table_with_tag("td:nth-child(2)", "Fred Smith")
-        end
-      end
-    end
-  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tabletastic
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: true
+  segments: 
+  - 0
+  - 2
+  - 0
+  - pre
+  version: 0.2.0.pre
 platform: ruby
 authors: 
 - Joshua Davey
@@ -9,19 +15,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 -06:00
+date: 2010-04-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: A table builder for active record collections   that produces semantically rich and accessible markup
 email: josh@joshuadavey.com
 executables: []
@@ -29,47 +37,45 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.rdoc
+- LICENSE
 files: 
-- .document
-- .gitignore
-- CHANGELOG.rdoc
+- lib/tabletastic/table_builder.rb
+- lib/tabletastic/table_field.rb
+- lib/tabletastic/version.rb
+- lib/tabletastic.rb
 - LICENSE
 - README.rdoc
-- Rakefile
-- VERSION
-- lib/tabletastic.rb
-- rails/init.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/tabletastic_spec.rb
-- tabletastic.gemspec
+- CHANGELOG.rdoc
 has_rdoc: true
 homepage: http://github.com/jgdavey/tabletastic
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 5
+      version: 1.3.5
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A smarter table builder for Rails collections

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-doc/

data/Rakefile

@@ -1,59 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-GEM = "tabletastic"
-LONGDESCRIPTION = %Q{A table builder for active record collections \
-  that produces semantically rich and accessible markup}
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = GEM
-    s.summary = %Q{A smarter table builder for Rails collections}
-    s.description = LONGDESCRIPTION
-    s.email = "josh@joshuadavey.com"
-    s.homepage = "http://github.com/jgdavey/tabletastic"
-    s.authors = ["Joshua Davey"]
-    s.require_path = 'lib'
-
-    s.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-desc 'Test the tabletastic plugin with specdoc formatting and colors'
-Spec::Rake::SpecTask.new('specdoc') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ["--format specdoc", "-c"]
-end
-
-desc 'Test the tabletastic plugin with rcov'
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts = ['--exclude', 'spec,Library']
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Tabletastic #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +0,0 @@
-0.1.3

data/rails/init.rb

@@ -1,3 +0,0 @@
-# Include hook code here
-require File.join(File.dirname(__FILE__), *%w[.. lib tabletastic])
-ActionView::Base.send :include, Tabletastic

data/spec/spec.opts

@@ -1,2 +0,0 @@
---diff
---color

data/tabletastic.gemspec

@@ -1,57 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{tabletastic}
-  s.version = "0.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Joshua Davey"]
-  s.date = %q{2009-12-28}
-  s.description = %q{A table builder for active record collections   that produces semantically rich and accessible markup}
-  s.email = %q{josh@joshuadavey.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/tabletastic.rb",
-     "rails/init.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/tabletastic_spec.rb",
-     "tabletastic.gemspec"
-  ]
-  s.homepage = %q{http://github.com/jgdavey/tabletastic}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A smarter table builder for Rails collections}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/tabletastic_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
-end
-