simple-navigation 3.8.0 → 3.9.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+*3.9.0
+
+* Added ability to pass a block to render_navigation for configuring dynamic navigation items (instead of passing :items). Credits to Ronald Chan.
+
 *3.8.0
 
 * Changed the way the context is fetched. Fixes incompatibility with Gretel. Thanks to Ivan Kasatenko.

data/README

@@ -18,5 +18,5 @@ Online Demo:
 Discussion Group for Feedback and Questions
   http://groups.google.com/group/simple-navigation
 
-Copyright (c) 2011 Andi Schacke, released under the MIT license
+Copyright (c) 2012 Andi Schacke, released under the MIT license
 

data/VERSION

@@ -1 +1 @@
-3.8.0
+3.9.0

data/lib/simple_navigation/rendering/helpers.rb

@@ -31,8 +31,16 @@ 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(options={})
-      active_navigation_item_container(options) { |container| container && container.render(options) }
+    #
+    # Instead of using the <tt>:items</tt> option, a block can be passed to specify the items dynamically
+    #
+    #   render_navigation do |menu|
+    #     menu.item :posts, "Posts", posts_path
+    #   end
+    #
+    def render_navigation(options={},&block)
+      container = active_navigation_item_container(options,&block)
+      container && container.render(options)
     end
 
     # Returns the name of the currently active navigation item belonging to the specified level.
@@ -68,12 +76,11 @@ module SimpleNavigation
     # options
     def active_navigation_item(options={},value_for_nil = nil)
       options[:level] = :leaves if options[:level].nil? || options[:level] == :all
-      active_navigation_item_container(options) do |container|
-        if container && (item = container.selected_item)
-          block_given? ? yield(item) : item
-        else
-          value_for_nil
-        end
+      container = active_navigation_item_container(options)
+      if container && (item = container.selected_item)
+        block_given? ? yield(item) : item
+      else
+        value_for_nil
       end
     end
 
@@ -88,20 +95,21 @@ module SimpleNavigation
     # * <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.
     #
     # Returns <tt>nil</tt> if no active item container can be found
-    def active_navigation_item_container(options={})
+    def active_navigation_item_container(options={},&block)
       options = SimpleNavigation::Helpers::apply_defaults(options)
-      SimpleNavigation::Helpers::load_config(options,self)
+      SimpleNavigation::Helpers::load_config(options,self,&block)
       container = SimpleNavigation.active_item_container_for(options[:level])
-      block_given? ? yield(container) : container
     end
 
     class << self
-      def load_config(options,includer)
+      def load_config(options,includer,&block)
         ctx = options.delete(:context)
         SimpleNavigation.init_adapter_from includer
         SimpleNavigation.load_config(ctx)
-        SimpleNavigation::Configuration.eval_config(ctx) 
-        SimpleNavigation.config.items(options[:items]) if options[:items]
+        SimpleNavigation::Configuration.eval_config(ctx)
+        if block_given? || options[:items]
+          SimpleNavigation.config.items(options[:items],&block)
+        end
         SimpleNavigation.handle_explicit_navigation if SimpleNavigation.respond_to?(:handle_explicit_navigation)
         raise "no primary navigation defined, either use a navigation config file or pass items directly to render_navigation" unless SimpleNavigation.primary_navigation
       end

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

@@ -170,6 +170,17 @@ describe SimpleNavigation::Helpers do
           @controller.render_navigation(:items => @items)
         end
       end
+      context 'block given' do
+        it 'should use block' do
+          block_executed = 0
+          expect do
+            @controller.render_navigation do |menu|
+              menu.class.should == SimpleNavigation::ItemContainer
+              block_executed += 1
+            end
+          end.to change{block_executed}.by(1)
+        end
+      end
     end
   
     describe 'no primary navigation defined' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-navigation
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport