link_to_active_state 1.0.2 → 1.0.3

data/README.md

@@ -88,6 +88,23 @@ Which will result in:
 
 Note the li tag is included as part of the html generated by the link_to helper and should not be added separately.
 
+You can also pass a proc to the wrapper option. This takes two arguments; the generated link and the options for the wrapper (which will include the active state class):
+```ruby
+link_to "Account", account_path, 
+  active_on: account_path,
+  active_wrapper: proc { |link, wrapper_opts|
+    content_tag(:li, link, wrapper_opts)
+  }
+```
+
+And for either of the above methods you can supply HTML attributes for the wrapper:
+```ruby
+link_to "Account", account_path,
+  active_on: account_path,
+  active_wrapper: :li,
+  active_wrapper_options: { rel: "gallery" }
+```
+
 ## Contributing
 
 1. Fork it

data/lib/link_to_active_state/version.rb

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

data/lib/link_to_active_state/view_helpers/url_helper.rb

@@ -33,11 +33,11 @@ module LinkToActiveState
         end
 
         if html_options.present? && html_options[:active_wrapper]
-          element = html_options.delete(:active_wrapper)
+          element_or_proc = html_options.delete(:active_wrapper)
           wrapper_options = html_options.delete(:active_wrapper_options) || {}
           wrapper_options = wrapper_options.merge(options)
 
-          content_tag(element, wrapper_options) do
+          render_with_wrapper(element_or_proc, wrapper_options) do
             link_to_without_active_state(*args, &block)
           end
         else
@@ -64,6 +64,17 @@ module LinkToActiveState
         original ||= ""
         [original, new].delete_if(&:blank?).join(" ")
       end
+      
+      def render_with_wrapper(element_or_proc, wrapper_options, &block)
+        content = block.call
+
+        case element_or_proc
+        when Proc
+          element_or_proc.call(content, wrapper_options)
+        when Symbol || String
+          content_tag(element_or_proc, content, wrapper_options)
+        end
+      end
     end
   end
 end

data/spec/link_to_active_state/view_helpers_spec.rb

@@ -3,5 +3,7 @@ require 'action_view'
 
 module LinkToActiveState
   module ViewHelpers
+    module UrlHelper
+    end
   end
 end

data/spec/link_to_active_state_spec.rb

@@ -20,9 +20,9 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
     end
 
     it "aliases link_to_with_active_state to link_to" do
-      lt = helper.link_to "Test", "/", :active_on => lambda { true }
-      ltwas = helper.link_to_with_active_state "Test", "/", :active_on => lambda { true }
-      ltwoas = helper.link_to_without_active_state "Test", "/", :active_on => lambda { true }
+      lt = helper.link_to "Test", "/", :active_on => proc { true }
+      ltwas = helper.link_to_with_active_state "Test", "/", :active_on => proc { true }
+      ltwoas = helper.link_to_without_active_state "Test", "/", :active_on => proc { true }
       lt.should eq(ltwas)
       lt.should_not eq(ltwoas)
     end
@@ -75,15 +75,27 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
         lt = helper.link_to "Home", "/", :active_on => "/", :active_wrapper => :li
         lt.should match(/<li>/i)
       end
-      
+    end
+
+    describe "wrapper element support" do
       it "supports options for the wrapper element" do
-        request.stub!(:fullpath).and_return("/wibble")
         li = helper.link_to "Home", "/", 
           :active_on => "/",
           :active_wrapper => :li,
           :active_wrapper_options => { :class => "wobble" }
         li.should match(/class=\"wobble\"/i)
       end
+
+      it "supports a proc as the wrapper element" do
+        request.stub!(:fullpath).and_return("/")
+        li = helper.link_to "Home", "/",
+          :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)
+      end
     end
   end
 end

metadata

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