tabletastic 0.2.0.pre5 → 0.2.0.pre6

data/CHANGELOG.rdoc

@@ -1,10 +1,12 @@
 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
-* Adding has_one associations
+* Update to Rails 3 API and idioms
+* Add default table html options
+* Add default lambda (table block) so that table_for can be called without passing a block
+* Add has_one associations
+* Add heading html hook for <th> elements
+* Super-basic mongoid support (2.x branch)
 
 v0.1.3 (Dec 28, 2009)
 
@@ -26,4 +28,4 @@ v0.1.0 (Nov 17, 2009)
 
 v0.0.1 (Nov 15, 2009)
 
-* Beta release, proof-of-concept
+* Beta release, proof-of-concept

data/README.rdoc

@@ -77,7 +77,7 @@ For more information about Rails 3 and Block helpers and the new conventions, ch
 == Installation
 
 In your Rails project, Gemfile:
-  gem "tabletastic"
+  gem "tabletastic", '~> 0.2.0.pre6'
 
 Or, for if you're behind the times, as a plugin:
   script/plugin install git://github.com/jgdavey/tabletastic.git

data/lib/tabletastic/table_builder.rb

@@ -22,13 +22,12 @@ module Tabletastic
     # * 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)}
+        @table_fields = args.empty? ? orm_fields : args.collect {|f| TableField.new(f.to_sym)}
       end
       action_cells(options[:actions], options[:action_prefix])
       ["\n", head, "\n", body, "\n"].join("").html_safe
@@ -60,8 +59,8 @@ module Tabletastic
       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
+      # Since this will likely be called with <%= %> (aka 'concat'), explicitly return an 
+      # empty string; this suppresses unwanted output
       return ""
     end
 
@@ -69,7 +68,7 @@ module Tabletastic
       content_tag(:thead) do
         content_tag(:tr) do
           @table_fields.inject("") do |result,field|
-            result += content_tag(:th, field.heading)
+            result + content_tag(:th, field.heading, field.heading_html)
           end
         end
       end
@@ -121,16 +120,29 @@ module Tabletastic
 
     protected
 
-    def active_record_fields
+    def orm_fields
       return [] if klass.blank?
-      fields = klass.content_columns.map(&:name)
-      fields += active_record_association_reflections
+      fields = if klass.respond_to?(:content_columns)
+        active_record_fields
+      elsif klass.respond_to?(:fields)
+        mongoid_fields
+      else
+        []
+      end
       fields -= @@default_hidden_columns
       fields.collect {|f| TableField.new(f.to_sym)}
     end
 
     private
 
+    def mongoid_fields
+      klass.fields.keys
+    end
+
+    def active_record_fields
+      klass.content_columns.map(&:name) + active_record_association_reflections
+    end
+
     def active_record_association_reflections
       return [] unless klass.respond_to?(:reflect_on_all_associations)
       associations = []

data/lib/tabletastic/table_field.rb

@@ -4,13 +4,13 @@ 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
+    attr_accessor :heading, :method_or_proc, :cell_html, :heading_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]
+      @cell_html, @heading_html = options[:cell_html], options[:heading_html]
       @klass = options.delete(:klass)
       @heading = options.delete(:heading) || @klass.try(:human_attribute_name, method.to_s) || method.to_s.humanize
     end
@@ -41,4 +41,4 @@ module Tabletastic
       end
     end
   end
-end
+end

data/lib/tabletastic/version.rb

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

data/spec/spec_helper.rb

@@ -21,7 +21,6 @@ Spork.prefork do
   end
 
   $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-  require 'tabletastic'
 
   module TabletasticSpecHelper
     include ActiveSupport
@@ -123,12 +122,13 @@ Spork.prefork do
     end
   end
 
-  include TabletasticSpecHelper
-  include Tabletastic
-  include Tabletastic::Helper
 end
 
 Spork.each_run do
   # This code will be run each time you run your specs.
+  require 'tabletastic'
 
+  include TabletasticSpecHelper
+  include Tabletastic
+  include Tabletastic::Helper
 end

data/spec/tabletastic/table_builder_spec.rb

@@ -19,30 +19,22 @@ describe Tabletastic::TableBuilder do
         concat(table_for(@posts) { |t| t.data })
       end
 
-      it "should output table with id of the class of the collection" do
-        output_buffer.should have_tag("table#posts")
-      end
+      subject { output_buffer }
 
-      it "should output head" do
-        output_buffer.should have_table_with_tag("thead")
-      end
+      it { should have_tag("table#posts") }
+
+      it { output_buffer.should have_table_with_tag("thead") } 
 
       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 { output_buffer.should have_table_with_tag("th", "Title") }
 
-      it "should include header for Body" do
-        output_buffer.should have_table_with_tag("th", "Body")
-      end
+      it { output_buffer.should have_table_with_tag("th", "Body") }
 
-      it "should output body" do
-        output_buffer.should have_table_with_tag("tbody")
-      end
+      it { output_buffer.should have_table_with_tag("tbody") }
 
       it "should include a row for each record" do
         output_buffer.should have_table_with_tag("tbody") do |tbody|
@@ -55,9 +47,7 @@ describe Tabletastic::TableBuilder do
         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 { output_buffer.should have_table_with_tag("tr#post_#{@post.id}") }
 
       it "should cycle row classes" do
         reset_output_buffer!
@@ -70,6 +60,21 @@ describe Tabletastic::TableBuilder do
         output_buffer.should have_table_with_tag("tr.even")
       end
 
+      context "mongoid collection" do
+        before do
+          reset_output_buffer!
+          ::Post.stub!(:respond_to?).with(:content_columns).and_return(false)
+          ::Post.stub!(:respond_to?).with(:fields).and_return(true)
+          ::Post.stub!(:fields).and_return({'title' => '', 'created_at' => ''})
+          concat(table_for(@posts) { |t| t.data })
+        end
+
+        it "should detect fields properly" do
+          output_buffer.should have_table_with_tag("td", "The title of the post")
+          output_buffer.should_not have_table_with_tag("td", "Lorem ipsum")
+        end
+      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])
@@ -176,12 +181,11 @@ describe Tabletastic::TableBuilder do
           t.data(:title, :created_at)
         end)
       end
+      subject { output_buffer }
 
-      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
+      it { should have_table_with_tag("th", "Title") }
+      it { should have_table_with_tag("th", "Created at") }
+      it { should_not have_table_with_tag("th", "Body") }
     end
 
     context "with a list of attributes and options[:actions]" do
@@ -210,11 +214,11 @@ describe Tabletastic::TableBuilder do
         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
+      subject { output_buffer }
+
+      it { should have_table_with_tag("th", "Title") }
+      it { should have_tag("td", "The title of the post") }
+      it { should have_tag("td", "Lorem ipsum") }
     end
 
     context "with custom cell options" do
@@ -227,17 +231,17 @@ describe Tabletastic::TableBuilder do
         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
+      subject { output_buffer }
+
+      it { should have_table_with_tag("th", "FooBar") }
+      it { should have_table_with_tag("th", "Body") }
 
       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
+    context "with custom heading option" do
       before do
         concat(table_for(@posts) do |t|
           t.data do
@@ -247,29 +251,42 @@ describe Tabletastic::TableBuilder do
         end)
       end
 
+      subject { output_buffer }
+
+      it { should have_table_with_tag("th:nth-child(1)", "Title") }
+      it { should have_table_with_tag("th:nth-child(2)", "Content") }
+      it { should have_table_with_tag("td:nth-child(2)", "Lorem ipsum") }
+      
       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
+    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")
+    context "with custom heading html option" do
+      before do
+        concat( table_for(@posts) do |t|
+          t.data do
+            t.cell(:title, :heading_html => {:class => 'hoja'})
+          end
+        end)
       end
+      subject { output_buffer }
+      it { should have_table_with_tag("th.hoja") }
     end
 
     context "with options[:actions]" do
-      it "includes path to post for :show" do
+      before do
         concat(table_for(@posts) do |t|
           t.data(:actions => :show) do
             t.cell(:title)
             t.cell(:body)
           end
         end)
-        output_buffer.should have_table_with_tag("td:nth-child(3) a[@href=\"/posts/#{@post.id}\"]")
       end
+      subject { output_buffer }
+      it { should have_table_with_tag("td:nth-child(3) a[@href=\"/posts/#{@post.id}\"]") }
     end
 
     context "and normal/association columns" do
@@ -297,7 +314,7 @@ describe Tabletastic::TableBuilder do
   end
 
   context "using human_attribute_names" do
-    it "should work" do
+    before do
       ::Post.stub!(:human_attribute_name).with('body').and_return("Blah blue")
 
       concat(table_for(@posts) do |t|
@@ -306,9 +323,10 @@ describe Tabletastic::TableBuilder do
           t.cell(:body)
         end
       end)
-
-      output_buffer.should have_table_with_tag("th", "Blah blue")
     end
+
+    subject { output_buffer }
+    it { should have_table_with_tag("th", "Blah blue") }
   end
 
   context "when table_for is not passed a block" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tabletastic
 version: !ruby/object:Gem::Version 
-  hash: -1876988180
   prerelease: true
   segments: 
   - 0
   - 2
   - 0
-  - pre5
-  version: 0.2.0.pre5
+  - pre6
+  version: 0.2.0.pre6
 platform: ruby
 authors: 
 - Joshua Davey
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 -05:00
+date: 2010-09-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,15 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,13 +41,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
-description: A table builder for active record collections that produces semantically rich and accessible table markup
+description: "    A table builder for active record collections that\n    produces semantically rich and accessible table markup\n"
 email: josh@joshuadavey.com
 executables: []
 
@@ -87,7 +83,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -96,7 +91,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3