tabs_on_rails 1.0.0 → 1.1.0

data/CHANGELOG.rdoc

@@ -1,6 +1,21 @@
 = Changelog
 
 
+== Release 1.1.0
+
+* FIXED: Incompatibility with release < 1.0.0 caused by open_tabs and close_tabs methods changes compared to 0.8.0.
+
+* CHANGED: Removed BUILD and STATUS constants. Added Version::ALPHA constant to be used when I need to package prereleases (see RubyGem --prerelease flag).
+
+* CHANGED: Removed empty install/uninstall hooks and tasks folder.
+
+* CHANGED: Removed rails/init hook because deprecated in Rails 3.
+
+* CHANGED: Drop dependency from Echoe. Change Rakefile to use custom tasks.
+
+* REMOVED: Deleted empty install.rb file.
+
+
 == Release 1.0.0
 
 * ADDED: Ability to pass arbitrary options to open_tabs and close_tags method. Thanks to aaronchi (closes #315)

data/LICENSE.rdoc

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

data/README.rdoc

@@ -9,7 +9,7 @@ It provides helpers for creating tabs with a flexible interface.
 * 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]).
+Note. 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]).
 
 
 == Rails Installation
@@ -17,9 +17,9 @@ Note. TabsOnRails doesn't work with Rails 2.1 or previous versions (see {Ticket
 === As a Gem
 
 This is the preferred way to install TabsOnRails and the best way if you want install a stable version.
-The GEM is hosted on {Gemcutter}[http://gemcutter.org/gems/tabs_on_rails].
+The GEM is hosted on {RubyGems}[http://rubygems.org/gems/tabs_on_rails].
 
-  $ gem install tabs_on_rails --source http://gemcutter.org/
+  $ gem install tabs_on_rails
 
 With Rails >= 2.2, you can specify the GEM dependency in your environment.rb file so that Rails will automatically check the requirement on startup.
 
@@ -28,7 +28,7 @@ With Rails >= 2.2, you can specify the GEM dependency in your environment.rb fil
     # other configurations
     # ...
     
-    config.gem "tabs_on_rails", :source => "http://gemcutter.org/"
+    config.gem "tabs_on_rails"
     
   end
 
@@ -39,7 +39,7 @@ This is the preferred way if you want to live on the edge and install a developm
   $ script/plugin install git://github.com/weppos/tabs_on_rails.git
 
 
-== Quick Start
+== Usage
 
 In your template use the <tt>tabs_tag</tt> helper to create your tab.
 
@@ -84,7 +84,7 @@ Use the <tt>current_tab</tt> helper method if you need to access the value of cu
   # In your view
   <p>The name of current tab is <%= current_tab %>.</p>
 
-The open tag can be customized with the `:open_tabs` option. 
+The open_tag can be customized with the `:open_tabs` option. 
 
   <% tabs_tag :open_tabs => { :id => "tabs", :class => "cool" } do |tab| %>
     <%= tab.home      'Homepage', root_path %>
@@ -267,23 +267,19 @@ This is the final result.
     <li class="" style="float: right;"><a href="/account">Account</a></li>
   </ul>
 
-== Documentation
 
-The library is still under development and this README file might not be contain the latest changes.
-For the full documentation, development roadmap and more information please visit the {project page}[http://code.simonecarletti.com/wiki/tabsonrails].
+== Author
 
-
-== Credits
-
-Author:: {Simone Carletti}[http://www.simonecarletti.com/] <weppos@weppos.net>
+* {Simone Carletti}[http://www.simonecarletti.com] <weppos@weppos.net>
 
 
 == Resources
 
-* {Homepage}[http://code.simonecarletti.com/tabsonrails]
-* {GitHub}[http://github.com/weppos/tabs_on_rails/]
+* {Homepage}[http://www.simonecarletti.com/code/tabs_on_rails]
+* {Source}[http://github.com/weppos/tabs_on_rails]
+* {Bugs & Features}[http://github.com/weppos/tabs_on_rails/issues]
 
 
 == License
 
-Copyright (c) 2009 Simone Carletti, TabsOnRails is released under the MIT license.
+Copyright (c) 2009-2010 Simone Carletti, TabsOnRails is released under the MIT license.

data/Rakefile

@@ -1,42 +1,115 @@
-$:.unshift(File.dirname(__FILE__) + "/lib")
+require "rubygems"
+require "rake/testtask"
+require "rake/rdoctask"
+require "rake/gempackagetask"
 
-require 'rubygems'
-require 'rake'
-require 'echoe'
-require 'tabs_on_rails'
+$:.unshift(File.dirname(__FILE__) + "/lib")
+require "tabs_on_rails"
 
 
 PKG_NAME    = ENV['PKG_NAME']    || TabsOnRails::GEM
 PKG_VERSION = ENV['PKG_VERSION'] || TabsOnRails::VERSION
-RUBYFORGE_PROJECT = nil
 
 if ENV['SNAPSHOT'].to_i == 1
   PKG_VERSION << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
 end
- 
- 
-Echoe.new(PKG_NAME, PKG_VERSION) do |p|
-  p.author        = "Simone Carletti"
-  p.email         = "weppos@weppos.net"
-  p.summary       = "A simple Ruby on Rails plugin for creating and managing Tabs."
-  p.url           = "http://code.simonecarletti.com/tabsonrails"
-  p.description   = <<-EOD
+
+
+# Run all the tests in the /test folder
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/**/*_test.rb"]
+  t.verbose = true
+end
+
+# Generate documentation
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include("*.rdoc", "lib/**/*.rb")
+  rd.rdoc_dir = "rdoc"
+end
+
+# Run test by default.
+task :default => ["test"]
+
+# This builds the actual gem. For details of what all these options
+# mean, and other ones you can add, check the documentation here:
+#
+#   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."
+  s.author            = "Simone Carletti"
+  s.email             = "weppos@weppos.net"
+  s.homepage          = "http://www.simonecarletti.com/code/tabs_on_rails"
+  s.description       = <<-EOD
     TabsOnRails is a simple Ruby on Rails plugin for creating and managing Tabs. \
     It provides helpers for creating tabs with a flexible interface.
   EOD
-  p.project       = RUBYFORGE_PROJECT
 
-  p.need_zip      = true
+  s.has_rdoc          = true
+  # You should probably have a README of some kind. Change the filename
+  # as appropriate
+  s.extra_rdoc_files  = Dir.glob("*.rdoc")
+  s.rdoc_options      = %w(--main README.rdoc)
 
-  p.development_dependencies += ["rake  ~>0.8.7",
-                                 "echoe ~>3.2.0"]
+  # 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.require_paths     = ["lib"]
 
-  p.rcov_options  = ["-Itest -x Rakefile,rcov,json,mocha,rack,actionpack,activesupport"]
+  # If you want to depend on other gems, add them here, along with any
+  # relevant versions
+  # s.add_dependency("some_other_gem", "~> 0.1.0")
+
+  # If your tests use any gems, include them here
+  # s.add_development_dependency("mocha") # for example
 end
 
+# This task actually builds the gem. We also regenerate a static
+# .gemspec file, which is useful if something (i.e. GitHub) will
+# be automatically building a gem for this project. If you're not
+# using GitHub, edit as appropriate.
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+desc "Build the gemspec file #{spec.name}.gemspec"
+task :gemspec do
+  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
+  File.open(file, "w") {|f| f << spec.to_ruby }
+end
+
+desc "Remove any temporary products, including gemspec."
+task :clean => [:clobber] do
+  rm "#{spec.name}.gemspec"
+end
+
+desc "Remove any generated file"
+task :clobber => [:clobber_rdoc, :clobber_rcov, :clobber_package]
+
+desc "Package the library and generates the gemspec"
+task :package => [:gemspec]
+
+begin
+  require "rcov/rcovtask"
+
+  desc "Create a code coverage report."
+  Rcov::RcovTask.new do |t|
+    t.test_files = FileList["test/**/*_test.rb"]
+    t.ruby_opts << "-Itest -x mocha,rcov,Rakefile"
+    t.verbose = true
+  end
+rescue LoadError
+  task :clobber_rcov
+  puts "RCov is not available"
+end
 
 begin
-  require 'code_statistics'
+  require "code_statistics"
+
   desc "Show library's code statistics"
   task :stats do
     CodeStatistics.new(["TabsOnRails", "lib"],

data/lib/tabs_on_rails/tabs.rb

@@ -27,10 +27,19 @@ module TabsOnRails
       @builder = (options.delete(:builder) || TabsBuilder).new(@context, options)
     end
     
-    %w(open_tabs close_tabs).each do |method|
-      define_method(method) do |*args|
-        @builder.send(method, *args)
-      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)
+        end                                               #   end
+      end                                                 # end
     end
     
     def method_missing(*args)

data/lib/tabs_on_rails/version.rb

@@ -18,14 +18,13 @@ module TabsOnRails
 
   module Version
     MAJOR = 1
-    MINOR = 0
-    TINY  = 0
+    MINOR = 1
+    PATCH = 0
+    BUILD = nil
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")
   end
 
-  VERSION         = Version::STRING
-  STATUS          = 'stable'
-  BUILD           = ''.match(/(\d+)/).to_a.first
+  VERSION = Version::STRING
 
 end

data/rails/init.rb

@@ -1,5 +1,3 @@
 require 'tabs_on_rails'
 
 ActionController::Base.send :include, TabsOnRails::ControllerMixin
-
-RAILS_DEFAULT_LOGGER.info("** TabsOnRails: initialized properly") if defined?(RAILS_DEFAULT_LOGGER)

data/tabs_on_rails.gemspec

@@ -2,36 +2,29 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabs_on_rails}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2010-08-09}
   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", "lib/tabs_on_rails.rb", "lib/tabs_on_rails/controller_mixin.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/tabs/builder.rb", "lib/tabs_on_rails/tabs/tabs_builder.rb", "lib/tabs_on_rails/version.rb", "tasks/tabs_on_rails_tasks.rake"]
-  s.files = ["CHANGELOG.rdoc", "LICENSE.rdoc", "Manifest", "README.rdoc", "Rakefile", "init.rb", "install.rb", "lib/tabs_on_rails.rb", "lib/tabs_on_rails/controller_mixin.rb", "lib/tabs_on_rails/tabs.rb", "lib/tabs_on_rails/tabs/builder.rb", "lib/tabs_on_rails/tabs/tabs_builder.rb", "lib/tabs_on_rails/version.rb", "rails/init.rb", "tasks/tabs_on_rails_tasks.rake", "test/controller_mixin_helpers_test.rb", "test/controller_mixin_test.rb", "test/controller_mixin_with_controller_test.rb", "test/fixtures/mixin/default.html.erb", "test/fixtures/mixin/with_open_close_tabs.html.erb", "test/tabs/builder_test.rb", "test/tabs/tabs_builder_test.rb", "test/test_helper.rb", "uninstall.rb", "tabs_on_rails.gemspec"]
-  s.homepage = %q{http://code.simonecarletti.com/tabsonrails}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tabs_on_rails", "--main", "README.rdoc"]
+  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", "test/fixtures/mixin", "test/fixtures/mixin/default.html.erb", "test/fixtures/mixin/with_open_close_tabs.html.erb", "test/tabs", "test/tabs/builder_test.rb", "test/tabs/tabs_builder_test.rb", "test/tabs_test.rb", "test/test_helper.rb", "lib/tabs_on_rails", "lib/tabs_on_rails/controller_mixin.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", "rails/init.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.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple Ruby on Rails plugin for creating and managing Tabs.}
-  s.test_files = ["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/tabs_builder_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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.7"])
-      s.add_development_dependency(%q<echoe>, ["~> 3.2.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<echoe>, ["~> 3.2.0"])
     end
   else
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<echoe>, ["~> 3.2.0"])
   end
 end

data/test/controller_mixin_test.rb

@@ -13,7 +13,7 @@ class ControllerMixinTest < ActionController::TestCase
     @response         = ActionController::TestResponse.new
   end
 
-  
+
   def test_set_tab
     controller.set_tab :footab
     assert_equal(:footab, controller.tab_stack[:default])
@@ -87,4 +87,186 @@ class ControllerMixinTest < ActionController::TestCase
     assert(!controller.current_tab?(:firsttab, :custom))
   end
 
-end
+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
+
+  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
+
+
+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_(.*)/
+        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
+
+
+  def test_render_default
+    get :action_dashboard
+    assert_equal(%Q{<ul>
+  <li><span>Dashboard</span></li>
+  <li><a href="/w">Welcome</a></li>
+</ul>}, @response.body)
+  end
+
+  def test_render_with_open_close_tabs
+    get :action_dashboard, :template => "with_open_close_tabs"
+    assert_equal(%Q{<ul id="tabs">
+  <li><span>Dashboard</span></li>
+  <li><a href="/w">Welcome</a></li>
+</ul>}, @response.body)
+  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,8 +1,8 @@
 require 'test_helper'
 
 class BuilderTest < ActiveSupport::TestCase
-  
-  BuilderTemplate = Class.new do
+
+  Template = Class.new do
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::UrlHelper
 
@@ -17,12 +17,12 @@ class BuilderTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
   def setup
-    @template = BuilderTemplate.new
+    @template = Template.new
     @builder  = TabsOnRails::Tabs::Builder.new(@template)
   end
-  
+
 
   def test_initialize_should_require_context
     assert_raise(ArgumentError) { TabsOnRails::Tabs::Builder.new }

data/test/tabs/tabs_builder_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TabsBuilderTest < ActionView::TestCase
 
-  TabsBuilderTemplate = Class.new do
+  Template = Class.new do
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::UrlHelper
 
@@ -19,7 +19,7 @@ class TabsBuilderTest < ActionView::TestCase
   end
 
   def setup
-    @template = TabsBuilderTemplate.new
+    @template = Template.new
     @builder  = TabsOnRails::Tabs::TabsBuilder.new(@template)
   end
 
@@ -44,15 +44,15 @@ class TabsBuilderTest < ActionView::TestCase
   def test_should_implement_builder
     assert_equal(TabsOnRails::Tabs::Builder, TabsOnRails::Tabs::TabsBuilder.superclass)
   end
-  
+
   def test_tab_for_should_return_link_to_unless_current_tab
     assert_dom_equal('<li><a href="#">Welcome</a></li>', @builder.tab_for(:welcome, 'Welcome', '#'))
     assert_dom_equal('<li><a href="http://foobar.com/">Foo Bar</a></li>', @builder.tab_for(:welcome, 'Foo Bar', 'http://foobar.com/'))
   end
-  
+
   def test_tab_for_should_return_span_if_current_tab
     assert_dom_equal('<li><span>Dashboard</span></li>', @builder.tab_for(:dashboard, 'Dashboard', '#'))
     assert_dom_equal('<li><span>Foo Bar</span></li>', @builder.tab_for(:dashboard, 'Foo Bar', '#'))
   end
-  
+
 end

data/test/tabs_test.rb

@@ -0,0 +1,85 @@
+require 'test_helper'
+
+class TabsTest < ActiveSupport::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
+    end
+  end
+
+  OpenZeroArgsBuilder = Class.new(TabsOnRails::Tabs::Builder) do
+    def open_tabs
+      '<ul>'
+    end
+  end
+
+  CloseZeroArgsBuilder = Class.new(TabsOnRails::Tabs::Builder) do
+    def close_tabs
+      '</ul>'
+    end
+  end
+
+
+  def setup
+    @template = Template.new
+    @klass    = TabsOnRails::Tabs
+    @tabs     = @klass.new(@template)
+  end
+
+
+  def test_initialize
+    @tabs = @klass.new(@template)
+    assert_equal @template, @tabs.instance_variable_get(:"@context")
+    assert_instance_of TabsOnRails::Tabs::TabsBuilder, @tabs.instance_variable_get(:"@builder")
+  end
+
+  def test_initialize_with_option_builder
+    builder = Class.new(TabsOnRails::Tabs::TabsBuilder)
+    @tabs = @klass.new(@template, :builder => builder)
+    assert_equal @template, @tabs.instance_variable_get(:"@context")
+    assert_instance_of builder, @tabs.instance_variable_get(:"@builder")
+  end
+
+
+  def test_open_tabs
+    assert_equal '<ul>', @tabs.open_tabs
+  end
+
+  def test_open_tabs_with_options
+    assert_equal '<ul class="foo">', @tabs.open_tabs(:class => "foo")
+  end
+
+  def test_open_tabs_should_ignore_options_if_arity_is_zero
+    @tabs = @klass.new(@template, :builder => OpenZeroArgsBuilder)
+    assert_nothing_raised do 
+      assert_equal '<ul>', @tabs.open_tabs(:class => "foo")
+    end
+  end
+
+  def test_close_tabs
+    assert_equal '</ul>', @tabs.close_tabs
+  end
+
+  def test_close_tabs_with_options
+    assert_equal '</ul>', @tabs.close_tabs(:class => "foo")
+  end
+
+  def test_open_tabs_should_ignore_options_if_arity_is_zero
+    @tabs = @klass.new(@template, :builder => CloseZeroArgsBuilder)
+    assert_nothing_raised do 
+      assert_equal '</ul>', @tabs.close_tabs(:class => "foo")
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-gem     'rails', '~>2.3.0'
-gem     'mocha', '~>0.9.7'
+gem     'rails', '~>2.3.5'
+gem     'mocha', '~>0.9.8'
 
 # Remember! Due to some Mocha internal changes,
 # Rails 2.2.x requires Mocha 0.9.5 and
@@ -45,5 +45,5 @@ module ControllerTestHelpers
       end
     end
   end
-  
-end
+
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tabs_on_rails
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Simone Carletti
@@ -9,29 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 +01:00
+date: 2010-08-09 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.2.0
-    version: 
+dependencies: []
+
 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: []
@@ -42,76 +29,61 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - LICENSE.rdoc
 - README.rdoc
-- lib/tabs_on_rails.rb
-- lib/tabs_on_rails/controller_mixin.rb
-- lib/tabs_on_rails/tabs.rb
-- lib/tabs_on_rails/tabs/builder.rb
-- lib/tabs_on_rails/tabs/tabs_builder.rb
-- lib/tabs_on_rails/version.rb
-- tasks/tabs_on_rails_tasks.rake
 files: 
+- Rakefile
+- init.rb
 - CHANGELOG.rdoc
 - LICENSE.rdoc
-- Manifest
 - README.rdoc
-- Rakefile
-- init.rb
-- install.rb
-- lib/tabs_on_rails.rb
-- lib/tabs_on_rails/controller_mixin.rb
-- lib/tabs_on_rails/tabs.rb
-- lib/tabs_on_rails/tabs/builder.rb
-- lib/tabs_on_rails/tabs/tabs_builder.rb
-- lib/tabs_on_rails/version.rb
-- rails/init.rb
-- tasks/tabs_on_rails_tasks.rake
-- test/controller_mixin_helpers_test.rb
+- tabs_on_rails.gemspec
 - test/controller_mixin_test.rb
-- test/controller_mixin_with_controller_test.rb
 - test/fixtures/mixin/default.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
-- uninstall.rb
-- tabs_on_rails.gemspec
+- lib/tabs_on_rails/controller_mixin.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://code.simonecarletti.com/tabsonrails
+homepage: http://www.simonecarletti.com/code/tabs_on_rails
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Tabs_on_rails
 - --main
 - README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple Ruby on Rails plugin for creating and managing Tabs.
-test_files: 
-- 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/tabs_builder_test.rb
-- test/test_helper.rb
+test_files: []
+

data/Manifest

@@ -1,24 +0,0 @@
-CHANGELOG.rdoc
-LICENSE.rdoc
-Manifest
-README.rdoc
-Rakefile
-init.rb
-install.rb
-lib/tabs_on_rails.rb
-lib/tabs_on_rails/controller_mixin.rb
-lib/tabs_on_rails/tabs.rb
-lib/tabs_on_rails/tabs/builder.rb
-lib/tabs_on_rails/tabs/tabs_builder.rb
-lib/tabs_on_rails/version.rb
-rails/init.rb
-tasks/tabs_on_rails_tasks.rake
-test/controller_mixin_helpers_test.rb
-test/controller_mixin_test.rb
-test/controller_mixin_with_controller_test.rb
-test/fixtures/mixin/default.html.erb
-test/fixtures/mixin/with_open_close_tabs.html.erb
-test/tabs/builder_test.rb
-test/tabs/tabs_builder_test.rb
-test/test_helper.rb
-uninstall.rb

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/tasks/tabs_on_rails_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :tabs_on_rails do
-#   # Task goes here
-# end

data/test/controller_mixin_helpers_test.rb

@@ -1,86 +0,0 @@
-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)
-  end
-end
-
-class NilOpenBoundaryBuilder < NilBoundariesBuilder
-  def close_tabs(options = {})
-    '<br />'
-  end
-end
-
-class NilCloseBoundaryBuilder < NilBoundariesBuilder
-  def open_tabs(options = {})
-    '<br />'
-  end
-end
-
-
-class ControllerMixinHelpersTest < ActionView::TestCase
-  tests TabsOnRails::ControllerMixin::HelperMethods
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-
-
-  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/controller_mixin_with_controller_test.rb

@@ -1,99 +0,0 @@
-require 'test_helper'
-
-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_(.*)/
-        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
-
-
-  def test_render_default
-    get :action_dashboard
-    assert_equal(%Q{<ul>
-  <li><span>Dashboard</span></li>
-  <li><a href="/w">Welcome</a></li>
-</ul>}, @response.body)
-  end
-
-  def test_render_with_open_close_tabs
-    get :action_dashboard, :template => "with_open_close_tabs"
-    assert_equal(%Q{<ul id="tabs">
-  <li><span>Dashboard</span></li>
-  <li><a href="/w">Welcome</a></li>
-</ul>}, @response.body)
-  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/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here