active_link_to 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c052d4d3334d1179c4dbcd757c1c233749a1915
-  data.tar.gz: a785035a19b30281072c0cbeb759f31db8ebe062
+  metadata.gz: 7b138b65cf5484c2189fadada7df67d2d4866b6c
+  data.tar.gz: a236a8a8fe79a8997bd14a1f325a91665d9659b7
 SHA512:
-  metadata.gz: 4d30230c3717c74f71a7daa41651cfda982dfe48dc9cc5ebb414f16d00a8351e4f7f0d1bf0b1ffea9ea08bbcfca5e61fdcfde7b600842561a3eeba12268f389c
-  data.tar.gz: 422d6301125a96c456aa33f480d0271d213bbefa7b41f5e3af1218d685f747e706c9afb1c0071b581b5c9a6c84c3d5f46839a59c5fff4d7aaf277dba4c22f488
+  metadata.gz: a7df0c88235eb79306d046d474fd0f2fa561d17e6ff00c4e0bc124c40417c4fef22798c62330c75b40efc71e2a2e40357f6f398a974c4d279c354c9139f93d83
+  data.tar.gz: 572bdf400d1dfdafcc9aae908b7254264f7b865241e01c1b20c24fc13fc25a89225c6a6eb7fcb79175c9b5d4747a2308103dda972e35e34cd08268e6fba144fb

data/.gitignore

@@ -1,5 +1,2 @@
-*.sw?
 .DS_Store
-coverage
-rdoc
-pkg
+Gemfile.lock

data/Gemfile

@@ -1,3 +1,10 @@
 source 'http://rubygems.org'
 
-gemspec
+gemspec
+
+group :test do
+  gem 'minitest'
+  gem 'rake'
+  gem 'rack-test'
+  gem 'nokogiri'
+end

data/README.md

@@ -1,4 +1,6 @@
 # active_link_to
+[![Gem Version](https://img.shields.io/gem/v/active_link_to.svg?style=flat)](http://rubygems.org/gems/active_link_to) [![Gem Downloads](https://img.shields.io/gem/dt/active_link_to.svg?style=flat)](http://rubygems.org/gems/active_link_to) [![Build Status](https://img.shields.io/travis/comfy/active_link_to.svg?style=flat)](https://travis-ci.org/comfy/active_link_to)
+
 Creates a link tag of the given name using a URL created by the set of options. Please see documentation for [link_to](http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html#method-i-link_to), as `active_link_to` is basically a wrapper for it. This method accepts an optional :active parameter that dictates if the given link will have an extra css class attached that marks it as 'active'.
 
 ## Install
@@ -7,7 +9,7 @@ When installing for Rails 3 applications add this to the Gemfile: `gem 'active_l
 For older Rails apps add `config.gem 'active_link_to'` in config/environment.rb and run `rake gems:install`. Or just checkout this repo into /vendor/plugins directory.
 
 ## Super Simple Example
-Here's a link that will have a class attached if it happens to be rendered 
+Here's a link that will have a class attached if it happens to be rendered
 on page with path `/users` or any child of that page, like `/users/123`
 
 ```ruby
@@ -27,7 +29,7 @@ Here's a list of available options that can be used as the `:active` value
 
 ```
 * Boolean                 -> true | false
-* Symbol                  -> :exclusive | :inclusive
+* Symbol                  -> :exclusive | :inclusive | :exact
 * Regex                   -> /regex/
 * Controller/Action Pair  -> [[:controller], [:action_a, :action_b]]
 ```
@@ -39,8 +41,8 @@ already, so let's try something more fun.
 
 We want to highlight a link that matches immediate url, but not the children
 nodes. Most commonly used for 'home' links.
-   
-```ruby 
+
+```ruby
 # For URL: /users will be active
 active_link_to 'Users', users_path, :active => :exclusive
 # => <a href="/users" class="active">Users</a>
@@ -51,18 +53,25 @@ active_link_to 'Users', users_path, :active => :exclusive
 active_link_to 'Users', users_path, :active => :exclusive
 # => <a href="/users">Users</a>
 ```
-    
+
 If we need to set link to be active based on some regular expression, we can do
 that as well. Let's try to activate links urls of which begin with 'use':
 
 ```ruby
 active_link_to 'Users', users_path, :active => /^\/use/
 ```
-    
+
+If we need to set link to be active based on an exact match, we can do
+that as well:
+
+```ruby
+active_link_to 'Users', users_path, :active => :exact
+```
+
 What if we need to mark link active for all URLs that match a particular controller,
 or action, or both? Or any number of those at the same time? Sure, why not:
-   
-```ruby 
+
+```ruby
 # For matching multiple controllers and actions:
 active_link_to 'User Edit', edit_user_path(@user), :active => [['people', 'news'], ['show', 'edit']]
 
@@ -72,13 +81,13 @@ active_link_to 'User Edit', edit_user_path(@user), :active => [['people', 'news'
 # for matching all controllers for a particular action
 active_link_to 'User Edit', edit_user_path(@user), :active => [[], ['edit']]
 ```
-    
+
 Sometimes it should be as easy as giving link true or false value:
 
 ```ruby
 active_link_to 'Users', users_path, :active => true
 ```
-    
+
 ## More Options
 You can specify active and inactive css classes for links:
 
@@ -89,7 +98,7 @@ active_link_to 'Users', users_path, :class_active => 'enabled'
 active_link_to 'News', news_path, :class_inactive => 'disabled'
 # => <a href="/news" class="disabled">News</a>
 ```
-    
+
 Sometimes you want to replace link tag with a span if it's active:
 
 ```ruby
@@ -101,21 +110,21 @@ If you are constructing navigation menu it might be helpful to wrap links in ano
 
 ```ruby
 active_link_to 'Users', users_path, :wrap_tag => :li
-# => <li class="active"><a href="/users">Users</a></li>
+# => <li class="active"><a href="/users" class="active">Users</a></li>
 ```
-    
+
 ## Helper Methods
-You may directly use methods that `active_link_to` relies on. 
+You may directly use methods that `active_link_to` relies on.
 
 `is_active_link?` will return true or false based on the URL and value of the `:active` parameter:
-    
+
 ```ruby
 is_active_link?(users_path, :inclusive)
 # => true
 ```
-    
+
 `active_link_to_class` will return the css class:
-    
+
 ```
 active_link_to_class(users_path, :active => :inclusive)
 # => 'active'
@@ -123,4 +132,4 @@ active_link_to_class(users_path, :active => :inclusive)
 
 ### Copyright
 
-Copyright (c) 2009-14 Oleg Khabarov, The Working Group Inc. See LICENSE for details.
+Copyright (c) 2009-15 Oleg Khabarov, The Working Group Inc. See LICENSE for details.

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake/testtask'
+require 'bundler/setup'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/active_link_to.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version       = ActiveLinkTo::VERSION
   s.authors       = ["Oleg Khabarov"]
   s.email         = ["oleg@khabarov.ca"]
-  s.homepage      = "http://github.com/twg/active_link_to"
+  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"
   

data/lib/active_link_to/active_link_to.rb

@@ -1,5 +1,5 @@
 module ActiveLinkTo
-  
+
   # Wrapper around link_to. Accepts following params:
   #   :active         => Boolean | Symbol | Regex | Controller/Action Pair
   #   :class_active   => String
@@ -65,19 +65,24 @@ module ActiveLinkTo
   #                   Symbol -> :exclusive | :inclusive
   #                    Regex -> /regex/
   #   Controller/Action Pair -> [[:controller], [:action_a, :action_b]]
+  #
   # Example usage:
+  #
   #   is_active_link?('/root', true)
   #   is_active_link?('/root', :exclusive)
   #   is_active_link?('/root', /^\/root/)
   #   is_active_link?('/root', ['users', ['show', 'edit']])
   #
   def is_active_link?(url, condition = nil)
-    url = url_for(url).sub(/\?.*/, '') # ignore GET params
+    original_url = url
+    url = URI::parse(url).path
     case condition
     when :inclusive, nil
       !request.fullpath.match(/^#{Regexp.escape(url).chomp('/')}(\/.*|\?.*)?$/).blank?
     when :exclusive
       !request.fullpath.match(/^#{Regexp.escape(url)}\/?(\?.*)?$/).blank?
+    when :exact
+      request.fullpath == original_url
     when Regexp
       !request.fullpath.match(condition).blank?
     when Array
@@ -89,6 +94,10 @@ module ActiveLinkTo
       true
     when FalseClass
       false
+    when Hash
+      condition.all? do |key, value|
+        params[key].to_s == value.to_s
+      end
     end
   end
 end

data/lib/active_link_to/version.rb

@@ -1,3 +1,3 @@
 module ActiveLinkTo
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/active_link_to_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require_relative 'test_helper'
 
-class ActiveLinkToTest < Test::Unit::TestCase
+class ActiveLinkToTest < MiniTest::Test
 
-  def test_is_active_link_booleans
+  def test_is_active_link_booleans_test
     assert is_active_link?('/', true)
     assert !is_active_link?('/', false)
   end
@@ -62,6 +62,20 @@ class ActiveLinkToTest < Test::Unit::TestCase
     assert is_active_link?('/root?attr=example', :exclusive)
   end
 
+  def test_is_active_link_symbol_exact
+    request.fullpath = '/root?param=test'
+    assert is_active_link?('/root?param=test', :exact)
+
+    request.fullpath = '/root?param=test'
+    refute is_active_link?('/root?param=exact', :exact)
+
+    request.fullpath = '/root'
+    refute is_active_link?('/root?param=test', :exact)
+
+    request.fullpath = '/root?param=test'
+    refute is_active_link?('/root', :exact)
+  end
+
   def test_is_active_link_regex
     request.fullpath = '/root'
     assert is_active_link?('/', /^\/root/)
@@ -88,6 +102,24 @@ class ActiveLinkToTest < Test::Unit::TestCase
     assert !is_active_link?('/', ['controller', 'action_a'])
   end
 
+  def test_is_active_link_hash
+    params[:a] = 1
+
+    assert is_active_link?('/', {:a => 1})
+    assert is_active_link?('/', {:a => 1, :b => nil})
+
+    assert !is_active_link?('/', {:a => 1, :b => 2})
+    assert !is_active_link?('/', {:a => 2})
+
+    params[:b] = 2
+
+    assert is_active_link?('/', {:a => 1, :b => 2})
+    assert is_active_link?('/', {:a => 1, :b => 2, :c => nil})
+
+    assert is_active_link?('/', {:a => 1})
+    assert is_active_link?('/', {:b => 2})
+  end
+
   def test_active_link_to_class
     request.fullpath = '/root'
     assert_equal 'active', active_link_to_class('/root')
@@ -100,62 +132,68 @@ class ActiveLinkToTest < Test::Unit::TestCase
   def test_active_link_to
     request.fullpath = '/root'
     link = active_link_to('label', '/root')
-    assert_equal '<a class="active" href="/root">label</a>', link
+    assert_html link, 'a.active[href="/root"]', 'label'
 
     link = active_link_to('label', '/other')
-    assert_equal '<a href="/other">label</a>', link
+    assert_html link, 'a[href="/other"]', 'label'
   end
 
   def test_active_link_to_with_existing_class
     request.fullpath = '/root'
     link = active_link_to('label', '/root', :class => 'current')
-    assert_equal '<a class="current active" href="/root">label</a>', link
+    assert_html link, 'a.current.active[href="/root"]', 'label'
 
     link = active_link_to('label', '/other', :class => 'current')
-    assert_equal '<a class="current" href="/other">label</a>', link
+    assert_html link, 'a.current[href="/other"]', 'label'
   end
 
   def test_active_link_to_with_custom_classes
     request.fullpath = '/root'
     link = active_link_to('label', '/root', :class_active => 'on')
-    assert_equal '<a class="on" href="/root">label</a>', link
+    assert_html link, 'a.on[href="/root"]', 'label'
 
     link = active_link_to('label', '/other', :class_inactive => 'off')
-    assert_equal '<a class="off" href="/other">label</a>', link
+    assert_html link, 'a.off[href="/other"]', 'label'
   end
 
   def test_active_link_to_with_wrap_tag
     request.fullpath = '/root'
     link = active_link_to('label', '/root', :wrap_tag => :li)
-    assert_equal '<li class="active"><a class="active" href="/root">label</a></li>', link
+    assert_html link, 'li.active a.active[href="/root"]', 'label'
 
     link = active_link_to('label', '/root', :wrap_tag => :li, :active_disable => true)
-    assert_equal '<li class="active"><span class="active">label</span></li>', link
+    assert_html link, 'li.active span.active', 'label'
 
     link = active_link_to('label', '/root', :wrap_tag => :li, :class => 'testing')
-    assert_equal '<li class="testing active"><a class="testing active" href="/root">label</a></li>', link
+    assert_html link, 'li.testing.active a.testing.active[href="/root"]', 'label'
   end
 
   def test_active_link_to_with_active_disable
     request.fullpath = '/root'
     link = active_link_to('label', '/root', :active_disable => true)
-    assert_equal '<span class="active">label</span>', link
+    assert_html link, 'span.active', 'label'
   end
 
   def test_should_not_modify_passed_params
     request.fullpath = '/root'
     params = { :class => 'testing', :active => :inclusive }
     out = active_link_to 'label', '/root', params
-    assert_equal '<a class="testing active" href="/root">label</a>', out
+    assert_html out, 'a.testing.active[href="/root"]', 'label'
     assert_equal ({:class => 'testing', :active => :inclusive }), params
   end
 
   def test_no_empty_class_attribute
     request.fullpath = '/root'
     link = active_link_to('label', '/root', :wrap_tag => :li)
-    assert_equal '<li class="active"><a class="active" href="/root">label</a></li>', link
+    assert_html link, 'li.active a.active[href="/root"]', 'label'
 
     link = active_link_to('label', '/other', :wrap_tag => :li)
-    assert_equal '<li><a href="/other">label</a></li>', link
+    assert_html link, 'li a[href="/other"]', 'label'
+  end
+
+  def test_active_link_to_with_url
+    request.fullpath = '/root'
+    link = active_link_to('label', 'http://example.com/root')
+    assert_html link, 'a.active[href="http://example.com/root"]', 'label'
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
-require 'test/unit'
-require 'action_controller'
+require 'minitest/autorun'
+require 'uri'
+require 'action_view'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -21,10 +22,17 @@ end
 
 ActiveLinkTo.send :include, FakeRequest
 
-class Test::Unit::TestCase
-  
+class MiniTest::Test
+
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActiveLinkTo
-  
+
+  def assert_html(html, selector, value = nil)
+    doc = Nokogiri::HTML(html)
+    element = doc.at_css(selector)
+    assert element, "No element found at: `#{selector}`"
+    assert_equal value, element.text if value
+  end
+
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: active_link_to
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Helpful method when you need to add some logic that figures out if the
@@ -33,7 +33,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -44,7 +44,7 @@ files:
 - lib/active_link_to/version.rb
 - test/active_link_to_test.rb
 - test/test_helper.rb
-homepage: http://github.com/twg/active_link_to
+homepage: http://github.com/comfy/active_link_to
 licenses: []
 metadata: {}
 post_install_message: 
@@ -53,17 +53,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActionView helper to render currently active links