xebec 2.5.2 → 2.6.0

data/VERSION

@@ -1 +1 @@
-2.5.2
+2.6.0

data/lib/xebec/has_nav_bars.rb

@@ -15,14 +15,14 @@ module Xebec
     # @param [Symbol, String] name the name of the navigation bar to look up
     # @param [Hash] html_attributes additional HTML attributes to add to the
     #                               navigation bar
-    def look_up_nav_bar_and_eval(name = nil, html_attributes = {}, &block)
+    def look_up_nav_bar_and_eval(name = nil, html_attributes = {}, options = {}, &block)
       name ||= Xebec::NavBar::DEFAULT_NAME
-      look_up_nav_bar(name, html_attributes).tap do |bar|
+      look_up_nav_bar(name, html_attributes, options).tap do |bar|
         block.bind(self).call(bar) if block_given?
       end
     end
     
-    def look_up_nav_bar(name, html_attributes)
+    def look_up_nav_bar(name, html_attributes, options = {})
       (nav_bars[name] ||= NavBar.new(name, html_attributes)).tap do |bar|
         bar.html_attributes.merge!(html_attributes)
       end

data/lib/xebec/nav_bar_helper.rb

@@ -31,8 +31,8 @@ module Xebec
     # @see Xebec::HasNavBars#nav_bar
     #
     # @return [Xebec::NavBarRenderer]
-    def nav_bar(name = nil, html_attributes = {}, &block)
-      look_up_nav_bar_and_eval name, html_attributes, &block
+    def nav_bar(name = nil, html_attributes = {}, options = {}, &block)
+      look_up_nav_bar_and_eval name, html_attributes, options, &block
     end
     
     # Renders a navigation bar if and only if it contains any
@@ -63,10 +63,11 @@ EOS
     
     # Override HasNavBars#look_up_nav_bar to replace with a
     # renderer if necessary.
-    def look_up_nav_bar(name, html_attributes)
+    def look_up_nav_bar(name, html_attributes, options = {})
       bar = super(name, html_attributes)
       if bar.kind_of?(Xebec::NavBar)
-        bar = nav_bars[bar.name] = Xebec::renderer_class.new(bar, self)
+        renderer_class = options[:renderer_class] || Xebec::renderer_class
+        bar = nav_bars[bar.name] = renderer_class.new(bar, self)
       end
       bar
     end

data/lib/xebec/nav_bar_renderer.rb

@@ -45,7 +45,7 @@ module Xebec
           helper.content_tag(*list_tag) do
             bar.items.map do |item|
               render_nav_item item
-            end
+            end.join("")
           end
         end
       end

data/test/nav_bar_helper_test.rb

@@ -25,6 +25,18 @@ class NavBarHelperTest < Test::Unit::TestCase
         Xebec::renderer_class = @old_renderer_class
       end
     end
+
+    should 'use a custom renderer class if one is passed in' do
+      begin
+        @old_renderer_class = Xebec::renderer_class
+        klass = Class.new do
+          def initialize(*args, &block); end;
+        end
+        assert @helper.nav_bar(nil, {}, :renderer_class => klass).kind_of?(klass)
+      ensure
+        Xebec::renderer_class = @old_renderer_class
+      end
+    end    
     
     should 'return a NavBar with the given name' do
       assert_equal :snacks, @helper.nav_bar(:snacks).name

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require 'action_controller/test_process'
 
 begin
   require 'redgreen/unicode'
-rescue
+rescue MissingSourceFile
   require 'redgreen'
 end
 

data/xebec.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{xebec}
-  s.version = "2.5.2"
+  s.version = "2.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James A. Rosen"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-06-04}
   s.description = %q{Helpers for generating navigation bars}
   s.email = %q{james.a.rosen@gmail.com}
   s.extra_rdoc_files = [
@@ -104,3 +104,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<redgreen>, ["~> 1.2.2"])
   end
 end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 5
-  - 2
-  version: 2.5.2
+  - 6
+  - 0
+  version: 2.6.0
 platform: ruby
 authors: 
 - James A. Rosen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency