actionview-encoded_mail_to 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1889e7f329fc1788237954b905303c8ea5e42270
-  data.tar.gz: 54405ecf947dec7c922eff82ff3560258d89a7e0
+  metadata.gz: 81457ed404f7ef4ac2b924a13a7eed04c20e4916
+  data.tar.gz: 4b42593a0733d6142d036ba1d987fa6930adc864
 SHA512:
-  metadata.gz: f47a5712d7a7287c6c296ba93bec885fa1c5b64a506222369a207af21934bbd76137d2e8eb28ee3926f2daa2895c472c99d497aae24f0e613bb5f9577446b171
-  data.tar.gz: 7e29b7714b642b5c06f5d9753e3879e91ba0af4b27265d2cfe417dd018610aace5c17ef18a04068da8c116779846dd2b3e77c4ad729c26658e6379cfeb812860
+  metadata.gz: 3ddbf2557c87e7b1debd014e21ab2e678411c6293a9ed67064770fbb0a816af3565d48f682d7036f3949499d09cce9be370cd49e46627d95b49a9f6491412194
+  data.tar.gz: 8b4ce8561cc71163f7372d86fe5e1d5fed55328cb7701c94f8e4825ff927efeeffb69a8f369b271225607a76ee0af8ec3ea6b6803cbc59f77d0febb710a1f1c4

data/lib/action_view/encoded_mail_to/mail_to_with_encoding.rb

@@ -46,19 +46,19 @@ module EncodedMailTo
         #   mail_to "me@domain.com", "My email", cc: "ccaddress@domain.com",
         #            subject: "This is an example email"
         #   # => <a href="mailto:me@domain.com?cc=ccaddress@domain.com&subject=This%20is%20an%20example%20email">My email</a>
-        def mail_to_with_encoding(email_address, name = nil, html_options = {})
+        def mail_to_with_encoding(email_address, name = nil, html_options = {}, &block)
           html_options.stringify_keys!
           if %w[encode replace_at replace_dot].none?{ |option| html_options.has_key? option }
-            mail_to_without_encoding email_address, name, html_options
+            mail_to_without_encoding email_address, name, html_options, &block
           else
-            _mail_to_with_encoding email_address, name, html_options
+            _mail_to_with_encoding email_address, name, html_options, &block
           end
         end
         alias_method_chain :mail_to, :encoding
         
         private
         
-          def _mail_to_with_encoding(email_address, name = nil, html_options = {})
+          def _mail_to_with_encoding(email_address, name = nil, html_options = {}, &block)
             email_address = ERB::Util.html_escape(email_address)
             
             encode = html_options.delete("encode").to_s
@@ -81,10 +81,16 @@ module EncodedMailTo
                 set_attributes += "a.setAttribute('#{name}', '#{value}');"
               end
               script_id = rand(36**8).to_s(36)
+              if block_given?
+                block_content = capture(&block).gsub('\'', %q(\\\')).gsub(/\n/, ' ')
+                link_content = "a.innerHTML='#{block_content}';"
+              else
+                link_content = "a.appendChild(document.createTextNode('#{name || email_address_obfuscated.html_safe}'));"
+              end
               create_link = "var script = document.getElementById('mail_to-#{script_id}');" +
                             "var a = document.createElement('a');" +
                             "#{set_attributes}" + 
-                            "a.appendChild(document.createTextNode('#{name || email_address_obfuscated.html_safe}'));" +
+                            link_content +
                             "script.parentNode.insertBefore(a,script);"
               create_link.each_byte do |c|
                 string << sprintf("%%%x", c)
@@ -102,9 +108,9 @@ module EncodedMailTo
                 char =~ /\w/ ? sprintf("%%%x", c) : char
               }.join
                     
-              content_tag "a", name || email_address_encoded.html_safe, html_options.merge("href" => "#{string}#{extras}".html_safe)
+              content_tag "a", name || email_address_encoded.html_safe, html_options.merge("href" => "#{string}#{extras}".html_safe), &block
             else
-              content_tag "a", name || email_address_obfuscated.html_safe, html_options.merge("href" => "mailto:#{email_address}#{extras}".html_safe)
+              content_tag "a", name || email_address_obfuscated.html_safe, html_options.merge("href" => "mailto:#{email_address}#{extras}".html_safe), &block
             end
           end
       end

data/lib/action_view/encoded_mail_to/version.rb

@@ -1,5 +1,5 @@
 module ActionView
   module EncodedMailTo
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/test/test_actionview-encoded_mail_to.rb

@@ -6,10 +6,13 @@ require 'action_pack'
 require 'action_view/helpers/capture_helper'
 require 'action_view/helpers/url_helper'
 require 'action_view/encoded_mail_to/mail_to_with_encoding'
+require 'action_view/buffers'
 
 class TestActionViewEncodedMailTo < MiniTest::Unit::TestCase
   include ActionView::Helpers::UrlHelper
   
+  attr_accessor :output_buffer
+
   def test_initialization
     [:mail_to, :mail_to_with_encoding, :mail_to_without_encoding].each do |method|
       assert_includes ActionView::Helpers::UrlHelper.instance_methods, method
@@ -44,6 +47,16 @@ class TestActionViewEncodedMailTo < MiniTest::Unit::TestCase
     )
   end
   
+  def test_mail_to_with_javascript_and_block
+    output = mail_to("me@example.com", nil, encode: "javascript") do
+      "<i class='icon-mail'></i>".html_safe
+    end
+    assert_match(
+      /<script id=\"mail_to-\S+\">eval\(decodeURIComponent\('%76%61%72%20%73%63%72%69%70%74%20%3d%20%64%6f%63%75%6d%65%6e%74%2e%67%65%74%45%6c%65%6d%65%6e%74%42%79%49%64%28%27%6d%61%69%6c%5f%74%6f%2d\S+%27%29%3b%76%61%72%20%61%20%3d%20%64%6f%63%75%6d%65%6e%74%2e%63%72%65%61%74%65%45%6c%65%6d%65%6e%74%28%27%61%27%29%3b%61%2e%73%65%74%41%74%74%72%69%62%75%74%65%28%27%68%72%65%66%27%2c%20%27%6d%61%69%6c%74%6f%3a%6d%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%27%29%3b%61%2e%69%6e%6e%65%72%48%54%4d%4c%3d%27%3c%69%20%63%6c%61%73%73%3d%5c%27%69%63%6f%6e%2d%6d%61%69%6c%5c%27%3e%3c%2f%69%3e%27%3b%73%63%72%69%70%74%2e%70%61%72%65%6e%74%4e%6f%64%65%2e%69%6e%73%65%72%74%42%65%66%6f%72%65%28%61%2c%73%63%72%69%70%74%29%3b'\)\)<\/script>/,
+      output
+    )
+  end
+
   def test_multiple_mail_to_with_javascript
     first = mail_to("me@domain.com", "My email", encode: "javascript")
     second = mail_to("me@domain.com", "My email", encode: "javascript")
@@ -83,6 +96,16 @@ class TestActionViewEncodedMailTo < MiniTest::Unit::TestCase
     )
   end
   
+  def test_mail_to_with_hex_and_block
+    output = mail_to("me@example.com", nil, encode: "hex") {
+      "<i class='icon-cog'></i> Contact Us".html_safe
+    }
+    assert_equal(
+      %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%65%78%61%6d%70%6c%65.%63%6f%6d\"><i class='icon-cog'></i> Contact Us</a>},
+      output
+    )
+  end
+
   def test_mail_to_with_replace_options
     assert_equal(
       %{<a href="mailto:me@domain.com">me(at)domain(dot)com</a>},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview-encoded_mail_to
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Deprecated support for email address obfuscation within the mail_to helper