zendesk-rinku 1.7.2.1 → 1.7.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTBhY2IxNDFiMWFkOGQxMzUzMjQ4MjlkYmMzZWI4MjhiODYwNGI3OQ==
-  data.tar.gz: !binary |-
-    OTQ1M2Y3MjE0Nzc5ODdjNmZjODVkYmVhMzdlNzc5OTlkZDUzOTA0OA==
+SHA1:
+  metadata.gz: ba308c8fd36a4e3cc84e7d1af205852d4cffe215
+  data.tar.gz: 6a9ec10f86b857a5adbee73c94784389d70fa9d9
 SHA512:
-  metadata.gz: !binary |-
-    ODg4NDIxOGZjNjJkMDc2ODFmODFkZTNlNGVmZDQ1YjkyYTg4ZGY1ZDM2NTM1
-    ZWE1ZjViMTJlNWVjOWU1YjVhOWRkZWJjNGY1ZWFhMzg3M2E4MzRkOGRkMjI4
-    NmVlOTJmNjg5ZDkxNWQ4MTFkOTkwODk3OTQwYjdhYjYwYzZmNWQ=
-  data.tar.gz: !binary |-
-    YmQ1MjBkNWYzMWQ4NWU4MDI4NDg3ZmRiNDhlMTMwNzFjN2E3MTE4NjdhMDhm
-    MGE2MDhkZjdmYTZjZGM5N2RmOGMwZmU3ZGFmYmFkN2ZhZmE2Yzg2YTNhZDRm
-    ZDk2M2RlN2IyMjkwY2UzZTE2ZDgxYzViMTZlZWQxOTZlMDhkYjY=
+  metadata.gz: 93c18c020778422065b163c781711d4b93596c3b9a2ed3931f9a8ae4cec56f8f669de82fe0c28bbc65ac9b10e67228e15ea5cc5db0ad41c4a13fabf7143c1321
+  data.tar.gz: fc20e83c04b8f02c92f3dd2bebb21ae1436e7831925b6661bafe032d1ff131c03186b1f1404dc5755a24a3d2e5c2e30a31635994c7fe687ee765f578979d08d5

data/README.markdown

@@ -1,3 +1,6 @@
+# Due to the absence of external maintenance
+# this is now a fully Zendesk owned/maintained gem
+
 Rinku does linking
 ==================
 
@@ -16,7 +19,7 @@ Rinku is available as a Ruby gem:
 
 The Rinku source is available at GitHub:
 
-    $ git clone git://github.com/vmg/rinku.git
+    $ git clone git://github.com/zendesk/rinku.git
 
 Rinku is a standalone library
 -----------------------------
@@ -96,13 +99,6 @@ require 'rails_rinku'
 The `rails_rinku` package monkeypatches Rails with an `auto_link` method that
 mimics 100% the original one, parameter per parameter. It's just faster.
 
-Rinku is written by me
-----------------------
-
-I am Vicent Marti, and I wrote Rinku.
-While Rinku is busy doing autolinks, you should be busy following me on twitter.
-[`@vmg`](http://twitter.com/vmg). Do it.
-
 Rinku has an awesome license
 ----------------------------
 

data/Rakefile

@@ -1,6 +1,7 @@
 require 'date'
 require 'rake/clean'
 require 'rake/extensiontask'
+require 'bundler/gem_tasks'
 require 'digest/md5'
 
 task :default => :test
@@ -28,7 +29,7 @@ require 'rubygems'
 $spec = eval(File.read('rinku.gemspec'))
 
 def package(ext='')
-  "pkg/rinku-#{$spec.version}" + ext
+  "pkg/zendesk-rinku-#{$spec.version}" + ext
 end
 
 desc 'Build packages'

data/ext/rinku/autolink.c

@@ -37,6 +37,9 @@
 #define strncasecmp	_strnicmp
 #endif
 
+int
+is_unicode_space(uint8_t *data, size_t offset);
+
 int
 sd_autolink_issafe(const uint8_t *link, size_t link_len)
 {
@@ -78,7 +81,7 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 		else if (data[link_end - 1] == ';') {
 			size_t new_end = link_end - 2;
 
-			while (new_end > 0 && isalpha(data[new_end]))
+			while (new_end > 0 && (isalnum(data[new_end]) || data[new_end] == '#'))
 				new_end--;
 
 			if (new_end < link_end - 2 && data[new_end] == '&')
@@ -143,17 +146,43 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 	return link_end;
 }
 
+static size_t
+autolink_delim_iter(uint8_t *data, size_t link_end, size_t offset, size_t size)
+{
+	size_t next_link_end;
+	int iterations = 0;
+	link_end = autolink_delim(data, link_end, offset, size);
+
+	while(link_end != 0) {
+		next_link_end = autolink_delim(data, link_end, offset, size);
+		if (next_link_end == link_end || iterations > 5) {
+			break;
+		}
+		link_end = next_link_end;
+		iterations++;
+	}
+
+	return link_end;
+}
+
+
 static size_t
 check_domain(uint8_t *data, size_t size, int allow_short)
 {
 	size_t i, np = 0;
 
-	if (!isalnum(data[0]))
-		return 0;
+	if (data[0] == '.' || data[0] == '-') return 0;
 
-	for (i = 1; i < size - 1; ++i) {
-		if (data[i] == '.') np++;
-		else if (!isalnum(data[i]) && data[i] != '-') break;
+	for (i = 0; i < size - 1; i++) {
+		if (data[i] == '.') {
+			np++;
+		} else if ((data[i] >= 'a' && data[i] <= 'z')
+			|| (data[i] >= 'A' && data[i] <= 'Z')
+			|| (data[i] >= '0' && data[i] <= '9')
+			|| (data[i] == '-')) {
+		} else {
+			break;
+		}
 	}
 
 	if (allow_short) {
@@ -188,16 +217,23 @@ sd_autolink__www(
 
 	link_end = check_domain(data, size, 0);
 
-	if (link_end == 0)
+	if (link_end == 0) {
 		return 0;
+	} else if (data[link_end] > 127) {
+		if (!is_unicode_space(data, link_end)) {
+			/* we prevent linking a domain that contains unicode
+			 * in case of sneaky lookalike attacks */
+			return 0;
+		}
+	} else {
+		while (link_end < size && !is_unicode_space(data, link_end)) {
+			link_end++;
+		}
+	}
 
-	while (link_end < size && !isspace(data[link_end]))
-		link_end++;
-
-	link_end = autolink_delim(data, link_end, max_rewind, size);
+	link_end = autolink_delim_iter(data, link_end, max_rewind, size);
 
-	if (link_end == 0)
-		return 0;
+	if (link_end == 0) { return 0; }
 
 	bufput(link, data, link_end);
 	*rewind_p = 0;
@@ -249,7 +285,7 @@ sd_autolink__email(
 	if (link_end < 2 || nb != 1 || np == 0)
 		return 0;
 
-	link_end = autolink_delim(data, link_end, max_rewind, size);
+	link_end = autolink_delim_iter(data, link_end, max_rewind, size);
 
 	if (link_end == 0)
 		return 0;
@@ -291,10 +327,16 @@ sd_autolink__url(
 		return 0;
 
 	link_end += domain_len;
-	while (link_end < size && !isspace(data[link_end]))
-		link_end++;
 
-	link_end = autolink_delim(data, link_end, max_rewind, size);
+	if (data[link_end] > 127) {
+		if (!is_unicode_space(data, link_end)) { return 0; }
+	} else {
+		while (link_end < size && !is_unicode_space(data, link_end)) {
+			link_end++;
+		}
+	}
+
+	link_end = autolink_delim_iter(data, link_end, max_rewind, size);
 
 	if (link_end == 0)
 		return 0;
@@ -304,3 +346,40 @@ sd_autolink__url(
 
 	return link_end;
 }
+
+int
+is_unicode_space(uint8_t *data, size_t offset) {
+
+	if(isspace(data[offset])) {
+		return 1;
+	}
+
+	/* Unicode Whitespace list from https://en.wikipedia.org/wiki/Whitespace_character#Unicode */
+	if (data[offset] == 0xE2) {
+		if (data[offset+1] == 0x80) {
+			if (data[offset+2] >= 0x80 && data[offset+2] <= 0x8C) {
+				return 1;
+			} else if (data[offset+2] == 0xA8 || data[offset+2] == 0xA9 || data[offset+2] == 0xAF) {
+				return 1;
+			}
+		} else if (data[offset+1] == 0x81) {
+			if (data[offset+2] == 0x9F) {
+				return 1;
+			}
+		}
+	} else if (data[offset] == 0xE3) {
+		if (data[offset+1] == 0x80) {
+			if (data[offset+2] == 0x80) {
+				return 1;
+			}
+		}
+	} else if (data[offset] == 0xEF) {
+		if (data[offset+1] == 0xBB) {
+			if (data[offset+2] == 0xBF) {
+				return 1;
+			}
+		}
+	}
+
+	return 0;
+}

data/lib/rinku.rb

@@ -1,5 +1,5 @@
 module Rinku
-  VERSION = "1.7.2"
+  VERSION = "1.7.3"
   attr_accessor :skip_tags
   extend self
 end

data/rinku.gemspec

@@ -1,19 +1,17 @@
-# encoding: UTF-8
-
 Gem::Specification.new do |s|
   s.name = 'zendesk-rinku'
-  s.version = '1.7.2.1'
+  s.version = '1.7.3'
   s.summary = "Mostly autolinking"
   s.description = <<-EOF
     A fast and very smart autolinking library that
     acts as a drop-in replacement for Rails `auto_link`
 
-    This is just a fork of vmg's lib with a small patch we need.
+    This is now a significant departure from the base gem.
   EOF
   s.email = 'shajith@zendesk.com'
-  s.homepage = 'http://github.com/shajith/rinku'
-  s.authors = ["Vicent Marti", "Shajith Chacko"]
-  # = MANIFEST =
+  s.homepage = 'https://github.com/zendesk/rinku'
+  s.authors = ["Shajith Chacko", "Jonathan Cheatham", "Matt Barker"]
+  s.license = "ISC"
   s.files = %w[
     COPYING
     README.markdown
@@ -28,11 +26,8 @@ Gem::Specification.new do |s|
     lib/rinku.rb
     lib/rails_rinku.rb
     rinku.gemspec
-    test/autolink_test.rb
   ]
-  # = MANIFEST =
-  s.test_files = ["test/autolink_test.rb"]
-  s.extra_rdoc_files = ["COPYING"]
   s.extensions = ["ext/rinku/extconf.rb"]
-  s.require_paths = ["lib"]
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rake-compiler"
 end

metadata

@@ -1,25 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: zendesk-rinku
 version: !ruby/object:Gem::Version
-  version: 1.7.2.1
+  version: 1.7.3
 platform: ruby
 authors:
-- Vicent Marti
 - Shajith Chacko
+- Jonathan Cheatham
+- Matt Barker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
-dependencies: []
-description: ! "    A fast and very smart autolinking library that\n    acts as a
-  drop-in replacement for Rails `auto_link`\n\n    This is just a fork of vmg's lib
-  with a small patch we need.\n"
+date: 2016-06-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |2
+      A fast and very smart autolinking library that
+      acts as a drop-in replacement for Rails `auto_link`
+
+      This is now a significant departure from the base gem.
 email: shajith@zendesk.com
 executables: []
 extensions:
 - ext/rinku/extconf.rb
-extra_rdoc_files:
-- COPYING
+extra_rdoc_files: []
 files:
 - COPYING
 - README.markdown
@@ -34,9 +64,9 @@ files:
 - lib/rails_rinku.rb
 - lib/rinku.rb
 - rinku.gemspec
-- test/autolink_test.rb
-homepage: http://github.com/shajith/rinku
-licenses: []
+homepage: https://github.com/zendesk/rinku
+licenses:
+- ISC
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -44,19 +74,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Mostly autolinking
-test_files:
-- test/autolink_test.rb
+test_files: []

data/test/autolink_test.rb

@@ -1,318 +0,0 @@
-# encoding: utf-8
-rootdir = File.dirname(File.dirname(__FILE__))
-$LOAD_PATH.unshift "#{rootdir}/lib"
-
-require 'test/unit'
-require 'cgi'
-require 'uri'
-require 'rinku'
-
-class RedcarpetAutolinkTest < Test::Unit::TestCase
-
-  SAFE_CHARS = "{}[]~'"
-
-  def assert_linked(expected, url)
-    assert_equal expected, Rinku.auto_link(url)
-  end
-
-  def test_segfault
-    Rinku.auto_link("a+b@d.com+e@f.com", mode=:all)
-  end
-
-  def test_escapes_quotes
-    assert_linked %(<a href="http://website.com/&quot;onmouseover=document.body.style.backgroundColor=&quot;pink&quot;;//">http://website.com/"onmouseover=document.body.style.backgroundColor="pink";//</a>),
-      %(http://website.com/"onmouseover=document.body.style.backgroundColor="pink";//)
-  end
-
-  def test_global_skip_tags
-    assert_equal Rinku.skip_tags, nil
-    Rinku.skip_tags = ['pre']
-    assert_equal Rinku.skip_tags, ['pre']
-
-    Rinku.skip_tags = ['pa']
-    url = 'This is just a <pa>http://www.pokemon.com</pa> test'
-    assert_equal Rinku.auto_link(url), url
-
-    Rinku.skip_tags = nil
-    assert_not_equal Rinku.auto_link(url), url
-  end
-
-  def test_auto_link_with_single_trailing_punctuation_and_space
-    url = "http://www.youtube.com"
-    url_result = generate_result(url)
-    assert_equal url_result, Rinku.auto_link(url)
-    assert_equal "link: #{url_result}. foo?", Rinku.auto_link("link: #{url}. foo?")
-  end
-
-  def test_does_not_segfault
-    assert_linked "< this is just a test", "< this is just a test"
-  end
-
-  def test_skips_tags
-    html = <<-html
-This is just a test. http://www.pokemon.com
-<div>
-  More test
-  http://www.amd.com
-</div>
-<pre>
-  CODE www.less.es
-</pre>
-    html
-
-    result = <<-result
-This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>
-<div>
-  More test
-  http://www.amd.com
-</div>
-<pre>
-  CODE <a href="http://www.less.es">www.less.es</a>
-</pre>
-    result
-    assert_equal result, Rinku.auto_link(html, :all, nil, ["div", "a"])
-  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, Rinku.auto_link(link1_raw)
-    assert_equal "(link: #{link1_result})", Rinku.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, Rinku.auto_link(link2_raw)
-    assert_equal "[link: #{link2_result}]", Rinku.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, Rinku.auto_link(link3_raw)
-    assert_equal "{link: #{link3_result}}", Rinku.auto_link("{link: #{link3_raw}}")
-  end
-
-  def test_auto_link_with_multiple_trailing_punctuations
-    url = "http://youtube.com"
-    url_result = generate_result(url)
-    assert_equal url_result, Rinku.auto_link(url)
-    assert_equal "(link: #{url_result}).", Rinku.auto_link("(link: #{url}).")
-  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>), Rinku.auto_link("<p>#{url}<br />#{email}<br /></p>") { |_url| _url[0...7] + '...'}
-  end
-
-  def test_auto_link_with_block_with_html
-    pic = "http://example.com/pic.png"
-    url = "http://example.com/album?a&b=c"
-
-    expect = %(My pic: <a href="#{pic}"><img src="#{pic}" width="160px"></a> -- full album here #{generate_result(url)})
-    text = "My pic: #{pic} -- full album here #{CGI.escapeHTML url}"
-
-    assert_equal expect, Rinku.auto_link(text) { |link|
-      if link =~ /\.(jpg|gif|png|bmp|tif)$/i
-        %(<img src="#{link}" width="160px">)
-      else
-        link
-      end
-    }
-  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, Rinku.auto_link(linked1)
-    assert_equal linked2, Rinku.auto_link(linked2)
-    assert_equal linked3, Rinku.auto_link(linked3)
-    assert_equal linked4, Rinku.auto_link(linked4)
-    assert_equal linked5, Rinku.auto_link(linked5)
-
-    linked_email = %Q(<a href="mailto:david@loudthinking.com">Mail me</a>)
-    assert_equal linked_email, Rinku.auto_link(linked_email)
-  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>), Rinku.auto_link("<p>#{url1}<br />#{url2}<br /></p>")
-  end
-
-  def test_block
-    link = Rinku.auto_link("Find ur favorite pokeman @ http://www.pokemon.com") do |url|
-      assert_equal url, "http://www.pokemon.com"
-      "POKEMAN WEBSITE"
-    end
-
-    assert_equal link, "Find ur favorite pokeman @ <a href=\"http://www.pokemon.com\">POKEMAN WEBSITE</a>"
-  end
-
-  def test_links_with_cyrillic_x
-    url = "http://example.com/х"
-
-    assert_linked "<a href=\"#{url}\">#{url}</a>", url
-  end
-
-  def test_autolink_works
-    url = "http://example.com/"
-    assert_linked "<a href=\"#{url}\">#{url}</a>", url
-  end
-
-  def test_autolink_options_for_short_domains
-    url = "http://google"
-    linked_url = "<a href=\"#{url}\">#{url}</a>"
-    flags = Rinku::AUTOLINK_SHORT_DOMAINS
-
-    # Specifying use short_domains in the args
-    url = "http://google"
-    linked_url = "<a href=\"#{url}\">#{url}</a>"
-    assert_equal Rinku.auto_link(url, nil, nil, nil, flags), linked_url
-
-    # Specifying no short_domains in the args
-    url = "http://google"
-    linked_url = "<a href=\"#{url}\">#{url}</a>"
-    assert_equal Rinku.auto_link(url, nil, nil, nil, 0), url
-  end
-
-  def test_not_autolink_www
-    assert_linked "Awww... man", "Awww... man"
-  end
-
-  def test_does_not_terminate_on_dash
-    url = "http://example.com/Notification_Center-GitHub-20101108-140050.jpg"
-    assert_linked "<a href=\"#{url}\">#{url}</a>", url
-  end
-
-  def test_does_not_include_trailing_gt
-    url = "http://example.com"
-    assert_linked "&lt;<a href=\"#{url}\">#{url}</a>&gt;", "&lt;#{url}&gt;"
-  end
-
-  def test_links_with_anchors
-    url = "https://github.com/github/hubot/blob/master/scripts/cream.js#L20-20"
-    assert_linked "<a href=\"#{url}\">#{url}</a>", url
-  end
-
-  def test_links_like_rails
-    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/Sprite_(computer_graphics)
-              http://en.wikipedia.org/wiki/Texas_hold%27em
-              https://www.google.com/doku.php?id=gps:resource:scs:start
-            )
-
-    urls.each do |url|
-      assert_linked %(<a href="#{CGI.escapeHTML url}">#{CGI.escapeHTML url}</a>), CGI.escapeHTML(url)
-    end
-  end
-
-  def test_links_like_autolink_rails
-    email_raw    = 'david@loudthinking.com'
-    email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
-    email2_raw    = '+david@loudthinking.com'
-    email2_result = %{<a href="mailto:#{email2_raw}">#{email2_raw}</a>}
-    link_raw     = 'http://www.rubyonrails.com'
-    link_result  = %{<a href="#{link_raw}">#{link_raw}</a>}
-    link_result_with_options  = %{<a href="#{link_raw}" target="_blank">#{link_raw}</a>}
-    link2_raw    = 'www.rubyonrails.com'
-    link2_result = %{<a href="http://#{link2_raw}">#{link2_raw}</a>}
-    link3_raw    = 'http://manuals.ruby-on-rails.com/read/chapter.need_a-period/103#page281'
-    link3_result = %{<a href="#{link3_raw}">#{link3_raw}</a>}
-    link4_raw    = CGI.escapeHTML 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
-    link4_result = %{<a href="#{link4_raw}">#{link4_raw}</a>}
-    link5_raw    = 'http://foo.example.com:3000/controller/action'
-    link5_result = %{<a href="#{link5_raw}">#{link5_raw}</a>}
-    link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
-    link6_result = %{<a href="#{link6_raw}">#{link6_raw}</a>}
-    link7_raw    = CGI.escapeHTML 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
-    link7_result = %{<a href="#{link7_raw}">#{link7_raw}</a>}
-    link8_raw    = 'http://foo.example.com:3000/controller/action.html'
-    link8_result = %{<a href="#{link8_raw}">#{link8_raw}</a>}
-    link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
-    link9_result = %{<a href="#{link9_raw}">#{link9_raw}</a>}
-    link10_raw    = 'http://www.mail-archive.com/ruby-talk@ruby-lang.org/'
-    link10_result = %{<a href="#{link10_raw}">#{link10_raw}</a>}
-
-    assert_linked %(Go to #{link_result} and say hello to #{email_result}), "Go to #{link_raw} and say hello to #{email_raw}"
-    assert_linked %(<p>Link #{link_result}</p>), "<p>Link #{link_raw}</p>"
-    assert_linked %(<p>#{link_result} Link</p>), "<p>#{link_raw} Link</p>"
-    assert_linked %(Go to #{link_result}.), %(Go to #{link_raw}.)
-    assert_linked %(<p>Go to #{link_result}, then say hello to #{email_result}.</p>), %(<p>Go to #{link_raw}, then say hello to #{email_raw}.</p>)
-    assert_linked %(<p>Link #{link2_result}</p>), "<p>Link #{link2_raw}</p>"
-    assert_linked %(<p>#{link2_result} Link</p>), "<p>#{link2_raw} Link</p>"
-    assert_linked %(Go to #{link2_result}.), %(Go to #{link2_raw}.)
-    assert_linked %(<p>Say hello to #{email_result}, then go to #{link2_result},</p>), %(<p>Say hello to #{email_raw}, then go to #{link2_raw},</p>)
-    assert_linked %(<p>Link #{link3_result}</p>), "<p>Link #{link3_raw}</p>"
-    assert_linked %(<p>#{link3_result} Link</p>), "<p>#{link3_raw} Link</p>"
-    assert_linked %(Go to #{link3_result}.), %(Go to #{link3_raw}.)
-    assert_linked %(<p>Go to #{link3_result}. seriously, #{link3_result}? i think I'll say hello to #{email_result}. instead.</p>), %(<p>Go to #{link3_raw}. seriously, #{link3_raw}? i think I'll say hello to #{email_raw}. instead.</p>)
-    assert_linked %(<p>Link #{link4_result}</p>), "<p>Link #{link4_raw}</p>"
-    assert_linked %(<p>#{link4_result} Link</p>), "<p>#{link4_raw} Link</p>"
-    assert_linked %(<p>#{link5_result} Link</p>), "<p>#{link5_raw} Link</p>"
-    assert_linked %(<p>#{link6_result} Link</p>), "<p>#{link6_raw} Link</p>"
-    assert_linked %(<p>#{link7_result} Link</p>), "<p>#{link7_raw} Link</p>"
-    assert_linked %(<p>Link #{link8_result}</p>), "<p>Link #{link8_raw}</p>"
-    assert_linked %(<p>#{link8_result} Link</p>), "<p>#{link8_raw} Link</p>"
-    assert_linked %(Go to #{link8_result}.), %(Go to #{link8_raw}.)
-    assert_linked %(<p>Go to #{link8_result}. seriously, #{link8_result}? i think I'll say hello to #{email_result}. instead.</p>), %(<p>Go to #{link8_raw}. seriously, #{link8_raw}? i think I'll say hello to #{email_raw}. instead.</p>)
-    assert_linked %(<p>Link #{link9_result}</p>), "<p>Link #{link9_raw}</p>"
-    assert_linked %(<p>#{link9_result} Link</p>), "<p>#{link9_raw} Link</p>"
-    assert_linked %(Go to #{link9_result}.), %(Go to #{link9_raw}.)
-    assert_linked %(<p>Go to #{link9_result}. seriously, #{link9_result}? i think I'll say hello to #{email_result}. instead.</p>), %(<p>Go to #{link9_raw}. seriously, #{link9_raw}? i think I'll say hello to #{email_raw}. instead.</p>)
-    assert_linked %(<p>#{link10_result} Link</p>), "<p>#{link10_raw} Link</p>"
-    assert_linked email2_result, email2_raw
-    assert_linked "#{link_result} #{link_result} #{link_result}", "#{link_raw} #{link_raw} #{link_raw}"
-    assert_linked '<a href="http://www.rubyonrails.com">Ruby On Rails</a>', '<a href="http://www.rubyonrails.com">Ruby On Rails</a>'
-  end
-
-  if "".respond_to?(:force_encoding)
-    def test_copies_source_encoding
-      str = "http://www.bash.org"
-
-      ret = Rinku.auto_link str
-      assert_equal str.encoding, ret.encoding
-
-      str.encode! 'binary'
-
-      ret = Rinku.auto_link str
-      assert_equal str.encoding, ret.encoding
-    end
-
-    def test_block_encoding
-      url = "http://example.com/х"
-      assert_equal "UTF-8", url.encoding.to_s
-
-      link = Rinku.auto_link(url) do |u|
-        assert_equal "UTF-8", u.encoding.to_s
-        u
-      end
-
-      assert_equal link.encoding.to_s, "UTF-8"
-    end
-
-  end
-
-  def generate_result(link_text, href = nil)
-    href ||= link_text
-    %{<a href="#{CGI.escapeHTML href}">#{CGI.escapeHTML link_text}</a>}
-  end
-
-end