simple-navigation 3.9.0 → 3.10.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+*3.10.0
+
+* Added ability to set selected_class on container level. Credits to Joost Hietbrink.
+* do not highlight items that are only partial matches. Thanks to Troy Thompson.
+* adding support for rails 4. Credits to Samer Masry.
+
 *3.9.0
 
 * Added ability to pass a block to render_navigation for configuring dynamic navigation items (instead of passing :items). Credits to Ronald Chan.

data/Gemfile

@@ -12,4 +12,5 @@ group :development do
   gem 'rspec', '>= 2.0.1'
   gem 'rake'
   gem 'rdoc'
+  gem 'jeweler'
 end

data/VERSION

@@ -1 +1 @@
-3.9.0
+3.10.0

data/lib/simple_navigation/adapters/rails.rb

@@ -49,15 +49,15 @@ module SimpleNavigation
       protected
       
       def self.rails_root
-        rails3? ? ::Rails.root : ::RAILS_ROOT
+        gte_rails3? ? ::Rails.root : ::RAILS_ROOT
       end
       
       def self.rails_env
-        rails3? ? ::Rails.env : ::RAILS_ENV
+        gte_rails3? ? ::Rails.env : ::RAILS_ENV
       end
       
-      def self.rails3?
-        ::Rails::VERSION::MAJOR == 3
+      def self.gte_rails3?
+        ::Rails::VERSION::MAJOR >= 3
       end
       
       def template_from(controller)
@@ -82,7 +82,7 @@ module SimpleNavigation
 end
 
 # Initializer for Rails3
-if defined?(Rails) && Rails::VERSION::MAJOR == 3
+if defined?(Rails) && SimpleNavigation::Adapters::Rails.gte_rails3?
   module SimpleNavigation                                                                                                
     class Railtie < Rails::Railtie                                                                                       
       initializer "simple_navigation.register" do |app|                                                             

data/lib/simple_navigation/core/item.rb

@@ -13,6 +13,7 @@ module SimpleNavigation
       options = setup_url_and_options(url_or_options, options_or_nil)
       @container.dom_class = options.delete(:container_class) if options[:container_class]
       @container.dom_id = options.delete(:container_id) if options[:container_id]
+      @container.selected_class = options.delete(:selected_class) if options[:selected_class]
       @key = key
       @method = options.delete(:method)
       @name = name
@@ -65,7 +66,7 @@ module SimpleNavigation
     # Returns the configured selected_class if the item is selected,
     # nil otherwise
     def selected_class
-      selected? ? SimpleNavigation.config.selected_class : nil
+      selected? ? (@container.selected_class || SimpleNavigation.config.selected_class) : nil
     end
 
     protected
@@ -88,7 +89,7 @@ module SimpleNavigation
         when Proc
           highlights_on.call
         when :subpath
-          !!(SimpleNavigation.request_uri =~ /^#{Regexp.escape url_without_anchor}/)
+          !!(SimpleNavigation.request_uri =~ /^#{Regexp.escape url_without_anchor}(\/|$|\?)/i)
         else
           raise ArgumentError, ':highlights_on must be a Regexp, Proc or :subpath'
         end

data/lib/simple_navigation/core/item_container.rb

@@ -4,7 +4,7 @@ module SimpleNavigation
   class ItemContainer
 
     attr_reader :items, :level
-    attr_accessor :renderer, :dom_id, :dom_class, :auto_highlight
+    attr_accessor :renderer, :dom_id, :dom_class, :auto_highlight, :selected_class
 
     def initialize(level=1) #:nodoc:
       @level = level

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe SimpleNavigation::Item do
 
   before(:each) do
-    @item_container = stub(:item_container, :level => 1).as_null_object
+    @item_container = stub(:item_container, :level => 1, :selected_class => nil).as_null_object
     @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', 'url', {})
     @adapter = stub(:adapter)
     SimpleNavigation.stub!(:adapter => @adapter)
@@ -215,6 +215,14 @@ describe SimpleNavigation::Item do
   end
 
   describe 'selected_class' do
+    context 'selected_class is defined in context' do
+      before(:each) do
+        @item_container = stub(:item_container, :level => 1, :selected_class => 'context_defined').as_null_object
+        @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', 'url', {})
+        @item.stub!(:selected? => true)
+      end
+      it {@item.instance_eval {selected_class.should == 'context_defined'}}
+    end
     context 'item is selected' do
       before(:each) do
         @item.stub!(:selected? => true)
@@ -389,6 +397,12 @@ describe SimpleNavigation::Item do
           end
           it {@item.send(:selected_by_condition?).should be_true}
         end
+        context 'we are in a route that has a similar name' do
+          before(:each) do
+            SimpleNavigation.stub!(:request_uri => '/resources_group/id')
+          end
+          it {@item.send(:selected_by_condition?).should be_false}
+        end
         context 'we are in a route not beginning with this item path' do
           before(:each) do
             SimpleNavigation.stub!(:request_uri => '/another_resource/id')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,6 +76,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: With the simple-navigation gem installed you can easily create multilevel
   navigations for your Rails, Sinatra or Padrino applications. The navigation is defined
   in a single configuration file. It supports automatic as well as explicit highlighting