simple-navigation 3.12.2 → 3.13.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.13.0
+
+* consider_item_names_as_safe is now false by default. Removed deprecation warning
+
 *3.12.2
 
 * Fixing issue #154. Thanks to Simon Curtois.

data/lib/simple_navigation/core/configuration.rb

@@ -32,16 +32,7 @@ module SimpleNavigation
     def initialize
       @autogenerate_item_ids = true
       @auto_highlight = true
-      @consider_item_names_as_safe = true
-
-      if defined?(ActiveSupport::Deprecation)
-        ActiveSupport::Deprecation.warn 'simple-navigation: ' \
-          'consider_item_names_as_safe will be set to false ' \
-          'by default in 3.13.0 release, hence item names '   \
-          'will be considered unsafe by default. '            \
-          'See https://github.com/codeplant/simple-navigation/wiki',
-          caller
-      end
+      @consider_item_names_as_safe = false
     end
 
     def active_leaf_class

data/lib/simple_navigation/version.rb

@@ -1,3 +1,3 @@
 module SimpleNavigation
-  VERSION = '3.12.2'
+  VERSION = '3.13.0'
 end

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

@@ -212,11 +212,27 @@ module SimpleNavigation
         context "when the adapter's template is set" do
           before { adapter.stub(template: template, html_safe: 'safe_text') }
 
-          it 'delegates the call to the template (with html_safe text)' do
-            expect(template).to receive(:link_to)
-                                .with('safe_text', 'url', options)
-            adapter.link_to('text', 'url', options)
+          context 'with considering item names as safe' do
+            before { SimpleNavigation.config.consider_item_names_as_safe = true }
+            after { SimpleNavigation.config.consider_item_names_as_safe = false }
+
+            it 'delegates the call to the template (with html_safe text)' do
+              expect(template).to receive(:link_to)
+                                  .with('safe_text', 'url', options)
+              adapter.link_to('text', 'url', options)
+            end
+          end
+
+          context 'with considering item names as UNsafe (default)' do
+
+            it 'delegates the call to the template (with html_safe text)' do
+              expect(template).to receive(:link_to)
+                                  .with('text', 'url', options)
+              adapter.link_to('text', 'url', options)
+            end
           end
+
+
         end
 
         context "when the adapter's template is not set" do
@@ -291,13 +307,16 @@ module SimpleNavigation
         let(:safe) { double(:safe) }
 
         context 'when config option consider_item_names_as_safe is true' do
+          before { SimpleNavigation.config.consider_item_names_as_safe = true }
+          after { SimpleNavigation.config.consider_item_names_as_safe = false }
+          
           it 'uses the html_safe version of the name' do
             expect(adapter.send(:link_title, name)).to be safe
           end
         end
 
         # TODO: Does it make sense ?
-        context 'when config option consider_item_names_as_safe is false' do
+        context 'when config option consider_item_names_as_safe is false (default)' do
           before do
             SimpleNavigation.config.consider_item_names_as_safe = false
             adapter.stub(template: template)

data/spec/lib/simple_navigation/core/configuration_spec.rb

@@ -63,6 +63,10 @@ module SimpleNavigation
       it 'should set the name_generator' do
         expect(config.name_generator).not_to be_nil
       end
+      
+      it 'should set the consider_item_names_as_safe to false' do
+        expect(config.consider_item_names_as_safe).to be_false
+      end
     end
 
     describe '#items' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 3.12.2
+  version: 3.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport