link_to_active_state 1.0.0 → 1.0.2

data/lib/link_to_active_state/version.rb

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

data/lib/link_to_active_state/view_helpers/url_helper.rb

@@ -1,5 +1,6 @@
 require 'action_view'
 require 'link_to_active_state'
+require 'pry'
 
 module LinkToActiveState
   module ViewHelpers
@@ -9,6 +10,8 @@ module LinkToActiveState
       end
 
       def link_to_with_active_state(*args, &block)
+        options = {}
+
         html_options = if block_given?
           args.second
         else
@@ -16,29 +19,29 @@ module LinkToActiveState
         end
 
         if html_options.present? && html_options[:active_on].present?
-          active_on = html_options[:active_on]
+          active_on = html_options.delete(:active_on)
+          active_state = html_options.delete(:active_state) || "active"
 
           if is_active?(active_on)
-            active_state = html_options[:active_state] || "active"
             case active_state
             when Proc
-              html_options.merge(active_state.call(html_options))
+              options = options.merge(active_state.call(html_options))
             when String
-              html_options[:class] = merge_class(html_options[:class], active_state)
+              options[:class] = merge_class(html_options[:class], active_state)
             end
           end
-
-          html_options.delete(:active_on)
-          html_options.delete(:active_state)
         end
 
         if html_options.present? && html_options[:active_wrapper]
           element = html_options.delete(:active_wrapper)
+          wrapper_options = html_options.delete(:active_wrapper_options) || {}
+          wrapper_options = wrapper_options.merge(options)
 
-          content_tag(element, html_options) do
+          content_tag(element, wrapper_options) do
             link_to_without_active_state(*args, &block)
           end
         else
+          html_options.merge!(options)
           link_to_without_active_state(*args, &block)
         end
       end

data/link_to_active_state.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rails", [">= 3.2.11"]
-  gem.add_development_dependency "rspec", ["~> 2.12.0"]
+  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

@@ -75,8 +75,15 @@ describe LinkToActiveState::ViewHelpers::UrlHelper do
         lt = helper.link_to "Home", "/", :active_on => "/", :active_wrapper => :li
         lt.should match(/<li>/i)
       end
-
+      
+      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
     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.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        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:
@@ -86,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Active states for links using the Rails link_to helper.