simple-navigation 1.2.1 → 1.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*master
+
+* renderers now have access to request_forgery_protection stuff (this allows delete-links as navigation-items)
+
 *1.2.1
 
 * changed way to include render_*-helper_methods into view (including them into Controller and declaring them as helper_methods instead of adding whole module as Helper). this seems to be more reliable under certain conditions. Credits to Gernot Kogler.

data/VERSION.yml

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

data/lib/simple_navigation.rb

@@ -3,6 +3,7 @@ module SimpleNavigation
 
   mattr_accessor :config_file
   mattr_accessor :config_file_path
+  mattr_accessor :controller
   
   # Reads the specified config_file and stores it for later evaluation.
   def self.load_config

data/lib/simple_navigation/configuration.rb

@@ -10,15 +10,29 @@ module SimpleNavigation
     attr_accessor :selected_class
     attr_reader :primary_navigation
 
-    # Evals the config_file inside the specified context (usually a controller or view)
-    def self.eval_config(context)
-      context.instance_eval(SimpleNavigation.config_file)
-    end
+    class << self
 
-    # Starts processing the configuration
-    def self.run(&block)
-      block.call Configuration.instance
-    end    
+      # Evals the config_file inside the specified context (usually a controller or view)
+      def eval_config(context)
+        context.instance_eval(SimpleNavigation.config_file)
+        SimpleNavigation.controller = extract_controller_from context
+      end
+
+      # Starts processing the configuration
+      def run(&block)
+        block.call Configuration.instance
+      end    
+
+      # Extracts a controller from the context.
+      def extract_controller_from(context)
+        if context.respond_to? :controller
+          context.controller
+        else
+          context
+        end
+      end
+
+    end
     
     # Sets the config's default-settings
     def initialize
@@ -36,6 +50,7 @@ module SimpleNavigation
     def loaded?
       !@primary_navigation.nil?
     end    
+    
   end  
   
 end

data/lib/simple_navigation/item.rb

@@ -2,14 +2,15 @@ module SimpleNavigation
   
   # Represents an item in your navigation. Gets generated by the item method in the config-file.
   class Item
-    attr_reader :key, :name, :url, :sub_navigation
+    attr_reader :key, :name, :url, :sub_navigation, :method
     
     # see ItemContainer#item
-    def initialize(key, name, url, html_options, sub_nav_block)
+    def initialize(key, name, url, options, sub_nav_block)
       @key = key
+      @method = options.delete(:method)
       @name = name
       @url = url
-      @html_options = html_options
+      @html_options = options
       if sub_nav_block
         @sub_navigation = ItemContainer.new
         sub_nav_block.call @sub_navigation

data/lib/simple_navigation/renderer/base.rb

@@ -10,13 +10,27 @@ module SimpleNavigation
       include ActionView::Helpers::UrlHelper
       include ActionView::Helpers::TagHelper
       
-      attr_reader :current_navigation, :current_sub_navigation
+      attr_reader :current_navigation, :current_sub_navigation, :controller
+
+      class << self
+        
+        # Delegates method calls to the controller.
+        def controller_method(*methods)
+          methods.each do |method|
+            delegate method, :to => :controller
+          end
+        end
+        
+      end
+
+      controller_method :form_authenticity_token, :protect_against_forgery?, :request_forgery_protection_token
       
       def initialize(current_navigation, current_sub_navigation=nil) #:nodoc:
         @current_navigation = current_navigation
         @current_sub_navigation = current_sub_navigation
+        @controller = SimpleNavigation.controller
       end
-      
+            
       # Renders the specified ItemContainer to HTML.
       #
       # If <tt>include_sub_navigation</tt> is set to true, the renderer should nest the sub_navigation for the active navigation 
@@ -24,7 +38,7 @@ module SimpleNavigation
       def render(item_container, include_sub_navigation=false)
         raise 'subclass responsibility'
       end
-      
+            
     end
   end
 end

data/lib/simple_navigation/renderer/list.rb

@@ -12,7 +12,7 @@ module SimpleNavigation
       def render(item_container, include_sub_navigation=false)
         list_content = item_container.items.inject([]) do |list, item|
           html_options = item.html_options(current_navigation)
-          li_content = link_to(item.name, item.url, :class => item.selected_class(current_navigation))
+          li_content = link_to(item.name, item.url, :class => item.selected_class(current_navigation), :method => item.method)
           li_content << (item.sub_navigation.render(current_sub_navigation)) if include_sub_navigation && item.sub_navigation && item.selected?(current_navigation)
           list << content_tag(:li, li_content, html_options)
         end

data/spec/lib/simple_navigation/configuration_spec.rb

@@ -17,6 +17,7 @@ describe SimpleNavigation::Configuration do
   describe 'self.eval_config' do
     before(:each) do
       @context = mock(:context)
+      @context.stub!(:instance_eval)
       @config_file = stub(:config_file)
       SimpleNavigation.stub!(:config_file).and_return(@config_file)
     end
@@ -24,8 +25,38 @@ describe SimpleNavigation::Configuration do
       @context.should_receive(:instance_eval).with(@config_file)
       SimpleNavigation::Configuration.eval_config(@context)
     end    
+    it "should set the controller" do
+      @controller = stub(:controller)
+      SimpleNavigation::Configuration.should_receive(:extract_controller_from).with(@context).and_return(@controller)
+      SimpleNavigation.should_receive(:controller=).with(@controller)
+      SimpleNavigation::Configuration.eval_config(@context)
+    end
   end
 
+  describe 'self.extract_controller_from' do
+    before(:each) do
+      @nav_context = stub(:nav_context)
+    end
+    
+    context 'object responds to controller' do
+      before(:each) do
+        @controller = stub(:controller)
+        @nav_context.stub!(:controller).and_return(@controller)
+      end
+      
+      it "should return the controller" do
+        SimpleNavigation::Configuration.extract_controller_from(@nav_context).should == @controller
+      end
+      
+    end
+    
+    context 'object does not respond to controller' do
+      it "should return the nav_context" do
+        SimpleNavigation::Configuration.extract_controller_from(@nav_context).should == @nav_context
+      end
+    end
+  end
+  
   describe 'initialize' do
     it "should set the List-Renderer as default upon initialize" do
       @config.renderer.should == SimpleNavigation::Renderer::List

data/spec/lib/simple_navigation/item_container_spec.rb

@@ -21,6 +21,7 @@ describe SimpleNavigation::ItemContainer do
     
       before(:each) do
         @item_container.stub!(:should_add_item?).and_return(true)
+        @options = {}
       end
     
       context 'block given' do    
@@ -30,28 +31,28 @@ describe SimpleNavigation::ItemContainer do
         end
       
         it "should should yield an new ItemContainer" do
-          @item_container.item('key', 'name', 'url', 'options') do |container|
+          @item_container.item('key', 'name', 'url', @options) do |container|
             container.should == @sub_container
           end
         end
         it "should create a new Navigation-Item with the given params and the specified block" do
-          SimpleNavigation::Item.should_receive(:new).with('key', 'name', 'url', 'options', @proc)
-          @item_container.item('key', 'name', 'url', 'options', &@proc)
+          SimpleNavigation::Item.should_receive(:new).with('key', 'name', 'url', @options, @proc)
+          @item_container.item('key', 'name', 'url', @options, &@proc)
         end
         it "should add the created item to the list of items" do
           @item_container.items.should_receive(:<<)
-          @item_container.item('key', 'name', 'url', 'options') {}
+          @item_container.item('key', 'name', 'url', @options) {}
         end
       end
     
       context 'no block given' do
         it "should create a new Navigation_item with the given params and nil as sub_navi" do
-          SimpleNavigation::Item.should_receive(:new).with('key', 'name', 'url', 'options', nil)
-          @item_container.item('key', 'name', 'url', 'options')
+          SimpleNavigation::Item.should_receive(:new).with('key', 'name', 'url', @options, nil)
+          @item_container.item('key', 'name', 'url', @options)
         end
         it "should add the created item to the list of items" do
           @item_container.items.should_receive(:<<)
-          @item_container.item('key', 'name', 'url', 'options')
+          @item_container.item('key', 'name', 'url', @options)
         end
       end
 

data/spec/lib/simple_navigation/item_spec.rb

@@ -3,7 +3,29 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe SimpleNavigation::Item do
   
   describe 'initialize' do
-  
+    context 'method' do
+      context 'defined' do
+        before(:each) do
+          @options = {:method => :delete}
+          @item = SimpleNavigation::Item.new(:my_key, 'name', 'url', @options, nil)          
+        end
+        it 'should set the method as instance_var' do
+          @item.method.should == :delete
+        end
+        it 'should set the html-options without the method' do
+          @item.instance_variable_get(:@html_options).key?(:method).should be_false
+        end
+      end
+      
+      context 'undefined' do
+        before(:each) do
+          @item = SimpleNavigation::Item.new(:my_key, 'name', 'url', {}, nil)          
+        end
+        it 'should set the instance-var to nil' do
+          @item.method.should be_nil
+        end
+      end
+    end
   end
   
   describe 'selected?' do
@@ -94,7 +116,7 @@ describe SimpleNavigation::Item do
         it {@item.html_options(:bla)[:id].should == 'my_key'}
       end
     end
-    
+        
   end
   
 

data/spec/lib/simple_navigation/renderer/base_spec.rb

@@ -2,6 +2,8 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe SimpleNavigation::Renderer::Base do
   before(:each) do
+    @controller = stub(:controller)
+    SimpleNavigation.stub!(:controller).and_return(@controller)
     @base_renderer = SimpleNavigation::Renderer::Base.new(:current_primary, :current_secondary)
   end
   it "should inclue ActionView::Helpers::UrlHelper" do
@@ -10,6 +12,45 @@ describe SimpleNavigation::Renderer::Base do
   it "should include ActionView::Helpers::TagHelper" do
     @base_renderer.should respond_to(:content_tag)
   end
-  it {@base_renderer.current_navigation.should == :current_primary}
-  it {@base_renderer.current_sub_navigation.should == :current_secondary}
+  
+  describe 'delegated methods' do
+    it {@base_renderer.should respond_to(:form_authenticity_token)}
+    it {@base_renderer.should respond_to(:protect_against_forgery?)}
+    it {@base_renderer.should respond_to(:request_forgery_protection_token)}
+  end
+  
+  describe 'initialize' do
+    it {@base_renderer.current_navigation.should == :current_primary}
+    it {@base_renderer.current_sub_navigation.should == :current_secondary}
+    it {@base_renderer.controller.should == @controller}
+  end
+  
+  describe 'controller_method' do
+    context 'delegate a single method' do
+      before(:each) do
+        @base_renderer.class_eval do
+          controller_method :my_method
+        end
+      end
+      it 'should delegate a controller_method to the controller' do
+        @controller.should_receive(:my_method)
+        @base_renderer.my_method
+      end
+    end
+    
+    context 'delegate multiple methods' do
+      before(:each) do
+        @base_renderer.class_eval do
+          controller_method :test1, :test2
+        end
+      end
+      it 'should delegate all controller_methods to the controller' do
+        @controller.should_receive(:test1)
+        @base_renderer.test1
+        @controller.should_receive(:test2)
+        @base_renderer.test2
+      end      
+    end
+  end
+  
 end

data/spec/lib/simple_navigation_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe SimpleNavigation do
+  
   describe 'load_config' do
     context 'config_file_path is set' do
       before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple-navigation
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Andi Schacke