simple-navigation 3.0.0.beta1 → 3.0.0.beta2

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.0.0.beta2
+
+* moving code for initializing plugin in sinatra to separate gem
+
 *3.0.0.beta1
 
 * moving deprecated rails controller methods (navigation, current_navigation) to separate file 'rails_controller_methods'. Deprecations removed. File can be required explicitly if controller methods should be still available.

data/Rakefile

@@ -34,10 +34,10 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "simple-navigation"
-    gemspec.summary = "Simple Navigation is a ruby library for creating navigations (with multiple levels) for your Ruby on Rails application."
+    gemspec.summary = "simple-navigation is a ruby library for creating navigations (with multiple levels) for your Rails2, Rails3, Sinatra or Padrino application."
     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 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."
+    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_dependency('activesupport', '>= 2.3.2')
     gemspec.authors = ["Andi Schacke"]

data/VERSION

@@ -0,0 +1 @@
+3.0.0

data/lib/simple_navigation/adapters/sinatra.rb

@@ -64,13 +64,3 @@ module SimpleNavigation
     end
   end
 end
-
-module SimpleNavigation
-  
-  # Adds registered method to SimpleNavigation. This is called when executing 'register SimpleNavigation'.
-  def self.registered(app)
-    register
-    app.helpers Helpers
-  end
-  
-end

data/lib/simple_navigation/core/configuration.rb

@@ -7,7 +7,7 @@ module SimpleNavigation
     include Singleton
 
     attr_accessor :renderer, :selected_class, :autogenerate_item_ids, :id_generator, :auto_highlight
-    attr_reader :render_all_levels, :primary_navigation
+    attr_reader :primary_navigation
 
     class << self
 
@@ -32,12 +32,6 @@ module SimpleNavigation
       @auto_highlight = true
     end
 
-    # Adds a deprecation warning when this options is set in the config file
-    def render_all_levels=(do_it)
-      ActiveSupport::Deprecation.warn("Setting render_all_levels in the config-file has been deprected. Please use render_navigation(:expand_all => true) instead")
-      @render_all_levels = do_it
-    end
-
     # This is the main method for specifying the navigation items. It can be used in two ways:
     #
     # 1. Declaratively specify your items in the config/navigation.rb file using a block. It then yields an SimpleNavigation::ItemContainer for adding navigation items.

data/lib/simple_navigation/rendering/helpers.rb

@@ -31,10 +31,8 @@ module SimpleNavigation
     #   will be loaded and used for rendering the navigation.
     # * <tt>:items</tt> - you can specify the items directly (e.g. if items are dynamically generated from database). See SimpleNavigation::ItemsProvider for documentation on what to provide as items.
     # * <tt>:renderer</tt> - specify the renderer to be used for rendering the navigation. Either provide the Class or a symbol matching a registered renderer. Defaults to :list (html list renderer).
-    def render_navigation(*args)
-      args = [Hash.new] if args.empty?
-      options = extract_backwards_compatible_options(*args)
-      options = {:context => :default, :level => :all}.merge(options)
+    def render_navigation(options={})
+      options = apply_defaults(options)
       ctx = options.delete(:context)
       SimpleNavigation.init_adapter_from self
       SimpleNavigation.load_config(ctx) 
@@ -46,50 +44,11 @@ module SimpleNavigation
       active_item_container.render(options) unless active_item_container.nil?
     end
 
-    # Deprecated. Renders the primary_navigation with the configured renderer. Calling render_navigation(:level => 0) has the same effect.
-    def render_primary_navigation(options = {})
-      ActiveSupport::Deprecation.warn("SimpleNavigation::Helpers.render_primary_navigation has been deprecated. Please use render_navigation(:level => 1) instead")
-      render_navigation(options.merge(:level => 1))
-    end
-
-    # Deprecated. Renders the sub_navigation with the configured renderer. Calling render_navigation(:level => 1) has the same effect.
-    def render_sub_navigation(options = {})
-      ActiveSupport::Deprecation.warn("SimpleNavigation::Helpers.render_primary_navigation has been deprecated. Please use render_navigation(:level => 2) instead")
-      render_navigation(options.merge(:level => 2))
-    end
-
     private
 
-    def extract_backwards_compatible_options(*args)
-      case args.first
-      when Hash
-        options = args.first
-        options[:level] = options.delete(:levels) if options[:levels]
-        deprecated_api! if options[:level] == :primary || options[:level] == :secondary || options[:level] == :nested
-        options[:level] = 1 if options[:level] == :primary
-        options[:level] = 2 if options[:level] == :secondary
-        options[:level] = :all if options[:level] == :nested
-      when Symbol
-        deprecated_api!
-        raise ArgumentError, "Invalid arguments" unless [:primary, :secondary, :nested].include? args.first
-        options = Hash.new
-        options[:level] = args.first
-        options[:level] = :all if options[:level] == :nested
-        options[:level] = 1 if options[:level] == :primary
-        options[:level] = 2 if options[:level] == :secondary
-        options.merge!(args[1] || {})
-      else
-        raise ArgumentError, "Invalid arguments"
-      end
-      if options[:all_open]
-        options[:expand_all] = options.delete(:all_open)
-        ActiveSupport::Deprecation.warn("render_navigation(:all_open => true) has been deprecated, please use render_navigation(:expand_all => true) instead")
-      end
-      options
-    end
-
-    def deprecated_api!
-      ActiveSupport::Deprecation.warn("You are using a deprecated API of SimpleNavigation::Helpers.render_navigation, please check the documentation on http://wiki.github.com/andi/simple-navigation")
+    def apply_defaults(options)
+      options[:level] = options.delete(:levels) if options[:levels]
+      {:context => :default, :level => :all}.merge(options)
     end
 
   end

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

@@ -106,15 +106,6 @@ describe SimpleNavigation::Configuration do
     end
   end
 
-  describe 'render_all_levels=' do
-    it "should set the instance var" do
-      ActiveSupport::Deprecation.silence do
-        @config.render_all_levels = true
-        @config.render_all_levels.should be_true
-      end
-    end
-  end
-
   describe 'loaded?' do
     it "should return true if primary_nav is set" do
       @config.instance_variable_set(:@primary_navigation, :bla)

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

@@ -74,6 +74,7 @@ describe SimpleNavigation::ItemContainer do
 
   describe 'selected_item' do
     before(:each) do
+      SimpleNavigation.stub!(:current_navigation_for => :nav)
       @item_container.stub!(:[] => nil)
       @item_1 = stub(:item, :selected? => false)
       @item_2 = stub(:item, :selected? => false)

data/spec/lib/simple_navigation/rails_controller_methods_spec.rb

@@ -43,10 +43,8 @@ describe 'explicit navigation in rails' do
       describe 'navigation' do
 
         def call_navigation(key1, key2=nil)
-          ActiveSupport::Deprecation.silence do
-            @controller.class_eval do
-              navigation key1, key2
-            end
+          @controller.class_eval do
+            navigation key1, key2
           end
         end
 
@@ -78,11 +76,11 @@ describe 'explicit navigation in rails' do
 
       describe 'current_navigation' do
         it "should set the sn_current_navigation_args as specified" do
-          ActiveSupport::Deprecation.silence {@controller.current_navigation(:first)}
+          @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.current_navigation(:first, :second)
           @controller.instance_variable_get(:@sn_current_navigation_args).should == [:first, :second]
         end
       end

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

@@ -89,14 +89,6 @@ describe SimpleNavigation::Helpers do
     end
 
     context 'primary' do
-      it "should call render on the primary_navigation" do
-        @primary_navigation.should_receive(:render)
-        ActiveSupport::Deprecation.silence {@controller.render_navigation(:primary)}
-      end
-      it "should call render on the primary_navigation (specifying level through options)" do
-        @primary_navigation.should_receive(:render)
-        ActiveSupport::Deprecation.silence {@controller.render_navigation(:level => :primary)}
-      end
       it "should call render on the primary_navigation (specifying level through options)" do
         @primary_navigation.should_receive(:render).with(:level => 1)
         @controller.render_navigation(:level => 1)
@@ -111,11 +103,7 @@ describe SimpleNavigation::Helpers do
         end
         it "should find the selected sub_navigation for the specified level" do
           SimpleNavigation.should_receive(:active_item_container_for).with(2)
-          ActiveSupport::Deprecation.silence {@controller.render_navigation(:secondary)}
-        end
-        it "should find the selected sub_navigation for the specified level" do
-          SimpleNavigation.should_receive(:active_item_container_for).with(2)
-          ActiveSupport::Deprecation.silence {@controller.render_navigation(:level => :secondary)}
+          @controller.render_navigation(:level => 2)
         end
         it "should find the selected sub_navigation for the specified level" do
           SimpleNavigation.should_receive(:active_item_container_for).with(1)
@@ -123,7 +111,7 @@ describe SimpleNavigation::Helpers do
         end
         it "should call render on the active item_container" do
           @selected_item_container.should_receive(:render).with(:level => 2)
-          ActiveSupport::Deprecation.silence {@controller.render_navigation(:secondary)}
+          @controller.render_navigation(:level => 2)
         end
       end
       context 'without an active item_container set' do
@@ -131,47 +119,16 @@ describe SimpleNavigation::Helpers do
           SimpleNavigation.stub!(:active_item_container_for => nil)
         end
         it "should not raise an error" do
-          lambda{ActiveSupport::Deprecation.silence {@controller.render_navigation(:secondary)}}.should_not raise_error
+          lambda {@controller.render_navigation(:level => 2)}.should_not raise_error
         end
       end
 
     end
 
-    context 'nested' do
-      it "should call render on the primary navigation with the :level => :all option set" do
-        @primary_navigation.should_receive(:render).with(:level => :all)
-        ActiveSupport::Deprecation.silence {@controller.render_navigation(:nested)}
-      end
-    end
-
     context 'unknown level' do
-      it "should raise an error" do
-        lambda {ActiveSupport::Deprecation.silence {@controller.render_navigation(:unknown)}}.should raise_error(ArgumentError)
-      end
       it "should raise an error" do
         lambda {@controller.render_navigation(:level => :unknown)}.should raise_error(ArgumentError)
       end
-      it "should raise an error" do
-        lambda {@controller.render_navigation('level')}.should raise_error(ArgumentError)
-      end
-    end
-  end
-
-  describe 'render_primary_navigation' do
-    it "should delegate to render_navigation(:level => 1)" do
-      ActiveSupport::Deprecation.silence do
-        @controller.should_receive(:render_navigation).with(:level => 1)
-        @controller.render_primary_navigation
-      end
-    end
-  end
-
-  describe 'render_sub_navigation' do
-    it "should delegate to render_navigation(:level => 2)" do
-      ActiveSupport::Deprecation.silence do
-        @controller.should_receive(:render_navigation).with(:level => 2)
-        @controller.render_sub_navigation
-      end
     end
   end
 
@@ -186,11 +143,4 @@ describe SimpleNavigation::Helpers do
     end
   end
 
-  describe 'option all_open should work as expand_all' do
-    it "should call render on the primary navigation with the include_subnavigation option set" do
-      @primary_navigation.should_receive(:render).with(:level => :all, :expand_all => true)
-      ActiveSupport::Deprecation.silence {@controller.render_navigation(:level => :all, :all_open => true)}
-    end
-  end
-
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta1
-  version: 3.0.0.beta1
+  - beta2
+  version: 3.0.0.beta2
 platform: ruby
 authors: 
 - Andi Schacke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +02:00
+date: 2010-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
         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.
+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.
 email: andreas.schacke@gmail.com
 executables: []
 
@@ -58,7 +58,7 @@ files:
 - CHANGELOG
 - README
 - Rakefile
-- VERSION.yml
+- VERSION
 - generators/navigation_config/USAGE
 - generators/navigation_config/navigation_config_generator.rb
 - generators/navigation_config/templates/config/navigation.rb
@@ -130,7 +130,7 @@ rubyforge_project: andi
 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.
+summary: simple-navigation is a ruby library for creating navigations (with multiple levels) for your Rails2, Rails3, Sinatra or Padrino application.
 test_files: 
 - spec/lib/simple_navigation/adapters/padrino_spec.rb
 - spec/lib/simple_navigation/adapters/rails_spec.rb

data/VERSION.yml

@@ -1,4 +0,0 @@
----
-:major: 3
-:minor: 0
-:patch: 0