navigasmic 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/lib/builders/html_builder.rb

@@ -47,10 +47,12 @@ module Navigasmic
       options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore
 
       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)
+      options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:highlighted]) if item.highlighted?(template.request.path, template.params, template)
 
       label = label_for_item(label)
-      label = template.link_to(label, item.link, options.delete(:link_html)) unless item.link.empty? || item.disabled?
+      link = item.link.is_a?(Proc) ? template.instance_eval(&item.link) : item.link
+
+      label = template.link_to(label, link, options.delete(:link_html)) unless !item.link? || item.disabled?
 
       item.hidden? ? '' : template.content_tag(@@item_tag, label + buffer, options.delete(:html))
     end

data/lib/navigasmic.rb

@@ -77,11 +77,18 @@ module Navigasmic #:nodoc:
 
       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?
+
+      if link?
+        if @link.is_a?(Proc)
+          @highlights_on << template.instance_eval(&@link)
+        else
+          @highlights_on << @link if link?
+        end
+      end
     end
 
     def link?
-      @link && !@link.empty?
+      @link && !@link.blank?
     end
 
     def disabled?
@@ -92,7 +99,7 @@ module Navigasmic #:nodoc:
       !@visible
     end
 
-    def highlighted?(path, params = {})
+    def highlighted?(path, params = {}, template = nil)
       params = clean_unwanted_keys(params)
       result = false
 
@@ -103,7 +110,7 @@ module Navigasmic #:nodoc:
         when String
           highlighted &= path == highlight
         when Proc
-          h = template.instance_eval(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

data/navigasmic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navigasmic}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: navigasmic
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Jeremy Jackson