simple-navigation 2.7.3 → 3.0.0.beta1

data/spec/lib/simple_navigation/{item_container_spec.rb → core/item_container_spec.rb}

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
-describe SimpleNavigation::ItemContainer do  
+describe SimpleNavigation::ItemContainer do
   before(:each) do
     @item_container = SimpleNavigation::ItemContainer.new
   end
@@ -74,22 +74,12 @@ describe SimpleNavigation::ItemContainer do
 
   describe 'selected_item' do
     before(:each) do
+      @item_container.stub!(:[] => nil)
       @item_1 = stub(:item, :selected? => false)
       @item_2 = stub(:item, :selected? => false)
       @item_container.instance_variable_set(:@items, [@item_1, @item_2])
     end
-    context 'navigation explicitely set' do
-      before(:each) do
-        @item_container.stub!(:[] => @item_1)
-      end
-      it "should return the explicitely selected item" do
-        @item_container.selected_item.should == @item_1
-      end
-    end
     context 'navigation not explicitely set' do
-      before(:each) do
-        @item_container.stub!(:[] => nil)
-      end
       context 'no item selected' do
         it "should return nil" do
           @item_container.selected_item.should be_nil
@@ -162,28 +152,21 @@ describe SimpleNavigation::ItemContainer do
     end
   end
 
-  describe 'current_explicit_navigation' do
-    it "should call SimpleNavigation.current_navigation with the container's level" do
-      SimpleNavigation.should_receive(:current_navigation_for).with(1)
-      @item_container.current_explicit_navigation
-    end
-  end
-
   describe 'item' do
-    
+
     context 'unconditional item' do
-    
+
       before(:each) do
         @item_container.stub!(:should_add_item?).and_return(true)
         @options = {}
       end
-    
-      context 'block given' do    
+
+      context 'block given' do
         before(:each) do
           @sub_container = stub(:sub_container)
           SimpleNavigation::ItemContainer.stub!(:new).and_return(@sub_container)
         end
-      
+
         it "should should yield an new ItemContainer" do
           @item_container.item('key', 'name', 'url', @options) do |container|
             container.should == @sub_container
@@ -198,7 +181,7 @@ describe SimpleNavigation::ItemContainer do
           @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(@item_container, 'key', 'name', 'url', @options, nil)
@@ -211,20 +194,20 @@ describe SimpleNavigation::ItemContainer do
       end
 
     end
-    
+
     context 'conditions given for item' do
-    
+
       context '"if" given' do
 
         before(:each) do
           @options = {:if => Proc.new {@condition}}
         end
-        
+
         it "should remove if from options" do
           @item_container.item('key', 'name', 'url', @options)
           @options[:if].should be_nil
         end
-        
+
         context 'if evals to true' do
           before(:each) do
             @condition = true
@@ -234,7 +217,7 @@ describe SimpleNavigation::ItemContainer do
             @item_container.item('key', 'name', 'url', @options)
           end
         end
-        
+
         context 'if evals to false' do
           before(:each) do
             @condition = false
@@ -244,7 +227,7 @@ describe SimpleNavigation::ItemContainer do
             @item_container.item('key', 'name', 'url', @options)
           end
         end
-        
+
         context 'if is not a proc or method' do
           it "should raise an error" do
             lambda {@item_container.item('key', 'name', 'url', {:if => 'text'})}.should raise_error
@@ -252,17 +235,17 @@ describe SimpleNavigation::ItemContainer do
         end
 
         context '"unless" given' do
-          
+
           before(:each) do
             @options = {:unless => Proc.new {@condition}}
           end
-          
-          
+
+
           it "should remove unless from options" do
             @item_container.item('key', 'name', 'url', @options)
             @options[:unless].should be_nil
           end
-          
+
           context 'unless evals to false' do
             before(:each) do
               @condition = false
@@ -282,20 +265,20 @@ describe SimpleNavigation::ItemContainer do
               @item_container.item('key', 'name', 'url', @options)
             end
           end
-          
+
         end
       end
     end
   end
-  
+
   describe '[]' do
-    
+
     before(:each) do
       @item_container.item(:first, 'first', 'bla')
       @item_container.item(:second, 'second', 'bla')
       @item_container.item(:third, 'third', 'bla')
     end
-  
+
     it "should return the item with the specified navi_key" do
       @item_container[:second].name.should == 'second'
     end
@@ -303,7 +286,7 @@ describe SimpleNavigation::ItemContainer do
       @item_container[:invalid].should be_nil
     end
   end
-  
+
   describe 'render' do
     before(:each) do
       @renderer_instance = stub(:renderer, :null_object => true)
@@ -316,7 +299,7 @@ describe SimpleNavigation::ItemContainer do
         end
         it "should call render on the renderer and pass self" do
           @renderer_instance.should_receive(:render).with(@item_container)
-        end          
+        end
         after(:each) do
           @item_container.render(:renderer => @renderer_class)
         end
@@ -330,10 +313,10 @@ describe SimpleNavigation::ItemContainer do
         end
         it "should call render on the renderer and pass self" do
           @renderer_instance.should_receive(:render).with(@item_container)
-        end     
+        end
         after(:each) do
           @item_container.render(:renderer => :my_renderer)
-        end     
+        end
       end
     end
     context 'no renderer specified' do
@@ -352,7 +335,7 @@ describe SimpleNavigation::ItemContainer do
       end
     end
   end
-  
+
   describe 'level_for_item' do
     before(:each) do
       @item_container.item(:p1, 'p1', 'p1')
@@ -373,7 +356,7 @@ describe SimpleNavigation::ItemContainer do
     it {@item_container.level_for_item(:x).should be_nil}
 
   end
-  
+
   describe 'empty?' do
     it "should be empty if there are no items" do
       @item_container.instance_variable_set(:@items, [])

data/spec/lib/simple_navigation/{item_spec.rb → core/item_spec.rb}

@@ -1,10 +1,12 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe SimpleNavigation::Item do
 
   before(:each) do
     @item_container = stub(:item_container, :level => 1)
     @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', 'url', {})
+    @adapter = stub(:adapter)
+    SimpleNavigation.stub!(:adapter => @adapter)
   end
 
   describe 'initialize' do
@@ -58,14 +60,14 @@ describe SimpleNavigation::Item do
           @item.instance_variable_get(:@html_options).key?(:method).should be_false
         end
       end
-      
+
       context 'undefined' do
         it 'should set the instance-var to nil' do
           @item.method.should be_nil
         end
       end
     end
-    
+
     context ':highlights_on option' do
       context 'defined' do
         before(:each) do
@@ -80,7 +82,7 @@ describe SimpleNavigation::Item do
           @item.instance_variable_get(:@html_options).key?(:highlights_on).should be_false
         end
       end
-      
+
       context 'undefined' do
         it 'should set the instance-var to nil' do
           @item.highlights_on.should be_nil
@@ -88,7 +90,7 @@ describe SimpleNavigation::Item do
       end
     end
   end
-  
+
   describe 'selected?' do
     context 'explicitly selected' do
       before(:each) do
@@ -130,7 +132,7 @@ describe SimpleNavigation::Item do
       end
     end
   end
-  
+
   describe 'selected_class' do
     context 'item is selected' do
       before(:each) do
@@ -138,7 +140,7 @@ describe SimpleNavigation::Item do
       end
       it {@item.instance_eval {selected_class.should == 'selected'}}
     end
-    
+
     context 'item is not selected' do
       before(:each) do
         @item.stub!(:selected? => false)
@@ -146,7 +148,7 @@ describe SimpleNavigation::Item do
       it {@item.instance_eval {selected_class.should == nil}}
     end
   end
-  
+
   describe 'html_options' do
     describe 'class' do
       context 'with classes defined in options' do
@@ -160,7 +162,7 @@ describe SimpleNavigation::Item do
           end
           it {@item.html_options[:class].should == 'my_class selected'}
         end
-      
+
         context 'with item not selected' do
           before(:each) do
             @item.stub!(:selected? => false)
@@ -168,7 +170,7 @@ describe SimpleNavigation::Item do
           it {@item.html_options[:class].should == 'my_class'}
         end
       end
-    
+
       context 'without classes in options' do
         before(:each) do
           @options = {}
@@ -180,7 +182,7 @@ describe SimpleNavigation::Item do
           end
           it {@item.html_options[:class].should == 'selected'}
         end
-      
+
         context 'with item not selected' do
           before(:each) do
             @item.stub!(:selected? => false)
@@ -189,7 +191,7 @@ describe SimpleNavigation::Item do
         end
       end
     end
-    
+
     describe 'id' do
       context 'with autogenerate_item_ids == true' do
         before(:each) do
@@ -202,7 +204,7 @@ describe SimpleNavigation::Item do
           end
           it {@item.html_options[:id].should == 'my_id'}
         end
-      
+
         context 'with no id defined in options (using default id)' do
           before(:each) do
             @item.html_options = {}
@@ -222,18 +224,18 @@ describe SimpleNavigation::Item do
           end
           it {@item.html_options[:id].should == 'my_id'}
         end
-      
+
         context 'with no id definied in options (using default id)' do
           before(:each) do
             @item.html_options = {}
           end
           it {@item.html_options[:id].should be_nil}
         end
-     
+
       end
 
     end
-        
+
   end
 
   describe 'selected_by_subnav?' do
@@ -259,25 +261,6 @@ describe SimpleNavigation::Item do
     end
   end
 
-  describe 'selected_by_config?' do
-    context 'navigation explicitly set' do
-      it "should return true if current matches key" do
-        @item_container.stub!(:current_explicit_navigation => :my_key)
-        @item.should be_selected_by_config
-      end
-      it "should return false if current does not match key" do
-        @item_container.stub!(:current_explicit_navigation => :other_key)
-        @item.should_not be_selected_by_config
-      end
-    end
-    context 'navigation not explicitly set' do
-      before(:each) do
-        @item_container.stub!(:current_explicit_navigation => nil)
-      end
-      it {@item.should_not be_selected_by_config}
-    end
-  end
-
   describe 'selected_by_url?' do
     context ':highlights_on option is set' do
       before(:each) do
@@ -331,31 +314,19 @@ describe SimpleNavigation::Item do
         before(:each) do
           @item.stub!(:root_path_match? => false)
         end
-        context 'template is set' do
+        context 'current request url matches url' do
           before(:each) do
-            @template = stub(:template)
-            SimpleNavigation.stub!(:template => @template)
-          end
-          context 'current request url matches url' do
-            before(:each) do
-              @template.stub!(:current_page? => true)
-            end
-            it "should test with the item's url" do
-              @template.should_receive(:current_page?).with('url')
-              @item.send(:selected_by_url?)
-            end
-            it {@item.send(:selected_by_url?).should be_true}
+            @adapter.stub!(:current_page? => true)
           end
-          context 'no match' do
-            before(:each) do
-              @template.stub!(:current_page? => false)
-            end
-            it {@item.send(:selected_by_url?).should be_false}
+          it "should test with the item's url" do
+            @adapter.should_receive(:current_page?).with('url')
+            @item.send(:selected_by_url?)
           end
+          it {@item.send(:selected_by_url?).should be_true}
         end
-        context 'template is not set' do
+        context 'no match' do
           before(:each) do
-            SimpleNavigation.stub!(:template => nil)
+            @adapter.stub!(:current_page? => false)
           end
           it {@item.send(:selected_by_url?).should be_false}
         end
@@ -370,28 +341,23 @@ describe SimpleNavigation::Item do
   end
 
   describe 'root_path_match?' do
-    before(:each) do
-      @request = stub(:request)
-      @controller = stub(:controller, :request => @request)
-      SimpleNavigation.stub!(:controller => @controller)
-    end
     it "should match if both url == /" do
-      @request.stub!(:path => '/')
+      @adapter.stub!(:request_path => '/')
       @item.stub!(:url => '/')
       @item.send(:root_path_match?).should be_true
     end
     it "should not match if item url is not /" do
-      @request.stub!(:path => '/')
+      @adapter.stub(:request_path => '/')
       @item.stub!(:url => '/bla')
       @item.send(:root_path_match?).should be_false
     end
     it "should not match if request url is not /" do
-      @request.stub!(:path => '/bla')
+      @adapter.stub(:request_path => '/bla')
       @item.stub!(:url => '/')
       @item.send(:root_path_match?).should be_false
     end
     it "should not match if urls do not match" do
-      @request.stub!(:path => '/bla')
+      @adapter.stub(:request_path => 'bla')
       @item.stub!(:url => '/bli')
       @item.send(:root_path_match?).should be_false
     end

data/spec/lib/simple_navigation/{items_provider_spec.rb → core/items_provider_spec.rb}

@@ -1,18 +1,18 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe SimpleNavigation::ItemsProvider do
-  
+
   before(:each) do
     @provider = stub(:provider)
     @items_provider = SimpleNavigation::ItemsProvider.new(@provider)
   end
-  
+
   describe 'initialize' do
     it "should set the provider" do
       @items_provider.provider.should == @provider
     end
   end
-  
+
   describe 'items' do
     before(:each) do
       @items = stub(:items)
@@ -21,7 +21,7 @@ describe SimpleNavigation::ItemsProvider do
       before(:each) do
         @items_provider.instance_variable_set(:@provider, :provider_method)
         @context = stub(:context, :provider_method => @items)
-        SimpleNavigation::Configuration.stub!(:context_for_eval => @context)
+        SimpleNavigation.stub!(:context_for_eval => @context)
       end
       it "should call the method specified by symbol on the context" do
         @context.should_receive(:provider_method)
@@ -46,7 +46,7 @@ describe SimpleNavigation::ItemsProvider do
     context 'provider is a collection' do
       before(:each) do
         @items_collection = []
-        @items_provider.instance_variable_set(:@provider, @items_collection)      
+        @items_provider.instance_variable_set(:@provider, @items_collection)
       end
       it "should return the collection itsself" do
         @items_provider.items.should == @items_collection
@@ -56,5 +56,5 @@ describe SimpleNavigation::ItemsProvider do
       it {lambda {@items_provider.items}.should raise_error}
     end
   end
-  
+
 end