tabs_on_rails 2.1.1 → 2.2.0

data/.gitignore

@@ -1,4 +1,11 @@
+# Bundler
 .bundle
-.idea
 pkg/*
-rdoc
+Gemfile.lock
+
+# RVM
+.rvmrc
+
+# YARD
+.yardoc
+yardoc/

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 
+## Release 2.2.0
+
+* NEW: Ability to configure a default builder (GH-20). [Thanks @ilstar]
+
+* NEW: Ability to pass a custom value for the "active" class (GH-23). [Thanks @ruurd]
+
+
 ## Release 2.1.1
 
 * FIXED: An invalid replace command caused a bug in 2.1.0.

data/{LICENSE → LICENSE.txt}

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Simone Carletti
+Copyright (c) 2009-2013 Simone Carletti
 
 MIT License
 

data/README.md

@@ -64,12 +64,7 @@ Use the `current_tab` helper method if you need to access the value of current t
     # In your view
     <p>The name of current tab is <%= current_tab %>.</p>
 
-Read the [documentation](/code/tabs_on_rails/docs/) to learn more about advanced usage, builders and namespaces.
-
-
-## Credits
-
-* [Simone Carletti](http://www.simonecarletti.com/) <weppos@weppos.net> - The Author
+Read the [documentation](http://www.simonecarletti.com/code/tabs_on_rails/docs/) to learn more about advanced usage, builders and namespaces.
 
 
 ## Resources
@@ -83,4 +78,4 @@ Read the [documentation](/code/tabs_on_rails/docs/) to learn more about advanced
 
 ## License
 
-*TabsOnRails* is Copyright (c) 2009-2012 Simone Carletti. This is Free Software distributed under the MIT license.
+Copyright (c) 2009-2013 Simone Carletti. This is Free Software distributed under the MIT license.

data/Rakefile

@@ -29,7 +29,7 @@ spec = Gem::Specification.new do |s|
 
   s.add_development_dependency "rails", ">= 3.0"
   s.add_development_dependency "appraisal"
-  s.add_development_dependency "mocha", "~> 0.9.10"
+  s.add_development_dependency "mocha"
   s.add_development_dependency "yard"
 end
 

data/lib/tabs_on_rails.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/tabs_on_rails/action_controller.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -156,7 +156,15 @@ module TabsOnRails
       #   # In your view
       #   <p>The name of current tab is <%= current_tab %>.</p>
       #
-      # === Customizing a Tab
+      #
+      # == Options
+      #
+      # You can pass the following options:
+      #
+      # - <tt>builder</tt>: the custom builder to use
+      # - <tt>active_class</tt>: the custom CSS class to use for active links
+      #
+      # == Customizing a Tab
       #
       # You can pass a hash of options to customize the style and the behavior of the tab item.
       # Behind the scenes, each time you create a tab, the <tt>#tab_for</tt> 
@@ -175,13 +183,10 @@ module TabsOnRails
       #   </ul>
       #
       # You can pass any option supported by the <li>content_tag</li> Rails helper.
-      # Additionally, the following options have a special meaning:
-      #
-      # * <tt>link_current</tt>: forces the current tab to be a link, instead of a span tag
       #
       # See <tt>TabsOnRails::Tabs::TabsBuilder#tab_for</tt> for more details.
       #
-      # === Customizing open_tabs and close_tabs
+      # == Customizing open_tabs and close_tabs
       #
       # The open_tabs and the close_tabs methods can be customized 
       # with the <tt>:open_tabs</tt> and <tt>:close_tabs</tt> option.

data/lib/tabs_on_rails/railtie.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/tabs_on_rails/tabs.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -15,9 +15,12 @@ module TabsOnRails
 
   class Tabs
 
+    mattr_accessor :default_builder
+    @@default_builder = TabsBuilder
+
     def initialize(context, options = {})
       @context = context
-      @builder = (options.delete(:builder) || TabsBuilder).new(@context, options)
+      @builder = (options.delete(:builder) || self.class.default_builder).new(@context, options)
       @options = options
     end
 

data/lib/tabs_on_rails/tabs/builder.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 

data/lib/tabs_on_rails/tabs/tabs_builder.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -37,9 +37,9 @@ module TabsOnRails
       #
       # Implements Builder#tab_for.
       #
-      def tab_for(tab, name, options, item_options = {})
-        item_options[:class] = item_options[:class].to_s.split(" ").push("current").join(" ") if current_tab?(tab)
-        content = @context.link_to_unless(current_tab?(tab), name, options) do
+      def tab_for(tab, name, url_options, item_options = {})
+        item_options[:class] = item_options[:class].to_s.split(" ").push(@options[:active_class] || "current").join(" ") if current_tab?(tab)
+        content = @context.link_to_unless(current_tab?(tab), name, url_options) do
           @context.content_tag(:span, name)
         end
         @context.content_tag(:li, content, item_options)

data/lib/tabs_on_rails/version.rb

@@ -3,7 +3,7 @@
 #
 # A simple Ruby on Rails plugin for creating and managing Tabs.
 #
-# Copyright (c) 2009-2012 Simone Carletti <weppos@weppos.net>
+# Copyright (c) 2009-2013 Simone Carletti <weppos@weppos.net>
 #++
 
 
@@ -12,8 +12,8 @@ module TabsOnRails
   # Holds information about library version.
   module Version
     MAJOR = 2
-    MINOR = 1
-    PATCH = 1
+    MINOR = 2
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/tabs_on_rails.gemspec

@@ -6,13 +6,13 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simone Carletti"]
-  s.date = "2012-02-03"
+  s.date = "2012-05-25"
   s.description = "TabsOnRails is a simple Rails plugin for creating tabs and navigation menus."
   s.email = "weppos@weppos.net"
-  s.files = [".gemtest", ".gitignore", ".travis.yml", "Appraisals", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "README.md", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "init.rb", "lib/tabs_on_rails.rb", "lib/tabs_on_rails/action_controller.rb", "lib/tabs_on_rails/railtie.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", "tabs_on_rails.gemspec", "test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/tabs/builder_test.rb", "test/unit/tabs/tabs_builder_test.rb", "test/unit/tabs_test.rb", "test/views/working/default.html.erb", "test/views/working/with_item_block.html.erb", "test/views/working/with_item_options.html.erb", "test/views/working/with_open_close_tabs.html.erb"]
+  s.files = [".gemtest", ".gitignore", ".travis.yml", "Appraisals", "CHANGELOG.md", "Gemfile", "LICENSE", "README.md", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "init.rb", "lib/tabs_on_rails.rb", "lib/tabs_on_rails/action_controller.rb", "lib/tabs_on_rails/railtie.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", "tabs_on_rails.gemspec", "test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/tabs/builder_test.rb", "test/unit/tabs/tabs_builder_test.rb", "test/unit/tabs_test.rb", "test/views/working/default.html.erb", "test/views/working/with_item_block.html.erb", "test/views/working/with_item_options.html.erb", "test/views/working/with_open_close_tabs.html.erb"]
   s.homepage = "http://www.simonecarletti.com/code/tabs_on_rails"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.21"
   s.summary = "A simple Ruby on Rails plugin for creating tabs and navigation menus."
   s.test_files = ["test/dummy.rb", "test/test_helper.rb", "test/unit/action_controller_test.rb", "test/unit/tabs/builder_test.rb", "test/unit/tabs/tabs_builder_test.rb", "test/unit/tabs_test.rb", "test/views/working/default.html.erb", "test/views/working/with_item_block.html.erb", "test/views/working/with_item_options.html.erb", "test/views/working/with_open_close_tabs.html.erb"]
 
@@ -22,18 +22,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rails>, [">= 3.0"])
       s.add_development_dependency(%q<appraisal>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.11.0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0"])
       s.add_dependency(%q<appraisal>, [">= 0"])
-      s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+      s.add_dependency(%q<mocha>, ["~> 0.11.0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0"])
     s.add_dependency(%q<appraisal>, [">= 0"])
-    s.add_dependency(%q<mocha>, ["~> 0.9.10"])
+    s.add_dependency(%q<mocha>, ["~> 0.11.0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end

data/test/unit/action_controller_test.rb

@@ -105,13 +105,14 @@ class WorkingMixinTestController < ActionController::Base
     execute("action_welcome")
   end
 
+
   private
 
-    def execute(method)
-      if method.to_s =~ /^action_(.*)/
-        render :action => (params[:template] || 'default')
-      end
+  def execute(method)
+    if method.to_s =~ /^action_(.*)/
+      render :action => (params[:template] || 'default')
     end
+  end
 
 
   class BlockBuilder < TabsOnRails::Tabs::TabsBuilder
@@ -163,6 +164,14 @@ class WorkingMixinTest < ActionController::TestCase
 </li></ul>}, @response.body)
   end
 
+  def test_render_with_option_active_class
+    get :action_dashboard, :template => "with_option_active_class"
+    assert_dom_equal(%Q{<ul id="tabs">
+  <li class="active"><span>Dashboard</span></li>
+  <li><a href="/w">Welcome</a></li>
+</ul>}, @response.body)
+  end
+
 
   def test_set_tab
     get :action_dashboard

data/test/unit/tabs/tabs_builder_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class TabsBuilderTest < ActionView::TestCase
 
   def setup
-    @builder  = TabsOnRails::Tabs::TabsBuilder.new(self)
+    @builder = TabsOnRails::Tabs::TabsBuilder.new(self)
   end
 
   def test_inherits_from_builder
@@ -60,4 +60,13 @@ class TabsBuilderTest < ActionView::TestCase
                      @builder.tab_for(:welcome, "Welcome", "#", :style => "padding: 10px")
   end
 
+  def test_tab_for_with_option_active_class
+    @builder = TabsOnRails::Tabs::TabsBuilder.new(self, :active_class => "active")
+    assert_dom_equal %Q{<li class="active"><span>Dashboard</span></li>},
+                     @builder.tab_for(:dashboard, "Dashboard", "#")
+    assert_dom_equal %Q{<li class="custom active"><span>Dashboard</span></li>},
+                     @builder.tab_for(:dashboard, "Dashboard", "#", :class => "custom")
+    assert_dom_equal %Q{<li><a href="#">Welcome</a></li>},
+                     @builder.tab_for(:welcome, "Welcome", "#")
+  end
 end

data/test/unit/tabs_test.rb

@@ -43,6 +43,17 @@ class TabsTest < ActionView::TestCase
     assert_instance_of builder, @tabs.instance_variable_get(:"@builder")
   end
 
+  def test_initialize_with_default_builder
+    default_builder = TabsOnRails::Tabs.default_builder
+    TabsOnRails::Tabs.default_builder = CustomBuilder
+
+    custom_tab = TabsOnRails::Tabs.new(@template) # doesnt need argument :builder => CustomBuilder
+
+    assert_instance_of CustomBuilder, custom_tab.instance_variable_get(:"@builder")
+
+    TabsOnRails::Tabs.default_builder = default_builder
+  end
+
 
   def test_open_tabs
     assert_equal '<ul>', @tabs.open_tabs
@@ -91,4 +102,21 @@ class TabsTest < ActionView::TestCase
     assert_dom_equal expected, result
   end
 
+  class CustomBuilder < TabsOnRails::Tabs::Builder
+    def open_tabs(options = {})
+      @context.tag("ul", options, open = true)
+    end
+
+    def close_tabs(options = {})
+      "</ul>".html_safe
+    end
+
+    def tab_for(tab, name, options, item_options = {})
+      item_options[:class] = (current_tab?(tab) ? 'active' : '')
+      @context.content_tag(:li, item_options) do
+        @context.link_to(name, options)
+      end
+    end
+  end
+
 end

data/test/views/working/with_option_active_class.html.erb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabs_on_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70306225493560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70306225493560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70306225493040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306225493040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70306225492480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306225492480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70306225491980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70306225491980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TabsOnRails is a simple Rails plugin for creating tabs and navigation
   menus.
 email: weppos@weppos.net
@@ -68,8 +88,7 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/3.0.gemfile
@@ -97,6 +116,7 @@ files:
 - test/views/working/with_item_block.html.erb
 - test/views/working/with_item_options.html.erb
 - test/views/working/with_open_close_tabs.html.erb
+- test/views/working/with_option_active_class.html.erb
 homepage: http://www.simonecarletti.com/code/tabs_on_rails
 licenses: []
 post_install_message: 
@@ -109,6 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -246050836927131597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple Ruby on Rails plugin for creating tabs and navigation menus.
@@ -132,3 +155,4 @@ test_files:
 - test/views/working/with_item_block.html.erb
 - test/views/working/with_item_options.html.erb
 - test/views/working/with_open_close_tabs.html.erb
+- test/views/working/with_option_active_class.html.erb

data/Gemfile.lock

@@ -1,99 +0,0 @@
-PATH
-  remote: .
-  specs:
-    tabs_on_rails (2.1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
-      mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.1)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.1)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.4.0)
-      bundler
-      rake
-    arel (3.0.0)
-    builder (3.0.0)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.1)
-    json (1.6.5)
-    mail (2.4.1)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    mocha (0.9.12)
-    multi_json (1.0.4)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.1)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
-      bundler (~> 1.0)
-      railties (= 3.2.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    sprockets (2.1.2)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    yard (0.7.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  mocha (~> 0.9.10)
-  rails (>= 3.0)
-  tabs_on_rails!
-  yard