Merge branch 'master' of https://github.com/cerebroso/active_link_to …

…into cerebroso-master

active_link_to.gemspec

@@ -11,10 +11,11 @@ Gem::Specification.new do |s|
   s.homepage      = "http://github.com/comfy/active_link_to"
   s.summary       = "ActionView helper to render currently active links"
   s.description   = "Helpful method 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.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
-  
+
   s.add_dependency 'actionpack'
-end
+  s.add_dependency 'addressable'
+end

lib/active_link_to.rb

@@ -1,2 +1,3 @@
+require 'addressable/uri'
 require 'active_link_to/active_link_to'
-require 'active_link_to/version'
+require 'active_link_to/version'

lib/active_link_to/active_link_to.rb

@@ -78,7 +78,7 @@ def is_active_link?(url, condition = nil)
     @is_active_link ||= {}
     @is_active_link[[url, condition]] ||= begin
       original_url = url
-      url = URI::parse(url).path
+      url = Addressable::URI::parse(url).path
       case condition
       when :inclusive, nil
         !request.fullpath.match(/^#{Regexp.escape(url).chomp('/')}(\/.*|\?.*)?$/).blank?