dev-ruby/actionview: remove unused patches.
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>
Mon, 26 Sep 2016 16:11:35 +0000 (18:11 +0200)
committerPatrice Clement <monsieurp@gentoo.org>
Mon, 31 Oct 2016 12:00:11 +0000 (13:00 +0100)
Closes: https://github.com/gentoo/gentoo/pull/2417

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
dev-ruby/actionview/files/actionview-4.1.13-url-helper.patch [deleted file]
dev-ruby/actionview/files/actionview-4.2.4-url-helper.patch [deleted file]

diff --git a/dev-ruby/actionview/files/actionview-4.1.13-url-helper.patch b/dev-ruby/actionview/files/actionview-4.1.13-url-helper.patch
deleted file mode 100644 (file)
index 6059557..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-commit e5ba382ccbfe08a1a4681e1b6ac851379eb41c7c
-Author: Rafael Mendonça França <rafaelmfranca@gmail.com>
-Date:   Fri Aug 28 01:36:00 2015 -0300
-
-    Merge pull request #21402 from k0kubun/ruby20-url-helper
-    
-    Fix mail_to to work well with Ruby 2.0
-
-diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
-index b130457..97e299d 100644
---- a/actionview/lib/action_view/helpers/url_helper.rb
-+++ b/actionview/lib/action_view/helpers/url_helper.rb
-@@ -471,7 +471,7 @@ module ActionView
-         }.compact
-         extras = extras.empty? ? '' : '?' + ERB::Util.html_escape(extras.join('&'))
- 
--        encoded_email_address = ERB::Util.url_encode(email_address).gsub("%40", "@")
-+        encoded_email_address = ERB::Util.url_encode(email_address.to_str).gsub("%40", "@")
-         html_options["href"] = "mailto:#{encoded_email_address}#{extras}".html_safe
- 
-         content_tag(:a, name || email_address, html_options, &block)
-diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
-index 10195dd..b044ebd 100644
---- a/actionview/test/template/url_helper_test.rb
-+++ b/actionview/test/template/url_helper_test.rb
-@@ -505,6 +505,13 @@ class UrlHelperTest < ActiveSupport::TestCase
-     )
-   end
- 
-+  def test_mail_to_with_html_safe_string
-+    assert_dom_equal(
-+      %{<a href="mailto:david@loudthinking.com">david@loudthinking.com</a>},
-+      mail_to("david@loudthinking.com".html_safe)
-+    )
-+  end
-+
-   def test_mail_to_with_img
-     assert_dom_equal %{<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>},
-       mail_to('feedback@example.com', '<img src="/feedback.png" />'.html_safe)
diff --git a/dev-ruby/actionview/files/actionview-4.2.4-url-helper.patch b/dev-ruby/actionview/files/actionview-4.2.4-url-helper.patch
deleted file mode 100644 (file)
index fb6f28e..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 253ba56f5639ffb5ebe98d01c3515604c756a96a Mon Sep 17 00:00:00 2001
-From: Takashi Kokubun <takashikkbn@gmail.com>
-Date: Thu, 27 Aug 2015 21:40:11 +0900
-Subject: [PATCH] Fix mail_to to work well with Ruby 2.0
-
-Ruby 2.0's ERB::Util.url_encode crashes ActiveSupport::SafeBuffer.
-Related to 0789e06
----
- actionview/lib/action_view/helpers/url_helper.rb | 2 +-
- actionview/test/template/url_helper_test.rb      | 7 +++++++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/actionview/lib/action_view/helpers/url_helper.rb b/actionview/lib/action_view/helpers/url_helper.rb
-index b724b9c..7485fc0 100644
---- a/actionview/lib/action_view/helpers/url_helper.rb
-+++ b/actionview/lib/action_view/helpers/url_helper.rb
-@@ -463,7 +463,7 @@ def mail_to(email_address, name = nil, html_options = {}, &block)
-         }.compact
-         extras = extras.empty? ? '' : '?' + extras.join('&')
- 
--        encoded_email_address = ERB::Util.url_encode(email_address).gsub("%40", "@")
-+        encoded_email_address = ERB::Util.url_encode(email_address.to_str).gsub("%40", "@")
-         html_options["href"] = "mailto:#{encoded_email_address}#{extras}"
- 
-         content_tag(:a, name || email_address, html_options, &block)
-diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
-index 6ca937a..9e09490 100644
---- a/actionview/test/template/url_helper_test.rb
-+++ b/actionview/test/template/url_helper_test.rb
-@@ -515,6 +515,13 @@ def test_mail_with_options
-     )
-   end
- 
-+  def test_mail_to_with_html_safe_string
-+    assert_dom_equal(
-+      %{<a href="mailto:david@loudthinking.com">david@loudthinking.com</a>},
-+      mail_to("david@loudthinking.com".html_safe)
-+    )
-+  end
-+
-   def test_mail_to_with_img
-     assert_dom_equal %{<a href="mailto:feedback@example.com"><img src="/feedback.png" /></a>},
-       mail_to('feedback@example.com', '<img src="/feedback.png" />'.html_safe)