active_link_to 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/active_link_to.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_link_to}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov"]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-06-23}
   s.description = %q{Extremely helpful when you need to add some logic that figures out if the link (or more often navigation item) is selected based on the current page or other arbitrary condition}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -29,12 +29,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/twg/active_link_to}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Marks currently active links}
-  s.test_files = [
-    "test/active_link_to_test.rb",
-    "test/test_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/active_link_to.rb

@@ -122,7 +122,7 @@ module ActiveLinkTo
     html_options[:class] += " #{css_class}" if !css_class.blank?
     html_options[:class].blank? ? html_options.delete(:class) : html_options[:class].lstrip!
     
-    if active_link_options[:disable_link] === true
+    if active_link_options[:disable_link] === true && is_active_link?(url, active_link_options)
       content_tag(:span, name, html_options)
     else
       link_to(name, url, html_options)

data/test/active_link_to_test.rb

@@ -86,6 +86,9 @@ class ActiveLinkToTest < Test::Unit::TestCase
     request.fullpath = '/test'
     out = active_link_to 'name', '/test', :active => { :disable_link => true }
     assert_equal '<span class="active">name</span>', out
+    
+    out = active_link_to 'name', '/other', :active => { :disable_link => true }
+    assert_equal '<a href="/other">name</a>', out
   end
   
   def test_should_not_modify_passed_params

metadata

@@ -1,28 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_link_to
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-10 00:00:00 Z
+date: 2011-06-23 00:00:00.000000000 -04:00
+default_executable: 
 dependencies: []
-
-description: Extremely helpful when you need to add some logic that figures out if the link (or more often navigation item) is selected based on the current page or other arbitrary condition
+description: Extremely helpful when you need to add some logic that figures out if
+  the link (or more often navigation item) is selected based on the current page or
+  other arbitrary condition
 email: oleg@theworkinggroup.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -32,33 +31,29 @@ files:
 - lib/active_link_to.rb
 - test/active_link_to_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://github.com/twg/active_link_to
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Marks currently active links
-test_files: 
-- test/active_link_to_test.rb
-- test/test_helper.rb
+test_files: []