xebec 2.6.0 → 2.6.1

data/lib/xebec/nav_bar_renderer.rb

@@ -2,13 +2,13 @@ require 'xebec/nav_bar'
 require 'xebec/html5'
 
 module Xebec
-  
+
   # A renderer for a Xebec::NavBar that knows how to turn the NavBar
   # into an HTML list using ActionView helper methods.
   class NavBarRenderer
-    
+
     # Create a new NavBar renderer object. The renderer will pass all
-    # methods on to the NavBar except for +to_s+, which will 
+    # methods on to the NavBar except for +to_s+, which will
     # render the NavBar as an HTML list.
     #
     # @param [Xebec::NavBar] bar the navigation bar to renderer
@@ -19,7 +19,7 @@ module Xebec
         helper.respond_to?(:content_tag) && helper.respond_to?(:link_to_unless_current)
       @bar, @helper = bar, helper
     end
-    
+
     # @return [String] the proxied navigation bar as an HTML list.
     #
     # The HREF for each navigation item is generated as follows:
@@ -43,32 +43,32 @@ module Xebec
       else
         helper.content_tag(root_element, options) do
           helper.content_tag(*list_tag) do
-            bar.items.map do |item|
-              render_nav_item item
-            end.join("")
+            bar.items.inject(''.html_safe) do |content, item|
+              content << render_nav_item(item)
+            end
           end
         end
       end
     end
-    
+
     def inspect
       to_s
     end
-    
+
     def respond_to?(sym)
       return true if bar.respond_to?(sym)
       super
     end
-    
+
     def method_missing(sym, *args, &block)
       return bar.send(sym, *args, &block) if bar.respond_to?(sym)
       super
     end
-    
+
     protected
-    
+
     attr_reader :bar, :helper
-    
+
     def root_navbar_tag
       html_attributes = bar.html_attributes
       html_attributes[:class] ||= ''
@@ -80,13 +80,13 @@ module Xebec
         return :div, html_attributes
       end
     end
-    
+
     # @return the first two arguments to a <tt>content_tag</tt> call --
     #         the name and HTML properties of the tag
     def list_tag
       return :ul, {}
     end
-    
+
     def render_nav_item(item)
       text = text_for_nav_item item
       href = href_for_nav_item item
@@ -96,12 +96,12 @@ module Xebec
       helper.content_tag(*list_item_tag(item, klass, text, href, is_current)) do
         if is_current
           helper.content_tag :span, text
-        else  
+        else
           helper.link_to text, href
         end
       end
     end
-    
+
     # @param [Xebec::NavItem] item the navigation item
     # @param [String] klass the HTML class attribute generated (including
     #                       the "current" class if applicable)
@@ -113,21 +113,21 @@ module Xebec
     def list_item_tag(item, klass, text, href, is_current)
       return :li, :class => klass
     end
-    
+
     def text_for_nav_item(item)
       item_name = item.name
       I18n.t "navbar.#{bar.name}.#{item_name}", :default => item_name.to_s.titleize
     end
-    
+
     def href_for_nav_item(item)
       item.href or helper.send("#{item.name}_path")
     end
-    
+
     def is_current_nav_item?(item, href)
       current = bar.current.to_s
       current == item.name.to_s || current.blank? && helper.current_page?(href)
     end
-    
+
   end
-  
+
 end

data/lib/xebec/nav_item.rb

@@ -1,9 +1,9 @@
 module Xebec
-  
+
   class NavItem
-    
+
     attr_reader :name, :href
-    
+
     # Create a new navigation item.
     #
     # @param [String, Symbol] name the name of the item
@@ -15,7 +15,7 @@ module Xebec
       raise ArgumentError.new("#{name || '<nil>'} is not a valid name for a navigation item") if name.blank?
       @name, @href = name, href
     end
-    
+
   end
-  
+
 end

data/lib/xebec/stylesheet_generator.rb

@@ -1,18 +1,18 @@
 module Xebec
-  
+
   # The `nav_bar` helper method will add the "current" class to the
   # currently-selected item of each navigation bar. Highlighting the
   # item requires just some basic CSS:
-  # 
+  #
   # nav { color: green; }
   # nav .current { color: purple; }
-  # 
+  #
   # Each rendered navigation bar will include its name as a CSS class
   # if you want to style them differently:
-  # 
+  #
   # nav.site { color: green; }
   # nav.area { color: white; background-color: green; }
-  # 
+  #
   # (In case you were wondering about those `nav` elements, they're
   # part of [the HTML5 specification](http://dev.w3.org/html5/spec/Overview.html#the-nav-element).
   #
@@ -27,7 +27,7 @@ module Xebec
     end
 
     protected
-    
+
     def after_generate
       puts "Generated a stylesheet with navigation bars #{navigation_bars.to_sentence}"
     end
@@ -39,7 +39,7 @@ module Xebec
     def banner
       %{Usage: #{$0} #{spec.name} [nav_bar_name [nav_bar_name ...]]\nGenerates navigation bar stylesheets in public/stylesheets/}
     end
-    
+
   end
-  
+
 end

data/lib/xebec/title_enhanced_nav_bar_renderer.rb

@@ -1,7 +1,7 @@
 require 'xebec/nav_bar_renderer'
 
 module Xebec
-  
+
   # Replaces the default Xebec::NavBarRenderer with a version
   # that supports separate "text" and "title" internationalization
   # options for each navigation item. Instead of
@@ -12,9 +12,9 @@ module Xebec
   #
   # @see Xebec::NavBarRenderer
   class TitleEnhancedNavBarRenderer < ::Xebec::NavBarRenderer
-    
+
     protected
-    
+
     def list_item_tag(item, klass, text, href, is_current)
       return :li, :class => klass, :title => title_for_nav_item(item, text)
     end
@@ -23,14 +23,14 @@ module Xebec
       item_name = item.name
       I18n.t "navbar.#{bar.name}.#{item_name}.text",  :default => item_name.to_s.titleize
     end
-    
+
     def title_for_nav_item(item, text)
       item_name = item.name
       I18n.t "navbar.#{bar.name}.#{item_name}.title", :default => text
     end
-    
+
   end
-  
+
 end
 
 Xebec::renderer_class = Xebec::TitleEnhancedNavBarRenderer

data/lib/xebec/web_app_theme_renderer.rb

@@ -1,22 +1,22 @@
 require 'xebec/nav_bar_renderer'
 
 module Xebec
-  
+
   # Replaces the default Xebec::NavBarRenderer with a version
   # that includes the CSS classes used by WebAppThemes.
   #
   # @see Xebec::NavBarRenderer
   # @see http://github.com/pilu/web-app-theme
   class WebAppThemeRenderer < ::Xebec::NavBarRenderer
-    
+
     protected
-    
+
     def list_tag
       return :ul, :class => 'wat-cf'
     end
-    
+
   end
-  
+
 end
 
 Xebec::renderer_class = Xebec::WebAppThemeRenderer

data/test/controller_support_test.rb

@@ -2,10 +2,11 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'xebec'
 
 class ControllerSupportTest < Test::Unit::TestCase
-  
+
   def setup
     @controller_class = Class.new(ActionController::Base).tap do |c|
       c.instance_eval do
+        include ActionController::Testing
         include Xebec::ControllerSupport
         def public_nav_bar(*args, &block)
           nav_bar(*args, &block)
@@ -14,41 +15,39 @@ class ControllerSupportTest < Test::Unit::TestCase
     end
     @controller = @controller_class.new
   end
-  
+
   def call_before_filters
-    @controller_class.before_filters.each do |filter|
-      filter.call(@controller)
-    end
+    @controller.run_callbacks(:process_action)
   end
-  
+
   context 'ControllerSupport::ClassMethods#nav_bar' do
-    
+
     should 'append a before_filter that looks up the named navigation bar' do
       @controller_class.public_nav_bar :turtles
       @controller.expects(:nav_bar).with(:turtles)
       call_before_filters
     end
-    
+
     should 'append a before_filter with the given options' do
       options = { :only => :show }
       @controller_class.expects(:append_before_filter).with(options)
       @controller_class.public_nav_bar :foo, options
     end
-  
+
     should 'append a before_filter that passes the given block to the named nav bar instance' do
       @controller_class.public_nav_bar(:baz) { |nb| nb.nav_item :help }
       bar = @controller.nav_bar :baz
       bar.expects(:nav_item).with(:help)
       call_before_filters
     end
-    
+
   end
-  
+
   context 'ControllerSupport::InstanceMethods#nav_bar' do
     should 'treat Symbol names and String names equivalently' do
       left = @controller.nav_bar(:left)
       assert_equal left, @controller.nav_bar('left')
     end
   end
-  
+
 end

data/test/html5_test.rb

@@ -3,55 +3,55 @@ require 'xebec'
 require 'xebec/html5'
 
 class HTML5Test < Test::Unit::TestCase
-  
+
   def setup
     @helper = new_nav_bar_helper
   end
-  
+
   def internet_explorer_8
     'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; MDDC)'
   end
-  
+
   def internet_explorer_7
     'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; InfoPath.1; MS-RTC LM 8)'
   end
-  
+
   def firefox
     'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.2pre) Gecko/20100225 Ubuntu/9.10 (karmic) Namoroka/3.6.2pre'
   end
-  
+
   def safari
     'Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11a Safari/525.20'
   end
-  
+
   context 'HTML5#user_agent_supports_html5?' do
     setup { Xebec::HTML5.force = false }
-    
+
     context 'when Xebec::HTML5.force is false' do
       should 'return false for Internet Explorer 8' do
         @helper.request.user_agent = internet_explorer_8
         assert !@helper.user_agent_supports_html5?
       end
-            
+
       should 'return false for Internet Explorer 7' do
         @helper.request.user_agent = internet_explorer_7
         assert !@helper.user_agent_supports_html5?
       end
-      
+
       should 'return true for Firefox' do
         @helper.request.user_agent = firefox
         assert @helper.user_agent_supports_html5?
       end
-      
+
       should 'return true for Safari' do
         @helper.request.user_agent = safari
         assert @helper.user_agent_supports_html5?
       end
     end
-    
+
     context 'when Xebec::HTML5.force is true' do
       setup { Xebec::HTML5.force = true }
-      
+
       should 'return false for Internet Explorer 8' do
         @helper.request.user_agent = internet_explorer_8
         assert @helper.user_agent_supports_html5?
@@ -72,7 +72,7 @@ class HTML5Test < Test::Unit::TestCase
         assert @helper.user_agent_supports_html5?
       end
     end
-    
+
   end
-  
+
 end

data/test/nav_bar_helper_test.rb

@@ -2,17 +2,17 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'xebec'
 
 class NavBarHelperTest < Test::Unit::TestCase
-  
+
   context 'NavBarHelper#nav_bar' do
-    
+
     setup do
       @helper = new_nav_bar_helper
     end
-    
+
     should 'return a NavBar renderer' do
       assert @helper.nav_bar.kind_of?(Xebec::NavBarRenderer)
     end
-    
+
     should 'use a custom renderer class if one is set' do
       begin
         @old_renderer_class = Xebec::renderer_class
@@ -36,34 +36,34 @@ class NavBarHelperTest < Test::Unit::TestCase
       ensure
         Xebec::renderer_class = @old_renderer_class
       end
-    end    
-    
+    end
+
     should 'return a NavBar with the given name' do
       assert_equal :snacks, @helper.nav_bar(:snacks).name
     end
-    
+
     should 'return the same NavBar for repeated calls with the same name' do
       snacks = @helper.nav_bar(:snacks)
       assert_equal snacks, @helper.nav_bar(:snacks)
     end
-    
+
     should 'treat Symbol names and String names equivalently' do
       desserts = @helper.nav_bar(:desserts)
       assert_equal desserts, @helper.nav_bar('desserts')
     end
-    
+
     should 'allow additional HTML attributes' do
       salads = @helper.nav_bar(:salads, :id => 'salads-nav')
       assert_equal 'salads-nav', @helper.nav_bar(:salads).html_attributes[:id]
     end
-    
+
     should "evaluate a block in the helper's scope" do
       @helper.expects(:zoink!)
-      @helper.nav_bar do
+      @helper.nav_bar do |bar|
         zoink!
       end
     end
-    
+
     should "yield the NavBar renderer to the given block" do
       bar = @helper.nav_bar
       bar.expects :zoink!
@@ -71,21 +71,21 @@ class NavBarHelperTest < Test::Unit::TestCase
         nb.zoink!
       end
     end
-    
+
   end
-  
+
   context 'NavBarHelper#nav_bar_unless_empty' do
     setup do
       @helper = new_nav_bar_helper
       @bar = @helper.nav_bar(:pets)
     end
-    
+
     context 'with an empty navigation bar' do
       should 'return an empty String' do
         assert @helper.nav_bar_unless_empty(:pets).blank?
       end
     end
-    
+
     context 'with a non-empty navigation bar' do
       setup { @bar.nav_item :cats, '/cats' }
       should 'return a navigation bar' do
@@ -93,5 +93,5 @@ class NavBarHelperTest < Test::Unit::TestCase
       end
     end
   end
-  
+
 end