active_link_to 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/active_link_to.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_link_to}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov"]
-  s.date = %q{2011-06-23}
+  s.date = %q{2011-07-18}
   s.description = %q{Extremely helpful when you need to add some logic that figures out if the link (or more often navigation item) is selected based on the current page or other arbitrary condition}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/lib/active_link_to.rb

@@ -148,8 +148,8 @@ module ActiveLinkTo
     when Regexp
       !request.fullpath.match(options[:when]).blank?
     when Array
-      controllers = options[:when][0]
-      actions     = options[:when][1]
+      controllers = [*options[:when][0]]
+      actions     = [*options[:when][1]]
       (controllers.blank? || controllers.member?(params[:controller])) &&
       (actions.blank? || actions.member?(params[:action]))
     when TrueClass

data/test/active_link_to_test.rb

@@ -49,6 +49,20 @@ class ActiveLinkToTest < Test::Unit::TestCase
     assert_equal '<a href="/test">name</a>', out
   end
   
+  
+  def test_matching_controller_action_singular_values
+    request.fullpath = '/test/23'
+    params[:controller], params[:action] = 'tests', 'show'
+    out = active_link_to 'name', '/test/23', :active => { :when => ['tests', ['show', 'edit']]}
+    assert_equal '<a href="/test/23" class="active">name</a>', out
+    out = active_link_to 'name', '/test/23', :active => { :when => [ 'tests' ]}
+    assert_equal '<a href="/test/23" class="active">name</a>', out
+    out = active_link_to 'name', '/test/23', :active => { :when => [nil, 'show']}
+    assert_equal '<a href="/test/23" class="active">name</a>', out
+    out = active_link_to 'name', '/test/23', :active => { :when => ['tests', 'update']}
+    assert_equal '<a href="/test/23">name</a>', out
+  end
+  
   def test_matching_controller_action_touples
     request.fullpath = '/test/23'
     params[:controller], params[:action] = 'tests', 'show'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_link_to
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-23 00:00:00.000000000 -04:00
+date: 2011-07-18 00:00:00.000000000 -04:00
 default_executable: 
 dependencies: []
 description: Extremely helpful when you need to add some logic that figures out if