simple-navigation 3.0.0 → 3.0.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+*3.0.1
+
+* allow controller instance variables named @template for rails3 apps. Credits to cmartyn.
+* added possibility to specify and item's URL as a block which is evaulated after the :if and :unless conditions have been checked. Credits to Nicholas Firth-McCoy.
+* upgraded to rspec 2.0.0
+* fixed cgi error in sinatra adapter. Credits to Jack Dempsey.
+
 *3.0.0
 
 * added ability to specify dynamic items using an array of hashes. Credits to Anshul Khandelwal for input and discussion.

data/Rakefile

@@ -1,21 +1,19 @@
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'rake/rdoctask'
 
 desc 'Default: run specs.'
 task :default => :spec
 
 desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--colour --format progress']
 end
 
 namespace :spec do
   desc "Run all specs with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-    t.spec_files = FileList['spec/**/*_spec.rb']
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.rspec_opts = ['--colour --format progress']
     t.rcov = true
     t.rcov_opts = ['--exclude', 'spec,/Users/']
   end
@@ -38,7 +36,7 @@ begin
     gemspec.email = "andreas.schacke@gmail.com"
     gemspec.homepage = "http://github.com/andi/simple-navigation"
     gemspec.description = "With the simple-navigation gem installed you can easily create multilevel navigations for your Rails, Sinatra or Padrino applications. The navigation is defined in a single configuration file. It supports automatic as well as explicit highlighting of the currently active navigation through regular expressions."
-    gemspec.add_development_dependency('rspec', '>= 1.2.8')
+    gemspec.add_development_dependency('rspec', '>= 2.0.1')
     gemspec.add_dependency('activesupport', '>= 2.3.2')
     gemspec.authors = ["Andi Schacke"]
     gemspec.rdoc_options = ["--inline-source", "--charset=UTF-8"]

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/lib/simple_navigation/adapters/rails.rb

@@ -59,7 +59,7 @@ module SimpleNavigation
       end
       
       def template_from(controller)
-        controller.instance_variable_get(:@template) || (controller.respond_to?(:view_context) ? controller.view_context : nil)
+        controller.respond_to?(:view_context) ? controller.view_context : controller.instance_variable_get(:@template)
       end
       
       # Marks the specified input as html_safe (for Rails3). Does nothing if html_safe is not defined on input. 

data/lib/simple_navigation/adapters/sinatra.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module SimpleNavigation
   module Adapters
     class Sinatra < Base

data/lib/simple_navigation/core/item.rb

@@ -13,7 +13,7 @@ module SimpleNavigation
       @key = key
       @method = options.delete(:method)
       @name = name
-      @url = url
+      @url = url.instance_of?(Proc) ? url.call : url
       @highlights_on = options.delete(:highlights_on)
       @html_options = options
       if sub_nav_block || items

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

@@ -11,7 +11,6 @@ module SimpleNavigation
     class Breadcrumbs < SimpleNavigation::Renderer::Base
 
       def render(item_container)
-        a_tags = a_tags(item_container)
         content_tag(:div, a_tags(item_container).join(join_with), {:id => item_container.dom_id, :class => item_container.dom_class})
       end
 

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::Adapters::Padrino do
 

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::Adapters::Rails do
 
@@ -265,5 +265,19 @@ describe SimpleNavigation::Adapters::Rails do
     end
   end
   
+  describe 'template_from' do
+    context 'Rails3' do 
+      before(:each) do
+        @controller.stub!(:view_context => 'view')
+      end
+      it {@adapter.send(:template_from, @controller).should == 'view'}
+    end
+    context 'Rails2' do
+      before(:each) do
+        @controller.instance_variable_set(:@template, 'view')
+      end
+      it {@adapter.send(:template_from, @controller).should == 'view'}
+    end
+  end
   
 end

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::Adapters::Sinatra do
 

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::Configuration do
 

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

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'spec_helper'
 
 describe SimpleNavigation::ItemAdapter, 'when item is an object' do
 

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::ItemContainer do
   before(:each) do
@@ -19,7 +19,7 @@ describe SimpleNavigation::ItemContainer do
     before(:each) do
       @item = stub(:item)
       @items = [@item]
-      @item_adapter = stub(:item_adapter, :null_object => true)
+      @item_adapter = stub(:item_adapter).as_null_object
       SimpleNavigation::ItemAdapter.stub(:new => @item_adapter)
       @item_container.stub!(:should_add_item? => true)
     end
@@ -290,7 +290,7 @@ describe SimpleNavigation::ItemContainer do
 
   describe 'render' do
     before(:each) do
-      @renderer_instance = stub(:renderer, :null_object => true)
+      @renderer_instance = stub(:renderer).as_null_object
       @renderer_class = stub(:renderer_class, :new => @renderer_instance)
     end
     context 'renderer specified as option' do

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::Item do
 
@@ -12,7 +12,7 @@ describe SimpleNavigation::Item do
   describe 'initialize' do
     context 'subnavigation' do
       before(:each) do
-        @subnav_container = stub(:subnav_container, :null_object => true)
+        @subnav_container = stub(:subnav_container).as_null_object
         SimpleNavigation::ItemContainer.stub!(:new => @subnav_container)
       end
       context 'block given' do
@@ -89,6 +89,22 @@ describe SimpleNavigation::Item do
         end
       end
     end
+    
+    context 'url' do
+      context 'url is a string' do
+        before(:each) do
+          @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', 'url', {})  
+        end
+        it {@item.url.should == 'url'}
+      end
+      context 'url is a proc' do
+        before(:each) do
+          @item = SimpleNavigation::Item.new(@item_container, :my_key, 'name', Proc.new {"my_" + "url"}, {})  
+        end
+        it {@item.url.should == 'my_url'}
+      end
+    end
+    
   end
 
   describe 'selected?' do

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

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'spec_helper'
 
 describe SimpleNavigation::ItemsProvider do
 

data/spec/lib/simple_navigation/rails_controller_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe 'explicit navigation in rails' do
   require 'simple_navigation/rails_controller_methods'

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::Helpers do
   class ControllerMock
@@ -9,7 +9,7 @@ describe SimpleNavigation::Helpers do
     @controller = ControllerMock.new
     SimpleNavigation.stub!(:load_config)
     SimpleNavigation::Configuration.stub!(:eval_config)
-    @primary_navigation = stub(:primary_navigation, :null_object => true)
+    @primary_navigation = stub(:primary_navigation).as_null_object
     SimpleNavigation.stub!(:primary_navigation).and_return(@primary_navigation)
     SimpleNavigation.stub!(:config_file? => true)
   end
@@ -64,7 +64,7 @@ describe SimpleNavigation::Helpers do
 
     context 'rendering of the item_container' do
       before(:each) do
-        @active_item_container = stub(:item_container, :null_object => true)
+        @active_item_container = stub(:item_container).as_null_object
         SimpleNavigation.stub!(:active_item_container_for => @active_item_container)
       end
       it "should lookup the active_item_container based on the level" do
@@ -98,7 +98,7 @@ describe SimpleNavigation::Helpers do
     context 'secondary' do
       context 'with current_primary_navigation set' do
         before(:each) do
-          @selected_item_container = stub(:selected_container, :null_object => true)
+          @selected_item_container = stub(:selected_container).as_null_object
           SimpleNavigation.stub!(:active_item_container_for => @selected_item_container)
         end
         it "should find the selected sub_navigation for the specified level" do
@@ -134,7 +134,7 @@ describe SimpleNavigation::Helpers do
 
   describe "should treat :level and :levels options the same" do
     before(:each) do
-      @selected_item_container = stub(:selected_container, :null_object => true)
+      @selected_item_container = stub(:selected_container).as_null_object
       SimpleNavigation.stub!(:active_item_container_for => @selected_item_container)
     end
     it  "should pass a valid levels options as level" do

data/spec/lib/simple_navigation/rendering/renderer/base_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation::Renderer::Base do
   before(:each) do
-    @options = stub(:options, :null_object => true)
+    @options = stub(:options).as_null_object
     @adapter = stub(:adapter)
     SimpleNavigation.stub!(:adapter => @adapter)
     @base_renderer = SimpleNavigation::Renderer::Base.new(@options)

data/spec/lib/simple_navigation/rendering/renderer/breadcrumbs_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
-require 'html/document' unless defined? HTML::Document
+require 'spec_helper'
+require 'html/document'# unless defined? HTML::Document
 
 describe SimpleNavigation::Renderer::Breadcrumbs do
 
@@ -15,23 +15,23 @@ describe SimpleNavigation::Renderer::Breadcrumbs do
     context 'regarding result' do
 
       it "should render a div-tag around the items" do
-        HTML::Selector.new('div').select(render).should have(1).entries
-      end
-      it "the rendered div-tag should have the specified dom_id" do
-        HTML::Selector.new('div#nav_dom_id').select(render).should have(1).entries
-      end
-      it "the rendered div-tag should have the specified class" do
-        HTML::Selector.new('div.nav_dom_class').select(render).should have(1).entries
-      end
-
-      context 'without current_navigation set' do
-        it "should not render any a-tag in the div-tag" do
-          HTML::Selector.new('div a').select(render).should have(0).entries
+          HTML::Selector.new('div').select(render).should have(1).entries
+        end
+        it "the rendered div-tag should have the specified dom_id" do
+          HTML::Selector.new('div#nav_dom_id').select(render).should have(1).entries
+        end
+        it "the rendered div-tag should have the specified class" do
+          HTML::Selector.new('div.nav_dom_class').select(render).should have(1).entries
+        end
+  
+        context 'without current_navigation set' do
+          it "should not render any a-tag in the div-tag" do
+            HTML::Selector.new('div a').select(render).should have(0).entries
+          end
         end
-      end
 
       context 'with current_navigation set' do
-        before :all do
+        before(:each) do
           @selection = HTML::Selector.new('div a').select(render(:invoices))
         end
         it "should render the selected a tags" do

data/spec/lib/simple_navigation/rendering/renderer/links_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
 require 'html/document' unless defined? HTML::Document
 
 describe SimpleNavigation::Renderer::Links do
@@ -6,7 +6,6 @@ describe SimpleNavigation::Renderer::Links do
     
   describe 'render' do
 
-
     def render(current_nav=nil, options={:level => :all})
       primary_navigation = primary_container
       select_item(current_nav) if current_nav

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

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec_helper'
 require 'html/document' unless defined? HTML::Document
 
 describe SimpleNavigation::Renderer::List do
@@ -145,7 +145,7 @@ describe SimpleNavigation::Renderer::List do
     
     describe 'link_options_for' do
       before(:each) do
-        setup_renderer_for SimpleNavigation::Renderer::List, :rails, options
+        setup_renderer_for SimpleNavigation::Renderer::List, :rails, {}
       end
       context 'no link options specified' do
         context 'method specified' do

data/spec/lib/simple_navigation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe SimpleNavigation do
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 ENV["RAILS_ENV"] = "test"
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'action_controller'
 
 module Rails
@@ -19,9 +19,17 @@ RAILS_ROOT = './' unless defined?(RAILS_ROOT)
 RAILS_ENV = 'test' unless defined?(RAILS_ENV)
 
 
-# Spec::Runner.configure do |config|
-  # no special config
-# end
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+end
 
 # spec helper methods
 def sub_items
@@ -60,9 +68,9 @@ def select_item(key)
     primary_item(:invoices) do |item|
       item.instance_variable_get(:@sub_navigation).items.find { |i| i.key == key}.stub!(:selected? => true)
     end
-
+  else
+    primary_item(key) {|item| item.stub!(:selected? => true) unless item.frozen?}
   end
-  primary_item(key) {|item| item.stub!(:selected? => true) unless item.frozen?}
 end
 
 def subnav_container

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple-navigation
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Andi Schacke
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
+date: 2010-10-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
-        - 1
         - 2
-        - 8
-        version: 1.2.8
+        - 0
+        - 1
+        version: 2.0.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 3
@@ -110,23 +115,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: andi
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: simple-navigation is a ruby library for creating navigations (with multiple levels) for your Rails2, Rails3, Sinatra or Padrino application.