tabs_on_rails 1.3.3 → 2.0.0.pre2

data/CHANGELOG.rdoc

@@ -1,9 +1,17 @@
 = Changelog
 
 
-== Release 1.3.3
+== Release 2.0.0.pre2
+
+* FIXED: Fixed permission error (#8)
+
+
+== Release 2.0.0.pre
+
+* CHANGED: Dropped support for Rails 2.
+
+* CHANGED: Remove "Incomplete `close_tabs' definition" warning. open_tabs/close_tabs can now have zero or more arguments.
 
-* FIXED: Permission error (see http://stackoverflow.com/questions/5085174/rails-gem-permissions-problem-tabs-on-rails)
 
 == Release 1.3.2
 
@@ -19,10 +27,10 @@
 
 == Release 1.3.0
 
-* ADDED: Ability to customize the behavior and the style of the li tab item
+* NEW: Ability to customize the behavior and the style of the li tab item
          passing a hash of options.
 
-           <% tabs_tag do |tab| %>
+           <%= tabs_tag do |tab| %>
              <%= tab.home      'Homepage', root_path, :style => "padding: 10px" %>
              <%= tab.dashboard 'Dashboard', dashboard_path %>
            <% end %>
@@ -36,7 +44,7 @@
 
 == Release 1.2.0
 
-* ADDED: Rails 3 compatibility.
+* NEW: Rails 3 compatibility.
 
 * CHANGED: Simplified tabs_tag helper by moving the rendering logic into TabsOnRails::Tabs#render.
 
@@ -60,7 +68,7 @@
 
 == Release 1.0.0
 
-* ADDED: Ability to pass arbitrary options to open_tabs and close_tags method. Thanks to aaronchi (closes #315)
+* NEW: Ability to pass arbitrary options to open_tabs and close_tags method. Thanks to aaronchi (closes #315)
 
 * REMOVED: tabs_tag no longer accepts a Builder as first parameter. Removed deprecation warning.
 
@@ -96,7 +104,7 @@ First stable release.
 
 == Release 0.3.0
 
-* ADDED: Support for namespaces in order to manage concurrent tab menus (closes #144).
+* NEW: Support for namespaces in order to manage concurrent tab menus (closes #144).
 
 * FIXED: `Uninitialized constant RAILS_DEFAULT_LOGGER (NameError)' error message when running tests outside a Rails environment.
 
@@ -109,7 +117,7 @@ First stable release.
 
 == Release 0.2.0
 
-* ADDED: The README file is definitely more useful now, filled up with some basic documentation.
+* NEW: The README file is definitely more useful now, filled up with some basic documentation.
 
 * CHANGED: Use the standard way to initialize a Rails plugin when packaged as a GEM (closes #146).
 

data/{LICENSE.rdoc → LICENSE}

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

data/README.rdoc

@@ -6,59 +6,33 @@ It provides helpers for generating navigation menus with a flexible interface.
 
 == Requirements
 
-* Ruby >= 1.8.6
-* Rails >= 2.2
-
-or
-
 * Rails 3
 
-Warning: *TabsOnRails* doesn't work with Rails 2.1 or previous versions
-(see {this comment}[http://www.simonecarletti.com/blog/2009/04/tabsonrails/#comment-2901]
-and {this commit}[http://github.com/weppos/tabs_on_rails/commit/d5ae9f401e3d0acc87251fa8957a8625e90ba4b3]).
+Please note 
 
+* TabsOnRails 2.x requires Rails 3. Use TabsOnRails 1.3.x with Rails 2.
+* TabsOnRails doesn't work with Rails 2.1 or lower
+("comment":http://www.simonecarletti.com/blog/2009/04/tabsonrails/#comment-2901 and "commit":http://github.com/weppos/tabs_on_rails/commit/d5ae9f401e3d0acc87251fa8957a8625e90ba4b3).
 
-== Installation
 
-=== As a Gem
+== Installation
 
-{RubyGems}[http://rubygems.org] is the preferred way to install *TabsOnRails* and the best way if you want install a stable version.
+"RubyGems":http://rubygems.org is the preferred way to install *TabsOnRails* and the best way if you want install a stable version.
 
   $ gem install tabs_on_rails
 
-With Rails >= 2.2, specify the Gem dependency in your <tt>environment.rb</tt> 
-file so that Rails will automatically check the requirement on startup.
-
-  Rails::Initializer.run do |config|
-    
-    # other configurations
-    # ...
-    
-    config.gem "tabs_on_rails"
-    
-  end
-
-With Rails 3, specify the Gem dependency in the 
-{Bundler}[http://gembundler.com] Gemfile.
+Specify the Gem dependency in the "Bundler":http://gembundler.com Gemfile.
 
   gem "tabs_on_rails"
 
-
-=== As a Plugin
-
-  $ script/plugin install git://github.com/weppos/tabs_on_rails.git
-
-Warning: this method is deprecated and will be removed in a future version.
-Use {Bundler}[http://gembundler.com]
-and the {:git option}[http://gembundler.com/v1.0/git.html]
-if you want to grab the latest version from the Git repository.
+Use "Bundler":http://gembundler.com and the ":git option":http://gembundler.com/v1.0/git.html if you want to grab the latest version from the Git repository.
 
 
 == Usage
 
 In your template use the <tt>tabs_tag</tt> helper to create your tab.
 
-  <% tabs_tag do |tab| %>
+  <%= tabs_tag do |tab| %>
     <%= tab.home      'Homepage', root_path %>
     <%= tab.dashboard 'Dashboard', dashboard_path %>
     <%= tab.account   'Account', account_path %>
@@ -107,7 +81,7 @@ You can pass a hash of options to customize the style and the behavior of the ta
 Behind the scenes, each time you create a tab, the <tt>#tab_for</tt> 
 method is invoked.
 
-  <% tabs_tag do |tab| %>
+  <%= tabs_tag do |tab| %>
     <%= tab.home      'Homepage', root_path, :style => "padding: 10px" %>
     <%= tab.dashboard 'Dashboard', dashboard_path %>
   <% end %>
@@ -124,7 +98,7 @@ See <tt>TabsOnRails::Tabs::TabsBuilder#tab_for</tt> for more details.
 
 The open_tabs and the close_tabs methods can be customized with the <tt>:open_tabs</tt> and <tt>:close_tabs</tt> option.
 
-  <% tabs_tag :open_tabs => { :id => "tabs", :class => "cool" } do |tab| %>
+  <%= tabs_tag :open_tabs => { :id => "tabs", :class => "cool" } do |tab| %>
     <%= tab.home      'Homepage', root_path %>
     <%= tab.dashboard 'Dashboard', dashboard_path %>
     <%= tab.account   'Account', account_path %>
@@ -190,12 +164,12 @@ Let's call it :navigation.
 
   class ProjectsController
     set_tab :projects
-  
+    
     # Create an other tab navigation level
     set_tab :first, :navigation, :only => %w(first)
     set_tab :second, :navigation, :only => %w(second)
     set_tab :third, :navigation, :only => %w(third)
-  
+    
     def first; end
     def second; end
     def third; end
@@ -213,13 +187,13 @@ The default namespace is called :default. Passing :default as name is the same a
 
 To switch namespace in your template, just pass the :namespace option to the <tt>tabs_tag</tt> helper method.
 
-  <% tabs_tag do |tab| %>
+  <%= tabs_tag do |tab| %>
     <%= tab.home      'Homepage', root_path %>
     <%= tab.dashboard 'Dashboard', dashboard_path %>
     <%= tab.projects  'Projects', projects_path %>
   <% end %>
 
-  <% tabs_tag :namespace => :navigation do |tab| %>
+  <%= tabs_tag :namespace => :navigation do |tab| %>
     <%= tab.first   'First', first_project_path %>
     <%= tab.second  'Second', second_project_path %>
     <%= tab.third   'Account', third_project_path %>
@@ -292,7 +266,7 @@ The following example creates a custom tab builder called <tt>MenuTabBuilder</tt
 
 In your view, simply pass the builder class to the <tt>tabs_tag</tt> method.
 
-  <% tabs_tag(:builder => MenuTabBuilder) do |tab| %>
+  <%= tabs_tag(:builder => MenuTabBuilder) do |tab| %>
     <%= tab.home        'Homepage', root_path %>
     <%= tab.dashboard,  'Dashboard', dashboard_path %>
     <%= tab.account     'Account', account_path, :style => 'float: right;' %>
@@ -322,4 +296,5 @@ This is the final result.
 
 == License
 
-Copyright (c) 2009-2010 Simone Carletti, TabsOnRails is released under the MIT license.
+*TabsOnRails* is Copyright (c) 2009-2011 Simone Carletti.
+This is Free Software distributed under the MIT license.

data/Rakefile

@@ -28,7 +28,6 @@ task :default => ["test"]
 #   http://rubygems.org/read/chapter/20
 #
 spec = Gem::Specification.new do |s|
-
   s.name              = PKG_NAME
   s.version           = PKG_VERSION
   s.summary           = "A simple Ruby on Rails plugin for creating and managing Tabs."
@@ -47,7 +46,7 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options      = %w(--main README.rdoc)
 
   # Add any extra files to include in the gem (like your README)
-  s.files             = %w( Rakefile init.rb ) + Dir.glob("*.{rdoc,gemspec}") + Dir.glob("{test,lib,rails}/**/*")
+  s.files             = %w( Rakefile LICENSE init.rb ) + Dir.glob("*.{rdoc,gemspec}") + Dir.glob("{test,lib,rails}/**/*")
   s.require_paths     = ["lib"]
 
   # If you want to depend on other gems, add them here, along with any
@@ -56,6 +55,8 @@ spec = Gem::Specification.new do |s|
 
   # If your tests use any gems, include them here
   s.add_development_dependency("bundler")
+  s.add_development_dependency("rails", "~> 3.0.3")
+  s.add_development_dependency("mocha", "~> 0.9.10")
 end
 
 # This task actually builds the gem. We also regenerate a static
@@ -110,7 +111,6 @@ begin
   end
 rescue LoadError
   task :clobber_rcov
-  puts "RCov is not available"
 end
 
 

data/init.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), "rails", "init")
+require 'tabs_on_rails'

data/lib/tabs_on_rails/{controller_mixin.rb → action_controller.rb}

@@ -16,7 +16,7 @@
 
 module TabsOnRails
 
-  module ControllerMixin
+  module ActionController
 
     def self.included(base)
       base.extend     ClassMethods
@@ -115,7 +115,7 @@ module TabsOnRails
 
       # In your template use the <tt>tabs_tag</tt> helper to create your tab.
       #
-      #   <% tabs_tag do |tab| %>
+      #   <%= tabs_tag do |tab| %>
       #     <%= tab.home      'Homepage', root_path %>
       #     <%= tab.dashboard 'Dashboard', dashboard_path %>
       #     <%= tab.account   'Account', account_path %>
@@ -164,7 +164,7 @@ module TabsOnRails
       # Behind the scenes, each time you create a tab, the <tt>#tab_for</tt> 
       # method is invoked.
       #
-      #   <% tabs_tag do |tab| %>
+      #   <%= tabs_tag do |tab| %>
       #     <%= tab.home      'Homepage', root_path, :style => "padding: 10px" %>
       #     <%= tab.dashboard 'Dashboard', dashboard_path %>
       #   <% end %>
@@ -187,7 +187,7 @@ module TabsOnRails
       # The open_tabs and the close_tabs methods can be customized 
       # with the <tt>:open_tabs</tt> and <tt>:close_tabs</tt> option.
       #
-      #   <% tabs_tag :open_tabs => { :id => "tabs", :class => "cool" } do |tab| %>
+      #   <%= tabs_tag :open_tabs => { :id => "tabs", :class => "cool" } do |tab| %>
       #     <%= tab.home      'Homepage', root_path %>
       #     <%= tab.dashboard 'Dashboard', dashboard_path %>
       #     <%= tab.account   'Account', account_path %>

data/lib/tabs_on_rails/railtie.rb

@@ -17,28 +17,22 @@
 module TabsOnRails
 
   if defined? Rails::Railtie
-    require "rails"
-
-    class Railtie < Rails::Railtie
-      initializer "tabs_on_rails.initialize" do
-        ActiveSupport.on_load :action_controller do
-          TabsOnRails::Railtie.init
-        end
-      end
+    class Railtie < ::Rails::Railtie
+      # initializer "tabs_on_rails.initialize" do
+      #   ActiveSupport.on_load :action_controller do
+      #     ::ActionController::Base.send :include, TabsOnRails::ActionController
+      #   end
+      # end
     end
-
   end
 
-  class Railtie
-
-    def self.rails_version
-      @@rails_version ||= Rails::VERSION::STRING rescue "2.2"
-    end
-
-    def self.init
-      ActionController::Base.send :include, TabsOnRails::ControllerMixin
-    end
+end
 
-  end
+require "active_support"
+require "action_controller"
 
-end
+# There should be a better way to do this!
+# I can't rely on Railtie#initializer because TabsOnRails::ActionController
+# provides class methods which should be available when the class
+# is evaluated.
+ActionController::Base.send :include, TabsOnRails::ActionController

data/lib/tabs_on_rails/tabs.rb

@@ -17,7 +17,6 @@
 require 'tabs_on_rails/tabs/builder'
 require 'tabs_on_rails/tabs/tabs_builder'
 
-
 module TabsOnRails
 
   class Tabs
@@ -27,15 +26,11 @@ module TabsOnRails
       @builder = (options.delete(:builder) || TabsBuilder).new(@context, options)
       @options = options
     end
-    
+
     %w(open_tabs close_tabs).each do |name|
       define_method(name) do |*args|                      # def open_tabs(*args)
         method = @builder.method(name)                    #   method = @builder.method(:open_tabs)
         if method.arity.zero?                             #   if method.arity.zero?
-          message = "Incomplete `#{name}' definition. " + #     ...
-            "Use #{name}(*args) to ignore arguments "   + #     ...
-            "or #{name}(options) to collect options"      #     ...
-          ActiveSupport::Deprecation.warn(message)        #     ...
           method.call                                     #     method.call
         else                                              #   else
           method.call(*args)                              #     method.call(*args)
@@ -54,17 +49,11 @@ module TabsOnRails
       open_tabs_options  = options.delete(:open_tabs)  || {}
       close_tabs_options = options.delete(:close_tabs) || {}
 
-      if Railtie.rails_version < "3"
-        @context.concat(open_tabs(open_tabs_options).to_s)
-        yield self
-        @context.concat(close_tabs(close_tabs_options).to_s)
-      else
-        "".tap do |html|
-          html << open_tabs(open_tabs_options).to_s
-          html << @context.capture(self, &block)
-          html << close_tabs(close_tabs_options).to_s
-        end.html_safe
-      end
+      "".tap do |html|
+        html << open_tabs(open_tabs_options).to_s
+        html << @context.capture(self, &block)
+        html << close_tabs(close_tabs_options).to_s
+      end.html_safe
     end
 
   end

data/lib/tabs_on_rails/version.rb

@@ -18,10 +18,10 @@ module TabsOnRails
 
   # Holds information about library version.
   module Version
-    MAJOR = 1
-    MINOR = 3
-    PATCH = 3
-    BUILD = nil
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
+    BUILD = "pre2"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")
   end

data/lib/tabs_on_rails.rb

@@ -14,11 +14,10 @@
 #++
 
 
-require 'tabs_on_rails/controller_mixin'
 require 'tabs_on_rails/tabs'
-require 'tabs_on_rails/railtie'
 require 'tabs_on_rails/version'
-
+require 'tabs_on_rails/action_controller'
+require 'tabs_on_rails/railtie'
 
 module TabsOnRails
 
@@ -26,12 +25,3 @@ module TabsOnRails
   GEM             = "tabs_on_rails"
 
 end
-
-# Compatibility with Rails 2
-unless "".respond_to?(:html_safe)
-  class String
-    def html_safe
-      self
-    end
-  end
-end

data/tabs_on_rails.gemspec

@@ -2,32 +2,37 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabs_on_rails}
-  s.version = "1.3.2"
+  s.version = "2.0.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2010-12-21}
+  s.date = %q{2011-01-30}
   s.description = %q{    TabsOnRails is a simple Ruby on Rails plugin for creating and managing Tabs.     It provides helpers for creating tabs with a flexible interface.
 }
   s.email = %q{weppos@weppos.net}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "LICENSE.rdoc", "README.rdoc"]
-  s.files = ["Rakefile", "init.rb", "CHANGELOG.rdoc", "LICENSE.rdoc", "README.rdoc", "tabs_on_rails.gemspec", "test/controller_mixin_test.rb", "test/fixtures/mixin/default.html.erb", "test/fixtures/mixin/with_item_options.html.erb", "test/fixtures/mixin/with_open_close_tabs.html.erb", "test/tabs/builder_test.rb", "test/tabs/tabs_builder_test.rb", "test/tabs_test.rb", "test/test_helper.rb", "lib/tabs_on_rails/controller_mixin.rb", "lib/tabs_on_rails/railtie.rb", "lib/tabs_on_rails/tabs/builder.rb", "lib/tabs_on_rails/tabs/tabs_builder.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/version.rb", "lib/tabs_on_rails.rb", "rails/init.rb"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
+  s.files = ["Rakefile", "LICENSE", "init.rb", "CHANGELOG.rdoc", "README.rdoc", "tabs_on_rails.gemspec", "test/tabs_on_rails", "test/tabs_on_rails/controller_mixin_test.rb", "test/tabs_on_rails/tabs", "test/tabs_on_rails/tabs/builder_test.rb", "test/tabs_on_rails/tabs/tabs_builder_test.rb", "test/tabs_on_rails/tabs_test.rb", "test/test_helper.rb", "test/views", "test/views/working", "test/views/working/default.html.erb", "test/views/working/with_item_options.html.erb", "test/views/working/with_open_close_tabs.html.erb", "lib/tabs_on_rails", "lib/tabs_on_rails/action_controller.rb", "lib/tabs_on_rails/railtie.rb", "lib/tabs_on_rails/tabs", "lib/tabs_on_rails/tabs/builder.rb", "lib/tabs_on_rails/tabs/tabs_builder.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/version.rb", "lib/tabs_on_rails.rb"]
   s.homepage = %q{http://www.simonecarletti.com/code/tabs_on_rails}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{A simple Ruby on Rails plugin for creating and managing Tabs.}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9.10"])
     else
       s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<mocha>, ["~> 0.9.10"])
     end
   else
     s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<mocha>, ["~> 0.9.10"])
   end
 end

data/test/{controller_mixin_test.rb → tabs_on_rails/controller_mixin_test.rb}

@@ -1,18 +1,10 @@
 require 'test_helper'
 
-class ControllerMixinTest < ActionController::TestCase
-  include ControllerTestHelpers
-
-  class MixinController < ActionController::Base
-  end
-
-  def setup
-    @controller       = MixinController.new
-    @controller_proxy = ControllerProxy.new(@controller)
-    @request          = ActionController::TestRequest.new
-    @response         = ActionController::TestResponse.new
-  end
+class MixinTestController < ActionController::Base
+end
 
+class MixinTest < ActionController::TestCase
+  tests MixinTestController
 
   def test_set_tab
     controller.set_tab :footab
@@ -90,121 +82,41 @@ class ControllerMixinTest < ActionController::TestCase
 end
 
 
-class ControllerMixinHelpersTest < ActionView::TestCase
-  tests TabsOnRails::ControllerMixin::HelperMethods
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-
-  MockBuilder = Class.new(TabsOnRails::Tabs::Builder) do
-    def initialize_with_mocha(*args)
-      checkpoint
-      initialize_without_mocha(*args)
-    end
-    alias_method_chain :initialize, :mocha
-
-    def checkpoint
-    end
-
-    def tab_for(tab, name, *args)
-    end
-  end
-
-  NilBoundariesBuilder = Class.new(TabsOnRails::Tabs::Builder) do
-    def tab_for(tab, name, *args)
-      @context.content_tag(:span, name)
-    end
-  end
-
-  NilOpenBoundaryBuilder = Class.new(NilBoundariesBuilder) do
-    def close_tabs(options = {})
-      '<br />'
-    end
-  end
-
-  NilCloseBoundaryBuilder = Class.new(NilBoundariesBuilder) do
-    def open_tabs(options = {})
-      '<br />'
-    end
-  end
-
-
-  def test_tabs_tag_should_raise_local_jump_error_without_block
-    assert_raise(LocalJumpError) { tabs_tag }
-  end
-  
-  def test_tabs_tag_with_builder
-    MockBuilder.any_instance.expects(:checkpoint).once
-    tabs_tag(:builder => MockBuilder) {}
-  end
+class WorkingMixinTestController < ActionController::Base
+  def self.controller_name; "working"; end
+  def self.controller_path; "working"; end
 
-  def test_tabs_tag_with_namespace
-    MockBuilder.any_instance.expects(:checkpoint).once
-    tabs_tag(:builder => MockBuilder, :namespace => :custom) do |tabs|
-      builder = tabs.instance_variable_get(:'@builder')
-      assert_equal(:custom, builder.instance_variable_get(:'@namespace'))
-    end
-  end
+  layout false
 
+  set_tab :dashboard
+  set_tab :welcome,   :only => %w( action_welcome )
+  set_tab :dashboard, :only => %w( action_namespace )
+  set_tab :homepage,  :namespace, :only => %w( action_namespace )
 
-  def test_tabs_tag_should_not_concat_open_close_tabs_when_nil
-    content = tabs_tag(:builder => NilBoundariesBuilder) do |t| 
-      concat t.single('Single', '#')
-    end
-
-    assert_dom_equal '<span>Single</span>', content
+  def action_dashboard
+    execute("action_dashboard")
   end
 
-  def test_tabs_tag_should_not_concat_open_tabs_when_nil
-    content = tabs_tag(:builder => NilOpenBoundaryBuilder) do |t|
-      concat t.single('Single', '#')
-    end
-
-    assert_dom_equal '<span>Single</span><br />', content
+  def action_namespace
+    execute("action_namespace")
   end
 
-  def test_tabs_tag_should_not_concat_close_tabs_when_nil
-    content = tabs_tag(:builder => NilCloseBoundaryBuilder) do |t|
-      concat t.single('Single', '#')
-    end
-
-    assert_dom_equal '<br /><span>Single</span>', content
+  def action_welcome
+    execute("action_welcome")
   end
 
-end
+  private
 
-
-class ControllerMixinWithControllerTest < ActionController::TestCase
-  include ControllerTestHelpers
-
-  class MixinController < ActionController::Base
-    def self.controller_name; "mixin"; end
-    def self.controller_path; "mixin"; end
-
-    layout false
-
-    set_tab :dashboard
-    set_tab :welcome,   :only => %w(action_welcome)
-    set_tab :dashboard, :only => %w(action_namespace)
-    set_tab :homepage,  :namespace, :only => %w(action_namespace)
-
-    def method_missing(method, *args)
-      if method =~ /^action_(.*)/
+    def execute(method)
+      if method.to_s =~ /^action_(.*)/
         render :action => (params[:template] || 'default')
       end
     end
 
-    def rescue_action(e) raise end
-  end
-
-  MixinController.view_paths = [ File.dirname(__FILE__) + "/fixtures/" ]
-
-  def setup
-    @controller = MixinController.new
-    @controller_proxy = ControllerProxy.new(@controller)
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+end
 
+class WorkingMixinTest < ActionController::TestCase
+  tests WorkingMixinTestController
 
   def test_render_default
     get :action_dashboard
@@ -243,8 +155,8 @@ class ControllerMixinWithControllerTest < ActionController::TestCase
 
   def test_set_tab_with_only_option
     get :action_welcome
-    assert_equal(:welcome, controller.current_tab)
-    assert_equal(:welcome, controller.current_tab(:default))
+    assert_equal :welcome,  controller.current_tab
+    assert_equal :welcome,  controller.current_tab(:default)
     assert_dom_equal(%Q{<ul>
   <li><a href="/d">Dashboard</a></li>
   <li class="current"><span>Welcome</span></li>
@@ -253,9 +165,9 @@ class ControllerMixinWithControllerTest < ActionController::TestCase
 
   def test_set_tab_with_namespace
     get :action_namespace
-    assert_equal(:dashboard, controller.current_tab)
-    assert_equal(:dashboard, controller.current_tab(:default))
-    assert_equal(:homepage, controller.current_tab(:namespace))
+    assert_equal :dashboard, controller.current_tab
+    assert_equal :dashboard, controller.current_tab(:default)
+    assert_equal :homepage,  controller.current_tab(:namespace)
     assert_dom_equal(%Q{<ul>
   <li class="current"><span>Dashboard</span></li>
   <li><a href="/w">Welcome</a></li>
@@ -278,3 +190,87 @@ class ControllerMixinWithControllerTest < ActionController::TestCase
   end
 
 end
+
+
+class ControllerMixinHelpersTest < ActionView::TestCase
+  tests TabsOnRails::ActionController::HelperMethods
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::UrlHelper
+
+  MockBuilder = Class.new(TabsOnRails::Tabs::Builder) do
+    def initialize_with_mocha(*args)
+      checkpoint
+      initialize_without_mocha(*args)
+    end
+    alias_method_chain :initialize, :mocha
+
+    def checkpoint
+    end
+
+    def tab_for(tab, name, *args)
+    end
+  end
+
+  NilBoundariesBuilder = Class.new(TabsOnRails::Tabs::Builder) do
+    def tab_for(tab, name, *args)
+      @context.content_tag(:span, name)
+    end
+  end
+
+  NilOpenBoundaryBuilder = Class.new(NilBoundariesBuilder) do
+    def close_tabs(options = {})
+      '<br />'
+    end
+  end
+
+  NilCloseBoundaryBuilder = Class.new(NilBoundariesBuilder) do
+    def open_tabs(options = {})
+      '<br />'
+    end
+  end
+
+
+  def test_tabs_tag_should_raise_local_jump_error_without_block
+    assert_raise(LocalJumpError) { tabs_tag }
+  end
+  
+  def test_tabs_tag_with_builder
+    MockBuilder.any_instance.expects(:checkpoint).once
+    tabs_tag(:builder => MockBuilder) { "" }
+  end
+
+  def test_tabs_tag_with_namespace
+    MockBuilder.any_instance.expects(:checkpoint).once
+    tabs_tag(:builder => MockBuilder, :namespace => :custom) do |tabs|
+      builder = tabs.instance_variable_get(:'@builder')
+      assert_equal(:custom, builder.instance_variable_get(:'@namespace'))
+      ""
+    end
+  end
+
+
+  def test_tabs_tag_should_not_concat_open_close_tabs_when_nil
+    content = tabs_tag(:builder => NilBoundariesBuilder) do |t|
+      concat t.single('Single', '#')
+    end
+
+    assert_dom_equal '<span>Single</span>', content
+  end
+
+  def test_tabs_tag_should_not_concat_open_tabs_when_nil
+    content = tabs_tag(:builder => NilOpenBoundaryBuilder) do |t|
+      concat t.single('Single', '#')
+    end
+
+    assert_dom_equal '<span>Single</span><br />', content
+  end
+
+  def test_tabs_tag_should_not_concat_close_tabs_when_nil
+    content = tabs_tag(:builder => NilCloseBoundaryBuilder) do |t|
+      concat t.single('Single', '#')
+    end
+
+    assert_dom_equal '<br /><span>Single</span>', content
+  end
+
+end

data/test/{tabs → tabs_on_rails/tabs}/tabs_builder_test.rb

@@ -1,27 +1,26 @@
 require 'test_helper'
 
 class TabsBuilderTest < ActionView::TestCase
-
-  Template = Class.new do
-    include ActionView::Helpers::TagHelper
-    include ActionView::Helpers::UrlHelper
-
-    def current_tab(namespace)
-      case namespace
-        when nil, :default
-          :dashboard
-        when :foospace
-          :footab
-        else
-          :elsetab
-      end
+  tests TabsOnRails::ActionController::HelperMethods
+
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::UrlHelper
+
+  def current_tab(namespace)
+    case namespace
+      when nil, :default
+        :dashboard
+      when :foospace
+        :footab
+      else
+        :elsetab
     end
   end
 
+
   def setup
-    @template = Template.new
     @klass    = TabsOnRails::Tabs::TabsBuilder
-    @builder  = @klass.new(@template)
+    @builder  = @klass.new(self)
   end
 
   def test_should_extend_builder

data/test/{tabs_test.rb → tabs_on_rails/tabs_test.rb}

@@ -67,6 +67,7 @@ class TabsTest < ActiveSupport::TestCase
     end
   end
 
+
   def test_close_tabs
     assert_equal '</ul>', @tabs.close_tabs
   end

data/test/test_helper.rb

@@ -1,33 +1,37 @@
 require 'rubygems'
 require 'bundler'
-Bundler.setup(:default, :test)
-
+Bundler.setup
 
 require 'test/unit'
-require 'active_support'
-require 'action_controller'
-require 'action_view/test_case'
+require 'mocha'
+
+ENV["RAILS_ENV"] = "test"
 
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require    File.dirname(__FILE__) + '/../init.rb'
+require "active_support"
+require "action_controller"
+require "rails/railtie"
 
-RAILS_ROOT = '.'    unless defined? RAILS_ROOT
-RAILS_ENV  = 'test' unless defined? RAILS_ENV
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'tabs_on_rails'
 
-ActionController::Base.logger = nil
-ActionController::Routing::Routes.reload rescue nil
+ActionController::Base.view_paths = File.join(File.dirname(__FILE__), 'views')
 
+TabsOnRails::Routes = ActionDispatch::Routing::RouteSet.new
+TabsOnRails::Routes.draw do
+  match ':controller(/:action(/:id))'
+end
 
-# Unit tests for Helpers are based on unit tests created and developed by Rails core team.
-# See action_pack/test/abstract_unit for more details.
+ActionController::Base.send :include, TabsOnRails::Routes.url_helpers
 
+class ActiveSupport::TestCase
+  setup do
+    @routes = TabsOnRails::Routes
+  end
 
-module ControllerTestHelpers
-  private
 
-    def controller
-      @controller_proxy
-    end
+  def controller
+    @controller_proxy ||= ControllerProxy.new(@controller)
+  end
 
   class ControllerProxy
     def initialize(controller)

data/test/{fixtures/mixin → views/working}/default.html.erb

@@ -1,4 +1,4 @@
-<% tabs_tag do |tabs| %>
+<%= tabs_tag do |tabs| %>
   <%= tabs.dashboard 'Dashboard', '/d' %>
   <%= tabs.welcome 'Welcome', '/w' %>
 <% end -%>

data/test/{fixtures/mixin → views/working}/with_item_options.html.erb

@@ -1,4 +1,4 @@
-<% tabs_tag(:open_tabs => { :id => "tabs" }, :close_tabs => { :class => "ignored" }) do |tabs| %>
+<%= tabs_tag(:open_tabs => { :id => "tabs" }, :close_tabs => { :class => "ignored" }) do |tabs| %>
   <%= tabs.dashboard 'Dashboard', '/d', :class => "custom" %>
   <%= tabs.welcome 'Welcome', '/w', :class => "custom" %>
 <% end -%>

data/test/views/working/with_open_close_tabs.html.erb

@@ -0,0 +1,4 @@
+<%= tabs_tag(:open_tabs => { :id => "tabs" }, :close_tabs => { :class => "ignored" }) do |tabs| %>
+  <%= tabs.dashboard 'Dashboard', '/d' %>
+  <%= tabs.welcome 'Welcome', '/w' %>
+<% end -%>

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: tabs_on_rails
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.3.3
+  hash: 1923832045
+  prerelease: 6
+  segments: 
+  - 2
+  - 0
+  - 0
+  - pre
+  - 2
+  version: 2.0.0.pre2
 platform: ruby
 authors: 
 - Simone Carletti
@@ -10,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
+date: 2011-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +28,44 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 9
+        - 10
+        version: 0.9.10
+  type: :development
+  version_requirements: *id003
 description: "    TabsOnRails is a simple Ruby on Rails plugin for creating and managing Tabs.     It provides helpers for creating tabs with a flexible interface.\n"
 email: weppos@weppos.net
 executables: []
@@ -32,31 +74,29 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG.rdoc
-- LICENSE.rdoc
 - README.rdoc
 files: 
 - Rakefile
+- LICENSE
 - init.rb
 - CHANGELOG.rdoc
-- LICENSE.rdoc
 - README.rdoc
 - tabs_on_rails.gemspec
-- test/controller_mixin_test.rb
-- test/fixtures/mixin/default.html.erb
-- test/fixtures/mixin/with_item_options.html.erb
-- test/fixtures/mixin/with_open_close_tabs.html.erb
-- test/tabs/builder_test.rb
-- test/tabs/tabs_builder_test.rb
-- test/tabs_test.rb
+- test/tabs_on_rails/controller_mixin_test.rb
+- test/tabs_on_rails/tabs/builder_test.rb
+- test/tabs_on_rails/tabs/tabs_builder_test.rb
+- test/tabs_on_rails/tabs_test.rb
 - test/test_helper.rb
-- lib/tabs_on_rails/controller_mixin.rb
+- test/views/working/default.html.erb
+- test/views/working/with_item_options.html.erb
+- test/views/working/with_open_close_tabs.html.erb
+- lib/tabs_on_rails/action_controller.rb
 - lib/tabs_on_rails/railtie.rb
 - lib/tabs_on_rails/tabs/builder.rb
 - lib/tabs_on_rails/tabs/tabs_builder.rb
 - lib/tabs_on_rails/tabs.rb
 - lib/tabs_on_rails/version.rb
 - lib/tabs_on_rails.rb
-- rails/init.rb
 has_rdoc: true
 homepage: http://www.simonecarletti.com/code/tabs_on_rails
 licenses: []
@@ -72,17 +112,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A simple Ruby on Rails plugin for creating and managing Tabs.

data/rails/init.rb

@@ -1,20 +0,0 @@
-#
-# = Tabs on Rails
-#
-# A simple Ruby on Rails plugin for creating and managing Tabs.
-#
-#
-# Category::    Rails
-# Package::     TabsOnRails
-# Author::      Simone Carletti <weppos@weppos.net>
-# License::     MIT License
-#
-#--
-#
-#++
-
-
-require "tabs_on_rails"
-
-
-TabsOnRails::Railtie.init

data/test/fixtures/mixin/with_open_close_tabs.html.erb

@@ -1,4 +0,0 @@
-<% tabs_tag(:open_tabs => { :id => "tabs" }, :close_tabs => { :class => "ignored" }) do |tabs| %>
-  <%= tabs.dashboard 'Dashboard', '/d' %>
-  <%= tabs.welcome 'Welcome', '/w' %>
-<% end -%>