navigasmic 0.5.5 → 0.5.6

data/README.textile

@@ -266,7 +266,7 @@ RDoc documentation _should_ be automatically generated after each commit and mad
 
 h2. Compatibility
 
-I'm only testing with the latest Rails 2.3.x stable release, and it should work under Rails 2.3.x as well.  Feel free to add backwards compatibility if you need it.
+I'm only testing with the latest Rails 3.x stable release, and it should work under Rails 2.3.x as well.  Feel free to add backwards compatibility if you need it.
 
 h2. Project Info
 

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/lib/builders/html_builder.rb

@@ -27,8 +27,8 @@ module Navigasmic
       raise ArgumentError, "Missing block" unless block_given?
 
       options[:html] ||= {}
-      options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:with_group])
-      options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore unless label.blank?
+      options[:html][:class] = template.add_html_class(options[:html][:class], @@classnames[:with_group])
+      options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore unless label.blank? || options[:html].has_key?(:id) 
 
       buffer = template.capture(self, &proc)
       group = template.content_tag(@@group_tag, buffer)
@@ -44,10 +44,10 @@ module Navigasmic
       item = NavigationItem.new(label, options, template)
 
       options[:html] ||= {}
-      options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore
+      options[:html][:id] = label.to_s.gsub(/\s/, '_').underscore unless options[:html].has_key?(:id) 
 
-      options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:disabled]) if item.disabled?
-      options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:highlighted]) if item.highlighted?(template.request.path, template.params, template)
+      options[:html][:class] = template.add_html_class(options[:html][:class], @@classnames[:disabled]) if item.disabled?
+      options[:html][:class] = template.add_html_class(options[:html][:class], @@classnames[:highlighted]) if item.highlighted?(template.request.path, template.params, template)
 
       label = label_for_item(label)
       link = item.link.is_a?(Proc) ? template.instance_eval(&item.link) : item.link
@@ -66,4 +66,4 @@ module Navigasmic
     end
 
   end
-end
+end

data/lib/navigasmic.rb

@@ -38,14 +38,14 @@ module Navigasmic #:nodoc:
       options = args.extract_options!
 
       options[:html] ||= {}
-      options[:html][:class] = add_class(options[:html][:class], 'semantic-navigation')
-      options[:html][:id] ||= name.to_s.underscore
+      options[:html][:class] = add_html_class(options[:html][:class], 'semantic-navigation')
+      options[:html][:id] ||= name.to_s.underscore  unless options[:html].has_key?(:id)
 
       builder = options.delete(:builder) || @@builder
       builder.new(self, name, options, &proc)
     end
 
-    def add_class(classnames, classname)
+    def add_html_class(classnames, classname)
       out = (classnames.is_a?(String) ? classnames.split(' ') : []) << classname
       out.join(' ')
     end

data/navigasmic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navigasmic}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2011-01-03}
+  s.date = %q{2011-07-01}
   s.description = %q{Semantic navigation; a semantic way to build beautifully simple navigation structures in Rails.}
   s.email = %q{jejacks0n@gmail.com}
   s.extra_rdoc_files = [
@@ -31,15 +31,10 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/jejacks0n/navigasmic}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Semantic navigation for Rails}
-  s.test_files = [
-    "test/navigasmic_test.rb",
-    "test/test_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: navigasmic
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Jeremy Jackson
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -07:00
-default_executable: 
+date: 2011-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
@@ -53,7 +52,6 @@ files:
 - navigasmic.gemspec
 - test/navigasmic_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/jejacks0n/navigasmic
 licenses: []
 
@@ -83,10 +81,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Semantic navigation for Rails
-test_files: 
-- test/navigasmic_test.rb
-- test/test_helper.rb
+test_files: []
+