simple-navigation 3.12.1 → 3.12.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.12.2
+
+* Fixing issue #154. Thanks to Simon Curtois.
+
 *3.12.1
 
 * bugfix (error in generator)

data/lib/simple_navigation/core/item_container.rb

@@ -74,6 +74,7 @@ module SimpleNavigation
     def items=(new_items)
       @items += new_items.map { |item| ItemAdapter.new(item) }
                          .keep_if { |item| should_add_item?(item.options) }
+                         .map { |item| item.to_simple_navigation_item(self) }
     end
 
     # Returns the Item with the specified key, nil otherwise.

data/lib/simple_navigation/version.rb

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

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

@@ -69,42 +69,31 @@ module SimpleNavigation
     end
 
     describe '#items=' do
-      let(:item) { double(:item) }
+      let(:item) {{ key: :my_key, name: 'test', url: '/' }}
       let(:items) { [item] }
       let(:item_adapter) { double(:item_adapter).as_null_object }
+      let(:real_item) { double(:real_item) }
 
       before do
-        ItemAdapter.stub(new: item_adapter)
-        item_container.stub(should_add_item?: true)
-      end
-
-      it 'wraps each item in an ItemAdapter' do
-        expect(ItemAdapter).to receive(:new)
-        item_container.items = items
+        ItemAdapter.stub(:new).and_return(item_adapter)
+        item_adapter.stub(to_simple_navigation_item: real_item)
       end
 
-      context 'when item should be added' do
-        let(:wrapped_item) { double(:wrapped_item).as_null_object }
-
-        before { ItemAdapter.stub(:new).with(item).and_return(wrapped_item) }
+      context 'when the item should be added' do
+        before { item_container.stub(should_add_item?: true) }
 
-        it 'converts item to an Item and adds it to the items collection' do
+        it 'converts it to an Item and adds it to the items collection' do
           item_container.items = items
-          expect(item_container.items).to include(wrapped_item)
+          expect(item_container.items).to include(real_item)
         end
       end
 
-      context 'when item should not be added' do
+      context 'when the item should not be added' do
         before { item_container.stub(should_add_item?: false) }
 
-        it "doesn't convert the item to an Item" do
-          expect(item_adapter).not_to receive(:to_simple_navigation_item)
-          item_container.items = items
-        end
-
-        it "doesn't add the item to the items-collection" do
-          expect(item_container.items).not_to receive(:<<)
+        it "doesn't add it to the items collection" do
           item_container.items = items
+          expect(item_container.items).not_to include(real_item)
         end
       end
     end

metadata

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