tabletastic 0.2.0.pre3 → 0.2.0.pre4

data/CHANGELOG.rdoc

@@ -3,6 +3,7 @@ Git (for upcoming v0.2.0 release)
 * 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
 
 v0.1.3 (Dec 28, 2009)
 

data/lib/tabletastic/helper.rb

@@ -14,8 +14,8 @@ module Tabletastic
     private
     # Finds the class representing the objects within the collection
     def default_class_for(collection)
-      if collection.respond_to?(:proxy_reflection)
-        collection.proxy_reflection.klass
+      if collection.respond_to?(:klass) # ActiveRecord::Relation
+        collection.klass
       elsif !collection.empty?
         collection.first.class
       end
@@ -36,4 +36,3 @@ end
 ActiveSupport.on_load(:action_view) do
   include Tabletastic::Helper
 end
-

data/lib/tabletastic/table_builder.rb

@@ -31,7 +31,7 @@ module Tabletastic
         @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
+      ["\n", head, "\n", body, "\n"].join("").html_safe
     end
 
     # individually specify a column, which will build up the header,
@@ -77,11 +77,11 @@ module Tabletastic
 
     def body
       content_tag(:tbody) do
-        @collection.inject("") do |rows, record|
+        @collection.inject("\n") do |rows, record|
           rowclass = @template.cycle("odd","even")
           rows += @template.content_tag_for(:tr, record, :class => rowclass) do
             cells_for_row(record)
-          end
+          end + "\n"
         end
       end
     end
@@ -133,7 +133,10 @@ module Tabletastic
 
     def active_record_association_reflections
       return [] unless klass.respond_to?(:reflect_on_all_associations)
-      associations = klass.reflect_on_all_associations(:belongs_to).map(&:name)
+      associations = []
+      associations += klass.reflect_on_all_associations(:belongs_to).map(&:name)
+      associations += klass.reflect_on_all_associations(:has_one).map(&:name)
+      associations
     end
 
     def content_tag(name, content = nil, options = nil, escape = true, &block)

data/lib/tabletastic/version.rb

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

data/spec/spec_helper.rb

@@ -55,6 +55,8 @@ Spork.prefork do
     end
     class ::Author
     end
+    class ::Profile
+    end
 
     def mock_everything
       def post_path(post); "/posts/#{post.id}"; end
@@ -71,16 +73,22 @@ Spork.prefork do
       ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
       ::Post.stub!(:model_name).and_return(ActiveModel::Name.new(::Post))
 
-      @fred = mock('user')
+      @fred = mock('author', :to_key => nil)
       @fred.stub!(:class).and_return(::Author)
       @fred.stub!(:name).and_return('Fred Smith')
       @fred.stub!(:id).and_return(37)
 
+      @profile = mock('profile')
+      @profile.stub!(:author).and_return(@fred)
+      @profile.stub!(:bio).and_return("This is my bio")
+      @fred.stub!(:profile).and_return(@profile)
+
+      ::Author.stub!(:content_columns).and_return([mock('column', :name => "name")])
+
       ::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')
       @freds_post.stub!(:class).and_return(::Post)
@@ -93,13 +101,22 @@ Spork.prefork do
       @fred.stub!(:posts).and_return([@freds_post])
       @fred.stub!(:post_ids).and_return([@freds_post.id])
 
-      @mock_reflection_belongs_to_author = mock('reflection', :options => {}, :name => :author, :klass => ::Author, :macro => :belongs_to)
+      @mock_reflection_belongs_to_author = mock('reflection1', :options => {}, :name => :author, :macro => :belongs_to, :collection => false)
+
+      @mock_reflection_has_one_profile = mock('reflection2', :options => {}, :name => :profile, :macro => :has_one, :collection => false)
 
       ::Post.stub!(:reflect_on_association).and_return do |column_name|
         @mock_reflection_belongs_to_author if column_name == :author
       end
 
-      ::Post.stub!(:reflect_on_all_associations).with(:belongs_to).and_return([])
+      ::Author.stub!(:reflect_on_association).and_return do |column_name|
+        mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts
+        @mock_reflection_has_one_profile if column_name == :profile
+      end
+
+
+      ::Post.stub!(:reflect_on_all_associations).and_return([])
+      ::Author.stub!(:reflect_on_all_associations).and_return([])
     end
   end
 

data/spec/tabletastic/table_builder_spec.rb

@@ -71,14 +71,22 @@ describe Tabletastic::TableBuilder do
       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]
-          @output_buffer = ""
           concat table_for(@posts) { |t| t.data }
           output_buffer.should have_table_with_tag("th", "Author")
           output_buffer.should have_table_with_tag("td", "Fred Smith")
         end
+
+        it "should handle has_one associations" do
+          ::Author.stub!(:reflect_on_all_associations).with(:has_one).and_return([@mock_reflection_has_one_profile])
+          concat table_for([@fred]) { |t| t.data }
+          output_buffer.should have_table_with_tag("th", "Profile")
+        end
       end
     end
 
@@ -290,7 +298,7 @@ describe Tabletastic::TableBuilder do
       end
     end
   end
-  
+
   context "using human_attribute_names" do
     it "should work" do
       ::Post.stub!(:human_attribute_name).with('body').and_return("Blah blue")
@@ -305,7 +313,7 @@ describe Tabletastic::TableBuilder do
       output_buffer.should have_table_with_tag("th", "Blah blue")
     end
   end
-  
+
   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}

data/spec/tabletastic/table_field_spec.rb

@@ -29,4 +29,10 @@ describe Tabletastic::TableField do
     end
     tf.cell_data("hello").should == "HELLO"
   end
+
+  it "should return normal, non html-safe strings" do
+    post = mock(:booya => 'crazy')
+    tf = TableField.new(:booya)
+    tf.cell_data(post).should_not be_html_safe
+  end
 end

data/spec/tabletastic_spec.rb

@@ -24,6 +24,26 @@ describe "Tabletastic#table_for" do
     end
   end
 
+  describe "guessing its class collection" do
+    before do
+      mock_everything
+    end
+
+    it "should find the class of the collection (ActiveRecord::Relation)" do
+      table = mock(Arel::Table)
+      collection = ActiveRecord::Relation.new(@post.class, table)
+      collection.stub!(:build_arel => table)
+      klass = Tabletastic::TableBuilder.send(:default_class_for, collection)
+      klass.should == Post
+    end
+
+    it "should find the class of the collection (Array of AR objects)" do
+      collection = [@post]
+      klass = Tabletastic::TableBuilder.send(:default_class_for, collection)
+      klass.should == Post
+    end
+  end
+
   describe "default options" do
     before do
       Tabletastic.default_table_html = {:class => 'default', :cellspacing => 0}
@@ -40,7 +60,7 @@ describe "Tabletastic#table_for" do
       output_buffer.should_not have_tag("table.default")
     end
   end
-  
+
   describe "without a block" do
     it "should use default block" do
       concat table_for([])

metadata

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