link_to_active_state 1.0.5 → 1.0.6

data/lib/link_to_active_state/version.rb

@@ -1,3 +1,3 @@
 module LinkToActiveState
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/link_to_active_state/view_helpers/url_helper.rb

@@ -20,6 +20,7 @@ module LinkToActiveState
 
         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)
@@ -36,9 +37,12 @@ module LinkToActiveState
         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 = html_options.delete(:active_wrapper_options) || {}
-          wrapper_options = wrapper_options.merge(options)
+          wrapper_options.merge!(options)
 
           render_with_wrapper(element_or_proc, wrapper_options) do
             link_to_without_active_state(*args, &block)

data/spec/link_to_active_state_spec.rb

@@ -101,6 +101,17 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
         li.should match(/<li class=\"active\">/i)
         li.should match(/<a href/i)
       end
+      
+      it "supports options on proc wrapper elements" do
+        request.stub!(:fullpath).and_return("/")
+        li = helper.link_to "Home", "/",
+          :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
 end

metadata

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