weppos-tabs_on_rails 0.2.0 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,6 +1,19 @@
 = Changelog
 
 
+== Release 0.3.0
+
+* ADDED: 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.
+
+* FIXED: Tests complains when Rails 2.3.2 is installed. This library is 100% compatible with Rails 2.3.2 but for now let's force tests to use Rails 2.2.2.
+
+* CHANGED: current_tab= controller instance/class methods are now deprecated. Use set_tab instead.
+
+* CHANGED: Calling tabs_tag with a custom builder as first parameter is now deprecated. Use :builder option instead.
+
+
 == Release 0.2.0
 
 * ADDED: The README file is definitely more useful now, filled up with some basic documentation.

data/Manifest

@@ -0,0 +1,23 @@
+CHANGELOG.rdoc
+init.rb
+install.rb
+lib/tabs_on_rails/controller_mixin.rb
+lib/tabs_on_rails/tabs.rb
+lib/tabs_on_rails/version.rb
+lib/tabs_on_rails.rb
+LICENSE.rdoc
+Manifest
+rails/init.rb
+Rakefile
+README.rdoc
+tabs_on_rails.gemspec
+tasks/tabs_on_rails_tasks.rake
+test/builder_test.rb
+test/controller_mixin_helpers_test.rb
+test/controller_mixin_test.rb
+test/controller_test.rb
+test/fixtures/mixin/standard.html.erb
+test/tabs_builder_test.rb
+test/tabs_on_rails_test.rb
+test/test_helper.rb
+uninstall.rb

data/README.rdoc

@@ -9,6 +9,9 @@ It provides helpers for creating tabs with a flexible interface.
 === As a Gem
 
 This is the preferred way to install TabsOnRails and the best way if you want install a stable version.
+
+  $ gem install weppos-tabs_on_rails --source http://gems.github.com
+
 You can specify the GEM dependency in your application environment.rb file:
 
   Rails::Initializer.run do |config|
@@ -18,7 +21,6 @@ You can specify the GEM dependency in your application environment.rb file:
     config.gem "weppos-tabs_on_rails", :lib => "tabs_on_rails", :source => "http://gems.github.com"
   end
 
-
 === As a Plugin
 
 This is the preferred way if you want to live on the edge and install a development version.
@@ -30,10 +32,10 @@ This is the preferred way if you want to live on the edge and install a developm
 
 In your template use the <tt>tabs_tag</tt> helper to create your tab.
 
-  <% tabs_tab do |tab| %>
-    <%= tab.home, 'Homepage', root_path %>
-    <%= tab.dashboard, 'Dashboard', dashboard_path %>
-    <%= tab.account, 'Account', account_path %>
+  <% tabs_tag do |tab| %>
+    <%= tab.home      'Homepage', root_path %>
+    <%= tab.dashboard 'Dashboard', dashboard_path %>
+    <%= tab.account   'Account', account_path %>
   <% end %>
 
 The example above produces the following HTML output.
@@ -48,10 +50,10 @@ The usage is similar to the Rails route file.
 You create named tabs with the syntax <tt>tab.name_of_tab</tt>. 
 
 The name you use creating a tab is the same you're going to refer to in your controller
-when you want to mark a tab as the current_tab.
+when you want to mark a tab as the current tab.
 
   class DashboardController < ApplicationController
-    current_tab :dashboard
+    set_tab :dashboard
   end
 
 Now, if the action belongs to DashboardController, the template will automatically render the following HTML code.
@@ -62,21 +64,30 @@ Now, if the action belongs to DashboardController, the template will automatical
     <li><a href="/account">Account</a></li>
   </ul>
 
+Use the <tt>current_tab</tt> helper method if you need to access the value of current tab in your controller or template.
+
+  class DashboardController < ApplicationController
+    set_tab :dashboard
+  end
+
+  # In your view
+  <p>The name of current tab is <%= current_tab %>.</p>
+
 
-== Restricting current_tab scope
+== Restricting set_tab scope
 
-The <tt>current_tab</tt> method understands all options you are used to pass to a Rails controller filter.
-In fact, behind the scenes this method uses a <tt>before_filter</tt> to set a special <tt>@current_tab</tt> variable.
+The <tt>set_tab</tt> method understands all options you are used to pass to a Rails controller filter.
+In fact, behind the scenes this method uses a <tt>before_filter</tt> to store the tab in the <tt>@tab_stack</tt> variable.
 
 Taking advantage of Rails filter options, you can restrict a tab to a selected group of actions in the same controller.
 
   class PostsController < ApplicationController
-    current_tab :admin
-    current_tab :posts, :only => [ :index, :show ]
+    set_tab :admin
+    set_tab :posts, :only => [ :index, :show ]
   end
   
   class ApplicationController < ActionController::Base
-    current_tab :admin, :if => :admin_controller?
+    set_tab :admin, :if => :admin_controller?
     
     def admin_controller?
       self.class.name =~ /^Admin(::|Controller)/
@@ -84,6 +95,100 @@ Taking advantage of Rails filter options, you can restrict a tab to a selected g
   end
 
 
+== Using Namescopes to create Multiple Tabs
+
+Namescopes enable you to create and manage tabs in parallels. The best way to demonstrate namescope usage is using an example.
+
+Let's assume your application provide a first level navigation menu with 3 elements: :home, :dashboard, :projects. The relationship between your tabs and your controllers is 1:1 so you should end up with the following source code.
+
+  class HomeController
+    set_tab :home
+  end
+
+  class DashboardController
+    set_tab :dashboard
+  end
+
+  class ProjectsController
+    set_tab :projects
+    
+    def first; end
+    def second; end
+    def third; end
+  end
+
+The project controller contains 3 actions and you might want to create a second-level navigation menu. This menu should reflect the navigation status of the user in the project page.
+
+Without namespaces, you wouldn't be able to accomplish this task because you already set the current tab value to :project. You need to create a parallel navigation menu and uniquely identify it with a custom namescope.
+Let's call it :navigation.
+
+  class ProjectsController
+    set_tab :projects
+  
+    # Create an other tab navigation level
+    set_tab :first, :navigation, :only => %(first)
+    set_tab :second, :navigation, :only => %(second)
+    set_tab :third, :navigation, :only => %(third)
+  
+    def first; end
+    def second; end
+    def third; end
+  end
+
+Voilà! That's all you need to do. And you can create an unlimited number of namescope as long as you use an unique name to identify them.
+
+The default namescope is called :default. Passing :default as namescope name is the same as don't using any namescope at all. The following lines are equivalent.
+
+  # The following 
+  set_tab :projects
+  set_tab :projects, :default
+
+
+=== Rendering Tabs with Namescopes
+
+To swith namescope in your template, just pass the :namescope option to the <tt>tabs_tag</tt> helper method.
+
+  <% tabs_tag do |tab| %>
+    <%= tab.home      'Homepage', root_path %>
+    <%= tab.dashboard 'Dashboard', dashboard_path %>
+    <%= tab.projects  'Projects', projects_path %>
+  <% end %>
+
+  <% tabs_tag :namescope => :navigation do |tab| %>
+    <%= tab.first   'First', first_project_path %>
+    <%= tab.second  'Second', second_project_path %>
+    <%= tab.third   'Account', third_project_path %>
+  <% end %>
+
+=== Namescope scope
+
+As a bonus feature, the namescope name does need to be unique within current request scope, not necessarily across the entire application. 
+
+Back to the previous example, you can reuse the same namescope in the other controllers. In this way, you can reuse your templates as well.
+
+  class HomeController
+    set_tab :home
+  end
+
+  class DashboardController
+    set_tab :dashboard
+
+    set_tab :index,  :navigation, :only => %(index)
+    set_tab :common, :navigation, :only => %(foo bar)
+    
+    # ...
+  end
+
+  class ProjectsController
+    set_tab :projects
+  
+    set_tab :first,  :navigation, :only => %(first)
+    set_tab :second, :navigation, :only => %(second)
+    set_tab :third,  :navigation, :only => %(third)
+    
+    # ...
+  end
+
 == Tab Builders
 
 The <tt>Builder</tt> is responsible for creating the tabs HTML code. This library is bundled with two <tt>Builders</tt>:
@@ -122,10 +227,10 @@ The following example creates a custom tab builder called MainTabBuilder.
 
 In your view, simply pass the builder class to the <tt>tabs_tag</tt> method.
 
-  <% tabs_tag(MenuTabBuilder) do |tab| %>
-    <%= tab.home, 'Homepage', root_path %>
-    <%= tab.dashboard, 'Dashboard', dashboard_path %>
-    <%= tab.account, 'Account', account_path, :style => 'float: right;' %>
+  <% tabs_tag(:builder => MenuTabBuilder) do |tab| %>
+    <%= tab.home        'Homepage', root_path %>
+    <%= tab.dashboard,  'Dashboard', dashboard_path %>
+    <%= tab.account     'Account', account_path, :style => 'float: right;' %>
   <% end %>
   
 This is the final result.

data/lib/tabs_on_rails/controller_mixin.rb

@@ -20,36 +20,120 @@ module TabsOnRails
     
     def self.included(base)
       base.extend         ClassMethods
-      base.send :helper,  HelperMethods
       base.class_eval do
-        attr_accessor :current_tab
+        include       InstanceMethods
+        helper        HelperMethods
         helper_method :current_tab
       end
     end
 
     module ClassMethods
 
-      # Sets +name+ as +current_tab+.
-      # 
+      # Sets the value for current tab to given name.
+      #
+      #   set_tab :foo
+      #
+      # If you need to manage multiple tabs, then you can pass an optional namespace.
+      #
+      #   set_tab :foo, :namespace
+      #
+      # The <tt>set_tab</tt> method understands all options you are used to pass to a Rails controller filter.
+      # In fact, behind the scenes this method uses a <tt>before_filter</tt>
+      # to store the tab in the <tt>@tab_stack</tt> variable.
+      # For example, you can set the tab only for a restricted group of actions in the same controller
+      # using the <tt>:only</tt> and <tt>:except</tt> options.
+      #
       # ==== Examples
       # 
-      #   tab :foo
-      #   tab :foo, :except => :new
-      #   tab :foo, :only => [ :index, :show ]
-      # 
-      def current_tab(name, options = {})
+      #   set_tab :foo
+      #   set_tab :foo, :except => :new
+      #   set_tab :foo, :only => [ :index, :show ]
+      #
+      #   set_tab :foo, :namespace
+      #   set_tab :foo, :namespace, :only => [ :index, :show ]
+      #
+      def set_tab(*args)
+        options = args.extract_options!
+        name, namespace = args
+        
         before_filter(options) do |controller|
-          controller.current_tab = name
+          controller.set_tab(name, namespace)
         end
       end
 
+      # This method is deprecated and exists only for compatibility with version 0.2.
+      # Please use <tt>set_tab</tt> method instead.
+      def current_tab(*args)
+        ActiveSupport::Deprecation.warn("Method current_tab is deprecated and will be removed in a future version. Please use set_tab instead.", caller)
+        set_tab(*args)
+      end
+
+    end
+
+    module InstanceMethods
+      
+      # This method is deprecated and exists only for compatibility with version 0.2.
+      # Please use <tt>set_tab</tt> method instead of <tt>current_tab=</tt> setter method.
+      def current_tab=(name)
+        ActiveSupport::Deprecation.warn("Method current_tab= is deprecated and will be removed in a future version. Please use set_tab instead.", caller)
+        set_tab(name)
+      end  
+
+      # Sets the value for current tab to given name.
+      # If you need to manage multiple tabs, then you can pass an optional namespace.
+      #
+      # ==== Examples
+      #
+      #   set_tab :homepage
+      #   set_tab :dashboard, :menu
+      #
+      def set_tab(name, namespace = nil)
+        tab_stack[namespace || :default] = name
+      end
+
+      # Returns the value for current tab in the default namespace,
+      # or nil if no tab has been set before.
+      # You can pass <tt>namespace</tt> get the value of current tab for a different namescope.
+      #
+      # ==== Examples
+      #
+      #   current_tab           # => nil
+      #   current_tab :menu     # => nil
+      #
+      #   set_tab :homepage
+      #   set_tab :dashboard, :menu
+      #
+      #   current_tab           # => :homepage
+      #   current_tab :menu     # => :dashboard
+      #
+      def current_tab(namespace = nil)
+        tab_stack[namespace || :default]
+      end
+
+      # Returns whether the current tab in <tt>namespace</tt> matches <tt>name</tt>.
+      def current_tab?(name, namespace = nil)
+        current_tab(namespace).to_s == name.to_s
+      end
+
+      # Initializes and/or returns the tab stack.
+      # You won't probably need to use this method directly
+      # unless you are trying to hack the plugin architecture.
+      def tab_stack
+        @tab_stack ||= {}
+      end
+
     end
 
     module HelperMethods
 
-      def tabs_tag(builder = nil, &block)
+      def tabs_tag(options = {}, &block)
         raise LocalJumpError, "no block given" unless block_given?
-        tabs  = Tabs.new(self, builder)
+
+        unless options.is_a?(Hash)
+          ActiveSupport::Deprecation.warn('tabs_tag takes a Hash of options, no longer a builder class. Use :builder => BuilderClass.', caller)
+          options = { :builder => options }
+        end
+        tabs  = Tabs.new(self, { :namespace => :default }.merge(options))
 
         concat(tabs.open_tabs.to_s)
         yield  tabs

data/lib/tabs_on_rails/tabs.rb

@@ -31,8 +31,11 @@ module TabsOnRails
     class Builder
       
       # Initializes a new builder with +context+.
-      def initialize(context)
-        @context = context
+      #
+      # Note. You should not overwrite this method to prevent incompatibility with future versions.
+      def initialize(context, options = {})
+        @context   = context
+        @namespace = options.delete(:namespace) || :default
       end
       
       # Returns true if +tab+ is the +current_tab+.
@@ -49,8 +52,9 @@ module TabsOnRails
       #   current_tab? 'bar'  # => false
       #
       def current_tab?(tab)
-        tab.to_s == @context.current_tab.to_s
+        tab.to_s == @context.current_tab(@namespace).to_s
       end
+
       
       # Creates and returns a tab with given +args+.
       # 
@@ -111,9 +115,10 @@ module TabsOnRails
       
     end
     
-    def initialize(context, builder = nil, &block)
+
+    def initialize(context, options = {}, &block)
       @context = context
-      @builder = (builder || TabsBuilder).new(@context)
+      @builder = (options.delete(:builder) || TabsBuilder).new(@context, options)
     end
     
     %w(open_tabs close_tabs).each do |method|

data/lib/tabs_on_rails/version.rb

@@ -18,7 +18,7 @@ module TabsOnRails
 
   module Version
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/tabs_on_rails.gemspec

@@ -2,26 +2,27 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabs_on_rails}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2009-02-17}
-  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.date = %q{2009-05-01}
+  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", "lib/tabs_on_rails/controller_mixin.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/version.rb", "lib/tabs_on_rails.rb", "LICENSE.rdoc", "README.rdoc"]
-  s.files = ["CHANGELOG.rdoc", "init.rb", "install.rb", "lib/tabs_on_rails/controller_mixin.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/version.rb", "lib/tabs_on_rails.rb", "LICENSE.rdoc", "rails/init.rb", "Rakefile", "README.rdoc", "tabs_on_rails.gemspec", "tasks/tabs_on_rails_tasks.rake", "test/builder_test.rb", "test/controller_mixin_helpers_test.rb", "test/controller_mixin_test.rb", "test/fixtures/mixin/standard.html.erb", "test/tabs_builder_test.rb", "test/tabs_on_rails_test.rb", "test/test_helper.rb", "uninstall.rb", "Manifest"]
+  s.files = ["CHANGELOG.rdoc", "init.rb", "install.rb", "lib/tabs_on_rails/controller_mixin.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/version.rb", "lib/tabs_on_rails.rb", "LICENSE.rdoc", "rails/init.rb", "Rakefile", "README.rdoc", "tabs_on_rails.gemspec", "tasks/tabs_on_rails_tasks.rake", "test/builder_test.rb", "test/controller_mixin_helpers_test.rb", "test/controller_mixin_test.rb", "test/fixtures/mixin/standard.html.erb", "test/tabs_builder_test.rb", "test/tabs_on_rails_test.rb", "test/test_helper.rb", "uninstall.rb", "Manifest", "test/controller_test.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://code.simonecarletti.com/tabsonrails}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tabs_on_rails", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{A simple Ruby on Rails plugin for creating and managing Tabs.}
-  s.test_files = ["test/builder_test.rb", "test/controller_mixin_helpers_test.rb", "test/controller_mixin_test.rb", "test/tabs_builder_test.rb", "test/tabs_on_rails_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/builder_test.rb", "test/controller_mixin_helpers_test.rb", "test/controller_mixin_test.rb", "test/controller_test.rb", "test/tabs_builder_test.rb", "test/tabs_on_rails_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rake>, [">= 0.8"])

data/test/builder_test.rb

@@ -1,29 +1,82 @@
 require 'test_helper'
 
+class BuilderTemplate
+  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
+end
+
+
 class BuilderTest < ActiveSupport::TestCase
   
   def setup
-    @template = Template.new
-    @builder  = TabsOnRails::Tabs::Builder.new(@template)
+    @template = BuilderTemplate.new
   end
   
+
   def test_initialize_should_require_context
     assert_raise(ArgumentError) { TabsOnRails::Tabs::Builder.new }
     assert_nothing_raised { TabsOnRails::Tabs::Builder.new(@template) }
   end
   
+  def test_initialize_should_allow_options
+    assert_nothing_raised { TabsOnRails::Tabs::Builder.new(@template, { :namespace => 'foonamespace' }) }
+  end
+
   def test_initialize_should_set_context
+    @builder  = TabsOnRails::Tabs::Builder.new(@template)
     assert_equal(@template, @builder.instance_variable_get(:'@context'))
   end
-  
-  def test_current_tab_question_should_return_true_if_tab_matches_current_tab
+
+  def test_initialize_should_set_namespace
+    @builder  = TabsOnRails::Tabs::Builder.new(@template)
+    assert_equal(:default, @builder.instance_variable_get(:'@namespace'))
+
+    @builder  = TabsOnRails::Tabs::Builder.new(@template, :namespace => :foobar)
+    assert_equal(:foobar, @builder.instance_variable_get(:'@namespace'))
+  end
+
+
+  def test_current_tab
+    @builder  = TabsOnRails::Tabs::Builder.new(@template)
     assert( @builder.current_tab?(:dashboard))
     assert( @builder.current_tab?('dashboard'))
     assert(!@builder.current_tab?(:welcome))
     assert(!@builder.current_tab?('welcome'))
   end
-  
+
+  def test_current_tab_with_namespace
+    @builder  = TabsOnRails::Tabs::Builder.new(@template, :namespace => :foospace)
+    assert( @builder.current_tab?(:footab))
+    assert( @builder.current_tab?('footab'))
+    assert(!@builder.current_tab?(:dashboard))
+    assert(!@builder.current_tab?('dashboard'))
+  end
+
+
+  def test_open_tabs
+    @builder  = TabsOnRails::Tabs::Builder.new(@template)
+    assert_equal(nil, @builder.open_tabs)
+  end
+
+  def test_close_tabs
+    @builder  = TabsOnRails::Tabs::Builder.new(@template)
+    assert_equal(nil, @builder.close_tabs)
+  end
+
+
   def test_tab_for_should_raise_not_implemented_error
+    @builder  = TabsOnRails::Tabs::Builder.new(@template)
     assert_raise(NotImplementedError) { @builder.tab_for }
     assert_raise(NotImplementedError) { @builder.tab_for('foo') }
     assert_raise(NotImplementedError) { @builder.tab_for('foo', 'bar') }

data/test/controller_mixin_helpers_test.rb

@@ -1,5 +1,20 @@
 require 'test_helper'
 
+class MockBuilder < TabsOnRails::Tabs::Builder
+
+  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
+
 class NilBoundariesBuilder < TabsOnRails::Tabs::Builder
   def tab_for(tab, name, *args)
     @context.content_tag(:span, name)
@@ -24,12 +39,26 @@ class ControllerMixinHelpersTest < ActionView::TestCase
   include ActionView::Helpers::UrlHelper
   include TabsOnRails::ControllerMixin::HelperMethods
   
+
   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
+    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(NilBoundariesBuilder) do |t| 
+    content = tabs_tag(:builder => NilBoundariesBuilder) do |t| 
       concat t.single('Single', '#')
     end
     
@@ -37,7 +66,7 @@ class ControllerMixinHelpersTest < ActionView::TestCase
   end
   
   def test_tabs_tag_should_not_concat_open_tabs_when_nil
-    content = tabs_tag(NilOpenBoundaryBuilder) do |t| 
+    content = tabs_tag(:builder => NilOpenBoundaryBuilder) do |t|
       concat t.single('Single', '#')
     end
     
@@ -45,11 +74,19 @@ class ControllerMixinHelpersTest < ActionView::TestCase
   end
   
   def test_tabs_tag_should_not_concat_close_tabs_when_nil
-    content = tabs_tag(NilCloseBoundaryBuilder) do |t| 
+    content = tabs_tag(:builder => NilCloseBoundaryBuilder) do |t|
       concat t.single('Single', '#')
     end
 
     assert_dom_equal('<br /><span>Single</span>', content)
   end
 
+
+  # Deprecated.
+  def test_deprecated_tabs_tag_with_builder
+    assert_deprecated do
+      tabs_tag(NilBoundariesBuilder) {}
+    end
+  end
+
 end

data/test/controller_mixin_test.rb

@@ -1,25 +1,8 @@
 require 'test_helper'
 
 class MixinController < ActionController::Base
-  def self.controller_name; "mixin"; end
-  def self.controller_path; "mixin"; end
-
-  layout false
-  
-  current_tab :dashboard
-  current_tab :welcome,   :only => [ :action_welcome ]
-
-  def method_missing(method, *args)
-    if method =~ /^action_(.*)/
-      render :action => (params[:template] || $1)
-    end
-  end
-
-  def rescue_action(e) raise end
 end
 
-MixinController.view_paths = [ File.dirname(__FILE__) + "/fixtures/" ]
-
 
 class ControllerMixinTest < ActiveSupport::TestCase
   
@@ -28,29 +11,88 @@ class ControllerMixinTest < ActiveSupport::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
+
   
-  def test_controller_should_include_current_tab_accessors
-    assert_equal(nil, @controller.current_tab)
-    @controller.current_tab = :footab
-    assert_equal(:footab, @controller.current_tab)
+  def test_set_tab
+    @controller.set_tab :footab
+    assert_equal(:footab, @controller.tab_stack[:default])
   end
-  
-  def test_current_tab_should_be_dashboard
-    get :action_dashboard, :template => 'standard'
-    assert_equal(:dashboard, @controller.current_tab)
-    assert_equal(%Q{<ul>
-  <li><span>Dashboard</span></li>
-  <li><a href="/w">Welcome</a></li>
-</ul>}, @response.body)
+
+  def test_set_tab_with_namespace
+    @controller.set_tab :footab, :namespace
+    assert_equal(:footab, @controller.tab_stack[:namespace])
   end
-  
-  def test_current_tab_should_be_welcome_only_for_action_welcone
-    get :action_welcome, :template => 'standard'
-    assert_equal(:welcome, @controller.current_tab)
-    assert_equal(%Q{<ul>
-  <li><a href="/d">Dashboard</a></li>
-  <li><span>Welcome</span></li>
-</ul>}, @response.body)
+
+  def test_set_tab_with_default_namespace
+    @controller.set_tab :footab, :default
+    assert_equal(:footab, @controller.tab_stack[:default])
+  end
+
+  def test_set_tab_with_and_without_namespace
+    @controller.set_tab :firsttab
+    @controller.set_tab :secondtab, :custom
+    assert_equal(:firsttab, @controller.tab_stack[:default])
+    assert_equal(:secondtab, @controller.tab_stack[:custom])
+  end
+
+
+  def test_current_tab
+    @controller.tab_stack[:default] = :mytab
+    assert_equal(:mytab, @controller.current_tab)
+  end
+
+  def test_current_tab_with_namespace
+    @controller.tab_stack[:namespace] = :mytab
+    assert_equal(:mytab, @controller.current_tab(:namespace))
+  end
+
+  def test_current_tab_with_default_namespace
+    @controller.tab_stack[:default] = :mytab
+    assert_equal(:mytab, @controller.current_tab(:default))
+  end
+
+  def test_set_tab_with_and_without_namespace
+    @controller.tab_stack[:default] = :firsttab
+    @controller.tab_stack[:custom] = :secondtab
+    assert_equal(:firsttab, @controller.current_tab(:default))
+    assert_equal(:secondtab, @controller.current_tab(:custom))
+  end
+
+
+  def test_current_tab_question
+    @controller.tab_stack[:default] = :mytab
+    assert( @controller.current_tab?(:mytab))
+    assert(!@controller.current_tab?(:yourtab))
+  end
+
+  def test_current_tab_question_with_namespace
+    @controller.tab_stack[:custom] = :mytab
+    assert( @controller.current_tab?(:mytab, :custom))
+    assert(!@controller.current_tab?(:yourtab, :custom))
+  end
+
+  def test_current_tab_question_with_default_namespace
+    @controller.tab_stack[:default] = :mytab
+    assert( @controller.current_tab?(:mytab, :default))
+    assert(!@controller.current_tab?(:yourtab, :default))
+  end
+
+  def test_current_tab_question_with_and_without_namespace
+    @controller.tab_stack[:default] = :firsttab
+    @controller.tab_stack[:custom] = :secondtab
+    assert( @controller.current_tab?(:firsttab, :default))
+    assert(!@controller.current_tab?(:secondtab, :default))
+    assert( @controller.current_tab?(:secondtab, :custom))
+    assert(!@controller.current_tab?(:firsttab, :custom))
+  end
+
+
+  # Deprecated.
+  def test_deprecated_current_tab_setter
+    assert_deprecated do
+      @controller.current_tab = :footab
+      assert_equal(:footab, @controller.tab_stack[:default])
+    end
   end
 
 end

data/test/controller_test.rb

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+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)
+
+  # Deprecated.
+  current_tab :deprecated,   :only => %w(action_current_tab)
+  
+
+  def method_missing(method, *args)
+    if method =~ /^action_(.*)/
+      render :action => (params[:template] || 'standard')
+    end
+  end
+
+  def rescue_action(e) raise end
+end
+
+MixinController.view_paths = [ File.dirname(__FILE__) + "/fixtures/" ]
+
+
+class ControllerMixinTest < ActiveSupport::TestCase
+  
+  def setup
+    @controller = MixinController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  
+  def test_set_tab
+    get :action_dashboard
+    assert_equal(:dashboard, @controller.current_tab)
+    assert_equal(:dashboard, @controller.current_tab(:default))
+    assert_equal(%Q{<ul>
+  <li><span>Dashboard</span></li>
+  <li><a href="/w">Welcome</a></li>
+</ul>}, @response.body)
+  end
+  
+  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(%Q{<ul>
+  <li><a href="/d">Dashboard</a></li>
+  <li><span>Welcome</span></li>
+</ul>}, @response.body)
+  end
+
+  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(%Q{<ul>
+  <li><span>Dashboard</span></li>
+  <li><a href="/w">Welcome</a></li>
+</ul>}, @response.body)
+  end
+
+  # Deprecated
+  def test_deprecate_current_tab
+    get :action_current_tab
+    assert_equal(:deprecated, @controller.current_tab)
+    assert_equal(:deprecated, @controller.current_tab(:default))
+  end
+
+end

data/test/tabs_builder_test.rb

@@ -1,17 +1,26 @@
 require 'test_helper'
 
-class Template
+class TabBuilderTemplate
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::UrlHelper
   
-  def current_tab; :dashboard; end
+  def current_tab(namespace)
+    case namespace
+      when nil, :default
+        :dashboard
+      when :foospace
+        :footab
+      else
+        :elsetab
+    end
+  end
 end
 
 
 class TabBuilderTest < ActiveSupport::TestCase
   
   def setup
-    @template = Template.new
+    @template = TabBuilderTemplate.new
     @builder  = TabsOnRails::Tabs::TabsBuilder.new(@template)
   end
   

data/test/test_helper.rb

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'test/unit'
-require 'mocha'
+
+# FIXME: tests raises an error with Rails 2.3.2,
+# althought this library is 100% compatible with Rails 2.3.x
+gem     'rails', '2.2.2'
 
 require 'active_support'
 require 'active_support/test_case'
@@ -8,16 +11,18 @@ require 'action_controller'
 require 'action_controller/cgi_ext'
 require 'action_controller/test_process'
 require 'action_view/test_case'
+require 'mocha'
 
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
+RAILS_ROOT = '.'    unless defined? RAILS_ROOT
+RAILS_ENV  = 'test' unless defined? RAILS_ENV
+RAILS_DEFAULT_LOGGER = Logger.new(STDOUT) unless defined? RAILS_DEFAULT_LOGGER
+
 # simulate the inclusion as Rails does loading the init.rb file.
 require    'tabs_on_rails'
 require    File.dirname(__FILE__) + '/../init.rb'
 
-RAILS_ROOT = '.'    unless defined? RAILS_ROOT
-RAILS_ENV  = 'test' unless defined? RAILS_ENV
-
 ActionController::Base.logger = nil
 ActionController::Routing::Routes.reload rescue nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weppos-tabs_on_rails
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Simone Carletti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - test/test_helper.rb
 - uninstall.rb
 - Manifest
+- test/controller_test.rb
 has_rdoc: true
 homepage: http://code.simonecarletti.com/tabsonrails
 post_install_message: 
@@ -98,12 +99,13 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A simple Ruby on Rails plugin for creating and managing Tabs.
 test_files: 
 - test/builder_test.rb
 - test/controller_mixin_helpers_test.rb
 - test/controller_mixin_test.rb
+- test/controller_test.rb
 - test/tabs_builder_test.rb
 - test/tabs_on_rails_test.rb
 - test/test_helper.rb