navigasmic 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/builders/html_builder.rb

@@ -28,14 +28,14 @@ module Navigasmic
 
       options[:html] ||= {}
       options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:with_group])
-      options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore
+      options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore unless label.blank?
 
       buffer = template.capture(self, &proc)
       group = template.content_tag(@@group_tag, buffer)
       label = label_for_group(label) unless label.blank?
 
       visible = options[:hidden_unless].nil? ? true : options[:hidden_unless].is_a?(Proc) ? template.instance_eval(&options[:hidden_unless]) : options[:hidden_unless]
-      visible ? template.content_tag(@@item_tag, label.to_s + group, options.delete(:html)) : ''
+      visible ? template.content_tag(@@item_tag, (label.to_s + group).html_safe, options.delete(:html)) : ''
     end
 
     def item(label, options = {}, &proc)

data/lib/navigasmic.rb

@@ -75,7 +75,7 @@ module Navigasmic #:nodoc:
       @disabled_conditions = options[:disabled_if] || proc { false }
       @visible = options[:hidden_unless].nil? ? true : options[:hidden_unless].is_a?(Proc) ? template.instance_eval(&options[:hidden_unless]) : options[:hidden_unless]
 
-      options[:highlights_on] = [options[:highlights_on]] if options[:highlights_on].kind_of?(Hash)
+      options[:highlights_on] = [options[:highlights_on]] if options[:highlights_on].kind_of?(Hash) || options[:highlights_on].kind_of?(String)
       @highlights_on = options[:highlights_on] || []
       @highlights_on << @link if link?
     end
@@ -103,9 +103,11 @@ module Navigasmic #:nodoc:
         when String
           highlighted &= path == highlight
         when Proc
-          h = template.instance_evel(highlight)
+          h = template.instance_eval(highlight)
           raise 'proc highlighting rules must evaluate to TrueClass or FalseClass' unless (h.is_a?(TrueClass) || h.is_a?(FalseClass))
           highlighted &= h
+        when Regexp
+          highlighted &= path.match(highlight)
         when Hash
           h = clean_unwanted_keys(highlight)
           h.each_key do |key|
@@ -114,7 +116,7 @@ module Navigasmic #:nodoc:
             highlighted &= h_key == params[key].to_s
           end
         else
-          raise 'highlighting rules should be a String, Proc or a Hash'
+          raise 'highlighting rules should be a String, Proc, Regexp or a Hash'
         end
 
         result |= highlighted

data/navigasmic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navigasmic}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2010-12-15}
+  s.date = %q{2011-01-03}
   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 = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: navigasmic
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Jeremy Jackson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -07:00
+date: 2011-01-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency