tabletastic 0.1.2 → 0.1.3

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+doc/

data/CHANGELOG.rdoc

@@ -0,0 +1,20 @@
+v0.1.3 (Dec 28, 2009)
+* Changing destroy action to have confirmation by default
+
+v0.1.2 (Nov 25, 2009)
+
+* Added ability to namespace :actions links (i.e. /admin/posts/1)
+
+v0.1.1 (Nov 22, 2009)
+
+* Added :actions option to data method for common show, edit, destroy links
+
+v0.1.0 (Nov 17, 2009)
+
+* First useful release
+* Added documentation
+* "Lazy" attributes can be supplied as blocks to cell method
+
+v0.0.1 (Nov 15, 2009)
+
+* Beta release, proof-of-concept

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Inspired by the projects table_builder and formtastic,
 I realized how often I created tables for my active record collections.
-This is my attempt to simply this (the default scaffold):
+This is my attempt to simplify this (the default scaffold):
 
   <table>
     <tr>
@@ -25,17 +25,13 @@ This is my attempt to simply this (the default scaffold):
 into this:
 
   <% table_for(@posts) do |t| %>
-    <%= t.data :title, :body, :author %>
+    <%= 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.
+goodness that tabular data should have, i.e. a +thead+ and +tbody+ element.
 
 
-== Warning
-
-This project is still being actively developed. As such, future updates might not be backwards-compatible.
-
 == Installation
 
 In your Rails project, as a gem:

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/tabletastic.rb

@@ -27,11 +27,15 @@ module Tabletastic
 
   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
+    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,
@@ -48,12 +52,13 @@ module Tabletastic
     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? ? fields : args
+        @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("")
@@ -81,61 +86,36 @@ module Tabletastic
     #
     #   <td>$1.50</td>
     #
-    def cell(*args, &block)
+    def cell(*args, &proc)
       options = args.extract_options!
-      @field_labels ||= []
-      @fields ||= []
-
-      method_or_attribute = args.first.to_sym
+      method = args.first.to_sym
+      method_or_proc = block_given? ? proc : method
 
-      method_or_attribute_or_proc = if block_given?
-        block.to_proc
-      else
-        method_or_attribute
-      end
-
-      if cell_html = options.delete(:cell_html)
-        @fields << [method_or_attribute_or_proc, cell_html]
-      else
-        @fields << method_or_attribute_or_proc
-      end
+      @fields << [method_or_proc, options.delete(:cell_html)]
 
-      if heading = options.delete(:heading)
-        @field_labels << heading
-      else
-        @field_labels << method_or_attribute.to_s.humanize
-      end
+      @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
-      @field_labels ||= fields
       content_tag(:thead) do
-        header_row
-      end
-    end
-
-    def header_row
-      content_tag(:tr) do
-        @field_labels.inject("") do |result,field|
-          result += content_tag(:th, field)
+        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
-        body_rows
-      end
-    end
-
-    def body_rows
-      @collection.inject("") do |rows, record|
-        rowclass = @template.cycle("odd","even")
-        rows += @template.content_tag_for(:tr, record, :class => rowclass) do
-          cells_for_row(record)
+        @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
@@ -181,19 +161,14 @@ module Tabletastic
         case action
         when :show
           @template.link_to("Show", compound_resource)
-        when :edit
-          @template.link_to("Edit", @template.polymorphic_path(compound_resource, :action => :edit))
         when :destroy
-          @template.link_to("Destroy", compound_resource, :method => :delete)
+          @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
 
-    def fields
-      return @fields if defined?(@fields)
-      @fields = @collection.empty? ? [] : active_record_fields
-    end
-
     protected
 
     def detect_string_method(association)
@@ -203,27 +178,23 @@ module Tabletastic
 
     def active_record_fields
       return [] if klass.blank?
-      # normal content columns
       fields = klass.content_columns.map(&:name)
-
-      # active record associations
-      if klass.respond_to?(:reflect_on_all_associations)
-        associations = klass.reflect_on_all_associations(:belongs_to)
-        associations = associations.map(&:name)
-        fields += associations
-      end
-
-      # remove utility columns by default
-      fields -= %w[created_at updated_at created_on updated_on lock_version version]
+      fields += active_record_association_reflections
+      fields -= @@default_hidden_columns
       fields = fields.map(&:to_sym)
     end
 
-    def content_tag(name, content = nil, options = nil, escape = true, &block)
-      @template.content_tag(name, content, options, escape, &block)
+    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)

data/spec/tabletastic_spec.rb

@@ -158,7 +158,7 @@ describe "Tabletastic#table_for" do
           table_for(@posts) do |t|
             concat(t.data(:actions => :destroy))
           end
-          output_buffer.should have_table_with_tag("a[@href=/posts/#{@post.id}]", "Destroy")
+          output_buffer.should have_table_with_tag("a[@href=/posts/#{@post.id}]")
           output_buffer.should have_table_with_tag("th", "")
         end
 
@@ -339,20 +339,3 @@ describe "Tabletastic#table_for" do
     end
   end
 end
-
-describe TableBuilder do
-  before do
-    mock_everything
-    ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
-    @posts = [@post, Post.new]
-    @builder = TableBuilder.new(@posts, ::Post, nil)
-  end
-
-  it "should detect attributes" do
-    @builder.fields.should include(:title)
-  end
-
-  it "should reject marked attributes" do
-    @builder.fields.should_not include(:created_at)
-  end
-end

data/tabletastic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabletastic}
-  s.version = "0.1.2"
+  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-11-25}
+  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 = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG.rdoc",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tabletastic
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Joshua Davey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -06:00
+date: 2009-12-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile