friendlyfashion-rails_autolink 1.0.11 → 1.0.12

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.0.12 / 2013-03-22
+
+* Added support for passsing options in block
+
 === 1.0.7 / 2012-04-27
 
 * Added support for non-latin characters in autolinked urls

data/lib/rails_autolink/helpers.rb

@@ -15,7 +15,7 @@ module RailsAutolink
         # <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and
         # e-mail address is yielded and the result is used as the link text. By default the
         # text given is sanitized, you can override this behaviour setting the
-        # <tt>:sanitize</tt> option to false, or you can add options to the sanitization of 
+        # <tt>:sanitize</tt> option to false, or you can add options to the sanitization of
         # the text using the <tt>:sanitize_options</tt> option hash.
         #
         # ==== Examples
@@ -106,9 +106,17 @@ module RailsAutolink
                 end
 
                 link_text = block_given?? yield(href) : href
+
+                custom_link_attributes = link_attributes
+
                 if link_text.is_a?(Hash)
-                  href = link_text[:href]      || href
-                  link_text = link_text[:text] || href
+
+                  if link_text[:html_options] && link_text[:html_options].is_a?(Hash)
+                    custom_link_attributes = link_text[:html_options].stringify_keys
+                  end
+
+                  href = link_text[:href]         || href
+                  link_text = link_text[:text]    || href
                 else
                   href = 'http://' + href unless scheme
                 end
@@ -117,7 +125,7 @@ module RailsAutolink
                   link_text = sanitize(link_text)
                   href      = sanitize(href)
                 end
-                content_tag(:a, link_text, link_attributes.merge('href' => href), !!options[:sanitize]) + punctuation.reverse.join('')
+                content_tag(:a, link_text, custom_link_attributes.merge('href' => href), !!options[:sanitize]) + punctuation.reverse.join('')
               end
             end
           end

data/rails_autolink.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'friendlyfashion-rails_autolink'
-  s.version = '1.0.11'
-  s.authors = ["Laurynas Butkus", "Tomas Didziokas", "Justas Janauskas", "Edvinas Bartkus"]
-  s.email   = ["laurynas.butkus@gmail.com", "tomas.did@gmail.com", "jjanauskas@gmail.com", "edvinas.bartkus@gmail.com"]
+  s.version = '1.0.12'
+  s.authors = ["Laurynas Butkus", "Tomas Didziokas", "Justas Janauskas", "Edvinas Bartkus", "Andrius Janauskas"]
+  s.email   = ["laurynas.butkus@gmail.com", "tomas.did@gmail.com", "jjanauskas@gmail.com", "edvinas.bartkus@gmail.com", "andrius.janauskas@gmail.com"]
   s.summary = 'This is an extraction of the `auto_link` method from rails. The `auto_link` method was removed from Rails in version Rails 3.1. This gem is meant to bridge the gap for people migrating.'
 
   s.add_dependency 'rails', '> 3.1'

data/test/test_rails_autolink.rb

@@ -58,6 +58,24 @@ class TestRailsAutolink < MiniTest::Unit::TestCase
     assert_equal '<a href="http://www.facebook.com">www.facebook.com</a>', result
   end
 
+  def test_auto_link_with_block_which_returns_hash_with_html_options
+    url = 'http://www.google.com/'
+    result = auto_link(url) do |it|
+      { text: "www.facebook.com", href: "http://www.facebook.com", html_options: { rel: "nofollow" } }
+    end
+
+    assert_equal '<a href="http://www.facebook.com" rel="nofollow">www.facebook.com</a>', result
+  end
+
+  def test_auto_link_with_block_which_returns_hash_with_html_options_override
+    url = 'http://www.google.com/'
+    result = auto_link(url, { rel: "nofollow" }) do |it|
+      { text: "www.facebook.com", href: "http://www.facebook.com", html_options: { } }
+    end
+
+    assert_equal '<a href="http://www.facebook.com">www.facebook.com</a>', result
+  end
+
   def test_auto_link_with_options_hash
     assert_dom_equal 'Welcome to my new blog at <a href="http://www.myblog.com/" class="menu" target="_blank">http://www.myblog.com/</a>. Please e-mail me at <a href="mailto:me@email.com" class="menu" target="_blank">me@email.com</a>.',
       auto_link("Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com.",
@@ -97,17 +115,17 @@ class TestRailsAutolink < MiniTest::Unit::TestCase
     assert_equal %{<a href="http://www.rubyonrails.com?id=1&num=2">http://www.rubyonrails.com?id=1&num=2</a>}, auto_link("#{link_raw}#{malicious_script}")
     assert auto_link("#{link_raw}#{malicious_script}").html_safe?
   end
-  
+
   def test_auto_link_should_sanitize_input_with_sanitize_options
     link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
     malicious_script  = '<script>alert("malicious!")</script>'
     text_with_attributes = %{<a href="http://ruby-lang-org" target="_blank" data-malicious="inject">Ruby</a>}
-    
+
     text_result = %{<a class="big" href="http://www.rubyonrails.com?id=1&num=2">http://www.rubyonrails.com?id=1&num=2</a><a href="http://ruby-lang-org" target="_blank">Ruby</a>}
     assert_equal text_result, auto_link("#{link_raw}#{malicious_script}#{text_with_attributes}",
                                         :sanitize_options => {:attributes => ["target", "href"]},
                                         :html => {:class => 'big'})
-    
+
     assert auto_link("#{link_raw}#{malicious_script}#{text_with_attributes}",
                      :sanitize_options => {:attributes => ["target", "href"]},
                      :html => {:class => 'big'}).html_safe?
@@ -116,7 +134,7 @@ class TestRailsAutolink < MiniTest::Unit::TestCase
   def test_auto_link_should_not_sanitize_input_when_sanitize_option_is_false
     link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
     malicious_script  = '<script>alert("malicious!")</script>'
-    
+
     assert_equal %{<a href="http://www.rubyonrails.com?id=1&num=2">http://www.rubyonrails.com?id=1&num=2</a><script>alert("malicious!")</script>}, auto_link("#{link_raw}#{malicious_script}", :sanitize => false)
     assert !auto_link("#{link_raw}#{malicious_script}", :sanitize => false).html_safe?
   end
@@ -165,14 +183,14 @@ class TestRailsAutolink < MiniTest::Unit::TestCase
     email_raw         = 'santiago@wyeworks.com'
     link_raw          = 'http://www.rubyonrails.org'
     malicious_script  = '<script>alert("malicious!")</script>'
-    
+
     assert auto_link(nil).html_safe?, 'should be html safe'
     assert auto_link('').html_safe?, 'should be html safe'
     assert auto_link("#{link_raw} #{link_raw} #{link_raw}").html_safe?, 'should be html safe'
     assert auto_link("hello #{email_raw}").html_safe?, 'should be html safe'
     assert auto_link("hello #{email_raw} #{malicious_script}").html_safe?, 'should be html safe'
   end
-  
+
   def test_auto_link_should_not_be_html_safe_when_sanitize_option_false
     email_raw         = 'santiago@wyeworks.com'
     link_raw          = 'http://www.rubyonrails.org'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendlyfashion-rails_autolink
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,11 @@ authors:
 - Tomas Didziokas
 - Justas Janauskas
 - Edvinas Bartkus
+- Andrius Janauskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,6 +37,7 @@ email:
 - tomas.did@gmail.com
 - jjanauskas@gmail.com
 - edvinas.bartkus@gmail.com
+- andrius.janauskas@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []