actionview-encoded_mail_to 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04367a07299aab0fe5c6835a0c656cb6cb38a60d
-  data.tar.gz: 8ae506583897c6bfb67c1c196a653deccf4fa746
+  metadata.gz: 2be7e7ec2f9a72bfbd74cdb19caa9fb1b32b4e1e
+  data.tar.gz: c09ef047805e6a175ff09bb3cac67e0217308046
 SHA512:
-  metadata.gz: d70122653906db2e2612740fe767c016210a5e84f3903f9cfcb597cf90bb3a3b890eb16007cbf1a6f63b4fa8932f8ac3a544faea5c26f493fccd8bdbd8177ae6
-  data.tar.gz: 7bc35f5cd72a467c636817d2e6cdc34718fbe07e618f575e080af328abfc60b5fef33124f1c1af00129e3e6cb2a38482a56e603a79fdf3cb1eedf74a7c27cbb2
+  metadata.gz: 73737a026c559aed3b64a711e7ca32478c53fc3993570766a1356c0c13085f6cd06d5c73330f29e6387d6f317067b843e18d5d4b8aab0d73447a6d45dbeebcac
+  data.tar.gz: 228c73383244b3335acbf85ccc94b2c81643ae03b74b8b47b6e818ebf5880f5f46240f507dd26af0fc13d28624b8b2a5c3f303e9059184b441363d23e7313a8a

data/lib/action_view/encoded_mail_to/mail_to_with_encoding.rb

@@ -47,6 +47,7 @@ module EncodedMailTo
         #            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 = {}, &block)
+          html_options, name = name, nil if block_given? && html_options.blank?
           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, &block
@@ -55,24 +56,24 @@ module EncodedMailTo
           end
         end
         alias_method_chain :mail_to, :encoding
-        
+
         private
-        
+
           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
-                    
+
             extras = %w{ cc bcc body subject }.map { |item|
               option = html_options.delete(item) || next
-              "#{item}=#{Rack::Utils.escape_path(option)}"
+              ERB::Util.html_escape "#{item}=#{Rack::Utils.escape_path(option)}"
             }.compact
-            extras = extras.empty? ? '' : '?' + ERB::Util.html_escape(extras.join('&'))
-                    
+            extras = extras.empty? ? '' : '?' + extras.join('&')
+
             email_address_obfuscated = email_address.to_str
             email_address_obfuscated.gsub!(/@/, html_options.delete("replace_at")) if html_options.key?("replace_at")
             email_address_obfuscated.gsub!(/\./, html_options.delete("replace_dot")) if html_options.key?("replace_dot")
-          
+
             case encode
             when "javascript"
               string = ''
@@ -89,7 +90,7 @@ module EncodedMailTo
               end
               create_link = "var script = document.getElementById('mail_to-#{script_id}');" +
                             "var a = document.createElement('a');" +
-                            "#{set_attributes}" + 
+                            "#{set_attributes}" +
                             link_content +
                             "script.parentNode.insertBefore(a,script);"
               create_link.each_byte do |c|
@@ -100,14 +101,14 @@ module EncodedMailTo
               email_address_encoded = email_address_obfuscated.unpack('C*').map {|c|
                 sprintf("&#%d;", c)
               }.join
-                    
+
               string = 'mailto:'.unpack('C*').map { |c|
                 sprintf("&#%d;", c)
               }.join + email_address.unpack('C*').map { |c|
                 char = c.chr
                 char =~ /\w/ ? sprintf("%%%x", c) : char
               }.join
-                    
+
               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), &block
@@ -116,4 +117,4 @@ module EncodedMailTo
       end
     end
   end
-end
+end

data/lib/action_view/encoded_mail_to/version.rb

@@ -1,5 +1,5 @@
 module ActionView
   module EncodedMailTo
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/test/test_actionview-encoded_mail_to.rb

@@ -4,13 +4,14 @@ require 'minitest/autorun'
 require 'rails'
 require 'action_pack'
 require 'action_view/helpers/capture_helper'
+require 'action_view/helpers/output_safety_helper'
 require 'action_view/helpers/url_helper'
 require 'action_view/encoded_mail_to/mail_to_with_encoding'
 require 'action_view/buffers'
 
 class TestActionViewEncodedMailTo < MiniTest::Test
   include ActionView::Helpers::UrlHelper
-  
+
   attr_accessor :output_buffer
 
   def test_initialization
@@ -18,7 +19,7 @@ class TestActionViewEncodedMailTo < MiniTest::Test
       assert_includes ActionView::Helpers::UrlHelper.instance_methods, method
     end
   end
-  
+
   def test_mail_to
     assert_equal %{<a href="mailto:nick@example.com">nick@example.com</a>}, mail_to("nick@example.com")
     assert_equal %{<a href="mailto:nick@example.com">Nick Reed</a>}, mail_to("nick@example.com", "Nick Reed")
@@ -27,26 +28,26 @@ class TestActionViewEncodedMailTo < MiniTest::Test
     assert_equal mail_to("nick@example.com", "Nick Reed", "class" => "admin"),
                  mail_to("nick@example.com", "Nick Reed", class: "admin")
   end
-  
+
   def test_mail_to_without_encoding
     assert_equal mail_to("nick@example.com", "Nick Reed"),
                  mail_to_without_encoding("nick@example.com", "Nick Reed")
   end
-  
+
   def test_mail_to_with_javascript
     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%64%6f%6d%61%69%6e%2e%63%6f%6d%27%29%3b%61%2e%61%70%70%65%6e%64%43%68%69%6c%64%28%64%6f%63%75%6d%65%6e%74%2e%63%72%65%61%74%65%54%65%78%74%4e%6f%64%65%28%27%4d%79%20%65%6d%61%69%6c%27%29%29%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>/,
       mail_to("me@domain.com", "My email", encode: "javascript")
     )
   end
-   
+
   def test_mail_to_with_javascript_unicode
     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%75%6e%69%63%6f%64%65%40%65%78%61%6d%70%6c%65%2e%63%6f%6d%27%29%3b%61%2e%61%70%70%65%6e%64%43%68%69%6c%64%28%64%6f%63%75%6d%65%6e%74%2e%63%72%65%61%74%65%54%65%78%74%4e%6f%64%65%28%27%c3%ba%6e%69%63%6f%64%65%27%29%29%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>/,
       mail_to("unicode@example.com", "únicode", encode: "javascript")
     )
   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
@@ -57,10 +58,20 @@ class TestActionViewEncodedMailTo < MiniTest::Test
     )
   end
 
+  def test_mail_to_with_javascript_and_block_excluding_name_argument
+    output = mail_to("me@example.com", 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")
-    
+
     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%64%6f%6d%61%69%6e%2e%63%6f%6d%27%29%3b%61%2e%61%70%70%65%6e%64%43%68%69%6c%64%28%64%6f%63%75%6d%65%6e%74%2e%63%72%65%61%74%65%54%65%78%74%4e%6f%64%65%28%27%4d%79%20%65%6d%61%69%6c%27%29%29%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>/,
       first
@@ -71,31 +82,31 @@ class TestActionViewEncodedMailTo < MiniTest::Test
     )
     refute_equal first, second
   end
-   
+
   def test_mail_with_options
     assert_equal(
       %{<a href="mailto:me@example.com?cc=ccaddress%40example.com&amp;bcc=bccaddress%40example.com&amp;body=This%20is%20the%20body%20of%20the%20message.&amp;subject=This%20is%20an%20example%20email">My email</a>},
       mail_to("me@example.com", "My email", cc: "ccaddress@example.com", bcc: "bccaddress@example.com", subject: "This is an example email", body: "This is the body of the message.")
     )
   end
-  
+
   def test_mail_to_with_img
     assert_equal %{<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>},
                  mail_to('feedback@example.com', '<img src="/feedback.png" />'.html_safe)
   end
-  
+
   def test_mail_to_with_hex
     assert_equal(
       %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">My email</a>},
       mail_to("me@domain.com", "My email", encode: "hex")
     )
-  
+
     assert_equal(
       %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">&#109;&#101;&#64;&#100;&#111;&#109;&#97;&#105;&#110;&#46;&#99;&#111;&#109;</a>},
       mail_to("me@domain.com", nil, encode: "hex")
     )
   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
@@ -111,37 +122,37 @@ class TestActionViewEncodedMailTo < MiniTest::Test
       %{<a href="mailto:me@domain.com">me(at)domain(dot)com</a>},
       mail_to("me@domain.com", nil, replace_at: "(at)", replace_dot: "(dot)")
     )
-  
+
     assert_equal(
       %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">&#109;&#101;&#40;&#97;&#116;&#41;&#100;&#111;&#109;&#97;&#105;&#110;&#46;&#99;&#111;&#109;</a>},
       mail_to("me@domain.com", nil, encode: "hex", replace_at: "(at)")
     )
-  
+
     assert_equal(
       %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">My email</a>},
       mail_to("me@domain.com", "My email", encode: "hex", replace_at: "(at)")
     )
-  
+
     assert_equal(
       %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">&#109;&#101;&#40;&#97;&#116;&#41;&#100;&#111;&#109;&#97;&#105;&#110;&#40;&#100;&#111;&#116;&#41;&#99;&#111;&#109;</a>},
       mail_to("me@domain.com", nil, encode: "hex", replace_at: "(at)", replace_dot: "(dot)")
     )
-  
+
     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%64%6f%6d%61%69%6e%2e%63%6f%6d%27%29%3b%61%2e%61%70%70%65%6e%64%43%68%69%6c%64%28%64%6f%63%75%6d%65%6e%74%2e%63%72%65%61%74%65%54%65%78%74%4e%6f%64%65%28%27%4d%79%20%65%6d%61%69%6c%27%29%29%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>/,
       mail_to("me@domain.com", "My email", encode: "javascript", replace_at: "(at)", replace_dot: "(dot)")
     )
-      
+
     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%64%6f%6d%61%69%6e%2e%63%6f%6d%27%29%3b%61%2e%61%70%70%65%6e%64%43%68%69%6c%64%28%64%6f%63%75%6d%65%6e%74%2e%63%72%65%61%74%65%54%65%78%74%4e%6f%64%65%28%27%6d%65%28%61%74%29%64%6f%6d%61%69%6e%28%64%6f%74%29%63%6f%6d%27%29%29%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>/,
       mail_to("me@domain.com", nil, encode: "javascript", replace_at: "(at)", replace_dot: "(dot)")
     )
   end
-  
+
   def test_mail_to_returns_html_safe_string
     assert mail_to("me@domain.com").html_safe?
     assert mail_to("me@domain.com", "My email", encode: "javascript").html_safe?
     assert mail_to("me@domain.com", "My email", encode: "hex").html_safe?
   end
-  
-end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionview-encoded_mail_to
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Nick Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails