simple-navigation 2.5.0 → 2.5.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+*2.5.1
+
+* set template correctly for Rails3 (brings auto highlighting to life again). Credits to Josep Jaume Rey.
+
 *2.5.0
 
 * added new renderer Renderer::Links to simply render the navigation as links inside a div.

data/VERSION.yml

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

data/lib/simple_navigation.rb

@@ -47,7 +47,7 @@ module SimpleNavigation
 
     def set_template_from(context)
       SimpleNavigation.controller = extract_controller_from context
-      SimpleNavigation.template = SimpleNavigation.controller.instance_variable_get(:@template)
+      SimpleNavigation.template = SimpleNavigation.controller.instance_variable_get(:@template) || (SimpleNavigation.controller.respond_to?(:view_context) ? SimpleNavigation.controller.view_context : nil)
     end
 
     # Returns the context in which the config file should be evaluated.

data/spec/lib/simple_navigation_spec.rb

@@ -58,18 +58,52 @@ describe SimpleNavigation do
       @context = stub :context
       SimpleNavigation.stub!(:extract_controller_from => @controller)
     end
-    it "should set the controller" do
-      @controller = stub(:controller)
-      SimpleNavigation.should_receive(:extract_controller_from).with(@context).and_return(@controller)
-      SimpleNavigation.should_receive(:controller=).with(@controller)
-      SimpleNavigation.set_template_from @context
+    context 'regarding setting the controller' do
+      it "should set the controller" do
+        @controller = Object.new
+        SimpleNavigation.should_receive(:extract_controller_from).with(@context).and_return(@controller)
+        SimpleNavigation.should_receive(:controller=).with(@controller)
+        SimpleNavigation.set_template_from @context
+      end
     end
-    it "should set the template" do
-      @template = stub(:template)
-      @controller = stub(:controller, :instance_variable_get => @template)
-      SimpleNavigation.stub!(:controller => @controller)
-      SimpleNavigation.should_receive(:template=).with(@template)
-      SimpleNavigation.set_template_from @context
+    context 'regarding setting the template' do
+      before(:each) do
+        @template = stub :template
+        @controller = Object.new
+        SimpleNavigation.stub!(:controller => @controller)
+      end
+      context 'template is stored in controller as instance_var (Rails2)' do
+        context 'template is set' do
+          before(:each) do
+            @controller.stub!(:instance_variable_get => @template)
+          end
+          it {SimpleNavigation.should_receive(:template=).with(@template)}
+         end
+        context 'template is not set' do
+          before(:each) do
+            @controller.stub!(:instance_variable_get => nil)
+          end
+          it {SimpleNavigation.should_receive(:template=).with(nil)}
+        end
+      end
+      context 'template is stored in controller as view_context (Rails3)' do
+        context 'template is set' do
+          before(:each) do            
+            @controller.stub!(:view_context => @template)
+          end
+          it {SimpleNavigation.should_receive(:template=).with(@template)}
+        end
+        context 'template is not set' do
+          before(:each) do            
+            @controller.stub!(:view_context => nil)
+          end
+          it {SimpleNavigation.should_receive(:template=).with(nil)}
+        end
+      end
+      after(:each) do
+        SimpleNavigation.set_template_from @context
+      end
+      
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Andi Schacke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +02:00
+date: 2010-04-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency