padrino-helpers 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -16,14 +16,15 @@ module Padrino
       # link_to('/dashboard', :class => 'blocky') do ... end
       # parameters: name, url='javascript:void(0)', options={}, &block
       def link_to(*args, &block)
+        options = args.extract_options!
         if block_given?
-          url, options = (args[0] || 'javascript:void(0);'), (args[1] || {})
+          url = args[0] || 'javascript:void(0);'
           options.reverse_merge!(:href => url)
           link_content = capture_html(&block)
           result_link = content_tag(:a, link_content, options)
           block_is_template?(block) ? concat_content(result_link) : result_link
         else
-          name, url, options = args.first, (args[1] || 'javascript:void(0);'), (args[2] || {})
+          name, url = args[0], (args[1] || 'javascript:void(0);')
           options.reverse_merge!(:href => url)
           content_tag(:a, name, options)
         end

data/padrino-helpers.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]

data/test/helper.rb

@@ -8,7 +8,7 @@ require 'webrat'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'support_helpers'
-require 'padrino-helpers'
+require File.dirname(__FILE__) + '/../lib/padrino-helpers'
 
 class Test::Unit::TestCase
   include Padrino::Helpers::OutputHelpers

data/test/test_asset_tag_helpers.rb

@@ -30,6 +30,10 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       actual_html = link_to('Sign up', '/register', :class => 'first', :id => 'linky')
       assert_has_tag('a#linky.first', :content => "Sign up", :href => '/register') { actual_html }
     end
+    should "display link element with void url and options" do
+      actual_link = link_to('Sign up', :class => "test")
+      assert_has_tag('a', :content => "Sign up", :href => 'javascript:void(0);', :class => 'test') { actual_link }
+    end
     should "display link element with ruby block" do
       actual_link = link_to('/register', :class => 'first', :id => 'binky') { "Sign up" }
       assert_has_tag('a#binky.first', :content => "Sign up", :href => '/register') { actual_link }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Padrino Team