tabs_on_rails 0.8.2 → 1.0.0

data/CHANGELOG.rdoc

@@ -1,6 +1,15 @@
 = Changelog
 
 
+== Release 1.0.0
+
+* ADDED: Ability to pass arbitrary options to open_tabs and close_tags method. Thanks to aaronchi (closes #315)
+
+* REMOVED: tabs_tag no longer accepts a Builder as first parameter. Removed deprecation warning.
+
+First stable release.
+
+
 == Release 0.8.2
 
 * CHANGED: GitHub Gem Building is Defunct. The gem is now hosted on Gemcutter (see http://github.com/blog/515-gem-building-is-defunct)

data/Manifest

@@ -1,23 +1,24 @@
 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
-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/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/README.rdoc

@@ -84,6 +84,22 @@ 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. 
+
+  <% tabs_tag :open_tabs => { :id => "tabs", :class => "cool" } do |tab| %>
+    <%= tab.home      'Homepage', root_path %>
+    <%= tab.dashboard 'Dashboard', dashboard_path %>
+    <%= tab.account   'Account', account_path %>
+  <% end %>
+
+  <ul id="tabs" class="cool">
+    <li><a href="/">Homepage</a></li>
+    <li><a href="/dashboard">Dashboard</a></li>
+    <li><a href="/account">Account</a></li>
+  </ul>
+
+Further customizations require a custom Builder (see below).
+
 
 == Restricting set_tab scope
 
@@ -172,7 +188,7 @@ To switch namespace in your template, just pass the :namespace option to the <tt
 
 === Namespace scope
 
-As a bonus feature, the namespace name does need to be unique within current request scope, not necessarily across the entire application.
+As a bonus feature, the namespace needs to be unique within current request scope, not necessarily across the entire application.
 
 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.
 
@@ -208,7 +224,7 @@ The <tt>Builder</tt> is responsible for creating the tabs HTML code. This librar
 
 === Understanding the Builder
 
-Builders act as formatters. A Builder incapsulates all the logic behind the tab creation including the code required to toggle tabs status.
+Builders act as formatters. A Builder encapsulates all the logic behind the tab creation including the code required to toggle tabs status.
 
 When the <tt>tabs_tag</tt> helper is called, it creates a new <tt>Tabs</tt> instance with selected Builder.
 If you don't provide a custom builder, then <tt>Tabs::TabsBuilder</tt> is used by default.
@@ -222,7 +238,7 @@ Additional overridable methods include:
 <tt>close_tabs</tt>:: the method called after the tab set
 <tt>tab_for</tt>:: the method called to create a single tab item
 
-The following example creates a custom tab builder called MainTabBuilder.
+The following example creates a custom tab builder called <tt>MenuTabBuilder</tt>.
 
   class MenuTabBuilder < TabsOnRails::Tabs::Builder
     def tab_for(tab, name, options, item_options = {})

data/Rakefile

@@ -1,18 +1,13 @@
+$:.unshift(File.dirname(__FILE__) + "/lib")
+
 require 'rubygems'
 require 'rake'
 require 'echoe'
-
-$:.unshift(File.dirname(__FILE__) + "/lib")
 require 'tabs_on_rails'
 
 
 PKG_NAME    = ENV['PKG_NAME']    || TabsOnRails::GEM
 PKG_VERSION = ENV['PKG_VERSION'] || TabsOnRails::VERSION
-PKG_SUMMARY = "A simple Ruby on Rails plugin for creating and managing Tabs."
-PKG_FILES   = FileList.new("{lib,rails,tasks,test}/**/*") do |files|
-  files.include %w(*.{rdoc,rb})
-  files.include %w(Rakefile)
-end
 RUBYFORGE_PROJECT = nil
 
 if ENV['SNAPSHOT'].to_i == 1
@@ -23,20 +18,20 @@ end
 Echoe.new(PKG_NAME, PKG_VERSION) do |p|
   p.author        = "Simone Carletti"
   p.email         = "weppos@weppos.net"
-  p.summary       = PKG_SUMMARY
+  p.summary       = "A simple Ruby on Rails plugin for creating and managing Tabs."
+  p.url           = "http://code.simonecarletti.com/tabsonrails"
   p.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.url           = "http://code.simonecarletti.com/tabsonrails"
   p.project       = RUBYFORGE_PROJECT
 
   p.need_zip      = true
-  p.rcov_options  = ["--main << README.rdoc -x Rakefile -x rcov"]
-  p.rdoc_pattern  = /^(lib|CHANGELOG.rdoc|README.rdoc|LICENSE.rdoc)/
 
-  p.development_dependencies += ["rake  >=0.8",
-                                 "echoe >=3.1"]
+  p.development_dependencies += ["rake  ~>0.8.7",
+                                 "echoe ~>3.2.0"]
+
+  p.rcov_options  = ["-Itest -x Rakefile,rcov,json,mocha,rack,actionpack,activesupport"]
 end
 
 

data/lib/tabs_on_rails/controller_mixin.rb

@@ -115,16 +115,15 @@ module TabsOnRails
 
       def tabs_tag(options = {}, &block)
         raise LocalJumpError, "no block given" unless block_given?
+        
+        options = options.dup
+        open_tabs_options  = options.delete(:open_tabs)  || {}
+        close_tabs_options = options.delete(:close_tabs) || {}
+        tabs = Tabs.new(self, { :namespace => :default }.merge(options))
 
-        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)
+        concat(tabs.open_tabs(open_tabs_options).to_s)
         yield  tabs
-        concat(tabs.close_tabs.to_s)
+        concat(tabs.close_tabs(close_tabs_options).to_s)
       end
 
     end

data/lib/tabs_on_rails/tabs.rb

@@ -14,107 +14,13 @@
 #++
 
 
+require 'tabs_on_rails/tabs/builder'
+require 'tabs_on_rails/tabs/tabs_builder'
+
+
 module TabsOnRails
-  
-  class Tabs
-    
-    # 
-    # = Builder
-    #
-    # The Builder class represents the interface for any custom Builder.
-    # 
-    # To create a custom Builder extend this class 
-    # and implement the following abstract methods:
-    # 
-    # * tab_for(args)
-    #
-    class Builder
-      
-      # Initializes a new builder with +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+.
-      #
-      # ==== Examples
-      # 
-      #   class MyController < ApplicationController
-      #     tab :foo
-      #   end
-      # 
-      #   current_tab? :foo   # => true
-      #   current_tab? 'foo'  # => true
-      #   current_tab? :bar   # => false
-      #   current_tab? 'bar'  # => false
-      #
-      def current_tab?(tab)
-        tab.to_s == @context.current_tab(@namespace).to_s
-      end
 
-      
-      # Creates and returns a tab with given +args+.
-      # 
-      # ==== Raises
-      # 
-      # NotImplemented:: you should implement this method in your custom Builder.
-      # 
-      def tab_for(*args)
-        raise NotImplementedError
-      end
-      
-      # Overwrite this method to use a custom open tag for your tabs.
-      def open_tabs
-      end
-      
-      # Overwrite this method to use a custom close tag for your tabs.
-      def close_tabs
-      end
-      
-    end
-    
-    #
-    # = Tabs Builder
-    # 
-    # The TabsBuilder is and example of custom Builder.
-    # It creates a new tab
-    #
-    class TabsBuilder < Builder
-      
-      # Implements Builder#tab_for.
-      # Returns a link_to +tab+ with +name+ and +options+ if +tab+ is not the current tab,
-      # a simple tab name wrapped by a span tag otherwise.
-      # 
-      #   current_tab? :foo   # => true
-      # 
-      #   tab_for :foo, 'Foo', foo_path
-      #   # => <li><span>Foo</span></li>
-      # 
-      #   tab_for :bar, 'Bar', bar_path
-      #   # => <li><a href="/link/to/bar">Bar</a></li>
-      # 
-      def tab_for(tab, name, options)
-        content = @context.link_to_unless(current_tab?(tab), name, options) do
-          @context.content_tag(:span, name)
-        end
-        @context.content_tag(:li, content)
-      end
-      
-      # Implements Builder#open_tabs.
-      def open_tabs
-        '<ul>'
-      end
-      
-      # Implements Builder#close_tabs.
-      def close_tabs
-        '</ul>'
-      end
-      
-    end
-    
+  class Tabs
 
     def initialize(context, options = {}, &block)
       @context = context
@@ -122,8 +28,8 @@ module TabsOnRails
     end
     
     %w(open_tabs close_tabs).each do |method|
-      define_method(method) do
-        @builder.send(method)
+      define_method(method) do |*args|
+        @builder.send(method, *args)
       end
     end
     

data/lib/tabs_on_rails/tabs/builder.rb

@@ -0,0 +1,79 @@
+# 
+# = Tabs on Rails
+#
+# A simple Ruby on Rails plugin for creating and managing Tabs.
+# 
+#
+# Category::    Rails
+# Package::     TabsOnRails
+# Author::      Simone Carletti <weppos@weppos.net>
+# License::     MIT License
+#
+#--
+#
+#++
+
+
+module TabsOnRails
+  class Tabs
+
+    # 
+    # = Builder
+    #
+    # The Builder class represents the interface for any custom Builder.
+    # 
+    # To create a custom Builder extend this class 
+    # and implement the following abstract methods:
+    # 
+    # * tab_for(args)
+    #
+    class Builder
+
+      # Initializes a new builder with +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+.
+      #
+      # ==== Examples
+      # 
+      #   class MyController < ApplicationController
+      #     tab :foo
+      #   end
+      # 
+      #   current_tab? :foo   # => true
+      #   current_tab? 'foo'  # => true
+      #   current_tab? :bar   # => false
+      #   current_tab? 'bar'  # => false
+      #
+      def current_tab?(tab)
+        tab.to_s == @context.current_tab(@namespace).to_s
+      end
+
+
+      # Creates and returns a tab with given +args+.
+      # 
+      # ==== Raises
+      # 
+      # NotImplemented:: you should implement this method in your custom Builder.
+      # 
+      def tab_for(*args)
+        raise NotImplementedError
+      end
+
+      # Overwrite this method to use a custom open tag for your tabs.
+      def open_tabs(*args)
+      end
+
+      # Overwrite this method to use a custom close tag for your tabs.
+      def close_tabs(*args)
+      end
+
+    end
+
+  end
+end

data/lib/tabs_on_rails/tabs/tabs_builder.rb

@@ -0,0 +1,81 @@
+# 
+# = Tabs on Rails
+#
+# A simple Ruby on Rails plugin for creating and managing Tabs.
+# 
+#
+# Category::    Rails
+# Package::     TabsOnRails
+# Author::      Simone Carletti <weppos@weppos.net>
+# License::     MIT License
+#
+#--
+#
+#++
+
+
+module TabsOnRails
+  class Tabs
+
+    #
+    # = Tabs Builder
+    # 
+    # The TabsBuilder is and example of custom Builder.
+    # It creates a new tab
+    #
+    class TabsBuilder < Builder
+
+      # Implements Builder#tab_for.
+      # Returns a link_to +tab+ with +name+ and +options+ if +tab+ is not the current tab,
+      # a simple tab name wrapped by a span tag otherwise.
+      # 
+      #   current_tab? :foo   # => true
+      # 
+      #   tab_for :foo, 'Foo', foo_path
+      #   # => <li><span>Foo</span></li>
+      # 
+      #   tab_for :bar, 'Bar', bar_path
+      #   # => <li><a href="/link/to/bar">Bar</a></li>
+      # 
+      def tab_for(tab, name, options)
+        content = @context.link_to_unless(current_tab?(tab), name, options) do
+          @context.content_tag(:span, name)
+        end
+        @context.content_tag(:li, content)
+      end
+
+      # Implements Builder#open_tabs.
+      # 
+      # Returns an unordered list open tag.
+      # The <tt>options</tt> is used to customize the HTML attributes of the tag.
+      #
+      #   open_tag
+      #   # => "<ul>"
+      #
+      #   open_tag :class => "centered"
+      #   # => "<ul class=\"centered\">"
+      #
+      def open_tabs(options = {})
+        @context.tag("ul", options, open = true)
+      end
+
+      # Implements Builder#close_tabs.
+      # 
+      # Returns an unordered list close tag.
+      # The <tt>options</tt> hash is ignored. It exists only for 
+      # coeherence with the parent Builder API.
+      #
+      #   close_tag
+      #   # => "</ul>"
+      #
+      #   close_tag :class => "centered"
+      #   # => "</ul>"
+      #
+      def close_tabs(options = {})
+        "</ul>"
+      end
+
+    end
+
+  end
+end

data/lib/tabs_on_rails/version.rb

@@ -17,15 +17,15 @@
 module TabsOnRails
 
   module Version
-    MAJOR = 0
-    MINOR = 8
-    TINY  = 2
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 
   VERSION         = Version::STRING
-  STATUS          = 'beta'
+  STATUS          = 'stable'
   BUILD           = ''.match(/(\d+)/).to_a.first
 
 end

data/tabs_on_rails.gemspec

@@ -2,36 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabs_on_rails}
-  s.version = "0.8.2"
+  s.version = "1.0.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-10-12}
+  s.date = %q{2009-10-29}
   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", "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.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.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   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_mixin_with_controller_test.rb", "test/tabs_builder_test.rb", "test/tabs_on_rails_test.rb", "test/test_helper.rb"]
+  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"])
-      s.add_development_dependency(%q<echoe>, [">= 3.1"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<echoe>, ["~> 3.2.0"])
     else
-      s.add_dependency(%q<rake>, [">= 0.8"])
-      s.add_dependency(%q<echoe>, [">= 3.1"])
+      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"])
-    s.add_dependency(%q<echoe>, [">= 3.1"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<echoe>, ["~> 3.2.0"])
   end
 end

data/test/controller_mixin_helpers_test.rb

@@ -23,13 +23,13 @@ class NilBoundariesBuilder < TabsOnRails::Tabs::Builder
 end
 
 class NilOpenBoundaryBuilder < NilBoundariesBuilder
-  def close_tabs
+  def close_tabs(options = {})
     '<br />'
   end
 end
 
 class NilCloseBoundaryBuilder < NilBoundariesBuilder
-  def open_tabs
+  def open_tabs(options = {})
     '<br />'
   end
 end
@@ -57,8 +57,8 @@ class ControllerMixinHelpersTest < ActionView::TestCase
       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', '#')

data/test/controller_mixin_with_controller_test.rb

@@ -16,7 +16,7 @@ class ControllerMixinWithControllerTest < ActionController::TestCase
 
     def method_missing(method, *args)
       if method =~ /^action_(.*)/
-        render :action => (params[:template] || 'standard')
+        render :action => (params[:template] || 'default')
       end
     end
 
@@ -33,6 +33,23 @@ class ControllerMixinWithControllerTest < ActionController::TestCase
   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)
@@ -64,6 +81,7 @@ class ControllerMixinWithControllerTest < ActionController::TestCase
 </ul>}, @response.body)
   end
 
+
   def test_current_tab
     get :action_dashboard
     assert_equal :dashboard, controller.current_tab

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

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

data/test/{builder_test.rb → tabs/builder_test.rb}

@@ -1,26 +1,26 @@
 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
+class BuilderTest < ActiveSupport::TestCase
+  
+  BuilderTemplate = 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
-end
-
-
-class BuilderTest < ActiveSupport::TestCase
   
   def setup
     @template = BuilderTemplate.new
+    @builder  = TabsOnRails::Tabs::Builder.new(@template)
   end
   
 
@@ -34,7 +34,6 @@ class BuilderTest < ActiveSupport::TestCase
   end
 
   def test_initialize_should_set_context
-    @builder  = TabsOnRails::Tabs::Builder.new(@template)
     assert_equal(@template, @builder.instance_variable_get(:'@context'))
   end
 
@@ -65,21 +64,26 @@ class BuilderTest < ActiveSupport::TestCase
 
 
   def test_open_tabs
-    @builder  = TabsOnRails::Tabs::Builder.new(@template)
-    assert_equal(nil, @builder.open_tabs)
+    assert_equal nil, @builder.open_tabs
+  end
+
+  def test_open_tabs_with_options
+    assert_equal nil, @builder.open_tabs(:foo => "bar")
   end
 
   def test_close_tabs
-    @builder  = TabsOnRails::Tabs::Builder.new(@template)
-    assert_equal(nil, @builder.close_tabs)
+    assert_equal nil, @builder.close_tabs
+  end
+
+  def test_close_tabs_with_options
+    assert_equal nil, @builder.close_tabs(:foo => "bar")
   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') }
   end
   
-end
+end

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TabsBuilderTest < ActionView::TestCase
 
-  class TabsBuilderTemplate
+  TabsBuilderTemplate = Class.new do
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::UrlHelper
 
@@ -22,7 +22,25 @@ class TabsBuilderTest < ActionView::TestCase
     @template = TabsBuilderTemplate.new
     @builder  = TabsOnRails::Tabs::TabsBuilder.new(@template)
   end
-  
+
+
+  def test_open_tabs
+    assert_equal '<ul>', @builder.open_tabs
+  end
+
+  def test_open_tabs_with_options
+    assert_equal '<ul style="foo">', @builder.open_tabs(:style => "foo")
+  end
+
+  def test_close_tabs
+    assert_equal "</ul>", @builder.close_tabs
+  end
+
+  def test_close_tabs_with_options
+    assert_equal '</ul>', @builder.close_tabs(:foo => "bar")
+  end
+
+
   def test_should_implement_builder
     assert_equal(TabsOnRails::Tabs::Builder, TabsOnRails::Tabs::TabsBuilder.superclass)
   end

data/test/test_helper.rb

@@ -1,8 +1,6 @@
-
-
 require 'rubygems'
 gem     'rails', '~>2.3.0'
-gem     'mocha', '0.9.7'
+gem     'mocha', '~>0.9.7'
 
 # Remember! Due to some Mocha internal changes,
 # Rails 2.2.x requires Mocha 0.9.5 and
@@ -10,12 +8,9 @@ gem     'mocha', '0.9.7'
 # gem     'rails', '2.2.2'
 # gem     'mocha', '0.9.5'
 
-require 'mocha'
 require 'test/unit'
 require 'active_support'
 require 'action_controller'
-require 'action_controller/cgi_ext'
-require 'action_controller/test_process'
 require 'action_view/test_case'
 
 $:.unshift File.dirname(__FILE__) + '/../lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tabs_on_rails
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Simone Carletti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +02:00
+date: 2009-10-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.8"
+        version: 0.8.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "3.1"
+        version: 3.2.0
     version: 
 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
@@ -40,36 +40,41 @@ extensions: []
 
 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
-- lib/tabs_on_rails.rb
-- LICENSE.rdoc
-- README.rdoc
+- tasks/tabs_on_rails_tasks.rake
 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
-- 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/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
 has_rdoc: true
 homepage: http://code.simonecarletti.com/tabsonrails
 licenses: []
@@ -104,10 +109,9 @@ signing_key:
 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_mixin_with_controller_test.rb
-- test/tabs_builder_test.rb
-- test/tabs_on_rails_test.rb
+- test/tabs/builder_test.rb
+- test/tabs/tabs_builder_test.rb
 - test/test_helper.rb

data/test/tabs_on_rails_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class TabsOnRailsTest < ActiveSupport::TestCase
-
-  def test_nothing_because_I_have_the_other_test_files
-    assert true
-  end
-
-end