simple-navigation 3.10.0 → 3.10.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.10.1
+
+* Padrino adapter now returns "html_safe"d content_tag
+
 *3.10.0
 
 * Added ability to set selected_class on container level. Credits to Joost Hietbrink.

data/VERSION

@@ -1 +1 @@
-3.10.0
+3.10.1

data/lib/simple_navigation/adapters/padrino.rb

@@ -8,11 +8,11 @@ module SimpleNavigation
       end
             
       def link_to(name, url, options={})
-        context.link_to name, url, options
+        context.link_to(name, url, options)
       end
       
       def content_tag(type, content, options={})
-        context.content_tag type, content, options
+        context.content_tag(type, content.html_safe, options)
       end
       
     end

data/lib/simple_navigation/rendering/renderer/breadcrumbs.rb

@@ -22,7 +22,7 @@ module SimpleNavigation
       def a_tags(item_container)
         item_container.items.inject([]) do |list, item|
           if item.selected?
-            list << tag_for(item) if item.selected?
+            list << tag_for(item)
             if include_sub_navigation?(item)
               list.concat a_tags(item.sub_navigation)
             end

data/spec/lib/simple_navigation/adapters/padrino_spec.rb

@@ -8,6 +8,7 @@ describe SimpleNavigation::Adapters::Padrino do
   
   before(:each) do
     @request = stub(:request)
+    @content = stub(:content)
     @context = stub(:context, :request => @request)
     @adapter = create_adapter
   end
@@ -21,8 +22,9 @@ describe SimpleNavigation::Adapters::Padrino do
   
   describe 'content_tag' do
     it "should delegate to context" do
+      @content.should_receive(:html_safe).and_return('content')
       @context.should_receive(:content_tag).with('type', 'content', :my_option => true)
-      @adapter.content_tag('type', 'content', :my_option => true)
+      @adapter.content_tag('type', @content, :my_option => true)
     end
   end
   

data/spec/lib/simple_navigation/rails_controller_methods_spec.rb

@@ -53,7 +53,7 @@ describe 'explicit navigation in rails' do
         end
         it 'should create an instance-method "sn_set_navigation" when being called' do
           call_navigation(:key)
-          @controller.respond_to?(:sn_set_navigation).should be_true
+          @controller.respond_to?(:sn_set_navigation, true).should be_true
         end
         it "the created method should not be public" do
           call_navigation(:key)

data/spec/lib/simple_navigation/rendering/helpers_spec.rb

@@ -89,10 +89,10 @@ describe SimpleNavigation::Helpers do
         before(:each) do
           select_item(:subnav1)
         end
-        it {@controller.active_navigation_item(:level => 2).should == @subnav1_item}
-        it {@controller.active_navigation_item.should == @subnav1_item}
-        it {@controller.active_navigation_item(:level => 1).should == @invoices_item}
-        it {@controller.active_navigation_item(:level => :all).should == @subnav1_item}
+        it {@controller.active_navigation_item(:level => 2).should eq(@subnav1_item)}
+        it {@controller.active_navigation_item.should eq(@subnav1_item)}
+        it {@controller.active_navigation_item(:level => 1).should eq(@invoices_item)}
+        it {@controller.active_navigation_item(:level => :all).should eq(@subnav1_item)}
       end
       context 'container does not have selected item' do
         context 'return value defaults to nil' do
@@ -100,7 +100,7 @@ describe SimpleNavigation::Helpers do
         end
         context 'return value reflects passed in value' do
           it {@controller.active_navigation_item({},'none').should == 'none'}
-          it {@controller.active_navigation_item({},@invoices_item).should == @invoices_item}
+          it {@controller.active_navigation_item({},@invoices_item).should eq(@invoices_item)}
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport