removing auto_link and moving it to the rails_autolink gem. :bomb:

3 files changed, 6 insertions, 379 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 184b2af018..448ee878b1 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,11 @@
 *Rails 3.1.0 (unreleased)*
 
+* auto_link has been removed with no replacement.  If you still use auto_link
+  please install the rails_autolink gem:
+    http://github.com/tenderlove/rails_autolink
+
+  [tenderlove]
+
 * Add `ActionController::ParamsWrapper` to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default [Prem Sichanugrist]
 
   This can be customizabled by setting `ActionController::Base.wrap_parameters` in `config/initializer/wrap_parameters.rb`
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 06e2b027da..ca09c77b5c 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -265,60 +265,6 @@ module ActionView
         text.html_safe.safe_concat("</p>")
       end
 
-      # Turns all URLs and e-mail addresses into clickable links. The <tt>:link</tt> option
-      # will limit what should be linked. You can add HTML attributes to the links using
-      # <tt>:html</tt>. Possible values for <tt>:link</tt> are <tt>:all</tt> (default),
-      # <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.
-      #
-      # ==== Examples
-      #   auto_link("Go to http://www.rubyonrails.org and say hello to david@loudthinking.com")
-      #   # => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> and
-      #   #     say hello to <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
-      #
-      #   auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :link => :urls)
-      #   # => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a>
-      #   #     or e-mail david@loudthinking.com"
-      #
-      #   auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :link => :email_addresses)
-      #   # => "Visit http://www.loudthinking.com/ or e-mail <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
-      #
-      #   post_body = "Welcome to my new blog at http://www.myblog.com/.  Please e-mail me at me@email.com."
-      #   auto_link(post_body, :html => { :target => '_blank' }) do |text|
-      #     truncate(text, :length => 15)
-      #   end
-      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>.
-      #         Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
-      #
-      #
-      # You can still use <tt>auto_link</tt> with the old API that accepts the
-      # +link+ as its optional second parameter and the +html_options+ hash
-      # as its optional third parameter:
-      #   post_body = "Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com."
-      #   auto_link(post_body, :urls)
-      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\">http://www.myblog.com</a>.
-      #         Please e-mail me at me@email.com."
-      #
-      #   auto_link(post_body, :all, :target => "_blank")
-      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.myblog.com</a>.
-      #         Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
-      def auto_link(text, *args, &block)#link = :all, html = {}, &block)
-        return '' if text.blank?
-
-        options = args.size == 2 ? {} : args.extract_options! # this is necessary because the old auto_link API has a Hash as its last parameter
-        unless args.empty?
-          options[:link] = args[0] || :all
-          options[:html] = args[1] || {}
-        end
-        options.reverse_merge!(:link => :all, :html => {})
-
-        case options[:link].to_sym
-          when :all                         then auto_link_email_addresses(auto_link_urls(text, options[:html], options, &block), options[:html], &block)
-          when :email_addresses             then auto_link_email_addresses(text, options[:html], &block)
-          when :urls                        then auto_link_urls(text, options[:html], options, &block)
-        end
-      end
-
       # Creates a Cycle object whose _to_s_ method cycles through elements of an
       # array every time it is called. This can be used for example, to alternate
       # classes for table rows.  You can use named cycles to allow nesting in loops.
@@ -464,77 +410,6 @@ module ActionView
           @_cycles = Hash.new unless defined?(@_cycles)
           @_cycles[name] = cycle_object
         end
-
-        AUTO_LINK_RE = %r{
-            (?: ([0-9A-Za-z+.:-]+:)// | www\. )
-            [^\s<]+
-          }x
-
-        # regexps for determining context, used high-volume
-        AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, /<\/a>/i]
-
-        AUTO_EMAIL_RE = /[\w.!#\$%+-]+@[\w-]+(?:\.[\w-]+)+/
-
-        BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
-
-        # Turns all urls into clickable links.  If a block is given, each url
-        # is yielded and the result is used as the link text.
-        def auto_link_urls(text, html_options = {}, options = {})
-          link_attributes = html_options.stringify_keys
-          text.gsub(AUTO_LINK_RE) do
-            scheme, href = $1, $&
-            punctuation = []
-
-            if auto_linked?($`, $')
-              # do not change string; URL is already linked
-              href
-            else
-              # don't include trailing punctuation character as part of the URL
-              while href.sub!(/[^\w\/-]$/, '')
-                punctuation.push $&
-                if opening = BRACKETS[punctuation.last] and href.scan(opening).size > href.scan(punctuation.last).size
-                  href << punctuation.pop
-                  break
-                end
-              end
-
-              link_text = block_given?? yield(href) : href
-              href = 'http://' + href unless scheme
-
-              unless options[:sanitize] == false
-                link_text = sanitize(link_text)
-                href      = sanitize(href)
-              end
-              content_tag(:a, link_text, link_attributes.merge('href' => href), !!options[:sanitize]) + punctuation.reverse.join('')
-            end
-          end
-        end
-
-        # Turns all email addresses into clickable links.  If a block is given,
-        # each email is yielded and the result is used as the link text.
-        def auto_link_email_addresses(text, html_options = {}, options = {})
-          text.gsub(AUTO_EMAIL_RE) do
-            text = $&
-
-            if auto_linked?($`, $')
-              text.html_safe
-            else
-              display_text = (block_given?) ? yield(text) : text
-
-              unless options[:sanitize] == false
-                text         = sanitize(text)
-                display_text = sanitize(display_text) unless text == display_text
-              end
-              mail_to text, display_text, html_options
-            end
-          end
-        end
-
-        # Detects already linked context or position in the middle of a tag
-        def auto_linked?(left, right)
-          (left =~ AUTO_LINK_CRE[0] and right =~ AUTO_LINK_CRE[1]) or
-            (left.rindex(AUTO_LINK_CRE[2]) and $' !~ AUTO_LINK_CRE[3])
-        end
     end
   end
 end
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index a4fcff5167..740f577a6e 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -278,260 +278,6 @@ class TextHelperTest < ActionView::TestCase
     assert_equal("12 berries", pluralize(12, "berry"))
   end
 
-  def test_auto_link_parsing
-    urls = %w(
-      http://www.rubyonrails.com
-      http://www.rubyonrails.com:80
-      http://www.rubyonrails.com/~minam
-      https://www.rubyonrails.com/~minam
-      http://www.rubyonrails.com/~minam/url%20with%20spaces
-      http://www.rubyonrails.com/foo.cgi?something=here
-      http://www.rubyonrails.com/foo.cgi?something=here&and=here
-      http://www.rubyonrails.com/contact;new
-      http://www.rubyonrails.com/contact;new%20with%20spaces
-      http://www.rubyonrails.com/contact;new?with=query&string=params
-      http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
-      http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
-      http://www.mail-archive.com/rails@lists.rubyonrails.org/
-      http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
-      http://en.wikipedia.org/wiki/Texas_hold'em
-      https://www.google.com/doku.php?id=gps:resource:scs:start
-      http://connect.oraclecorp.com/search?search[q]=green+france&search[type]=Group
-      http://of.openfoundry.org/projects/492/download#4th.Release.3
-      http://maps.google.co.uk/maps?f=q&q=the+london+eye&ie=UTF8&ll=51.503373,-0.11939&spn=0.007052,0.012767&z=16&iwloc=A
-    )
-
-    urls.each do |url|
-      assert_equal generate_result(url), auto_link(url)
-    end
-  end
-
-  def generate_result(link_text, href = nil, escape = false)
-    href ||= link_text
-    if escape
-      %{<a href="#{CGI::escapeHTML href}">#{CGI::escapeHTML link_text}</a>}
-    else
-      %{<a href="#{href}">#{link_text}</a>}
-    end
-  end
-
-  def test_auto_link_should_not_be_html_safe
-    email_raw    = 'santiago@wyeworks.com'
-    link_raw     = 'http://www.rubyonrails.org'
-
-    assert !auto_link(nil).html_safe?, 'should not be html safe'
-    assert !auto_link('').html_safe?, 'should not be html safe'
-    assert !auto_link("#{link_raw} #{link_raw} #{link_raw}").html_safe?, 'should not be html safe'
-    assert !auto_link("hello #{email_raw}").html_safe?, 'should not be html safe'
-  end
-
-  def test_auto_link_email_address
-    email_raw    = 'aaron@tenderlovemaking.com'
-    email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
-    assert !auto_link_email_addresses(email_result).html_safe?, 'should not be html safe'
-  end
-
-  def test_auto_link
-    email_raw    = 'david@loudthinking.com'
-    email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
-    link_raw     = 'http://www.rubyonrails.com'
-    link_result  = generate_result(link_raw)
-    link_result_with_options = %{<a href="#{link_raw}" target="_blank">#{link_raw}</a>}
-
-    assert_equal '', auto_link(nil)
-    assert_equal '', auto_link('')
-    assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}")
-
-    assert_equal %(hello #{email_result}), auto_link("hello #{email_raw}", :email_addresses)
-    assert_equal %(Go to #{link_result}), auto_link("Go to #{link_raw}", :urls)
-    assert_equal %(Go to #{link_raw}), auto_link("Go to #{link_raw}", :email_addresses)
-    assert_equal %(Go to #{link_result} and say hello to #{email_result}), auto_link("Go to #{link_raw} and say hello to #{email_raw}")
-    assert_equal %(<p>Link #{link_result}</p>), auto_link("<p>Link #{link_raw}</p>")
-    assert_equal %(<p>#{link_result} Link</p>), auto_link("<p>#{link_raw} Link</p>")
-    assert_equal %(<p>Link #{link_result_with_options}</p>), auto_link("<p>Link #{link_raw}</p>", :all, {:target => "_blank"})
-    assert_equal %(Go to #{link_result}.), auto_link(%(Go to #{link_raw}.))
-    assert_equal %(<p>Go to #{link_result}, then say hello to #{email_result}.</p>), auto_link(%(<p>Go to #{link_raw}, then say hello to #{email_raw}.</p>))
-    assert_equal %(#{link_result} #{link_result}), auto_link(%(#{link_result} #{link_raw}))
-
-    email2_raw    = '+david@loudthinking.com'
-    email2_result = %{<a href="mailto:#{email2_raw}">#{email2_raw}</a>}
-    assert_equal email2_result, auto_link(email2_raw)
-
-    email3_raw    = '+david@loudthinking.com'
-    email3_result = %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;+%64%61%76%69%64@%6c%6f%75%64%74%68%69%6e%6b%69%6e%67.%63%6f%6d">#{email3_raw}</a>}
-    assert_equal email3_result, auto_link(email3_raw, :all, :encode => :hex)
-    assert_equal email3_result, auto_link(email3_raw, :email_addresses, :encode => :hex)
-
-    link2_raw    = 'www.rubyonrails.com'
-    link2_result = generate_result(link2_raw, "http://#{link2_raw}")
-    assert_equal %(Go to #{link2_result}), auto_link("Go to #{link2_raw}", :urls)
-    assert_equal %(Go to #{link2_raw}), auto_link("Go to #{link2_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link2_result}</p>), auto_link("<p>Link #{link2_raw}</p>")
-    assert_equal %(<p>#{link2_result} Link</p>), auto_link("<p>#{link2_raw} Link</p>")
-    assert_equal %(Go to #{link2_result}.), auto_link(%(Go to #{link2_raw}.))
-    assert_equal %(<p>Say hello to #{email_result}, then go to #{link2_result}.</p>), auto_link(%(<p>Say hello to #{email_raw}, then go to #{link2_raw}.</p>))
-
-    link3_raw    = 'http://manuals.ruby-on-rails.com/read/chapter.need_a-period/103#page281'
-    link3_result = generate_result(link3_raw)
-    assert_equal %(Go to #{link3_result}), auto_link("Go to #{link3_raw}", :urls)
-    assert_equal %(Go to #{link3_raw}), auto_link("Go to #{link3_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link3_result}</p>), auto_link("<p>Link #{link3_raw}</p>")
-    assert_equal %(<p>#{link3_result} Link</p>), auto_link("<p>#{link3_raw} Link</p>")
-    assert_equal %(Go to #{link3_result}.), auto_link(%(Go to #{link3_raw}.))
-    assert_equal %(<p>Go to #{link3_result}. Seriously, #{link3_result}? I think I'll say hello to #{email_result}. Instead.</p>),
-       auto_link(%(<p>Go to #{link3_raw}. Seriously, #{link3_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
-
-    link4_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
-    link4_result = generate_result(link4_raw)
-    assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>")
-    assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>")
-
-    link5_raw    = 'http://foo.example.com:3000/controller/action'
-    link5_result = generate_result(link5_raw)
-    assert_equal %(<p>#{link5_result} Link</p>), auto_link("<p>#{link5_raw} Link</p>")
-
-    link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
-    link6_result = generate_result(link6_raw)
-    assert_equal %(<p>#{link6_result} Link</p>), auto_link("<p>#{link6_raw} Link</p>")
-
-    link7_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
-    link7_result = generate_result(link7_raw)
-    assert_equal %(<p>#{link7_result} Link</p>), auto_link("<p>#{link7_raw} Link</p>")
-
-    link8_raw    = 'http://foo.example.com:3000/controller/action.html'
-    link8_result = generate_result(link8_raw)
-    assert_equal %(Go to #{link8_result}), auto_link("Go to #{link8_raw}", :urls)
-    assert_equal %(Go to #{link8_raw}), auto_link("Go to #{link8_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link8_result}</p>), auto_link("<p>Link #{link8_raw}</p>")
-    assert_equal %(<p>#{link8_result} Link</p>), auto_link("<p>#{link8_raw} Link</p>")
-    assert_equal %(Go to #{link8_result}.), auto_link(%(Go to #{link8_raw}.))
-    assert_equal %(<p>Go to #{link8_result}. Seriously, #{link8_result}? I think I'll say hello to #{email_result}. Instead.</p>),
-       auto_link(%(<p>Go to #{link8_raw}. Seriously, #{link8_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
-
-    link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
-    link9_result = generate_result(link9_raw)
-    assert_equal %(Go to #{link9_result}), auto_link("Go to #{link9_raw}", :urls)
-    assert_equal %(Go to #{link9_raw}), auto_link("Go to #{link9_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link9_result}</p>), auto_link("<p>Link #{link9_raw}</p>")
-    assert_equal %(<p>#{link9_result} Link</p>), auto_link("<p>#{link9_raw} Link</p>")
-    assert_equal %(Go to #{link9_result}.), auto_link(%(Go to #{link9_raw}.))
-    assert_equal %(<p>Go to #{link9_result}. Seriously, #{link9_result}? I think I'll say hello to #{email_result}. Instead.</p>),
-       auto_link(%(<p>Go to #{link9_raw}. Seriously, #{link9_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
-
-    link10_raw    = 'http://www.mail-archive.com/ruby-talk@ruby-lang.org/'
-    link10_result = generate_result(link10_raw)
-    assert_equal %(<p>#{link10_result} Link</p>), auto_link("<p>#{link10_raw} Link</p>")
-
-    link11_raw    = 'http://asakusa.rubyist.net/'
-    link11_result = generate_result(link11_raw)
-    with_kcode 'u' do
-      assert_equal %(浅草.rbの公式サイトはこちら#{link11_result}), auto_link("浅草.rbの公式サイトはこちら#{link11_raw}")
-    end
-  end
-
-  def test_auto_link_should_sanitize_input_when_sanitize_option_is_not_false
-    link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
-    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)
-  end
-
-  def test_auto_link_should_not_sanitize_input_when_sanitize_option_is_false
-    link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
-    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, :sanitize => false)
-  end
-
-  def test_auto_link_other_protocols
-    ftp_raw = 'ftp://example.com/file.txt'
-    assert_equal %(Download #{generate_result(ftp_raw)}), auto_link("Download #{ftp_raw}")
-
-    file_scheme   = 'file:///home/username/RomeoAndJuliet.pdf'
-    z39_scheme    = 'z39.50r://host:696/db'
-    chrome_scheme = 'chrome://package/section/path'
-    view_source   = 'view-source:http://en.wikipedia.org/wiki/URI_scheme'
-    assert_equal generate_result(file_scheme), auto_link(file_scheme)
-    assert_equal generate_result(z39_scheme), auto_link(z39_scheme)
-    assert_equal generate_result(chrome_scheme), auto_link(chrome_scheme)
-    assert_equal generate_result(view_source), auto_link(view_source)
-  end
-
-  def test_auto_link_already_linked
-    linked1 = generate_result('Ruby On Rails', 'http://www.rubyonrails.com')
-    linked2 = %('<a href="http://www.example.com">www.example.com</a>')
-    linked3 = %('<a href="http://www.example.com" rel="nofollow">www.example.com</a>')
-    linked4 = %('<a href="http://www.example.com"><b>www.example.com</b></a>')
-    linked5 = %('<a href="#close">close</a> <a href="http://www.example.com"><b>www.example.com</b></a>')
-    assert_equal linked1, auto_link(linked1)
-    assert_equal linked2, auto_link(linked2)
-    assert_equal linked3, auto_link(linked3)
-    assert_equal linked4, auto_link(linked4)
-    assert_equal linked5, auto_link(linked5)
-
-    linked_email = %Q(<a href="mailto:david@loudthinking.com">Mail me</a>)
-    assert_equal linked_email, auto_link(linked_email)
-  end
-
-  def test_auto_link_within_tags
-    link_raw    = 'http://www.rubyonrails.org/images/rails.png'
-    link_result = %Q(<img src="#{link_raw}" />)
-    assert_equal link_result, auto_link(link_result)
-  end
-
-  def test_auto_link_with_brackets
-    link1_raw = 'http://en.wikipedia.org/wiki/Sprite_(computer_graphics)'
-    link1_result = generate_result(link1_raw)
-    assert_equal link1_result, auto_link(link1_raw)
-    assert_equal "(link: #{link1_result})", auto_link("(link: #{link1_raw})")
-
-    link2_raw = 'http://en.wikipedia.org/wiki/Sprite_[computer_graphics]'
-    link2_result = generate_result(link2_raw)
-    assert_equal link2_result, auto_link(link2_raw)
-    assert_equal "[link: #{link2_result}]", auto_link("[link: #{link2_raw}]")
-
-    link3_raw = 'http://en.wikipedia.org/wiki/Sprite_{computer_graphics}'
-    link3_result = generate_result(link3_raw)
-    assert_equal link3_result, auto_link(link3_raw)
-    assert_equal "{link: #{link3_result}}", auto_link("{link: #{link3_raw}}")
-  end
-
-  def test_auto_link_at_eol
-    url1 = "http://api.rubyonrails.com/Foo.html"
-    url2 = "http://www.ruby-doc.org/core/Bar.html"
-
-    assert_equal %(<p><a href="#{url1}">#{url1}</a><br /><a href="#{url2}">#{url2}</a><br /></p>), auto_link("<p>#{url1}<br />#{url2}<br /></p>")
-  end
-
-  def test_auto_link_with_block
-    url = "http://api.rubyonrails.com/Foo.html"
-    email = "fantabulous@shiznadel.ic"
-
-    assert_equal %(<p><a href="#{url}">#{url[0...7]}...</a><br /><a href="mailto:#{email}">#{email[0...7]}...</a><br /></p>), auto_link("<p>#{url}<br />#{email}<br /></p>") { |_url| truncate(_url, :length => 10) }
-  end
-
-  def test_auto_link_with_block_with_html
-    pic = "http://example.com/pic.png"
-    url = "http://example.com/album?a&b=c"
-
-    assert_equal %(My pic: <a href="#{pic}"><img src="#{pic}" width="160px"></a> -- full album here #{generate_result(url)}), auto_link("My pic: #{pic} -- full album here #{url}") { |link|
-      if link =~ /\.(jpg|gif|png|bmp|tif)$/i
-        raw %(<img src="#{link}" width="160px">)
-      else
-        link
-      end
-    }
-  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.",
-                :link => :all, :html => { :class => "menu", :target => "_blank" })
-  end
-
-  def test_auto_link_with_multiple_trailing_punctuations
-    url = "http://youtube.com"
-    url_result = generate_result(url)
-    assert_equal url_result, auto_link(url)
-    assert_equal "(link: #{url_result}).", auto_link("(link: #{url}).")
-  end
-
   def test_cycle_class
     value = Cycle.new("one", 2, "3")
     assert_equal("one", value.to_s)