simple-navigation 1.1.1 → 1.1.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+*1.1.2
+
+* Bugfix: config now gets evaluated on every render_navigation call. Credits to Joël Azémar.
+* Config file gets reloaded on every render_navigation call in development mode. Only load config file on server start in production mode.
+
+
 *1.1.1
 
 * Change plugin into a GemPlugin

data/Rakefile

@@ -52,7 +52,7 @@ begin
         )
 
         host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/simple-navigation/"
+        remote_dir = "/var/www/gforge-projects/andi/"
         local_dir = 'rdoc'
 
         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload

data/VERSION.yml

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

data/lib/simple_navigation/helpers.rb

@@ -23,7 +23,8 @@ module SimpleNavigation
     # 
     # :primary which only renders the primary_navigation (also see render_primary_navigation) and :secondary which only renders the sub_navigation (see render_sub_navigation).
     def render_navigation(level = :nested)
-      SimpleNavigation::Configuration.eval_config(self) unless SimpleNavigation.config.loaded?
+      SimpleNavigation.load_config unless ::RAILS_ENV == 'production'
+      SimpleNavigation::Configuration.eval_config(self)
       case level
       when :primary:
         SimpleNavigation.primary_navigation.render(@current_primary_navigation)

data/lib/simple_navigation.rb

@@ -2,10 +2,13 @@
 module SimpleNavigation
 
   mattr_accessor :config_file
+  mattr_accessor :config_file_path
   
   # Reads the specified config_file and stores it for later evaluation.
-  def self.load_config(config_file)
-    self.config_file = IO.read(config_file)
+  def self.load_config
+    raise "config_file_path is not set!" unless self.config_file_path
+    raise "Config file '#{config_file_path}' does not exists!" unless File.exists?(self.config_file_path)
+    self.config_file = IO.read(self.config_file_path)
   end
 
   # Returns the singleton instance of the SimpleNavigation::Configuration

data/rails/init.rb

@@ -1,3 +1,4 @@
-config_file_path = File.join(RAILS_ROOT, 'config', 'navigation.rb')
-SimpleNavigation.load_config(config_file_path) if File.exists?(config_file_path)
+default_config_file_path = File.join(RAILS_ROOT, 'config', 'navigation.rb')
+SimpleNavigation.config_file_path = default_config_file_path unless SimpleNavigation.config_file_path
+SimpleNavigation.load_config
 ActionController::Base.send(:include, SimpleNavigation::ControllerMethods)

data/spec/lib/{configuration_spec.rb → simple_navigation/configuration_spec.rb}

@@ -1,29 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe SimpleNavigation do
-
-  describe 'load_config' do
-        
-    before(:each) do
-      @config_file = '"my_navigation_config"'
-      IO.stub!(:read).and_return(@config_file)
-    end
-    
-    it "should load the navigation-configfile into a string" do
-      IO.should_receive(:read).with('./config/navigation.rb')
-      SimpleNavigation.load_config('./config/navigation.rb')
-    end
-    it "should store that string in a module-var" do
-      SimpleNavigation.load_config('./config/navigation.rb')
-      SimpleNavigation.config_file.should == @config_file
-    end
-  end
-  
-  describe 'config' do
-    it {SimpleNavigation.config.should == SimpleNavigation::Configuration.instance}
-  end
-  
-end
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe SimpleNavigation::Configuration do
   

data/spec/lib/{controller_methods_spec.rb → simple_navigation/controller_methods_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 ActionController::Base.send(:include, SimpleNavigation::ControllerMethods)
 

data/spec/lib/{helpers_spec.rb → simple_navigation/helpers_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe SimpleNavigation::Helpers do
   class ControllerMock
@@ -7,12 +7,61 @@ describe SimpleNavigation::Helpers do
   
   before(:each) do
     @controller = ControllerMock.new
-    SimpleNavigation.config.stub!(:loaded?).and_return(true)
-    @primary_navigation = stub(:primary_navigation)
+    SimpleNavigation.stub!(:load_config)
+    SimpleNavigation::Configuration.stub!(:eval_config)
+    @primary_navigation = stub(:primary_navigation, :null_object => true)
     SimpleNavigation.stub!(:primary_navigation).and_return(@primary_navigation)
   end
   
   describe 'render_navigation' do
+    describe 'regarding loading of the config-file' do
+      context "RAILS_ENV undefined" do
+        before(:each) do
+          ::RAILS_ENV = nil
+        end
+        it "should load the config file" do
+          SimpleNavigation.should_receive(:load_config)
+          @controller.render_navigation
+        end
+      end
+      context "RAILS_ENV defined" do
+        before(:each) do
+          ::RAILS_ENV = 'production'
+        end
+        context "RAILS_ENV=production" do
+          it "should not load the config file" do
+            SimpleNavigation.should_not_receive(:load_config)
+            @controller.render_navigation          
+          end
+        end
+        
+        context "RAILS_ENV=development" do
+          before(:each) do
+            ::RAILS_ENV = 'development'
+          end
+          it "should load the config file" do
+            SimpleNavigation.should_receive(:load_config)
+            @controller.render_navigation
+          end
+        end
+        
+        context "RAILS_ENV=test" do
+          before(:each) do
+            ::RAILS_ENV = 'test'
+          end
+          it "should load the config file" do
+            SimpleNavigation.should_receive(:load_config)
+            @controller.render_navigation
+          end
+        end
+      end
+    end
+    
+    it "should eval the config on every request" do
+      SimpleNavigation::Configuration.should_receive(:eval_config).with(@controller)
+      @controller.render_navigation
+    end
+    
     context 'primary' do
       before(:each) do
         @controller.instance_variable_set(:@current_primary_navigation, :current_primary)

data/spec/lib/{item_container_spec.rb → simple_navigation/item_container_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe SimpleNavigation::ItemContainer do  
   before(:each) do

data/spec/lib/{item_spec.rb → simple_navigation/item_spec.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe SimpleNavigation::Item do
   

data/spec/lib/{renderer → simple_navigation/renderer}/base_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe SimpleNavigation::Renderer::Base do
   before(:each) do

data/spec/lib/{renderer → simple_navigation/renderer}/list_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'html/document' unless defined? HTML::Document
 
 describe SimpleNavigation::Renderer::List do

data/spec/lib/simple_navigation_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe SimpleNavigation do
+  describe 'load_config' do
+    context 'config_file_path is set' do
+      before(:each) do
+        SimpleNavigation.config_file_path = 'path_to_config'
+      end
+      
+      context 'config_file does exist' do
+        before(:each) do
+          File.stub!(:exists?).and_return(true)
+          IO.stub!(:read).and_return('file_content')
+        end
+        it "should not raise an error" do
+          lambda{SimpleNavigation.load_config}.should_not raise_error
+        end
+        it "should read the config file from disc" do
+          IO.should_receive(:read).with('path_to_config')
+          SimpleNavigation.load_config
+        end
+        it "should store the read content in the module" do
+          SimpleNavigation.should_receive(:config_file=).with('file_content')
+          SimpleNavigation.load_config
+        end
+      end
+      
+      context 'config_file does not exist' do
+        before(:each) do
+          File.stub!(:exists?).and_return(false)
+        end
+        it {lambda{SimpleNavigation.load_config}.should raise_error}
+      end
+    end
+    
+    context 'config_file_path is not set' do
+      before(:each) do
+        SimpleNavigation.config_file_path = nil
+      end
+      it {lambda{SimpleNavigation.load_config}.should raise_error}
+    end
+  end
+  
+  describe 'config' do
+    it {SimpleNavigation.config.should == SimpleNavigation::Configuration.instance}
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 ENV["RAILS_ENV"] = "test"
+RAILS_ENV = "test"
 require 'rubygems'
 require 'spec'
 require 'active_support'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple-navigation
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Andi Schacke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-14 00:00:00 +02:00
+date: 2009-04-18 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -37,13 +37,14 @@ files:
 - lib/simple_navigation/renderer/base.rb
 - lib/simple_navigation/renderer/list.rb
 - rails/init.rb
-- spec/lib/configuration_spec.rb
-- spec/lib/controller_methods_spec.rb
-- spec/lib/helpers_spec.rb
-- spec/lib/item_container_spec.rb
-- spec/lib/item_spec.rb
-- spec/lib/renderer/base_spec.rb
-- spec/lib/renderer/list_spec.rb
+- spec/lib/simple_navigation/configuration_spec.rb
+- spec/lib/simple_navigation/controller_methods_spec.rb
+- spec/lib/simple_navigation/helpers_spec.rb
+- spec/lib/simple_navigation/item_container_spec.rb
+- spec/lib/simple_navigation/item_spec.rb
+- spec/lib/simple_navigation/renderer/base_spec.rb
+- spec/lib/simple_navigation/renderer/list_spec.rb
+- spec/lib/simple_navigation_spec.rb
 - spec/spec_helper.rb
 - README
 has_rdoc: true
@@ -74,11 +75,12 @@ signing_key:
 specification_version: 2
 summary: Simple Navigation is a ruby library for creating a navigation (optionally with sub navigation) for your rails app.
 test_files: 
-- spec/lib/configuration_spec.rb
-- spec/lib/controller_methods_spec.rb
-- spec/lib/helpers_spec.rb
-- spec/lib/item_container_spec.rb
-- spec/lib/item_spec.rb
-- spec/lib/renderer/base_spec.rb
-- spec/lib/renderer/list_spec.rb
+- spec/lib/simple_navigation/configuration_spec.rb
+- spec/lib/simple_navigation/controller_methods_spec.rb
+- spec/lib/simple_navigation/helpers_spec.rb
+- spec/lib/simple_navigation/item_container_spec.rb
+- spec/lib/simple_navigation/item_spec.rb
+- spec/lib/simple_navigation/renderer/base_spec.rb
+- spec/lib/simple_navigation/renderer/list_spec.rb
+- spec/lib/simple_navigation_spec.rb
 - spec/spec_helper.rb