xebec 2.2.0 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.2.0
1
+ 2.3.0
@@ -90,8 +90,9 @@ module Xebec
90
90
  def render_nav_item(item)
91
91
  text = text_for_nav_item item
92
92
  href = href_for_nav_item item
93
- options = is_current_nav_item?(item, href) ? { :class => Xebec.currently_selected_nav_item_class } : {}
94
- helper.content_tag :li, options do
93
+ klass = item.name.to_s
94
+ klass << " #{Xebec.currently_selected_nav_item_class}" if is_current_nav_item?(item, href)
95
+ helper.content_tag :li, :class => klass do
95
96
  helper.link_to_unless_current text, href
96
97
  end
97
98
  end
@@ -78,7 +78,7 @@ class NavBarRendererTest < Test::Unit::TestCase
78
78
  end
79
79
  should 'render a navigation bar with the appropriate items' do
80
80
  assert_select_from @renderer.to_s, 'ul' do
81
- assert_select 'li' do
81
+ assert_select 'li.foo' do
82
82
  assert_select 'a[href="/foo"]', 'Foo'
83
83
  end
84
84
  end
@@ -92,7 +92,7 @@ class NavBarRendererTest < Test::Unit::TestCase
92
92
  end
93
93
  should 'render a navigation bar with the item marked as current' do
94
94
  assert_select_from @renderer.to_s, 'ul' do
95
- assert_select 'li.current', 'Foo'
95
+ assert_select 'li.foo.current', 'Foo'
96
96
  end
97
97
  end
98
98
  context 'when Xebec is configured to use a different "current" class' do
@@ -102,7 +102,7 @@ class NavBarRendererTest < Test::Unit::TestCase
102
102
  end
103
103
  should 'use the configured CSS class' do
104
104
  assert_select_from @renderer.to_s, 'ul' do
105
- assert_select 'li.active', 'Foo'
105
+ assert_select 'li.foo.active', 'Foo'
106
106
  end
107
107
  end
108
108
  teardown do
@@ -119,7 +119,7 @@ class NavBarRendererTest < Test::Unit::TestCase
119
119
  should 'render a navigation bar with the item not marked as current' do
120
120
  assert_select_from @renderer.to_s, 'ul' do
121
121
  assert_select 'li', 'Foo'
122
- assert_select 'li.current', { :count => 0, :text=> 'Foo' }
122
+ assert_select 'li.foo.current', { :count => 0, :text=> 'Foo' }
123
123
  end
124
124
  end
125
125
  should 'not render an empty "class" attribute' do
@@ -133,7 +133,7 @@ class NavBarRendererTest < Test::Unit::TestCase
133
133
  end
134
134
  should 'render a navigation bar with the appropriate items' do
135
135
  assert_select_from @renderer.to_s, 'ul' do
136
- assert_select 'li' do
136
+ assert_select 'li.foo' do
137
137
  assert_select 'a[href="http://foo.com"]', 'Foo'
138
138
  end
139
139
  end
@@ -148,21 +148,21 @@ class NavBarRendererTest < Test::Unit::TestCase
148
148
  end
149
149
  should 'render a non-link navigation item' do
150
150
  assert_select_from @renderer.to_s, 'ul' do
151
- assert_select 'li', 'Home' do
151
+ assert_select 'li.home', 'Home' do
152
152
  assert_select 'a', 0
153
153
  end
154
154
  end
155
155
  end
156
156
  should 'render other items as links' do
157
157
  assert_select_from @renderer.to_s, 'ul' do
158
- assert_select 'li' do
158
+ assert_select 'li.sign_up' do
159
159
  assert_select 'a[href="/sign_up"]', 'Sign Up'
160
160
  end
161
161
  end
162
162
  end
163
163
  should 'add the "current" class to the current item' do
164
164
  assert_select_from @renderer.to_s, 'ul' do
165
- assert_select 'li.current', 'Home'
165
+ assert_select 'li.home.current', 'Home'
166
166
  end
167
167
  end
168
168
  end
@@ -175,7 +175,7 @@ class NavBarRendererTest < Test::Unit::TestCase
175
175
  end
176
176
  should 'render a navigation bar using the internationalized text' do
177
177
  assert_select_from @renderer.to_s, 'ul' do
178
- assert_select 'li' do
178
+ assert_select 'li.foo' do
179
179
  assert_select 'a', 'My Foos'
180
180
  end
181
181
  end
data/xebec.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{xebec}
8
- s.version = "2.2.0"
8
+ s.version = "2.3.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["James A. Rosen"]
12
- s.date = %q{2010-03-13}
12
+ s.date = %q{2010-03-14}
13
13
  s.description = %q{Helpers for generating navigation bars}
14
14
  s.email = %q{james.a.rosen@gmail.com}
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
4
4
  prerelease: false
5
5
  segments:
6
6
  - 2
7
- - 2
7
+ - 3
8
8
  - 0
9
- version: 2.2.0
9
+ version: 2.3.0
10
10
  platform: ruby
11
11
  authors:
12
12
  - James A. Rosen
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-03-13 00:00:00 -05:00
17
+ date: 2010-03-14 00:00:00 -05:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency