simple-navigation 2.7.2 → 2.7.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+*2.7.3
+
+* initializing SimpleNavigation.config_file_path with empty array (was nil before). Allows for adding paths before gem has been initialized.
+
 *2.7.2
 
 * added ability to have more than one config_file_path (useful if simple-navigation is used as a part of another gem/plugin). Credits to Luke Imhoff.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 3
 :major: 2
 :minor: 7
-:patch: 2

data/lib/simple_navigation.rb

@@ -19,6 +19,7 @@ module SimpleNavigation
   mattr_accessor :config_files, :config_file_paths, :default_renderer, :controller, :template, :explicit_current_navigation, :rails_env, :rails_root, :registered_renderers
 
   self.config_files = {}
+  self.config_file_paths = []
   self.registered_renderers = {
     :list         => SimpleNavigation::Renderer::List,
     :links        => SimpleNavigation::Renderer::Links,
@@ -30,7 +31,7 @@ module SimpleNavigation
 
     # Sets the config file path and installs the ControllerMethods in ActionController::Base.
     def init_rails
-      SimpleNavigation.config_file_paths ||= [SimpleNavigation.default_config_file_path]
+      SimpleNavigation.config_file_paths << SimpleNavigation.default_config_file_path
       ActionController::Base.send(:include, SimpleNavigation::ControllerMethods)
     end
   

data/spec/lib/simple_navigation_spec.rb

@@ -1,16 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe SimpleNavigation do
-  
-  describe 'config_files' do
-    before(:each) do
-      SimpleNavigation.config_files = {}
-    end
-    it "should be an empty hash after loading the module" do
-      SimpleNavigation.config_files.should == {}
-    end
-  end
-  
+    
   describe 'config_file_name' do
     context 'for :default navigation_context' do
       it "should return the name of the default config file" do
@@ -188,6 +179,7 @@ describe SimpleNavigation do
 
   describe 'self.init_rails' do
     before(:each) do
+      SimpleNavigation.config_file_paths = []
       SimpleNavigation.stub!(:default_config_file_path => 'default_path')
       ActionController::Base.stub!(:include)
     end
@@ -195,15 +187,12 @@ describe SimpleNavigation do
       before(:each) do
         SimpleNavigation.config_file_path = 'my_path'
       end
-      it "should not override the config_file_path" do
+      it "should have both the default_path and the new path" do
         SimpleNavigation.init_rails
-        SimpleNavigation.config_file_paths.should == ['my_path']
+        SimpleNavigation.config_file_paths.should == ['my_path', 'default_path']
       end
     end
     context 'SimpleNavigation.config_file_paths are not set' do
-      before(:each) do
-        SimpleNavigation.config_file_paths = nil
-      end
       it "should set the config_file_path to the default" do
         SimpleNavigation.init_rails
         SimpleNavigation.config_file_paths.should == ['default_path']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple-navigation
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 2
   - 7
-  - 2
-  version: 2.7.2
+  - 3
+  version: 2.7.3
 platform: ruby
 authors: 
 - Andi Schacke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency