tabletastic 0.2.0.pre6 → 0.2.0

data/CHANGELOG.rdoc

@@ -1,12 +1,14 @@
-Git (for upcoming v0.2.0 release)
+v0.2.0 (Oct 24, 2010)
 
-* [DEPRECATED] use of table.data method without = in erb or haml. See README for more information.
+* This gem is now Rails 3 only
 * Update to Rails 3 API and idioms
+* [DEPRECATED] use of table.data method without = in erb or haml. See README for more information.
 * 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)
+* Add ability to pass :action_prefix an array (Thanks, brunowernimont)
 
 v0.1.3 (Dec 28, 2009)
 

data/lib/tabletastic/table_builder.rb

@@ -104,18 +104,21 @@ module Tabletastic
     # Dynamically builds links for the action
     def action_link(action, prefix)
       html_class = "actions #{action.to_s}_link"
-      proc = lambda do |resource|
+      block = lambda do |resource|
         compound_resource = [prefix, resource].compact
+        compound_resource.flatten! if prefix.kind_of?(Array)
         case action
         when :show
           @template.link_to("Show", compound_resource)
         when :destroy
-          @template.link_to("Destroy", compound_resource, :method => :delete, :confirm => @@destroy_confirm_message)
+          @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))
+          @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)
+      self.cell(action, :heading => "", :cell_html => {:class => html_class}, &block)
     end
 
     protected

data/lib/tabletastic/version.rb

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

data/spec/spec_helper.rb

@@ -1,134 +1,130 @@
-require 'rubygems'
-require 'spork'
-
-Spork.prefork do
-  ## Use bundler to exec the specs
-  $LOAD_PATH.unshift(File.dirname(__FILE__))
-  require 'bundler'
-  Bundler.setup
-  require 'rspec'
-
-  require 'rspec_tag_matchers'
-  require 'active_record'
-  require 'action_controller'
-
-  require 'action_view/base'
-  require 'action_view/template'
-  require 'action_view/helpers'
-
-  RSpec.configure do |config|
-    config.include(RspecTagMatchers)
-  end
+## Use bundler to exec the specs
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'bundler'
+Bundler.setup
+require 'rspec'
+
+require 'rspec_tag_matchers'
+require 'active_record'
+require 'action_controller'
+
+require 'action_view/base'
+require 'action_view/template'
+require 'action_view/helpers'
+
+RSpec.configure do |config|
+  config.include(RspecTagMatchers)
+end
 
-  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-  module TabletasticSpecHelper
-    include ActiveSupport
-    include ActionView
-    include ActionView::Helpers::UrlHelper
-    include ActionView::Helpers::TagHelper
-    include ActionView::Helpers::TextHelper
-    include ActionView::Helpers::ActiveModelHelper
-    include ActionView::Helpers::RecordTagHelper
-    include ActionView::Helpers::CaptureHelper
-    include ActionView::Helpers::RawOutputHelper
-    include ActionDispatch::Routing::PolymorphicRoutes
-
-    def self.included(base)
-      base.class_eval do
-        attr_accessor :output_buffer
-      end
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+module TabletasticSpecHelper
+  include ActiveSupport
+  include ActionView
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::ActiveModelHelper
+  include ActionView::Helpers::RecordTagHelper
+  include ActionView::Helpers::CaptureHelper
+  include ActionView::Helpers::RawOutputHelper
+  include ActionDispatch::Routing::PolymorphicRoutes
+
+  def self.included(base)
+    base.class_eval do
+      attr_accessor :output_buffer
     end
+  end
 
-    def reset_output_buffer!
-      @output_buffer = ActionView::OutputBuffer.new
-    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, {}) &&
-          HaveTag.new(selector, inner_text_or_options, options, &block)
+  module ::RspecTagMatchers
+    class HaveTag
+      def description
+        description = "have tag <#@selector>"
+        description << " with inner text '#@inner_text'" if @inner_text
+        description
       end
     end
+    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)
+    end
+  end
 
-    class ::Post
-      def id
-      end
+  class MockARModel
+    def id
+    end
+    def to_key
+      [id]
     end
-    class ::Author
+    def self.human_attribute_name(col)
+      col.humanize if col
     end
-    class ::Profile
+    def self.model_name
+      ActiveModel::Name.new(self)
+    end
+  end
+  class ::Author < MockARModel; end
+  class ::Post < MockARModel; end
+  class ::Profile < MockARModel; end
+
+  def mock_everything
+    def post_path(post); "/posts/#{post.id}"; end
+    def admin_post_path(post); "/admin/posts/#{post.id}"; end
+    def author_post_path(author, post); "/authors/#{author.id}/posts/#{post.id}"; end
+    def admin_author_post_path(author, post); "/admin/authors/#{author.id}/posts/#{post.id}"; end
+    def edit_post_path(post); "/posts/#{post.id}/edit"; end
+    def edit_admin_post_path(post); "/admin/posts/#{post.id}/edit"; end
+    def edit_admin_author_post_path(author, post)
+      "/admin/authors/#{author.id}/posts/#{post.id}/edit"
     end
 
-    def mock_everything
-      def post_path(post); "/posts/#{post.id}"; end
-      def admin_post_path(post); "/admin/posts/#{post.id}"; end
-      def edit_post_path(post); "/posts/#{post.id}/edit"; end
-      def edit_admin_post_path(post); "/admin/posts/#{post.id}/edit"; end
-
-      # Sometimes we need a mock @post object and some Authors for belongs_to
-      @post = mock('post')
-      @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!(:model_name).and_return(ActiveModel::Name.new(::Post))
-
-      @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))
-
-      @freds_post = mock('post')
-      @freds_post.stub!(:class).and_return(::Post)
-      @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])
-      @fred.stub!(:post_ids).and_return([@freds_post.id])
-
-      @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
+    # Sometimes we need a mock @post object and some Authors for belongs_to
+    @post = Post.new
+    @post.stub(:id => nil)
+    @post.stub!(:author)
+    ::Post.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
 
-      ::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
+    @fred = Author.new
+    @fred.stub(:name => "Fred Smith", :id => 37)
+
+    @profile = Profile.new
+    @profile.stub(:author => @fred, :bio => "This is my bio")
+    @fred.stub(:profile => @profile)
+
+    ::Author.stub!(:content_columns).and_return([mock('column', :name => "name")])
+    ::Author.stub!(:find).and_return([@fred])
 
+    @freds_post = Post.new
+    @freds_post.stub(:title => "Fred's Post", :id => 19, :author => @fred, :author_id => @fred.id)
+    @freds_post.stub!(:body)
+    @fred.stub(:posts => [@freds_post])
 
-      ::Post.stub!(:reflect_on_all_associations).and_return([])
-      ::Author.stub!(:reflect_on_all_associations).and_return([])
+    @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
-  end
 
-end
+    ::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
 
-Spork.each_run do
-  # This code will be run each time you run your specs.
-  require 'tabletastic'
 
-  include TabletasticSpecHelper
-  include Tabletastic
-  include Tabletastic::Helper
+    ::Post.stub!(:reflect_on_all_associations).and_return([])
+    ::Author.stub!(:reflect_on_all_associations).and_return([])
+  end
 end
+
+
+require 'tabletastic'
+
+include TabletasticSpecHelper
+include Tabletastic
+include Tabletastic::Helper

data/spec/tabletastic/table_builder_spec.rb

@@ -65,6 +65,7 @@ describe Tabletastic::TableBuilder 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!(:respond_to?).with(:empty?).and_return(false)
           ::Post.stub!(:fields).and_return({'title' => '', 'created_at' => ''})
           concat(table_for(@posts) { |t| t.data })
         end
@@ -143,34 +144,66 @@ describe Tabletastic::TableBuilder do
       end
 
       context "with options[:actions_prefix]" do
-        it "includes path to admin post for :show" do
-          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
+        context "with a single symbol as argument" do
+          it "includes path to admin post for :show" do
+            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
-          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")
+          it "includes path to admin post for :edit" do
+            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
+            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
+            concat(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
 
-        it "includes path to admin post for :destroy" do
-          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")
+        context "with a resource as an argument" do
+          it "nests the link within the resource correctly for :show" do
+            concat(table_for(@posts) do |t|
+              t.data(:actions => :show, :action_prefix => @fred)
+            end)
+            output_buffer.should have_tag("td:nth-child(3) a[@href=\"/authors/#{@fred.id}/posts/#{@post.id}\"]", "Show")
+          end
         end
 
-        it "includes path to admin for all actions" do
-          concat(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")
+        context "with an array as an argument" do
+          it "nests correctly for namespace and resource for :show" do
+            concat(table_for(@posts) do |t|
+              t.data(:actions => :show, :action_prefix => [:admin, @fred])
+            end)
+            output_buffer.should have_tag(
+              "td a[@href=\"/admin/authors/#{@fred.id}/posts/#{@post.id}\"]", "Show")
+          end
+          it "includes path to admin for all actions" do
+            concat(table_for(@posts) do |t|
+              concat(t.data(:actions => :all, :action_prefix => [:admin, @fred]))
+            end)
+            output_buffer.should have_tag(
+              "td a[@href=\"/admin/authors/#{@fred.id}/posts/#{@post.id}\"]", "Show")
+            output_buffer.should have_tag(
+              "td a[@href=\"/admin/authors/#{@fred.id}/posts/#{@post.id}/edit\"]", "Edit")
+            output_buffer.should have_tag(
+              "td a[@href=\"/admin/authors/#{@fred.id}/posts/#{@post.id}\"]", "Destroy")
+          end
         end
       end
     end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tabletastic
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - pre6
-  version: 0.2.0.pre6
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joshua Davey
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-11 00:00:00 -04:00
+date: 2010-09-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency