simple-navigation 2.7.3 → 3.0.0.beta1

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 ENV["RAILS_ENV"] = "test"
 require 'rubygems'
 require 'spec'
-require 'active_support'
 require 'action_controller'
 
 module Rails
@@ -15,11 +14,14 @@ $:.unshift File.join(File.dirname(__FILE__), '../lib')
 
 require 'simple_navigation'
 
-SimpleNavigation.rails_root = './'
+# SimpleNavigation.root = './'
+RAILS_ROOT = './' unless defined?(RAILS_ROOT)
+RAILS_ENV = 'test' unless defined?(RAILS_ENV)
+
 
 # Spec::Runner.configure do |config|
   # no special config
-# endx
+# end
 
 # spec helper methods
 def sub_items
@@ -53,12 +55,12 @@ def primary_item(key)
 end
 
 def select_item(key)
-  if(key == :subnav1) 
+  if(key == :subnav1)
     select_item(:invoices)
     primary_item(:invoices) do |item|
       item.instance_variable_get(:@sub_navigation).items.find { |i| i.key == key}.stub!(:selected? => true)
     end
-    
+
   end
   primary_item(key) {|item| item.stub!(:selected? => true) unless item.frozen?}
 end
@@ -70,3 +72,12 @@ def subnav_container
   container.instance_variable_set(:@items, items)
   container
 end
+
+def setup_renderer_for(renderer_class, framework, options)
+  adapter = case framework
+  when :rails
+    SimpleNavigation::Adapters::Rails.new(stub(:context, :view_context => ActionView::Base.new))
+  end
+  SimpleNavigation.stub!(:adapter => adapter)
+  @renderer = renderer_class.new(options)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple-navigation
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  prerelease: true
   segments: 
-  - 2
-  - 7
   - 3
-  version: 2.7.3
+  - 0
+  - 0
+  - beta1
+  version: 3.0.0.beta1
 platform: ruby
 authors: 
 - Andi Schacke
@@ -15,18 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +02:00
+date: 2010-09-01 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: 15
         segments: 
         - 1
         - 2
@@ -34,6 +32,20 @@ dependencies:
         version: 1.2.8
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 2
+        version: 2.3.2
+  type: :runtime
+  version_requirements: *id002
 description: With the simple-navigation gem installed you can easily create multilevel navigations for your Ruby on Rails applications. The navigation is defined in a single configuration file. It supports automatic as well as explicit highlighting of the currently active navigation.
 email: andreas.schacke@gmail.com
 executables: []
@@ -53,31 +65,39 @@ files:
 - lib/generators/navigation_config/navigation_config_generator.rb
 - lib/simple-navigation.rb
 - lib/simple_navigation.rb
-- lib/simple_navigation/configuration.rb
-- lib/simple_navigation/controller_methods.rb
-- lib/simple_navigation/helpers.rb
-- lib/simple_navigation/initializer.rb
-- lib/simple_navigation/item.rb
-- lib/simple_navigation/item_adapter.rb
-- lib/simple_navigation/item_container.rb
-- lib/simple_navigation/items_provider.rb
-- lib/simple_navigation/railtie.rb
-- lib/simple_navigation/renderer/base.rb
-- lib/simple_navigation/renderer/breadcrumbs.rb
-- lib/simple_navigation/renderer/links.rb
-- lib/simple_navigation/renderer/list.rb
+- lib/simple_navigation/adapters.rb
+- lib/simple_navigation/adapters/base.rb
+- lib/simple_navigation/adapters/padrino.rb
+- lib/simple_navigation/adapters/rails.rb
+- lib/simple_navigation/adapters/sinatra.rb
+- lib/simple_navigation/core.rb
+- lib/simple_navigation/core/configuration.rb
+- lib/simple_navigation/core/item.rb
+- lib/simple_navigation/core/item_adapter.rb
+- lib/simple_navigation/core/item_container.rb
+- lib/simple_navigation/core/items_provider.rb
+- lib/simple_navigation/rails_controller_methods.rb
+- lib/simple_navigation/rendering.rb
+- lib/simple_navigation/rendering/helpers.rb
+- lib/simple_navigation/rendering/renderer/base.rb
+- lib/simple_navigation/rendering/renderer/breadcrumbs.rb
+- lib/simple_navigation/rendering/renderer/links.rb
+- lib/simple_navigation/rendering/renderer/list.rb
 - rails/init.rb
-- spec/lib/simple_navigation/configuration_spec.rb
-- spec/lib/simple_navigation/controller_methods_spec.rb
-- spec/lib/simple_navigation/helpers_spec.rb
-- spec/lib/simple_navigation/item_adapter_spec.rb
-- spec/lib/simple_navigation/item_container_spec.rb
-- spec/lib/simple_navigation/item_spec.rb
-- spec/lib/simple_navigation/items_provider_spec.rb
-- spec/lib/simple_navigation/renderer/base_spec.rb
-- spec/lib/simple_navigation/renderer/breadcrumbs_spec.rb
-- spec/lib/simple_navigation/renderer/links_spec.rb
-- spec/lib/simple_navigation/renderer/list_spec.rb
+- spec/lib/simple_navigation/adapters/padrino_spec.rb
+- spec/lib/simple_navigation/adapters/rails_spec.rb
+- spec/lib/simple_navigation/adapters/sinatra_spec.rb
+- spec/lib/simple_navigation/core/configuration_spec.rb
+- spec/lib/simple_navigation/core/item_adapter_spec.rb
+- spec/lib/simple_navigation/core/item_container_spec.rb
+- spec/lib/simple_navigation/core/item_spec.rb
+- spec/lib/simple_navigation/core/items_provider_spec.rb
+- spec/lib/simple_navigation/rails_controller_methods_spec.rb
+- spec/lib/simple_navigation/rendering/helpers_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/base_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/breadcrumbs_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/links_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/list_spec.rb
 - spec/lib/simple_navigation_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -91,41 +111,40 @@ 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.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple Navigation is a ruby library for creating navigations (with multiple levels) for your Ruby on Rails application.
 test_files: 
-- spec/lib/simple_navigation/configuration_spec.rb
-- spec/lib/simple_navigation/controller_methods_spec.rb
-- spec/lib/simple_navigation/helpers_spec.rb
-- spec/lib/simple_navigation/item_adapter_spec.rb
-- spec/lib/simple_navigation/item_container_spec.rb
-- spec/lib/simple_navigation/item_spec.rb
-- spec/lib/simple_navigation/items_provider_spec.rb
-- spec/lib/simple_navigation/renderer/base_spec.rb
-- spec/lib/simple_navigation/renderer/breadcrumbs_spec.rb
-- spec/lib/simple_navigation/renderer/links_spec.rb
-- spec/lib/simple_navigation/renderer/list_spec.rb
+- spec/lib/simple_navigation/adapters/padrino_spec.rb
+- spec/lib/simple_navigation/adapters/rails_spec.rb
+- spec/lib/simple_navigation/adapters/sinatra_spec.rb
+- spec/lib/simple_navigation/core/configuration_spec.rb
+- spec/lib/simple_navigation/core/item_adapter_spec.rb
+- spec/lib/simple_navigation/core/item_container_spec.rb
+- spec/lib/simple_navigation/core/item_spec.rb
+- spec/lib/simple_navigation/core/items_provider_spec.rb
+- spec/lib/simple_navigation/rails_controller_methods_spec.rb
+- spec/lib/simple_navigation/rendering/helpers_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/base_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/breadcrumbs_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/links_spec.rb
+- spec/lib/simple_navigation/rendering/renderer/list_spec.rb
 - spec/lib/simple_navigation_spec.rb
 - spec/spec_helper.rb

data/lib/simple_navigation/initializer.rb

@@ -1,21 +0,0 @@
-module SimpleNavigation
-  module Initializer
-
-    class Rails2
-      def self.run
-        SimpleNavigation.rails_root = RAILS_ROOT
-        SimpleNavigation.rails_env = RAILS_ENV
-        SimpleNavigation.init_rails
-      end
-    end
-    
-    class Rails3
-      def self.run
-        SimpleNavigation.rails_root = Rails.root
-        SimpleNavigation.rails_env = Rails.env
-        SimpleNavigation.init_rails
-      end
-    end
-    
-  end
-end

data/lib/simple_navigation/railtie.rb

@@ -1,7 +0,0 @@
-module SimpleNavigation                                                                                                
-  class Railtie < Rails::Railtie                                                                                       
-    initializer "simple_navigation.init_rails" do |app|                                                                
-      SimpleNavigation::Initializer::Rails3.run
-    end                                                                                                                
-  end                                                                                                                  
-end

data/spec/lib/simple_navigation/controller_methods_spec.rb

@@ -1,90 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-ActionController::Base.send(:include, SimpleNavigation::ControllerMethods)
-
-describe SimpleNavigation::ControllerMethods do
-
-  def stub_loading_config
-    SimpleNavigation::Configuration.stub!(:load)
-  end
-
-  before(:each) do
-    stub_loading_config
-    class TestController
-      class << self
-        def helper_method(*args)
-          @helper_methods = args
-        end
-        def before_filter(*args)
-          @before_filters = args
-        end
-      end
-    end
-    TestController.send(:include, SimpleNavigation::ControllerMethods)
-    @controller = TestController.new
-  end
-  
-  describe 'when being included' do
-    it "should extend the ClassMethods" do
-      @controller.class.should respond_to(:navigation)
-    end
-    it "should include the InstanceMethods" do
-      @controller.should respond_to(:current_navigation)
-    end
-    it "should install the helper methods" do
-      @controller.class.instance_variable_get(:@helper_methods).should == [:render_navigation, :render_primary_navigation, :render_sub_navigation]
-    end
-  end
-  
-  describe 'class_methods' do
-    
-    describe 'navigation' do
-      
-      def call_navigation(key1, key2=nil)
-        ActiveSupport::Deprecation.silence do
-          @controller.class_eval do
-            navigation key1, key2
-          end
-        end
-      end
-      
-      it "should not have an instance-method 'sn_set_navigation' if navigation-method has not been called" do
-        @controller.respond_to?(:sn_set_navigation).should be_false
-      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
-      end
-      it "the created method should not be public" do
-        call_navigation(:key)
-        @controller.public_methods.map(&:to_sym).should_not include(:sn_set_navigation)
-      end
-      it "the created method should be protected" do
-        call_navigation(:key)
-        @controller.protected_methods.map(&:to_sym).should include(:sn_set_navigation)
-      end
-      it 'the created method should call current_navigation with the specified keys' do
-        call_navigation(:primary, :secondary)
-        @controller.should_receive(:current_navigation).with(:primary, :secondary)
-        @controller.send(:sn_set_navigation)
-      end
-    end
-    
-  end
-  
-  describe 'instance_methods' do
-    
-    describe 'current_navigation' do
-      it "should set the sn_current_navigation_args as specified" do
-        ActiveSupport::Deprecation.silence {@controller.current_navigation(:first)}
-        @controller.instance_variable_get(:@sn_current_navigation_args).should == [:first]
-      end
-      it "should set the sn_current_navigation_args as specified" do
-        ActiveSupport::Deprecation.silence {@controller.current_navigation(:first, :second)}
-        @controller.instance_variable_get(:@sn_current_navigation_args).should == [:first, :second]
-      end
-    end
-    
-  end
-  
-end

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

@@ -1,121 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require 'html/document' unless defined? HTML::Document
-
-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
-      @renderer = SimpleNavigation::Renderer::Links.new(options)
-      HTML::Document.new(@renderer.render(primary_navigation)).root
-    end
-      
-    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
-      it "should render an a-tag for each item" do
-        HTML::Selector.new('a').select(render).should have(3).entries
-      end
-      it "should pass the specified html_options to the a element" do
-        HTML::Selector.new('a[style=float:right]').select(render).should have(1).entries
-      end
-      it "should give the a-tag the id specified in the html_options" do
-        HTML::Selector.new('a#my_id').select(render).should have(1).entries
-      end
-      it "should give the a-tag the default id (stringified key) if no id is specified in the html_options" do
-        HTML::Selector.new('a#invoices').select(render).should have(1).entries
-      end
-      it "should not apply the the default id where there is an id specified in the html_options" do
-        HTML::Selector.new('a#users').select(render).should be_empty
-      end
-    
-      context 'with current_navigation set' do
-        it "should mark the matching a-item as selected (with the css_class specified in configuration)" do
-          HTML::Selector.new('a.selected').select(render(:invoices)).should have(1).entries
-        end      
-      end
-    
-      context 'without current_navigation set' do
-        it "should not mark any of the items as selected" do
-          HTML::Selector.new('a.selected').select(render).should be_empty
-        end
-      end
-    
-      # context 'nested sub_navigation' do
-      #   it "should nest the current_primary's subnavigation inside the selected li-element" do
-      #     HTML::Selector.new('li.selected ul li').select(render(:invoices)).should have(2).entries
-      #   end
-      #   it "should be possible to identify sub items using an html selector (using ids)" do
-      #     HTML::Selector.new('#invoices #subnav1').select(render(:invoices)).should have(1).entries
-      #   end
-      #   context 'expand_all => false' do
-      #     it "should not render the invoices submenu if the user-primary is active" do
-      #       HTML::Selector.new('#invoices #subnav1').select(render(:users, :level => :all, :expand_all => false)).should be_empty
-      #       HTML::Selector.new('#invoices #subnav2').select(render(:users, :level => :all, :expand_all => false)).should be_empty
-      #     end
-      #   end
-      # 
-      #   context 'expand_all => true' do
-      #     it "should render the invoices submenu even if the user-primary is active" do
-      #       HTML::Selector.new('#invoices #subnav1').select(render(:users, :level => :all, :expand_all => true)).should have(1).entry
-      #       HTML::Selector.new('#invoices #subnav2').select(render(:users, :level => :all, :expand_all => true)).should have(1).entry
-      #     end
-      #   end
-      #     
-      # end
-    end
-    
-    context 'regarding method calls' do
-      
-      context 'regarding the div_content' do
-        before(:each) do
-          @primary_navigation = primary_container
-          @div_content = stub(:div_content)
-          @div_items = stub(:div_items, :join => @div_content)
-          @items.stub!(:inject => @div_items)
-          @renderer = SimpleNavigation::Renderer::Links.new(options)
-        end
-      
-        it "should join the list_items" do
-          @div_items.should_receive(:join)
-        end
-      
-        it "should html_saferize the list_content" do
-          @renderer.should_receive(:html_safe).with(@div_content)
-        end
-      
-        after(:each) do
-          @renderer.render(@primary_navigation)
-        end
-      end
-      
-      context 'regarding the items' do
-        before(:each) do
-          @primary_navigation = primary_container
-          @renderer = SimpleNavigation::Renderer::Links.new(options)
-        end
-        
-        it "should call html_safe on every item's name" do
-          @items.each do |item|
-            @renderer.should_receive(:html_safe).with(item.name)
-          end
-          @renderer.should_receive(:html_safe).with(anything)
-          @renderer.render(@primary_navigation)
-        end
-      end
-      
-    end
-    
-  end
-end