simple-navigation 3.3.4 → 3.4.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+*3.4.0
+
+* Added Gemfile for easier development with Bundler. Thanks to Josep Jaume.
+* modified :highlights_on option to accept a :subpath option (as well as Proc and Regexp forms). This can be used to automatically highlight an item even for items within a subpath.  Thanks to Josep Jaume.
+
 *3.3.4
 
 * modified :highlights_on option to accept a Proc (as well as the existing Regexp form). This can be used to provide specific highlighting conditions inline. Thanks to superlou for sparking the idea for the concept.

data/Gemfile

@@ -0,0 +1,5 @@
+source :rubygems
+gem 'actionpack'
+gem 'rspec'
+gem 'rake'
+gem 'rdoc'

data/Rakefile

@@ -40,7 +40,7 @@ begin
     gemspec.add_dependency('activesupport', '>= 2.3.2')
     gemspec.authors = ["Andi Schacke", "Mark J. Titorenko"]
     gemspec.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-    gemspec.files = FileList["[A-Z]*", "{lib,spec,rails,generators}/**/*"] - FileList["**/*.log"]
+    gemspec.files = FileList["[A-Z]*", "{lib,spec,rails,generators}/**/*"] - FileList["**/*.log", "Gemfile.lock"]
     gemspec.rubyforge_project = 'andi'
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-3.3.4
+3.4.0

data/lib/simple_navigation/core/item.rb

@@ -83,8 +83,10 @@ module SimpleNavigation
           SimpleNavigation.request_uri =~ highlights_on
         when Proc
           highlights_on.call
+        when :subpath
+          !!(SimpleNavigation.request_uri =~ /^#{Regexp.escape url_without_anchor}/)
         else
-          raise ArgumentError, ':highlights_on must be a Regexp or Proc'
+          raise ArgumentError, ':highlights_on must be a Regexp, Proc or :subpath'
         end
       elsif auto_highlight?
         !!(root_path_match? || SimpleNavigation.current_page?(url_without_anchor))
@@ -114,7 +116,7 @@ module SimpleNavigation
     end
 
     def url_without_anchor
-      url.split('#').first  
+      url.split('#').first
     end
 
   end

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

@@ -67,7 +67,7 @@ describe SimpleNavigation::Item do
         end
       end
     end
-    
+
     context 'setting class and id on the container' do
       before(:each) do
         @options = {:container_class => 'container_class', :container_id => 'container_id'}
@@ -100,27 +100,27 @@ describe SimpleNavigation::Item do
         end
       end
     end
-    
+
     context 'url' do
       context 'url is a string' do
         before(:each) do
-          @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', 'url', {})  
+          @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', 'url', {})
         end
         it {@item.url.should == 'url'}
       end
       context 'url is a proc' do
         before(:each) do
-          @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', Proc.new {"my_" + "url"}, {})  
+          @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', Proc.new {"my_" + "url"}, {})
         end
         it {@item.url.should == 'my_url'}
       end
     end
-    
+
   end
 
   describe 'name' do
     before(:each) do
-      SimpleNavigation.config.stub!(:name_generator => Proc.new {|name| "<span>#{name}</span>"})  
+      SimpleNavigation.config.stub!(:name_generator => Proc.new {|name| "<span>#{name}</span>"})
     end
     context 'default (generator is applied)' do
       it {@item.name.should == "<span>name</span>"}
@@ -335,6 +335,24 @@ describe SimpleNavigation::Item do
           it {@item.send(:selected_by_condition?).should be_false}
         end
       end
+      context ':highlights_on is :subpath' do
+        before(:each) do
+          @item.stub!(:url => '/resources')
+          @item.stub!(:highlights_on => :subpath)
+        end
+        context 'we are in a route beginning with this item path' do
+          before(:each) do
+            SimpleNavigation.stub!(:request_uri => '/resources/id')
+          end
+          it {@item.send(:selected_by_condition?).should be_true}
+        end
+        context 'we are in a route not beginning with this item path' do
+          before(:each) do
+            SimpleNavigation.stub!(:request_uri => '/another_resource/id')
+          end
+          it {@item.send(:selected_by_condition?).should be_false}
+        end
+      end
       context ':highlights_on is not a regexp or a proc' do
         before(:each) do
           @item.stub!(:highlights_on => "not a regexp")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-11 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-08-05 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70351130084240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70351130084240
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70351130083760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70351130083760
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70351130083280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70351130083280
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70351130082800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70351130082800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152960620 !ruby/object:Gem::Requirement
+  requirement: &70351130082320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +66,10 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *2152960620
+  version_requirements: *70351130082320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152959780 !ruby/object:Gem::Requirement
+  requirement: &70351130081840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +77,7 @@ dependencies:
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152959780
+  version_requirements: *70351130081840
 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
@@ -46,6 +89,7 @@ extra_rdoc_files:
 - README
 files:
 - CHANGELOG
+- Gemfile
 - README
 - Rakefile
 - VERSION
@@ -92,7 +136,6 @@ files:
 - spec/lib/simple_navigation/rendering/renderer/text_spec.rb
 - spec/lib/simple_navigation_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/andi/simple-navigation
 licenses: []
 post_install_message: 
@@ -115,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: andi
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: simple-navigation is a ruby library for creating navigations (with multiple