test/builders/builder_test.rb test/builders/tabs_builder_test.rb test/fixtures/mixin/default.html.erb test/fixtures/mixin/with_open_close_tabs.html.erb @@ -1,6 +1,11 @@ = Changelog +== next mini + +* ADDED: Ability to pass arbitrary options to open_tabs and close_tags method. Thanks to aaronchi (closes #315) + + == 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) CHANGELOG.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 README.rdoc @@ -115,6 +115,10 @@ 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) || {} unless options.is_a?(Hash) ActiveSupport::Deprecation.warn('tabs_tag takes a Hash of options, no longer a builder class. Use :builder => BuilderClass.', caller) @@ -122,9 +126,9 @@ module TabsOnRails 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 lib/tabs_on_rails/controller_mixin.rb @@ -67,11 +67,11 @@ module TabsOnRails end # Overwrite this method to use a custom open tag for your tabs. - def open_tabs + def open_tabs(*args) end # Overwrite this method to use a custom close tag for your tabs. - def close_tabs + def close_tabs(*args) end end @@ -83,7 +83,7 @@ module TabsOnRails # 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. @@ -104,13 +104,34 @@ module TabsOnRails end # Implements Builder#open_tabs. - def open_tabs - '<ul>' + # + # 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. - def close_tabs - '</ul>' + # + # 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 @@ -122,8 +143,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 lib/tabs_on_rails/tabs.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', '#') test/controller_mixin_helpers_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 test/controller_mixin_with_controller_test.rb test/builder_test.rb test/fixtures/mixin/standard.html.erb test/tabs_builder_test.rb 4620a00a665b5afd089a3bde564a96a9d8968de8 Simone Carletti weppos@weppos.net http://github.com/weppos/tabs_on_rails/commit/6d1c197ba8ba87b6f38d7a8deb7f4fe4889cfe66 6d1c197ba8ba87b6f38d7a8deb7f4fe4889cfe66 2009-10-28T11:31:21-07:00 2009-10-28T11:31:21-07:00 Added ability to pass arbitrary options to open_tabs and close_tags method. Thanks to aaronchi (closes #315) 36357d9239d6414c1c00a9385ca47b8d68da42f9 Simone Carletti weppos@weppos.net