weppos-tabs_on_rails 0.3.0 → 0.8.0

data/CHANGELOG.rdoc

@@ -1,6 +1,21 @@
 = Changelog
 
 
+== Release 0.8.0
+
+* FIXED: Invalid usage of the word namescope instead of namespace.
+
+* FIXED: :current_tab? not available as helper method (closes #229).
+
+* FIXED: GitHub now requires the Manifest file to be included in the repos.
+
+* FIXED: Controller methods should be protected/private (closes #228).
+
+* CHANGED: Status to Beta and bumped release (closes #227).
+
+* REMOVED: Deprecated current_tab setter method. Use set_tab instead.
+
+
 == Release 0.3.0
 
 * ADDED: Support for namespaces in order to manage concurrent tab menus (closes #144).

data/Manifest

@@ -15,7 +15,7 @@ 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/controller_mixin_with_controller_test.rb
 test/fixtures/mixin/standard.html.erb
 test/tabs_builder_test.rb
 test/tabs_on_rails_test.rb

data/README.rdoc

@@ -4,6 +4,14 @@ TabsOnRails is a simple Rails plugin for creating and managing Tabs.
 It provides helpers for creating tabs with a flexible interface.
 
 
+== Requirements
+
+* Ruby >= 1.8.6
+* Rails >= 2.2
+
+Note. TabsOnRails doesn't work with Rails 2.1 or previous versions (see {Ticket #245}[http://code.simonecarletti.com/issues/show/245]).
+
+
 == Rails Installation
 
 === As a Gem
@@ -83,7 +91,7 @@ Taking advantage of Rails filter options, you can restrict a tab to a selected g
 
   class PostsController < ApplicationController
     set_tab :admin
-    set_tab :posts, :only => [ :index, :show ]
+    set_tab :posts, :only => %w(index show)
   end
   
   class ApplicationController < ActionController::Base
@@ -95,11 +103,11 @@ Taking advantage of Rails filter options, you can restrict a tab to a selected g
   end
 
 
-== Using Namescopes to create Multiple Tabs
+== Using Namespaces 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.
+Namespaces enable you to create and manage tabs in parallels. The best way to demonstrate namespace usage is with 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.
+Let's assume your application provides 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
@@ -119,34 +127,33 @@ Let's assume your application provide a first level navigation menu with 3 eleme
 
 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.
+Without namespaces, you wouldn't be able to accomplish this task because you already set the current tab value to :projects. You need to create a parallel navigation menu and uniquely identify it with a custom namespace.
 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)
+    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
   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.
+Voilà! That's all you need to do. And you can create an unlimited number of namespaces 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 default namespace is called :default. Passing :default as name is the same as don't using any namespace at all. The following lines are equivalent.
 
-  # The following 
   set_tab :projects
   set_tab :projects, :default
 
 
-=== Rendering Tabs with Namescopes
+=== Rendering Tabs with Namespaces
 
-To swith namescope in your template, just pass the :namescope option to the <tt>tabs_tag</tt> helper method.
+To switch namespace in your template, just pass the :namespace option to the <tt>tabs_tag</tt> helper method.
 
   <% tabs_tag do |tab| %>
     <%= tab.home      'Homepage', root_path %>
@@ -154,17 +161,17 @@ To swith namescope in your template, just pass the :namescope option to the <tt>
     <%= tab.projects  'Projects', projects_path %>
   <% end %>
 
-  <% tabs_tag :namescope => :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 %>
   <% end %>
 
-=== Namescope scope
+=== Namespace scope
 
-As a bonus feature, the namescope name does need to be unique within current request scope, not necessarily across the entire application. 
+As a bonus feature, the namespace 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.
+Back to the previous example, you can reuse the same namespace in the other controllers. In this way, you can reuse your templates as well.
 
   class HomeController
     set_tab :home
@@ -173,8 +180,8 @@ Back to the previous example, you can reuse the same namescope in the other cont
   class DashboardController
     set_tab :dashboard
 
-    set_tab :index,  :navigation, :only => %(index)
-    set_tab :common, :navigation, :only => %(foo bar)
+    set_tab :index,  :navigation, :only => %w(index)
+    set_tab :common, :navigation, :only => %w(foo bar)
     
     # ...
   end
@@ -182,9 +189,9 @@ Back to the previous example, you can reuse the same namescope in the other cont
   class ProjectsController
     set_tab :projects
   
-    set_tab :first,  :navigation, :only => %(first)
-    set_tab :second, :navigation, :only => %(second)
-    set_tab :third,  :navigation, :only => %(third)
+    set_tab :first,  :navigation, :only => %w(first)
+    set_tab :second, :navigation, :only => %w(second)
+    set_tab :third,  :navigation, :only => %w(third)
     
     # ...
   end

data/lib/tabs_on_rails.rb

@@ -10,7 +10,7 @@
 # License::     MIT License
 #
 #--
-# SVN: $Id$
+# 
 #++
 
 

data/lib/tabs_on_rails/controller_mixin.rb

@@ -10,7 +10,7 @@
 # License::     MIT License
 #
 #--
-# SVN: $Id$
+# 
 #++
 
 
@@ -23,7 +23,7 @@ module TabsOnRails
       base.class_eval do
         include       InstanceMethods
         helper        HelperMethods
-        helper_method :current_tab
+        helper_method :current_tab, :current_tab?
       end
     end
 
@@ -57,70 +57,57 @@ module TabsOnRails
         name, namespace = args
         
         before_filter(options) do |controller|
-          controller.set_tab(name, namespace)
+          controller.instance_eval { 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
+      protected
+
+        # 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 the value for current tab in the default namespace,
+        # or nil if no tab has been set before.
+        # You can pass <tt>namespace</tt> to get the value of current tab for a different namespace.
+        #
+        # ==== 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
+        # 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
+        # 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
 

data/lib/tabs_on_rails/tabs.rb

@@ -10,7 +10,7 @@
 # License::     MIT License
 #
 #--
-# SVN: $Id$
+#
 #++
 
 

data/lib/tabs_on_rails/version.rb

@@ -10,7 +10,7 @@
 # License::     MIT License
 #
 #--
-# SVN: $Id$
+#
 #++
 
 
@@ -18,14 +18,14 @@ module TabsOnRails
 
   module Version
     MAJOR = 0
-    MINOR = 3
+    MINOR = 8
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 
   VERSION         = Version::STRING
-  STATUS          = 'alpha'
+  STATUS          = 'beta'
   BUILD           = ''.match(/(\d+)/).to_a.first
 
 end

data/tabs_on_rails.gemspec

@@ -2,23 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabs_on_rails}
-  s.version = "0.3.0"
+  s.version = "0.8.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-05-01}
+  s.date = %q{2009-06-23}
   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", "test/controller_test.rb"]
-  s.has_rdoc = true
+  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", "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_mixin_with_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"]
   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.2}
+  s.rubygems_version = %q{1.3.4}
   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/controller_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_mixin_with_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

data/test/controller_mixin_helpers_test.rb

@@ -13,6 +13,7 @@ class MockBuilder < TabsOnRails::Tabs::Builder
 
   def tab_for(tab, name, *args)
   end
+
 end
 
 class NilBoundariesBuilder < TabsOnRails::Tabs::Builder
@@ -35,10 +36,10 @@ end
 
 
 class ControllerMixinHelpersTest < ActionView::TestCase
+  tests TabsOnRails::ControllerMixin::HelperMethods
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::UrlHelper
-  include TabsOnRails::ControllerMixin::HelperMethods
-  
+
 
   def test_tabs_tag_should_raise_local_jump_error_without_block
     assert_raise(LocalJumpError) { tabs_tag }
@@ -81,12 +82,4 @@ class ControllerMixinHelpersTest < ActionView::TestCase
     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,98 +1,90 @@
 require 'test_helper'
 
-class MixinController < ActionController::Base
-end
+class ControllerMixinTest < ActiveSupport::TestCase
+  include ControllerTestHelpers
 
+  class MixinController < ActionController::Base
+  end
 
-class ControllerMixinTest < ActiveSupport::TestCase
-  
   def setup
-    @controller = MixinController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    @controller       = MixinController.new
+    @controller_proxy = ControllerProxy.new(@controller)
+    @request          = ActionController::TestRequest.new
+    @response         = ActionController::TestResponse.new
   end
 
   
   def test_set_tab
-    @controller.set_tab :footab
-    assert_equal(:footab, @controller.tab_stack[:default])
+    controller.set_tab :footab
+    assert_equal(:footab, controller.tab_stack[:default])
   end
 
   def test_set_tab_with_namespace
-    @controller.set_tab :footab, :namespace
-    assert_equal(:footab, @controller.tab_stack[:namespace])
+    controller.set_tab :footab, :namespace
+    assert_equal(:footab, controller.tab_stack[:namespace])
   end
 
   def test_set_tab_with_default_namespace
-    @controller.set_tab :footab, :default
-    assert_equal(:footab, @controller.tab_stack[:default])
+    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])
+    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)
+    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))
+    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))
+    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))
+    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))
+    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))
+    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))
+    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
+    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
 
-end
+end

data/test/controller_mixin_with_controller_test.rb

@@ -0,0 +1,81 @@
+require 'test_helper'
+
+class ControllerMixinWithControllerTest < ActiveSupport::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_(.*)/
+        render :action => (params[:template] || 'standard')
+      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
+
+
+  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
+
+  def test_current_tab
+    get :action_dashboard
+    assert_equal :dashboard, controller.current_tab
+    assert_equal :dashboard, controller.current_tab(:default)
+  end
+
+  def test_current_tab_question
+    get :action_dashboard
+    assert  controller.current_tab?(:dashboard)
+    assert  controller.current_tab?(:dashboard, :default)
+    assert !controller.current_tab?(:foobar)
+    assert !controller.current_tab?(:foobar, :default)
+  end
+
+end

data/test/tabs_builder_test.rb

@@ -1,26 +1,25 @@
 require 'test_helper'
 
-class TabBuilderTemplate
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  
-  def current_tab(namespace)
-    case namespace
-      when nil, :default
-        :dashboard
-      when :foospace
-        :footab
-      else
-        :elsetab
+class TabsBuilderTest < ActiveSupport::TestCase
+
+  class TabsBuilderTemplate
+    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
-end
-
 
-class TabBuilderTest < ActiveSupport::TestCase
-  
   def setup
-    @template = TabBuilderTemplate.new
+    @template = TabsBuilderTemplate.new
     @builder  = TabsOnRails::Tabs::TabsBuilder.new(@template)
   end
   

data/test/test_helper.rb

@@ -28,3 +28,25 @@ ActionController::Routing::Routes.reload rescue nil
 
 # 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.
+
+
+module ControllerTestHelpers
+  private
+
+    def controller
+      @controller_proxy
+    end
+
+  class ControllerProxy
+    def initialize(controller)
+      @controller = controller
+    end
+    def method_missing(method, *args)
+      @controller.instance_eval do
+        m = method(method)
+        m.call(*args)
+      end
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weppos-tabs_on_rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Simone Carletti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/tabs_on_rails/version.rb
 - lib/tabs_on_rails.rb
 - LICENSE.rdoc
+- Manifest
 - rails/init.rb
 - Rakefile
 - README.rdoc
@@ -63,14 +64,13 @@ files:
 - test/builder_test.rb
 - test/controller_mixin_helpers_test.rb
 - test/controller_mixin_test.rb
+- test/controller_mixin_with_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
-- Manifest
-- test/controller_test.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://code.simonecarletti.com/tabsonrails
 post_install_message: 
 rdoc_options: 
@@ -105,7 +105,7 @@ test_files:
 - test/builder_test.rb
 - test/controller_mixin_helpers_test.rb
 - test/controller_mixin_test.rb
-- test/controller_test.rb
+- test/controller_mixin_with_controller_test.rb
 - test/tabs_builder_test.rb
 - test/tabs_on_rails_test.rb
 - test/test_helper.rb

data/test/controller_test.rb

@@ -1,76 +0,0 @@
-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