simple-navigation 3.4.2 → 3.5.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.5.0
+
+* Added (configurable) "simple-navigation-active-leaf" class to last selected element and elements that have :highlights_on return true. Thanks to Frank Schumacher (thenoseman).
+
 *3.4.2
 
 * Improve Gemfile dependencies with :development and :rails groups.
@@ -218,4 +222,4 @@
 
 *1.1.1
 
-* Change plugin into a GemPlugin
+* Change plugin into a GemPlugin

data/VERSION

@@ -1 +1 @@
-3.4.2
+3.5.0

data/generators/navigation_config/templates/config/navigation.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Configures your navigation
 SimpleNavigation::Configuration.run do |navigation|
   # Specify a custom renderer if needed.
@@ -8,6 +9,10 @@ SimpleNavigation::Configuration.run do |navigation|
   # Specify the class that will be applied to active navigation items. Defaults to 'selected'
   # navigation.selected_class = 'your_selected_class'
 
+  # Specify the class that will be applied to the current leaf of
+  # active navigation items. Defaults to 'simple-navigation-active-leaf'
+  # navigation.active_leaf_class = 'your_active_leaf_class'
+
   # Item keys are normally added to list items as id.
   # This setting turns that off
   # navigation.autogenerate_item_ids = false
@@ -42,7 +47,7 @@ SimpleNavigation::Configuration.run do |navigation|
     #           :method - Specifies the http-method for the generated link - default is :get.
     #           :highlights_on - if autohighlighting is turned off and/or you want to explicitly specify
     #                            when the item should be highlighted, you can set a regexp which is matched
-    #                            against the current URI.
+    #                            against the current URI.  You may also use a proc, or the symbol <tt>:subpath</tt>. 
     #
     primary.item :key_1, 'name', url, options
 
@@ -68,4 +73,4 @@ SimpleNavigation::Configuration.run do |navigation|
 
   end
 
-end
+end

data/lib/simple_navigation/core/configuration.rb

@@ -6,7 +6,7 @@ module SimpleNavigation
   class Configuration
     include Singleton
 
-    attr_accessor :renderer, :selected_class, :autogenerate_item_ids, :id_generator, :auto_highlight, :name_generator
+    attr_accessor :renderer, :selected_class, :active_leaf_class, :autogenerate_item_ids, :id_generator, :auto_highlight, :name_generator
     attr_reader :primary_navigation
 
     class << self
@@ -27,6 +27,7 @@ module SimpleNavigation
     def initialize
       @renderer = SimpleNavigation.default_renderer || SimpleNavigation::Renderer::List
       @selected_class = 'selected'
+      @active_leaf_class = 'simple-navigation-active-leaf'
       @autogenerate_item_ids = true
       @id_generator = Proc.new {|id| id.to_s }
       @name_generator = Proc.new {|name| name}
@@ -68,4 +69,4 @@ module SimpleNavigation
         
   end  
   
-end
+end

data/lib/simple_navigation/core/item.rb

@@ -53,13 +53,19 @@ module SimpleNavigation
     def html_options
       default_options = self.autogenerate_item_ids? ? {:id => autogenerated_item_id} : {}
       options = default_options.merge(@html_options)
-      options[:class] = [@html_options[:class], self.selected_class].flatten.compact.join(' ')
+      options[:class] = [@html_options[:class], self.selected_class, self.active_leaf_class].flatten.compact.join(' ')
       options.delete(:class) if options[:class].nil? || options[:class] == ''
       options
     end
 
-    # Returns the configured selected_class if the item is selected, nil otherwise
-    #
+    # Returns the configured active_leaf_class if the item is the selected leaf,
+    # nil otherwise
+    def active_leaf_class
+      selected_by_condition? ? SimpleNavigation.config.active_leaf_class : nil
+    end
+
+    # Returns the configured selected_class if the item is selected,
+    # nil otherwise
     def selected_class
       selected? ? SimpleNavigation.config.selected_class : nil
     end

data/spec/lib/simple_navigation/core/configuration_spec.rb

@@ -43,6 +43,9 @@ describe SimpleNavigation::Configuration do
     it "should set the selected_class to 'selected' as default" do
       @config.selected_class.should == 'selected'
     end
+    it "should set the active_leaf_class to 'simple-navigation-active-leaf' as default" do
+      @config.active_leaf_class.should == 'simple-navigation-active-leaf'
+    end
     it "should set autogenerate_item_ids to true as default" do
       @config.autogenerate_item_ids.should be_true
     end

data/spec/lib/simple_navigation/core/item_spec.rb

@@ -197,14 +197,14 @@ describe SimpleNavigation::Item do
         end
         context 'with item selected' do
           before(:each) do
-            @item.stub!(:selected? => true)
+            @item.stub!(:selected? => true, :selected_by_condition? => true)
           end
-          it {@item.html_options[:class].should == 'my_class selected'}
+          it {@item.html_options[:class].should == 'my_class selected simple-navigation-active-leaf'}
         end
 
         context 'with item not selected' do
           before(:each) do
-            @item.stub!(:selected? => false)
+            @item.stub!(:selected? => false, :selected_by_condition? => false)
           end
           it {@item.html_options[:class].should == 'my_class'}
         end
@@ -217,25 +217,26 @@ describe SimpleNavigation::Item do
         end
         context 'with item selected' do
           before(:each) do
-            @item.stub!(:selected? => true)
+            @item.stub!(:selected? => true, :selected_by_condition? => true)
           end
-          it {@item.html_options[:class].should == 'selected'}
+          it {@item.html_options[:class].should == 'selected simple-navigation-active-leaf'}
         end
 
         context 'with item not selected' do
           before(:each) do
-            @item.stub!(:selected? => false)
+            @item.stub!(:selected? => false, :selected_by_condition? => false)
           end
           it {@item.html_options[:class].should be_blank}
         end
       end
+
     end
 
     describe 'id' do
       context 'with autogenerate_item_ids == true' do
         before(:each) do
           @item.stub!(:autogenerate_item_ids? => true)
-          @item.stub!(:selected? => false)
+          @item.stub!(:selected? => false, :selected_by_condition? => false)
         end
         context 'with id defined in options' do
           before(:each) do
@@ -255,7 +256,7 @@ describe SimpleNavigation::Item do
       context 'with autogenerate_item_ids == false' do
         before(:each) do
           @item.stub!(:autogenerate_item_ids? => false)
-          @item.stub!(:selected? => false)
+          @item.stub!(:selected? => false, :selected_by_condition? => false)
         end
         context 'with id defined in options' do
           before(:each) do
@@ -284,11 +285,11 @@ describe SimpleNavigation::Item do
         @item.stub!(:sub_navigation => @sub_navigation)
       end
       it "should return true if subnav is selected" do
-        @sub_navigation.stub!(:selected? => true)
+        @sub_navigation.stub!(:selected? => true, :selected_by_condition? => true)
         @item.should be_selected_by_subnav
       end
       it "should return false if subnav is not selected" do
-        @sub_navigation.stub!(:selected? => false)
+        @sub_navigation.stub!(:selected? => false, :selected_by_condition? => true)
         @item.should_not be_selected_by_subnav
       end
     end

data/spec/spec_helper.rb

@@ -56,7 +56,7 @@ def containers
   container.dom_id = 'nav_dom_id'
   container.dom_class = 'nav_dom_class'
   @items = primary_items.map {|params| SimpleNavigation::Item.new(container, *params)}
-  @items.each {|i| i.stub!(:selected? => false)}
+  @items.each {|i| i.stub!(:selected? => false, :selected_by_condition? => false)}
   container.instance_variable_set(:@items, @items)
   sub_container = subnav_container
   primary_item(:invoices) {|item| item.instance_variable_set(:@sub_navigation, sub_container)}
@@ -79,14 +79,14 @@ def select_item(key)
       item.instance_variable_get(:@sub_navigation).items.find { |i| i.key == key}.stub!(:selected? => true)
     end
   else
-    primary_item(key) {|item| item.stub!(:selected? => true) unless item.frozen?}
+    primary_item(key) {|item| item.stub!(:selected? => true, :selected_by_condition? => true) unless item.frozen?}
   end
 end
 
 def subnav_container
   container = SimpleNavigation::ItemContainer.new(2)
   items = sub_items.map {|params| SimpleNavigation::Item.new(container, *params)}
-  items.each {|i| i.stub!(:selected? => false)}
+  items.each {|i| i.stub!(:selected? => false, :selected_by_condition? => false)}
   container.instance_variable_set(:@items, items)
   container
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
-  - 4
-  - 2
-  version: 3.4.2
+  - 5
+  - 0
+  version: 3.5.0
 platform: ruby
 authors: 
 - Andi Schacke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +01:00
+date: 2011-08-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency