active_link_to 0.0.5 → 0.0.6

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = 'Marks currently active links'
     gem.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'
     gem.email = "oleg@theworkinggroup.ca"
-    gem.homepage = "http://github.com/OlegK/active_link_to"
+    gem.homepage = "http://github.com/theworkinggroup/active_link_to"
     gem.authors = ["Oleg Khabarov"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.rubyforge_project = 'active-link-to'

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/active_link_to.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{active_link_to}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2010-07-01}
   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 = [
@@ -28,11 +28,11 @@ Gem::Specification.new do |s|
      "test/active_link_to_test.rb",
      "test/test_helper.rb"
   ]
-  s.homepage = %q{http://github.com/OlegK/active_link_to}
+  s.homepage = %q{http://github.com/theworkinggroup/active_link_to}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{active-link-to}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Marks currently active links}
   s.test_files = [
     "test/active_link_to_test.rb",
@@ -49,3 +49,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/active_link_to.rb

@@ -142,11 +142,11 @@ module ActiveLinkTo
   def is_active_link?(url, options = {})
     case options[:when]
     when :self, nil
-      !request.request_uri.match(/^#{Regexp.escape(url)}(\/?.*)?$/).blank?
+      !request.fullpath.match(/^#{Regexp.escape(url)}(\/?.*)?$/).blank?
     when :self_only
-      !request.request_uri.match(/^#{Regexp.escape(url)}\/?(\?.*)?$/).blank?
+      !request.fullpath.match(/^#{Regexp.escape(url)}\/?(\?.*)?$/).blank?
     when Regexp
-      !request.request_uri.match(options[:when]).blank?
+      !request.fullpath.match(options[:when]).blank?
     when Array
       controllers = options[:when][0]
       actions     = options[:when][1]

data/test/active_link_to_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ActiveLinkToTest < Test::Unit::TestCase
   
   def test_matching_self
-    request.request_uri = '/test'
+    request.fullpath = '/test'
     out = active_link_to 'name', '/test'
     assert_equal '<a href="/test" class="active">name</a>', out
     out = active_link_to 'name', '/test', :active => { :when => :self }
@@ -13,13 +13,13 @@ class ActiveLinkToTest < Test::Unit::TestCase
   end
   
   def test_matching_self_with_extra_parameters
-    request.request_uri = '/test?status=what'
+    request.fullpath = '/test?status=what'
     out = active_link_to 'name', '/test'
     assert_equal '<a href="/test" class="active">name</a>', out
   end
   
   def test_matching_self_only
-    request.request_uri = '/test/fail'
+    request.fullpath = '/test/fail'
     out = active_link_to 'name', '/test/fail', :active => { :when => :self_only }
     assert_equal '<a href="/test/fail" class="active">name</a>', out
     out = active_link_to 'name', '/test', :active => { :when => :self_only }
@@ -27,13 +27,13 @@ class ActiveLinkToTest < Test::Unit::TestCase
   end
   
   def test_matching_self_only_with_extra_parameters
-    request.request_uri = '/test/fail?why=because'
+    request.fullpath = '/test/fail?why=because'
     out = active_link_to 'name', '/test/fail', :active => { :when => :self_only }
     assert_equal '<a href="/test/fail" class="active">name</a>', out
   end
   
   def test_matching_custom_regex
-    request.request_uri = '/test/something_else'
+    request.fullpath = '/test/something_else'
     out = active_link_to 'name', '/test', :active => { :when => /^\/te/}
     assert_equal '<a href="/test" class="active">name</a>', out
     out = active_link_to 'name', '/test', :active => { :when => /^\/no/}
@@ -41,7 +41,7 @@ class ActiveLinkToTest < Test::Unit::TestCase
   end
   
   def test_matching_controller_action_touples
-    request.request_uri = '/test/23'
+    request.fullpath = '/test/23'
     params[:controller], params[:action] = 'tests', 'show'
     out = active_link_to 'name', '/test/23', :active => { :when => [['tests'], ['show', 'edit']]}
     assert_equal '<a href="/test/23" class="active">name</a>', out
@@ -54,7 +54,7 @@ class ActiveLinkToTest < Test::Unit::TestCase
   end
   
   def test_matching_booleans
-    request.request_uri = 'doesnotmatter'
+    request.fullpath = 'doesnotmatter'
     out = active_link_to 'name', '/test', :active => { :when => true }
     assert_equal '<a href="/test" class="active">name</a>', out
     out = active_link_to 'name', '/test', :active => { :when => false }
@@ -62,25 +62,25 @@ class ActiveLinkToTest < Test::Unit::TestCase
   end
   
   def test_setting_active_class
-    request.request_uri = '/test'
+    request.fullpath = '/test'
     out = active_link_to 'name', '/test', :active => { :active_class => 'new_active'}
     assert_equal '<a href="/test" class="new_active">name</a>', out
   end
   
   def test_setting_inactive_class
-    request.request_uri = '/test'
+    request.fullpath = '/test'
     out = active_link_to 'name', '/not-test', :active => { :inactive_class => 'new_inactive'}
     assert_equal '<a href="/not-test" class="new_inactive">name</a>', out
   end
   
   def test_transforming_to_span
-    request.request_uri = '/test'
+    request.fullpath = '/test'
     out = active_link_to 'name', '/test', :active => { :disable_link => true }
     assert_equal '<span class="active">name</span>', out
   end
   
   def test_should_not_modify_passed_params
-    request.request_uri = '/test'
+    request.fullpath = '/test'
     params = {:class => 'testing'}
     out = active_link_to 'name', '/test', params
     assert_equal '<a href="/test" class="testing active">name</a>', out

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require 'active_link_to'
 # need this to simulate requests that drive active_link_helper
 module FakeRequest
   class Request
-    attr_accessor :request_uri
+    attr_accessor :fullpath
   end
   def request
     @request ||= Request.new

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: active_link_to
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -04:00
+date: 2010-07-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +39,7 @@ files:
 - test/active_link_to_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/OlegK/active_link_to
+homepage: http://github.com/theworkinggroup/active_link_to
 licenses: []
 
 post_install_message: 
@@ -46,18 +51,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: active-link-to
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Marks currently active links