link_to_active_state 1.0.7 → 1.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 29ddfa2d41bf42590f15f13cd9855ad7d0975461
+  data.tar.gz: 64ffecdfbe4acd7be542c9deb3631fc807eb2542
+SHA512:
+  metadata.gz: 643104f46becb061bacf9b052f7dcd6c0fe0421ae1140f4cd04987f15ae6326690a9c39ba76ae1173ec81e26e7a8f83e6bddff0682a0306fb4944436d25bf9ee
+  data.tar.gz: 3937bced3f91d5ef03ba0b8c855575e642d77ed4714b4fba5d7ecc0b0336286a45fb39b922d436b0dd9f6f100e58189d9c7c3724a342defbb9c8a2f92b0b1e2f

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

@@ -13,7 +13,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.7"
+  VERSION = "1.0.8"
 end

data/lib/link_to_active_state/view_helpers/url_helper.rb

@@ -9,14 +9,13 @@ module LinkToActiveState
       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) || {}
@@ -25,23 +24,20 @@ module LinkToActiveState
           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]
-          if wrapper_options[:class].present?
-            options[:class] = merge_class(wrapper_options[:class], options[:class])
-          end
-          
           element_or_proc = html_options.delete(:active_wrapper)
-          wrapper_options.merge!(options)
 
           render_with_wrapper(element_or_proc, wrapper_options) do
             link_to_without_active_state(*args, &block)
@@ -53,20 +49,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
 
@@ -74,7 +76,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/spec/link_to_active_state_spec.rb

@@ -10,6 +10,19 @@ end
 describe LinkToActiveState::ViewHelpers::UrlHelper do
   let(:helper) { App::Helper.new }
 
+  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
       helper.should respond_to(:link_to_without_active_state)
@@ -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,29 +94,32 @@ 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|

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: link_to_active_state
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.0.8
 platform: ruby
 authors:
 - Robert May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2015-09-10 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
 description: A simple gem to implement active states on links using the standard Rails
@@ -51,9 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .public_cert.pem
-- .travis.yml
+- ".gitignore"
+- ".public_cert.pem"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,27 +63,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+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: 2.4.5.1
 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