simple-navigation 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+*2.0.1
+
+* fixed handling of a non-existent explicit navigation item for a navigation context
+
 *2.0.0
 
 * added auto_highlight feature. Active navigation is determined by comparing urls, no need to explicitly set it in the controllers anymore. Thanks to Jack Dempsey and Florian Hanke for the support on this.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 2
 :minor: 0

data/lib/simple_navigation.rb

@@ -61,8 +61,13 @@ module SimpleNavigation
     # the correct instance variable in the controller.
     def handle_explicit_navigation
       if SimpleNavigation.explicit_navigation_args
-        level, navigation = parse_explicit_navigation_args
-        self.controller.instance_variable_set(:"@sn_current_navigation_#{level}", navigation)
+        begin
+          level, navigation = parse_explicit_navigation_args
+          self.controller.instance_variable_set(:"@sn_current_navigation_#{level}", navigation)
+        rescue
+          #we do nothing here
+          #TODO: check if this is the right way to handle wrong explicit navigation
+        end
       end
     end
 
@@ -78,7 +83,7 @@ module SimpleNavigation
         options = {}
         if args.size == 1 #only an navi-key has been specified, try to find out level
           level = SimpleNavigation.primary_navigation.level_for_item(args.first)
-          options[:"level_#{level}"] = args.first
+          options[:"level_#{level}"] = args.first if level
         else
           args.each_with_index {|arg, i| options[:"level_#{i + 1}"] = arg}
         end

data/simple-navigation.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple-navigation}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andi Schacke"]
-  s.date = %q{2009-10-10}
+  s.date = %q{2009-10-13}
   s.description = %q{With the simple-navigation gem installed you can easily create multilevel navigations for your Ruby on Rails applications. The navigation is defined in a single configuration file. It supports automatic as well as explicit highlighting of the currently active navigation.}
   s.email = %q{andreas.schacke@gmail.com}
   s.extra_rdoc_files = [

data/spec/lib/simple_navigation_spec.rb

@@ -180,14 +180,26 @@ describe SimpleNavigation do
         end
       end
       context 'single navigation' do
-        before(:each) do
-          @primary = stub(:primary, :level_for_item => 2)
-          SimpleNavigation.stub!(:primary_navigation => @primary)
-          args :key
+        context 'specified key is a valid navigation item' do
+          before(:each) do
+            @primary = stub(:primary, :level_for_item => 2)
+            SimpleNavigation.stub!(:primary_navigation => @primary)
+            args :key
+          end
+          it "should set the correct instance var in the controller" do
+            @controller.should_receive(:instance_variable_set).with(:@sn_current_navigation_2, :key)
+            SimpleNavigation.handle_explicit_navigation
+          end
         end
-        it "should set the correct instance var in the controller" do
-          @controller.should_receive(:instance_variable_set).with(:@sn_current_navigation_2, :key)
-          SimpleNavigation.handle_explicit_navigation
+        context 'specified key is an invalid navigation item' do
+          before(:each) do
+            @primary = stub(:primary, :level_for_item => nil)
+            SimpleNavigation.stub!(:primary_navigation => @primary)
+            args :key
+          end
+          it "should not raise an ArgumentError" do
+            lambda {SimpleNavigation.handle_explicit_navigation}.should_not raise_error(ArgumentError)
+          end
         end
       end
       context 'hash with level' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple-navigation
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Andi Schacke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +02:00
+date: 2009-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: []