innetra-easy_navigation 1.0.8 → 2.0.0

data/Rakefile

@@ -2,8 +2,8 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('easy_navigation', '1.0.8') do |e|
-  e.description    = "Easy navigation for ruby on rails 2.2 (i18n)"
+Echoe.new('easy_navigation', '2.0.0') do |e|
+  e.description    = "Easy navigation for Ruby on Rails 2.2 (i18n)"
   e.url            = "http://github.com/innetra/easy_navigation"
   e.author         = "Ivan Torres"
   e.email          = "mexpolk@gmail.com"

data/easy_navigation.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_navigation}
-  s.version = "1.0.8"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Torres"]
-  s.date = %q{2008-12-19}
-  s.description = %q{Easy navigation for ruby on rails 2.2 (i18n)}
+  s.date = %q{2008-12-21}
+  s.description = %q{Easy navigation for Ruby on Rails 2.2 (i18n)}
   s.email = %q{mexpolk@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/easy_navigation.rb"]
   s.files = ["Manifest", "README.rdoc", "Rakefile", "init.rb", "lib/easy_navigation.rb", "easy_navigation.gemspec"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{easy_navigation}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Easy navigation for ruby on rails 2.2 (i18n)}
+  s.summary = %q{Easy navigation for Ruby on Rails 2.2 (i18n)}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/easy_navigation.rb

@@ -2,44 +2,65 @@ module EasyNavigation
 
   module Helper
   
-    def render_navigation(name)
-    
-      html = ""
-      class_name = ""
+    def easy_navigation(name, options = {})
+
+      navigation_class_name = (options[:navigation_class] || "navigation").to_s
+      tab_class_name = (options[:tab_class] || "tab").to_s
+      menu_class_name = (options[:menu_class] || "menu").to_s
+      separator_class_name = (options[:separator_class] || "separator").to_s
+      separator = options[:separator] || false
+
+      tabs_html = ""
       
       EasyNavigation::Builder.navigation[name][:tabs].each do |tab|
         menus_html = ""
         current_tab = false
         tab[:menus].each do |menu|
-          class_name = "menu"
-          if current_menu?(menu)
-            class_name << " current"
+          if current = current_menu?(menu)
             current_tab = true
-          end 
-          menus_html << content_tag("li", link_to(t(menu[:text]), menu[:url]), 
-            :class => class_name, :id => menu[:name])
-         if EasyNavigation::Builder.navigation[name][:options][:separator]
-           menus_html << content_tag("li", "|", :class => "separator") 
-         end
+          end
+          menus_html << self.render_menu(menu[:name], menu[:text], 
+            menu[:url].merge!(:skip_relative_url_root => true), 
+            ("#{menu_class_name} current" if current) || menu_class_name)
+          if separator
+           menus_html << self.render_separator(separator_class_name)
+          end
         end
-        class_name = "tab"
-        class_name << " current" if current_tab
-        html << content_tag("li",
-          "#{link_to(t(tab[:text]), tab[:url])} #{content_tag("ul", menus_html)}", 
-          :class => class_name, :id => tab[:name])
+        tabs_html << self.render_tab(tab[:name], 
+          tab[:text], 
+          tab[:url].merge!(:skip_relative_url_root => true), 
+          menus_html, ("#{tab_class_name} current" if current_tab) || tab_class_name)
       end
-      content_tag("ul", html, :id => "navigation")
+      self.render_navigation("navigation_" << name.to_s, tabs_html, navigation_class_name)
+    end
+    
+    protected
+    
+    def render_separator(class_name)
+      content_tag("li", "|", :class => class_name)
+    end
+    
+    def render_menu(id, text, url, class_name)
+      content_tag("li", link_to(t(text), url), :id => id, :class => class_name)
+    end
+    
+    def render_tab(id, text, url, menus_html, class_name)
+      content_tag("li",
+        "#{link_to(t(text), url)} #{content_tag("ul", menus_html)}",
+        :id => id, :class => class_name)
+    end
+    
+    def render_navigation(id, tabs_html, class_name)
+      content_tag("ul", tabs_html, :id => id, :class => class_name)
     end
     
-    private
-
     def current_menu?(menu)
-      current = controller.controller_name == menu[:url][:controller] && 
+      current = controller.params[:controller] == menu[:url][:controller].gsub(/^\//, "") && 
         (controller.action_name == menu[:url][:action] || menu[:url][:action] == nil)
       if menu.has_key?:on 
          (menu[:on].is_a?(Array) ? menu[:on] : [menu[:on]]).each do |controllers|
           (controllers.is_a?(Array) ? controllers : [controllers]).each do |c|
-             current |= controller.controller_name == c[:controller]
+             current |= controller.params[:controller] == c[:controller].gsub(/^\//, "")
             if c.has_key?:only
               current &= (c[:only].is_a?(Array) ? c[:only] : [c[:only]]).include?controller.action_name
             end
@@ -79,7 +100,7 @@ module EasyNavigation
       end
         
       def navigation(name, options = {}, &block)
-        navigation = Navigation.new(name, options.merge!(:prefix => "easy_navigation"))
+        navigation = Navigation.new(name, options.merge!(:prefix => "navigation"))
         yield navigation
         self.navigations << navigation.build
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: innetra-easy_navigation
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
+  version: 2.0.0
 platform: ruby
 authors: 
 - Ivan Torres
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-19 00:00:00 -08:00
+date: 2008-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
-description: Easy navigation for ruby on rails 2.2 (i18n)
+description: Easy navigation for Ruby on Rails 2.2 (i18n)
 email: mexpolk@gmail.com
 executables: []
 
@@ -59,6 +59,6 @@ rubyforge_project: easy_navigation
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Easy navigation for ruby on rails 2.2 (i18n)
+summary: Easy navigation for Ruby on Rails 2.2 (i18n)
 test_files: []