link_to_active_state 1.0.4 → 1.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 6235f67887d012b32ed65cc5639c1d4235600e9572e3cf70a864caa4b300a83a
+  data.tar.gz: 47dd042be4c6b327b5aaa4f2c620ffc40d5eb713633ec8525cf83a6ec852151d
+SHA512:
+  metadata.gz: 7be4375b7dd4fc5166fdc933e8d24c165f0b04f1c3d5c49883754a0436b1d9406c6dd85bf96e04d834a0290eff4cb540e9638e6296348fcc40fe0e23cf56e9f1
+  data.tar.gz: 0eba6b78e4d563f9c59d910371a779858a89f70f3ef6a1a89038ec50343f18383cc18faae87033c2109f6c9f83af96048ed7a8ba05a53da686ff2d2fc0f4a0ea

data/.travis.yml

@@ -1,11 +1,9 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
-  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
   - rbx-19mode
   - ruby-head
   - jruby-head
-  - 1.8.7

data/README.md

@@ -1,6 +1,7 @@
 # LinkToActiveState
 
-[![Build Status](https://travis-ci.org/robotmay/link_to_active_state.png?branch=master)](https://travis-ci.org/robotmay/link_to_active_state) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/robotmay/link_to_active_state) [![Dependency Status](https://gemnasium.com/robotmay/link_to_active_state.png)](https://gemnasium.com/robotmay/link_to_active_state)
+[![Build Status](https://travis-ci.org/robotmay/link_to_active_state.png?branch=master)](https://travis-ci.org/robotmay/link_to_active_state)
+[![Gem Version](https://badge.fury.io/rb/link_to_active_state.svg)](http://badge.fury.io/rb/link_to_active_state)
 
 A simple gem to implement active states on links using the standard Rails `link_to` helper. 
 This can be helpful in navigation lists or buttons to give them a class when the current URL matches a condition on the link helper.
@@ -13,7 +14,7 @@ Add this line to your application's Gemfile:
 
 Or install from the repository:
 
-    gem 'link_to_active_state', git: 'git://github.com/robotmay/link_to_active_state.git', tag: 'v0.1.2'
+    gem 'link_to_active_state', git: 'git://github.com/robotmay/link_to_active_state.git', tag: 'v1.0.5'
 
 And then execute:
 

data/lib/link_to_active_state/version.rb

@@ -1,3 +1,3 @@
 module LinkToActiveState
-  VERSION = "1.0.4"
+  VERSION = "1.0.9"
 end

data/lib/link_to_active_state/view_helpers/url_helper.rb

@@ -1,43 +1,44 @@
 require 'action_view'
 require 'link_to_active_state'
-require 'pry'
 
 module LinkToActiveState
   module ViewHelpers
     module UrlHelper
       def self.included(base)
-        base.send(:alias_method_chain, :link_to, :active_state)
+        base.send(:alias_method, :link_to_without_active_state, :link_to)
+        base.send(:alias_method, :link_to, :link_to_with_active_state)
       end
 
       def link_to_with_active_state(*args, &block)
-        options = {}
-
         link_options, html_options = if block_given?
           [args.first, args.second]
         else
           [args[1], args[2]]
         end
 
+        options = {}
         link_options ||= {}
+        html_options ||= {}
+        wrapper_options = html_options.delete(:active_wrapper_options) || {}
 
         if html_options.present? && html_options[:active_on].present?
           active_on = html_options.delete(:active_on)
           active_state = html_options.delete(:active_state) || "active"
 
-          if is_active?(active_on, link_options)
+          if is_active?(active_on, link_options, html_options)
             case active_state
             when Proc
               options = options.merge(active_state.call(html_options))
+              wrapper_options = wrapper_options.merge(active_state.call(html_options))
             when String
               options[:class] = merge_class(html_options[:class], active_state)
+              wrapper_options[:class] = merge_class(wrapper_options[:class], active_state)
             end
           end
         end
 
         if html_options.present? && html_options[:active_wrapper]
           element_or_proc = html_options.delete(:active_wrapper)
-          wrapper_options = html_options.delete(:active_wrapper_options) || {}
-          wrapper_options = wrapper_options.merge(options)
 
           render_with_wrapper(element_or_proc, wrapper_options) do
             link_to_without_active_state(*args, &block)
@@ -49,20 +50,26 @@ module LinkToActiveState
       end
 
       private
-      def is_active?(active_on, link_options = {})
+      def is_active?(active_on, link_options = {}, html_options = {})
+        if html_options.present? && html_options[:ignore_query]
+          path = request.fullpath.gsub( /\?.*/, "" )
+        else
+          path = request.fullpath
+        end
+
         case active_on
         when String
-          request.fullpath == active_on
+          path == active_on
         when Array
-          active_on.include?(request.fullpath)
+          active_on.include?(path)
         when Regexp
-          request.fullpath =~ active_on
+          path =~ active_on
         when Proc
           active_on.arity == 1 ? active_on.call(request) : active_on.call
         else
-          # Anything else we'll take as a true argument, and match the link's URL
+          # Anything else we'll take as a true argument, and match the link's URL (including any query string)
           url = url_for(link_options)
-          request.fullpath == url
+          path == url
         end
       end
 
@@ -70,7 +77,7 @@ module LinkToActiveState
         original ||= ""
         [original, new].delete_if(&:blank?).join(" ")
       end
-      
+
       def render_with_wrapper(element_or_proc, wrapper_options, &block)
         content = block.call
 

data/link_to_active_state.gemspec

@@ -7,10 +7,11 @@ Gem::Specification.new do |gem|
   gem.name          = "link_to_active_state"
   gem.version       = LinkToActiveState::VERSION
   gem.authors       = ["Robert May"]
-  gem.email         = ["robotmay@gmail.com"]
+  gem.email         = ["rob@afternoonrobot.co.uk"]
   gem.description   = %q{A simple gem to implement active states on links using the standard Rails `link_to` helper.}
   gem.summary       = %q{Active states for links using the Rails link_to helper.}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/robotmay/link_to_active_state"
+  gem.licenses      = ["MIT"]
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -19,5 +20,4 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rails", [">= 3.2.11"]
   gem.add_development_dependency "rspec", ["~> 2.13.0"]
-  gem.add_development_dependency "pry", [">= 0.9.12"]
 end

data/spec/link_to_active_state_spec.rb

@@ -8,7 +8,20 @@ module App
 end
 
 describe LinkToActiveState::ViewHelpers::UrlHelper do
-  let(:helper) { App::Helper.new }
+  let(:helper) { App::Helper.new(ActionView::LookupContext.new([Pathname.new(__dir__).to_s]), {}, nil) }
+
+  let(:request) do
+    class Request
+      def fullpath
+      end
+    end
+
+    Request.new
+  end
+
+  before(:each) do
+    helper.stub!(:request).and_return(request)
+  end
 
   context "integration with ActionView" do
     it "aliases the original link_to helper" do
@@ -29,19 +42,6 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
   end
 
   context "active states on links" do
-    let(:request) do
-      class Request
-        def fullpath
-        end
-      end
-
-      Request.new
-    end
-
-    before(:each) do
-      helper.stub!(:request).and_return(request)
-    end
-
     context "when the current request path matches" do
       it "adds an active state" do
         request.stub!(:fullpath).and_return("/")
@@ -66,6 +66,18 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
         lt = helper.link_to "Home", "/", :active_on => "/"
         lt.should_not match(/li class=\"active\"/i)
       end
+
+      it "matches in spite of query string if ignore query is true" do
+        request.stub!(:fullpath).and_return("/wobble?test=true")
+        lt = helper.link_to "Madness", "/wobble", :active_on => true, :ignore_query => true
+        lt.should match(/class=\"active\"/i)
+      end
+
+      it "doesn't match in spite of query string if ignore query is not specified" do
+        request.stub!(:fullpath).and_return("/wobble?test=true")
+        lt = helper.link_to "Madness", "/wobble", :active_on => true
+        lt.should_not match(/class=\"active\"/i)
+      end
     end
 
     context "when the current request doesn't match" do
@@ -82,24 +94,38 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
       end
     end
 
-    describe "wrapper element support" do
+    describe "wrapper element" do
       it "supports options for the wrapper element" do
-        li = helper.link_to "Home", "/", 
+        li = helper.link_to "Home", "/",
+          :class => "wobble",
           :active_on => "/",
           :active_wrapper => :li,
-          :active_wrapper_options => { :class => "wobble" }
-        li.should match(/class=\"wobble\"/i)
+          :active_wrapper_options => { :class => "wibble" }
+        li.should match(/class=\"wibble\"/i)
       end
 
       it "supports a proc as the wrapper element" do
         request.stub!(:fullpath).and_return("/")
         li = helper.link_to "Home", "/",
+          :class => "wobble",
           :active_on => "/",
           :active_wrapper => proc { |link, wrapper_options|
             "<li class=\"#{wrapper_options[:class]}\">#{link}</li>"
           }
         li.should match(/<li class=\"active\">/i)
-        li.should match(/<a href/i)
+        li.should match(/<a class=\"wobble\" href/i)
+      end
+
+      it "supports options on proc wrapper elements" do
+        request.stub!(:fullpath).and_return("/")
+        li = helper.link_to "Home", "/",
+          :class => "wobble",
+          :active_on => "/",
+          :active_wrapper_options => { :class => "wibble" },
+          :active_wrapper => proc { |link, wrapper_options|
+            "<li class=\"#{wrapper_options[:class]}\">#{link}</li>"
+          }
+        li.should match(/<li class=\"wibble active\">/i)
       end
     end
   end

metadata

@@ -1,75 +1,54 @@
 --- !ruby/object:Gem::Specification
 name: link_to_active_state
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.0.9
 platform: ruby
 authors:
 - Robert May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.12
 description: A simple gem to implement active states on links using the standard Rails
   `link_to` helper.
 email:
-- robotmay@gmail.com
+- rob@afternoonrobot.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .public_cert.pem
-- .travis.yml
+- ".gitignore"
+- ".public_cert.pem"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,29 +61,28 @@ files:
 - spec/link_to_active_state/view_helpers_spec.rb
 - spec/link_to_active_state_spec.rb
 - spec/spec_helper.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/robotmay/link_to_active_state
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Active states for links using the Rails link_to helper.
 test_files:
 - spec/link_to_active_state/view_helpers_spec.rb