link_to_active_state 1.0.3 → 1.0.4

data/README.md

@@ -49,6 +49,11 @@ Or a proc:
 link_to "Account", account_path, active_on: lambda { request.fullpath == account_path }
 ```
 
+Any other value will cause it to be matched against the URL supplied to the link_to helper:
+```ruby
+link_to "Account", account_path, active_on: true
+```
+
 ### Custom options
 
 By default the class "active" will be added to the existing classes of the link. However you can specify your own:

data/lib/link_to_active_state/version.rb

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

data/lib/link_to_active_state/view_helpers/url_helper.rb

@@ -12,17 +12,19 @@ module LinkToActiveState
       def link_to_with_active_state(*args, &block)
         options = {}
 
-        html_options = if block_given?
-          args.second
+        link_options, html_options = if block_given?
+          [args.first, args.second]
         else
-          args[2]
+          [args[1], args[2]]
         end
 
+        link_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)
+          if is_active?(active_on, link_options)
             case active_state
             when Proc
               options = options.merge(active_state.call(html_options))
@@ -47,7 +49,7 @@ module LinkToActiveState
       end
 
       private
-      def is_active?(active_on)
+      def is_active?(active_on, link_options = {})
         case active_on
         when String
           request.fullpath == active_on
@@ -57,6 +59,10 @@ module LinkToActiveState
           request.fullpath =~ 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
+          url = url_for(link_options)
+          request.fullpath == url
         end
       end
 

data/spec/link_to_active_state_spec.rb

@@ -43,13 +43,18 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
     end
 
     context "when the current request path matches" do
-
       it "adds an active state" do
         request.stub!(:fullpath).and_return("/")
         lt = helper.link_to "Home", "/", :active_on => "/"
         lt.should match(/class=\"active\"/i)
       end
 
+      it "uses the link's URL by default" do
+        request.stub!(:fullpath).and_return("/")
+        lt = helper.link_to "Home", "/", :active_on => true
+        lt.should match(/class=\"active\"/i)
+      end
+
       it "encloses link in an element with active state if active_wrapper is true" do
         request.stub!(:fullpath).and_return("/")
         lt = helper.link_to "Home", "/", :active_on => "/", :active_wrapper => :li

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: link_to_active_state
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors: