simple-navigation 2.4.1 → 2.4.2

data/CHANGELOG

@@ -1,3 +1,10 @@
+*2.4.2
+
+* Rails 3.0.0.beta2 compatibility
+* Renderer::List --> make content of ul-tag html_safe for rails 3.0.0.beta2 (due to rails3 XSS protection). Credits to Johan Svensson and Disha Albaqui.
+* updated copyright
+* reduced visibility of 'sn_set_navigation' to protected
+
 *2.4.1
 
 * removing depencency to rails. It installs the newest rails, even if a matching version is present. why is that?

data/README

@@ -19,5 +19,5 @@ Online Demo:
 Discussion Group for Feedback and Questions
   http://groups.google.com/group/simple-navigation
 
-Copyright (c) 2009 Andi Schacke, released under the MIT license
+Copyright (c) 2010 Andi Schacke, released under the MIT license
 

data/VERSION.yml

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

data/lib/simple_navigation/controller_methods.rb

@@ -60,6 +60,7 @@ module SimpleNavigation
           define_method :sn_set_navigation do
             current_navigation(*args)
           end
+          protected :sn_set_navigation
           before_filter :sn_set_navigation
         end
       end

data/lib/simple_navigation/renderer/list.rb

@@ -18,8 +18,9 @@ module SimpleNavigation
             li_content << render_sub_navigation_for(item)
           end  
           list << content_tag(:li, li_content, html_options)
-        end
-        content_tag(:ul, list_content.join, {:id => item_container.dom_id, :class => item_container.dom_class})
+        end.join
+        list_content = list_content.html_safe if list_content.respond_to?(:html_safe)
+        content_tag(:ul, list_content, {:id => item_container.dom_id, :class => item_container.dom_class})
       end
     end
     

data/spec/lib/simple_navigation/controller_methods_spec.rb

@@ -53,10 +53,18 @@ describe SimpleNavigation::ControllerMethods do
         call_navigation(:key)
         @controller.respond_to?(:sn_set_navigation).should be_true
       end
+      it "the created method should not be public" do
+        call_navigation(:key)
+        @controller.public_methods.map(&:to_sym).should_not include(:sn_set_navigation)
+      end
+      it "the created method should be protected" do
+        call_navigation(:key)
+        @controller.protected_methods.map(&:to_sym).should include(:sn_set_navigation)
+      end
       it 'the created method should call current_navigation with the specified keys' do
         call_navigation(:primary, :secondary)
         @controller.should_receive(:current_navigation).with(:primary, :secondary)
-        @controller.sn_set_navigation
+        @controller.send(:sn_set_navigation)
       end
     end
     

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

@@ -54,74 +54,113 @@ describe SimpleNavigation::Renderer::List do
       HTML::Document.new(@renderer.render(primary_navigation)).root
     end
       
-    it "should render a ul-tag around the items" do
-      HTML::Selector.new('ul').select(render).should have(1).entries
-    end
-    it "the rendered ul-tag should have the specified dom_id" do
-      HTML::Selector.new('ul#nav_dom_id').select(render).should have(1).entries
-    end
-    it "the rendered ul-tag should have the specified class" do
-      HTML::Selector.new('ul.nav_dom_class').select(render).should have(1).entries
-    end
-    it "should render a li tag for each item" do
-      HTML::Selector.new('li').select(render).should have(3).entries
-    end
-    it "should render an a-tag inside each li-tag" do
-      HTML::Selector.new('li a').select(render).should have(3).entries
-    end
-    it "should pass the specified html_options to the li element" do
-      HTML::Selector.new('li[style=float:right]').select(render).should have(1).entries
-    end
-    it "should give the li the id specified in the html_options" do
-      HTML::Selector.new('li#my_id').select(render).should have(1).entries
-    end
-    it "should give the li the default id (stringified key) if no id is specified in the html_options" do
-      HTML::Selector.new('ul li#invoices').select(render).should have(1).entries
-    end
-    it "should not apply the the default id where there is an id specified in the html_options" do
-      HTML::Selector.new('ul li#users').select(render).should be_empty
-    end
-    
-    context 'with current_navigation set' do
-      it "should mark the matching li-item as selected (with the css_class specified in configuration)" do
-        HTML::Selector.new('li.selected').select(render(:invoices)).should have(1).entries
+    context 'regarding result' do
+      
+      it "should render a ul-tag around the items" do
+        HTML::Selector.new('ul').select(render).should have(1).entries
+      end
+      it "the rendered ul-tag should have the specified dom_id" do
+        HTML::Selector.new('ul#nav_dom_id').select(render).should have(1).entries
+      end
+      it "the rendered ul-tag should have the specified class" do
+        HTML::Selector.new('ul.nav_dom_class').select(render).should have(1).entries
+      end
+      it "should render a li tag for each item" do
+        HTML::Selector.new('li').select(render).should have(3).entries
+      end
+      it "should render an a-tag inside each li-tag" do
+        HTML::Selector.new('li a').select(render).should have(3).entries
       end
-      it "should also mark the links inside the selected li's as selected" do
-        HTML::Selector.new('li.selected a.selected').select(render(:invoices)).should have(1).entries
+      it "should pass the specified html_options to the li element" do
+        HTML::Selector.new('li[style=float:right]').select(render).should have(1).entries
       end
+      it "should give the li the id specified in the html_options" do
+        HTML::Selector.new('li#my_id').select(render).should have(1).entries
+      end
+      it "should give the li the default id (stringified key) if no id is specified in the html_options" do
+        HTML::Selector.new('ul li#invoices').select(render).should have(1).entries
+      end
+      it "should not apply the the default id where there is an id specified in the html_options" do
+        HTML::Selector.new('ul li#users').select(render).should be_empty
+      end
+    
+      context 'with current_navigation set' do
+        it "should mark the matching li-item as selected (with the css_class specified in configuration)" do
+          HTML::Selector.new('li.selected').select(render(:invoices)).should have(1).entries
+        end
+        it "should also mark the links inside the selected li's as selected" do
+          HTML::Selector.new('li.selected a.selected').select(render(:invoices)).should have(1).entries
+        end
       
-    end
+      end
     
-    context 'without current_navigation set' do
-      it "should not mark any of the items as selected" do
-        HTML::Selector.new('li.selected').select(render).should be_empty
+      context 'without current_navigation set' do
+        it "should not mark any of the items as selected" do
+          HTML::Selector.new('li.selected').select(render).should be_empty
+        end
+        it "should not mark any links as selected" do
+          HTML::Selector.new('a.selected').select(render).should be_empty
+        end
       end
-      it "should not mark any links as selected" do
-        HTML::Selector.new('a.selected').select(render).should be_empty
+    
+      context 'nested sub_navigation' do
+        it "should nest the current_primary's subnavigation inside the selected li-element" do
+          HTML::Selector.new('li.selected ul li').select(render(:invoices)).should have(2).entries
+        end
+        it "should be possible to identify sub items using an html selector (using ids)" do
+          HTML::Selector.new('#invoices #subnav1').select(render(:invoices)).should have(1).entries
+        end
+        context 'expand_all => false' do
+          it "should not render the invoices submenu if the user-primary is active" do
+            HTML::Selector.new('#invoices #subnav1').select(render(:users, :level => :all, :expand_all => false)).should be_empty
+            HTML::Selector.new('#invoices #subnav2').select(render(:users, :level => :all, :expand_all => false)).should be_empty
+          end
+        end
+      
+        context 'expand_all => true' do
+          it "should render the invoices submenu even if the user-primary is active" do
+            HTML::Selector.new('#invoices #subnav1').select(render(:users, :level => :all, :expand_all => true)).should have(1).entry
+            HTML::Selector.new('#invoices #subnav2').select(render(:users, :level => :all, :expand_all => true)).should have(1).entry
+          end
+        end
+          
       end
     end
     
-    context 'nested sub_navigation' do
-      it "should nest the current_primary's subnavigation inside the selected li-element" do
-        HTML::Selector.new('li.selected ul li').select(render(:invoices)).should have(2).entries
+    context 'regarding method calls' do
+      before(:each) do
+        @primary_navigation = primary_container
+        @list_content = stub(:list_content)
+        @list_items = stub(:list_items, :join => @list_content)
+        @items.stub!(:inject => @list_items)
+        @renderer = SimpleNavigation::Renderer::List.new(options)
       end
-      it "should be possible to identify sub items using an html selector (using ids)" do
-        HTML::Selector.new('#invoices #subnav1').select(render(:invoices)).should have(1).entries
+      
+      it "should join the list_items" do
+        @list_items.should_receive(:join)
       end
-      context 'expand_all => false' do
-        it "should not render the invoices submenu if the user-primary is active" do
-          HTML::Selector.new('#invoices #subnav1').select(render(:users, :level => :all, :expand_all => false)).should be_empty
-          HTML::Selector.new('#invoices #subnav2').select(render(:users, :level => :all, :expand_all => false)).should be_empty
+      
+      context 'html_safe is defined on the joined list_content' do
+        before(:each) do
+          @safe_list_content = stub(:safe_list_content)
+          @list_content.stub!(:html_safe => @safe_list_content)
+        end
+        
+        it "should create the ul-element with the html_safe content" do
+          @renderer.should_receive(:content_tag).with(:ul, @safe_list_content, anything)
         end
       end
       
-      context 'expand_all => true' do
-        it "should render the invoices submenu even if the user-primary is active" do
-          HTML::Selector.new('#invoices #subnav1').select(render(:users, :level => :all, :expand_all => true)).should have(1).entry
-          HTML::Selector.new('#invoices #subnav2').select(render(:users, :level => :all, :expand_all => true)).should have(1).entry
+      context 'html_safe is not defined on the joined list_content' do
+        it "should create the ul-element with the normal list content" do
+          @renderer.should_receive(:content_tag).with(:ul, @list_content, anything)
         end
       end
-          
+    
+      after(:each) do
+        @renderer.render(@primary_navigation)
+      end
+      
     end
     
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple-navigation
 version: !ruby/object:Gem::Version 
-  version: 2.4.1
+  prerelease: false
+  segments: 
+  - 2
+  - 4
+  - 2
+  version: 2.4.2
 platform: ruby
 authors: 
 - Andi Schacke
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +01:00
+date: 2010-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 8
         version: 1.2.8
-    version: 
+  type: :development
+  version_requirements: *id001
 description: 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.
 email: andreas.schacke@gmail.com
 executables: []
@@ -77,18 +86,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: andi
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple Navigation is a ruby library for creating navigations (with multiple levels) for your Ruby on Rails application.