xebec 2.6.0 → 2.6.1

data/test/nav_bar_renderer_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'xebec'
 
 class NavBarRendererTest < Test::Unit::TestCase
-  
+
   context 'creating a NavBar renderer' do
     should 'require a NavBar' do
       assert_raises(ArgumentError) do
@@ -15,62 +15,62 @@ class NavBarRendererTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context 'a NavBar renderer' do
-    
+
     setup do
       clear_translations!
       @bar = Xebec::NavBar.new('elephants')
       @helper = new_nav_bar_helper
       @renderer = Xebec::NavBarRenderer.new(@bar, @helper)
     end
-    
+
     should 'respond to :name' do
       assert @renderer.respond_to?(:name)
     end
-    
+
     should "return the NavBar's name when sent :name" do
       assert_equal 'elephants', @renderer.name
     end
-    
+
     should 'support additional HTML properties' do
       @bar.html_attributes.merge!(:id => 'salads-nav')
       assert_equal({:id => 'salads-nav'}, @renderer.html_attributes)
       assert_select_from @renderer.to_s, '#salads-nav'
     end
-    
+
     should 'not respond to a method that the underlying NavBar does not' do
       assert !@renderer.respond_to?(:cromulize)
     end
-    
+
     context 'for a browser that supports HTML5' do
       setup { @renderer.stubs(:user_agent_supports_html5?).returns(true) }
-      
+
       should "render a navigation bar with the bar's name" do
         assert_select_from @renderer.to_s, "nav.elephants"
       end
-      
+
       context 'with an empty NavBar' do
         should 'render an empty navigation bar' do
           assert_select_from @renderer.to_s, 'nav', /$^/
         end
       end
     end
-    
+
     context 'for a browser that does not support HTML5' do
       setup { @helper.stubs(:user_agent_supports_html5?).returns(false) }
-      
+
       should "render a div.navbar the bar's name" do
         assert_select_from @renderer.to_s, "div.navbar.elephants"
       end
-      
+
       context 'with an empty NavBar' do
         should 'render an empty navigation bar' do
           assert_select_from @renderer.to_s, 'div.navbar', /$^/
         end
       end
     end
-    
+
     context 'with a NavBar that has a navigation item declared as a name' do
       setup do
         @helper.stubs(:foo_path).returns("/foo")
@@ -84,7 +84,7 @@ class NavBarRendererTest < Test::Unit::TestCase
         end
       end
     end
-    
+
     context 'with a NavBar that has a navigation item set as current' do
       setup do
         @bar.nav_item :foo, '/foo'
@@ -110,7 +110,7 @@ class NavBarRendererTest < Test::Unit::TestCase
         end
       end
     end
-    
+
     context 'with a NavBar that has a NavItem with a String name' do
       setup do
         @bar.nav_item 'foo', '/foo'
@@ -127,7 +127,7 @@ class NavBarRendererTest < Test::Unit::TestCase
         assert_equal original_text, @bar.items.first.name.dup
       end
     end
-    
+
     context 'with a NavBar that has a navigation item not set as current' do
       setup do
         @bar.nav_item :foo, '/foo'
@@ -143,7 +143,7 @@ class NavBarRendererTest < Test::Unit::TestCase
         assert(!(/class\s*=\s*["']\s*["']/ === @renderer.to_s))
       end
     end
-    
+
     context 'with a NavBar that has a navigation item declared as a name and URL' do
       setup do
         @bar.nav_item :foo, 'http://foo.com'
@@ -156,7 +156,7 @@ class NavBarRendererTest < Test::Unit::TestCase
         end
       end
     end
-    
+
     context 'with a NavBar that has a navigation item that links to the current page' do
       setup do
         @helper.stubs(:current_page?).with('/').returns(true)
@@ -183,7 +183,7 @@ class NavBarRendererTest < Test::Unit::TestCase
         end
       end
     end
-    
+
     context "with a NavBar that has a navigation item with an i18n'd title" do
       setup do
         define_translation 'navbar.elephants.foo', 'My Foos'
@@ -198,7 +198,18 @@ class NavBarRendererTest < Test::Unit::TestCase
         end
       end
     end
-    
+
+    context 'with a NavBar that has several nav items' do
+      setup do
+        @bar.nav_item :foo, '/foo'
+        @bar.nav_item :bar, '/bar'
+      end
+
+      should 'return an HTML-safe navigation bar' do
+        assert @renderer.to_s.html_safe?
+      end
+    end
+
   end
-  
+
 end

data/test/nav_bar_test.rb

@@ -2,29 +2,29 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'xebec'
 
 class NavBarTest < Test::Unit::TestCase
-  
+
   context 'a NavBar' do
-    
+
     setup do
       @bar = Xebec::NavBar.new
     end
-    
+
     should 'use :default as its name by default' do
       assert_equal :default, @bar.name
     end
-    
+
     should 'use a specified name' do
       assert_equal 'fazbot', Xebec::NavBar.new('fazbot').name
     end
-    
+
     should 'be empty by default' do
       assert @bar.empty?
     end
-    
+
     should 'not have any item specified as current by default' do
       assert @bar.current.blank?
     end
-    
+
     context 'with some items' do
       setup do
         @bar.nav_item :foo
@@ -34,7 +34,7 @@ class NavBarTest < Test::Unit::TestCase
         assert !@bar.empty?
       end
     end
-    
+
     should 'not allow a nameless item to be added' do
       assert_raises ArgumentError do
         @bar.nav_item nil
@@ -43,7 +43,7 @@ class NavBarTest < Test::Unit::TestCase
         @bar.nav_item ''
       end
     end
-    
+
   end
-  
+
 end

data/test/test_helper.rb

@@ -1,19 +1,17 @@
+ENV["RAILS_ENV"] = "test"
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+
 require 'test/unit'
 require 'test/unit/testcase'
-require 'rubygems'
 require 'shoulda'
 require 'mocha'
-require 'activesupport'
-require 'actionpack'
+require 'active_support'
+require 'action_pack'
 require 'action_view'
 require 'action_controller'
-require 'action_controller/test_process'
-
-begin
-  require 'redgreen/unicode'
-rescue MissingSourceFile
-  require 'redgreen'
-end
+require 'action_dispatch'
 
 [['..', 'lib'], ['lib']].each do |lib_dir|
   lib_path = File.expand_path(File.join(File.dirname(__FILE__), *lib_dir))
@@ -23,21 +21,21 @@ end
 require 'xebec'
 
 Test::Unit::TestCase.class_eval do
-  include ActionController::Assertions::SelectorAssertions
-  
+  include ActionDispatch::Assertions::SelectorAssertions
+
   def assert_select_from(text, *args, &block)
     @selected = HTML::Document.new(text).root.children
     assert_select(*args, &block)
   end
-  
+
   def new_nav_bar_helper
     ActionView::Base.new.tap do |helper|
       helper.extend Xebec::NavBarHelper
-      helper.request = ActionController::TestRequest.new
+      helper.request = ActionDispatch::TestRequest.new
       helper.stubs(:current_page?).returns(false)
     end
   end
-  
+
   def clear_translations!
     I18n.reload!
   end
@@ -46,6 +44,6 @@ Test::Unit::TestCase.class_eval do
     hash = key.to_s.split('.').reverse.inject(value) do |value, key_part|
       { key_part.to_sym => value }
     end
-    I18n.backend.send :merge_translations, I18n.locale, hash
+    I18n.backend.send :store_translations, I18n.locale, hash
   end
 end

data/test/title_enhanced_nav_bar_renderer_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'xebec'
 
 class TitleEnhancedNavBarRendererTest < Test::Unit::TestCase
-  
+
   def setup
     @old_renderer_class = Xebec::renderer_class
     load 'xebec/title_enhanced_nav_bar_renderer.rb'
@@ -12,17 +12,17 @@ class TitleEnhancedNavBarRendererTest < Test::Unit::TestCase
     @renderer = Xebec::renderer_class.new(@bar, @helper)
     @bar.nav_item :zn, '/elements/zn'
   end
-  
+
   def teardown
     Xebec::renderer_class = @old_renderer_class
   end
-  
+
   context 'using the title-enhanced renderer' do
-    
+
     should 'replace the default renderer class automatically' do
       assert_equal Xebec::TitleEnhancedNavBarRenderer, Xebec::renderer_class
     end
-    
+
     context 'with neither text nor a title translation specified' do
       should "use the nav item's name titleized for the link text" do
         assert_select_from @renderer.to_s, 'ul li.zn' do
@@ -33,7 +33,7 @@ class TitleEnhancedNavBarRendererTest < Test::Unit::TestCase
         assert_select_from @renderer.to_s, 'ul li.zn[title="Zn"]'
       end
     end
-    
+
     context 'with a text but not a title translation specified' do
       setup do
         define_translation 'navbar.elements.zn.text', 'Zinc'
@@ -48,7 +48,7 @@ class TitleEnhancedNavBarRendererTest < Test::Unit::TestCase
         assert_select_from @renderer.to_s, 'ul li.zn[title="Zinc"]'
       end
     end
-    
+
     context 'with a title but no text translation specified' do
       setup do
         define_translation 'navbar.elements.zn.title', 'Zinc'
@@ -63,7 +63,7 @@ class TitleEnhancedNavBarRendererTest < Test::Unit::TestCase
         assert_select_from @renderer.to_s, 'ul li.zn[title="Zinc"]'
       end
     end
-    
+
     context 'with both a title and a text translation specified' do
       setup do
         define_translation 'navbar.elements.zn.text',  'Zinc'
@@ -79,7 +79,7 @@ class TitleEnhancedNavBarRendererTest < Test::Unit::TestCase
         assert_select_from @renderer.to_s, 'ul li.zn[title="30: Zinc"]'
       end
     end
-    
+
   end
-  
+
 end

data/test/web_app_theme_renderer_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'xebec'
 
 class WebAppThemeRendererTest < Test::Unit::TestCase
-  
+
   def setup
     @old_renderer_class = Xebec::renderer_class
     load 'xebec/web_app_theme_renderer.rb'
@@ -11,19 +11,19 @@ class WebAppThemeRendererTest < Test::Unit::TestCase
     @renderer = Xebec::renderer_class.new(@bar, @helper)
     @bar.nav_item :baz, '/baz'
   end
-  
+
   def teardown
     Xebec::renderer_class = @old_renderer_class
   end
-  
+
   context 'using the Web-App-Theme support' do
     should 'replace the default renderer class automatically' do
       assert_equal Xebec::WebAppThemeRenderer, Xebec::renderer_class
     end
-    
+
     should 'render navigation <ul>s with wat-cf' do
       assert_select_from @renderer.to_s, 'ul.wat-cf'
     end
   end
-  
+
 end

data/xebec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xebec}
-  s.version = "2.6.0"
+  s.version = "2.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James A. Rosen"]
-  s.date = %q{2010-06-04}
+  s.date = %q{2011-01-16}
   s.description = %q{Helpers for generating navigation bars}
   s.email = %q{james.a.rosen@gmail.com}
   s.extra_rdoc_files = [
@@ -19,9 +19,7 @@ Gem::Specification.new do |s|
     ".gitignore",
      "README.md",
      "Rakefile",
-     "VERSION",
      "developer_tasks/doc.rake",
-     "developer_tasks/gem.rake",
      "developer_tasks/test.rake",
      "doc/example_app/Gemfile",
      "doc/example_app/README.md",
@@ -92,16 +90,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, ["~> 2.10.3"])
       s.add_development_dependency(%q<mocha>, ["~> 0.9.8"])
-      s.add_development_dependency(%q<redgreen>, ["~> 1.2.2"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0"])
     else
       s.add_dependency(%q<shoulda>, ["~> 2.10.3"])
       s.add_dependency(%q<mocha>, ["~> 0.9.8"])
-      s.add_dependency(%q<redgreen>, ["~> 1.2.2"])
+      s.add_dependency(%q<rails>, ["~> 3.0"])
     end
   else
     s.add_dependency(%q<shoulda>, ["~> 2.10.3"])
     s.add_dependency(%q<mocha>, ["~> 0.9.8"])
-    s.add_dependency(%q<redgreen>, ["~> 1.2.2"])
+    s.add_dependency(%q<rails>, ["~> 3.0"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 6
-  - 0
-  version: 2.6.0
+  - 1
+  version: 2.6.1
 platform: ruby
 authors: 
 - James A. Rosen
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -04:00
+date: 2011-01-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -46,17 +48,17 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: redgreen
+  name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id003
 description: Helpers for generating navigation bars
@@ -71,9 +73,7 @@ files:
 - .gitignore
 - README.md
 - Rakefile
-- VERSION
 - developer_tasks/doc.rake
-- developer_tasks/gem.rake
 - developer_tasks/test.rake
 - doc/example_app/Gemfile
 - doc/example_app/README.md
@@ -135,6 +135,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -142,6 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Navigation helpers