navigasmic 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/builders/html_builder.rb

@@ -34,7 +34,7 @@ module Navigasmic
       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) ? options[:hidden_unless].call : options[:hidden_unless]
+      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)) : ''
     end
 

data/lib/builders/xml_builder.rb

@@ -30,7 +30,7 @@ module Navigasmic
 
       buffer = template.capture(self, &proc)
 
-      visible = options[:hidden_unless].nil? ? true : options[:hidden_unless].is_a?(Proc) ? options[:hidden_unless].call : options[:hidden_unless]
+      visible = options[:hidden_unless].nil? ? true : options[:hidden_unless].is_a?(Proc) ? template.instance_eval(&options[:hidden_unless]) : options[:hidden_unless]
       visible ? template.concat(template.content_tag(@@group_tag, buffer)) : ''
     end
 

data/lib/navigasmic.rb

@@ -73,7 +73,7 @@ module Navigasmic #:nodoc:
       @link ||= {}
 
       @disabled_conditions = options[:disabled_if] || proc { false }
-      @visible = options[:hidden_unless].nil? ? true : options[:hidden_unless].is_a?(Proc) ? options[:hidden_unless].call : options[:hidden_unless]
+      @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)
       @highlights_on = options[:highlights_on] || []
@@ -103,7 +103,7 @@ module Navigasmic #:nodoc:
         when String
           highlighted &= path == highlight
         when Proc
-          h = highlight.call
+          h = template.instance_evel(highlight)
           raise 'proc highlighting rules must evaluate to TrueClass or FalseClass' unless (h.is_a?(TrueClass) || h.is_a?(FalseClass))
           highlighted &= h
         when Hash

data/navigasmic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navigasmic}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2010-12-13}
+  s.date = %q{2010-12-15}
   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: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jeremy Jackson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -07:00
+date: 2010-12-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency