rinku 2.0.0 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07c65aa1e4fe77d917eeeb0d4ab03889f5b72443
-  data.tar.gz: 2e77157e5b959fbda3660e0676d20686e59bd469
+SHA256:
+  metadata.gz: 8f7f8c8339abdc0a121db5d557f431d4532fc7f17ac8ae0ceede5b36a8a79235
+  data.tar.gz: b58a5fd614fafbcd87e7402e7cb54646af697ef6e908ed3c533683e8d1128e1e
 SHA512:
-  metadata.gz: e4c692320131620c6b1398a0d8784091bd1952660bfb1ab14ec7ee32fd115f7c0a39a6faddd924045f4085ee91a1062b67cd6a0600df768a7ccb092a1083e772
-  data.tar.gz: bc6774b49bb020deaa479ce8145c881e49e037c1539924e3f4cd2a0e8e0e1fb9871356b848e8090d3f3d79239131b0c4d7d6c8afdad117e0dd35edcbe1b5fa14
+  metadata.gz: 8e52f7b000fa28489a04aac17189cc401c863c0c2620f5170c4700b855c233fb6fa8bb8f81ab0c096919311e5aac593b05385ce49d279ed03679cb3c3a405112
+  data.tar.gz: 8b8453c5ff30e0a0b81c54bd8374a84b2ec847b28fd08929f559f97388ddf69cd62e4ced564a834328526df0d41cc21ea3998b1dc453a74d0170eab85647f389

data/COPYING

@@ -1,3 +1,5 @@
+ISC License
+
 Copyright (c) 2011, Vicent Marti
 
 Permission to use, copy, modify, and distribute this software for any

data/README.markdown

@@ -1,6 +1,9 @@
 Rinku does linking
 ==================
 
+[![Build Status](https://travis-ci.org/vmg/rinku.svg?branch=master)](https://travis-ci.org/vmg/rinku)
+[![Dependency Status](https://www.versioneye.com/ruby/rinku/badge.svg)](https://www.versioneye.com/ruby/rinku)
+
 Rinku is a Ruby library that does autolinking.
 It parses text and turns anything that remotely resembles a link into an HTML link,
 just like the Ruby on Rails `auto_link` method -- but it's about 20 times faster,
@@ -91,6 +94,12 @@ choose to use Rinku instead.
 
 ~~~~ruby
 require 'rails_rinku'
+include ActionView::Helpers::TextHelper
+post_body = "Welcome to my new blog at http://www.myblog.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>."
 ~~~~
 
 The `rails_rinku` package monkeypatches Rails with an `auto_link` method that

data/Rakefile

@@ -1,50 +1,12 @@
-require 'date'
-require 'rake/clean'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rake/extensiontask'
-require 'digest/md5'
-
-task :default => :test
-
-# ==========================================================
-# Ruby Extension
-# ==========================================================
-
-Rake::ExtensionTask.new('rinku')
-
-# ==========================================================
-# Testing
-# ==========================================================
-
 require 'rake/testtask'
-Rake::TestTask.new('test') do |t|
-  t.test_files = FileList['test/*_test.rb']
-  t.ruby_opts += ['-rubygems'] if defined? Gem
-end
-task 'test' => [:compile]
 
-# PACKAGING =================================================================
+task default: :test
 
-require 'rubygems'
-$spec = eval(File.read('rinku.gemspec'))
+Rake::ExtensionTask.new('rinku') # defines compile task
 
-def package(ext='')
-  "pkg/rinku-#{$spec.version}" + ext
-end
-
-desc 'Build packages'
-task :package => package('.gem')
-
-desc 'Build and install as local gem'
-task :install => package('.gem') do
-  sh "gem install #{package('.gem')}"
-end
-
-desc 'Update the gemspec'
-task :update_gem => file('rinku.gemspec')
-
-directory 'pkg/'
-
-file package('.gem') => %w[pkg/ rinku.gemspec] + $spec.files do |f|
-  sh "gem build rinku.gemspec"
-  mv File.basename(f.name), f.name
+Rake::TestTask.new(test: :compile) do |t|
+  t.test_files = FileList['test/*_test.rb']
 end

data/ext/rinku/autolink.c

@@ -27,6 +27,14 @@
 #define strncasecmp	_strnicmp
 #endif
 
+static int
+is_valid_hostchar(const uint8_t *link, size_t link_len)
+{
+	size_t pos = 0;
+	int32_t ch = utf8proc_next(link, &pos);
+	return !utf8proc_is_space(ch) && !utf8proc_is_punctuation(ch);
+}
+
 bool
 autolink_issafe(const uint8_t *link, size_t link_len)
 {
@@ -52,7 +60,7 @@ autolink_issafe(const uint8_t *link, size_t link_len)
 static bool
 autolink_delim(const uint8_t *data, struct autolink_pos *link)
 {
-	uint8_t cclose, copen = 0;
+	int32_t cclose, copen = 0;
 	size_t i;
 
 	for (i = link->start; i < link->end; ++i)
@@ -88,25 +96,14 @@ autolink_delim(const uint8_t *data, struct autolink_pos *link)
 	if (link->end == link->start)
 		return false;
 
-	cclose = data[link->end - 1];
-
-	switch (cclose) {
-	case '"':	copen = '"'; break;
-	case '\'':	copen = '\''; break;
-	case ')':	copen = '('; break;
-	case ']':	copen = '['; break;
-	case '}':	copen = '{'; break;
-	}
+	cclose = utf8proc_rewind(data, link->end);
+	copen = utf8proc_open_paren_character(cclose);
 
 	if (copen != 0) {
-		size_t closing = 0;
-		size_t opening = 0;
-		size_t i = link->start;
-
-		/* Try to close the final punctuation sign in this same line;
-		 * if we managed to close it outside of the URL, that means that it's
-		 * not part of the URL. If it closes inside the URL, that means it
-		 * is part of the URL.
+		/* Try to close the final punctuation sign in this link; if
+		 * there's more closing than opening punctuation symbols in the
+		 * URL, we conservatively remove one closing punctuation from
+		 * the end of the URL.
 		 *
 		 * Examples:
 		 *
@@ -117,23 +114,51 @@ autolink_delim(const uint8_t *data, struct autolink_pos *link)
 		 *		=> http://www.pokemon.com/Pikachu_(Electric)
 		 *
 		 *	foo http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *		=> http://www.pokemon.com/Pikachu_(Electric))
+		 *		=> http://www.pokemon.com/Pikachu_(Electric)
 		 *
 		 *	(foo http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *		=> foo http://www.pokemon.com/Pikachu_(Electric)
+		 *		=> http://www.pokemon.com/Pikachu_(Electric)
 		 */
 
+		size_t closing = 0;
+		size_t opening = 0;
+		size_t i = link->start;
+
 		while (i < link->end) {
-			if (data[i] == copen)
+			int32_t c = utf8proc_next(data, &i);
+			if (c == copen)
 				opening++;
-			else if (data[i] == cclose)
+			else if (c == cclose)
 				closing++;
+		}
 
-			i++;
+		if (copen == cclose) {
+			if (opening > 0)
+				utf8proc_back(data, &link->end);
 		}
+		else {
+			if (closing > opening)
+				utf8proc_back(data, &link->end);
+		}
+	}
 
-		if (closing != opening)
-			link->end--;
+	return true;
+}
+
+static bool
+autolink_delim_iter(const uint8_t *data, struct autolink_pos *link)
+{
+	size_t prev_link_end;
+	int iterations = 0;
+
+	while(link->end != 0) {
+		prev_link_end = link->end;
+		if (!autolink_delim(data, link))
+			return false;
+		if (prev_link_end == link->end || iterations > 5) {
+			break;
+		}
+		iterations++;
 	}
 
 	return true;
@@ -143,16 +168,25 @@ static bool
 check_domain(const uint8_t *data, size_t size,
 		struct autolink_pos *link, bool allow_short)
 {
-	size_t i, np = 0;
+	size_t i, np = 0, uscore1 = 0, uscore2 = 0;
 
 	if (!rinku_isalnum(data[link->start]))
 		return false;
 
 	for (i = link->start + 1; i < size - 1; ++i) {
-		if (data[i] == '.') np++;
-		else if (!rinku_isalnum(data[i]) && data[i] != '-') break;
+		if (data[i] == '_') {
+			uscore2++;
+		} else if (data[i] == '.') {
+			uscore1 = uscore2;
+			uscore2 = 0;
+			np++;
+		} else if (!is_valid_hostchar(data + i, size - i) && data[i] != '-')
+			break;
 	}
 
+	if (uscore1 > 0 || uscore2 > 0)
+		return false;
+
 	link->end = i;
 
 	if (allow_short) {
@@ -198,7 +232,7 @@ autolink__www(
 		return false;
 
 	link->end = utf8proc_find_space(data, link->end, size);
-	return autolink_delim(data, link);
+	return autolink_delim_iter(data, link);
 }
 
 bool
@@ -244,7 +278,7 @@ autolink__email(
 			break;
 	}
 
-	if ((link->end - pos) < 2 || nb != 1 || np == 0)
+	if ((link->end - pos) < 2 || nb != 1 || np == 0 || (np == 1 && data[link->end - 1] == '.'))
 		return false;
 
 	return autolink_delim(data, link);
@@ -278,5 +312,5 @@ autolink__url(
 	if (!autolink_issafe(data + link->start, size - link->start))
 		return false;
 
-	return autolink_delim(data, link);
+	return autolink_delim_iter(data, link);
 }

data/ext/rinku/utf8.c

@@ -75,12 +75,38 @@ int32_t utf8proc_next(const uint8_t *str, size_t *pos)
 	return read_cp(str + p, length);
 }
 
+int32_t utf8proc_back(const uint8_t *str, size_t *pos)
+{
+	const size_t p = *pos;
+	int8_t length = 0;
+
+	if (!p)
+		return 0x0;
+
+	if ((str[p - 1] & 0x80) == 0x0) {
+		(*pos) -= 1;
+		return str[p - 1];
+	}
+
+	if (p > 1 && utf8proc_utf8class[str[p - 2]] == 2)
+		length = 2;
+	else if (p > 2 && utf8proc_utf8class[str[p - 3]] == 3)
+		length = 3;
+	else if (p > 3 && utf8proc_utf8class[str[p - 4]] == 4)
+		length = 4;
+
+	(*pos) -= length;
+	return read_cp(&str[*pos], length);
+}
+
 size_t utf8proc_find_space(const uint8_t *str, size_t pos, size_t size)
 {
 	while (pos < size) {
 		const size_t last = pos;
 		int32_t uc = utf8proc_next(str, &pos);
-		if (utf8proc_is_space(uc))
+		if (uc == 0xFFFD)
+			return size;
+		else if (utf8proc_is_space(uc))
 			return last;
 	}
 	return size;
@@ -93,7 +119,7 @@ int32_t utf8proc_rewind(const uint8_t *data, size_t pos)
 	if (!pos)
 		return 0x0;
 
-	if ((data[pos - 1] & 0xC0) == 0x0)
+	if ((data[pos - 1] & 0x80) == 0x0)
 		return data[pos - 1];
 
 	if (pos > 1 && utf8proc_utf8class[data[pos - 2]] == 2)
@@ -106,6 +132,24 @@ int32_t utf8proc_rewind(const uint8_t *data, size_t pos)
 	return read_cp(&data[pos - length], length);
 }
 
+int32_t utf8proc_open_paren_character(int32_t cclose)
+{
+	switch (cclose) {
+	case '"': return '"';
+	case '\'':  return '\'';
+	case ')': return '(';
+	case ']': return '[';
+	case '}': return '{';
+	case 65289: return 65288; /* （） */
+	case 12305: return 12304; /* 【】 */
+	case 12303: return 12302; /* 『』 */
+	case 12301: return 12300; /* 「」 */
+	case 12299: return 12298; /* 《》 */
+	case 12297: return 12296; /* 〈〉 */
+	}
+	return 0;
+}
+
 bool utf8proc_is_space(int32_t uc)
 {
 	return (uc == 9 || uc == 10 || uc == 12 || uc == 13 ||

data/ext/rinku/utf8.h

@@ -26,8 +26,11 @@ bool rinku_isalpha(char c);
 bool rinku_isalnum(char c);
 
 int32_t utf8proc_rewind(const uint8_t *data, size_t pos);
+int32_t utf8proc_next(const uint8_t *str, size_t *pos);
+int32_t utf8proc_back(const uint8_t *data, size_t *pos);
 size_t utf8proc_find_space(const uint8_t *str, size_t pos, size_t size);
 
+int32_t utf8proc_open_paren_character(int32_t cclose);
 bool utf8proc_is_space(int32_t uc);
 bool utf8proc_is_punctuation(int32_t uc);
 

data/lib/rails_rinku.rb

@@ -13,10 +13,18 @@ module RailsRinku
     options.reverse_merge!(:link => :all, :html => {})
     text = h(text) unless text.html_safe?
 
+    tag_options_method = if Gem::Version.new(Rails.version) >= Gem::Version.new("5.1")
+      # Rails >= 5.1
+      tag_builder.method(:tag_options)
+    else
+      # Rails <= 5.0
+      method(:tag_options)
+    end
+
     Rinku.auto_link(
       text,
       options[:link],
-      tag_options(options[:html]),
+      tag_options_method.call(options[:html]),
       options[:skip],
       &block
     ).html_safe

data/lib/rinku.rb

@@ -1,5 +1,5 @@
 module Rinku
-  VERSION = "1.7.3"
+  VERSION = "2.0.6"
 
   class << self
     attr_accessor :skip_tags

data/rinku.gemspec

@@ -1,8 +1,6 @@
-# encoding: UTF-8
-
 Gem::Specification.new do |s|
   s.name = 'rinku'
-  s.version = '2.0.0'
+  s.version = '2.0.6'
   s.summary = "Mostly autolinking"
   s.description = <<-EOF
     A fast and very smart autolinking library that
@@ -11,6 +9,7 @@ Gem::Specification.new do |s|
   s.email = 'vicent@github.com'
   s.homepage = 'https://github.com/vmg/rinku'
   s.authors = ["Vicent Marti"]
+  s.license = 'ISC'
   # = MANIFEST =
   s.files = %w[
     COPYING
@@ -39,5 +38,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rake-compiler"
-  s.add_development_dependency "minitest"
+  s.add_development_dependency "minitest", ">= 5.0"
+
+  s.required_ruby_version = '>= 2.0.0'
 end

data/test/autolink_test.rb

@@ -1,6 +1,5 @@
-# encoding: utf-8
-rootdir = File.dirname(File.dirname(__FILE__))
-$LOAD_PATH.unshift "#{rootdir}/lib"
+require 'bundler/setup'
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'minitest/autorun'
 require 'cgi'
@@ -10,7 +9,7 @@ require 'rinku'
 class RinkuAutoLinkTest < Minitest::Test
   def generate_result(link_text, href = nil)
     href ||= link_text
-    href = "http://" + href unless href =~ %r{\A\w+://}
+    href = "http://" + href unless href =~ %r{\A(\w+://|mailto:)}
     %{<a href="#{CGI.escapeHTML href}">#{CGI.escapeHTML link_text}</a>}
   end
 
@@ -28,7 +27,7 @@ class RinkuAutoLinkTest < Minitest::Test
   end
 
   def test_global_skip_tags
-    assert_equal Rinku.skip_tags, nil
+    assert_nil Rinku.skip_tags
     Rinku.skip_tags = ['pre']
     assert_equal Rinku.skip_tags, ['pre']
 
@@ -363,6 +362,13 @@ This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>
     assert_linked "email#{NBSP}<a href=\"mailto:#{email_raw}\">#{email_raw}</a>", "email#{NBSP}#{email_raw}"
   end
 
+  def test_identifies_unicode_spaces
+    assert_linked(
+      %{This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>\u202F\u2028\u2001},
+      "This is just a test. http://www.pokemon.com\u202F\u2028\u2001"
+    )
+  end
+
   def test_www_is_case_insensitive
     url = "www.reddit.com"
     assert_linked generate_result(url), url
@@ -376,4 +382,64 @@ This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>
     url = "WwW.reddit.CoM"
     assert_linked generate_result(url), url
   end
+
+  def test_non_emails_ending_in_periods
+    assert_linked "abc/def@ghi.", "abc/def@ghi."
+    assert_linked "abc/def@ghi. ", "abc/def@ghi. "
+    assert_linked "abc/def@ghi. x", "abc/def@ghi. x"
+    assert_linked "abc/def@ghi.< x", "abc/def@ghi.< x"
+    assert_linked "abc/<a href=\"mailto:def@ghi.x\">def@ghi.x</a>", "abc/def@ghi.x"
+    assert_linked "abc/<a href=\"mailto:def@ghi.x\">def@ghi.x</a>. a", "abc/def@ghi.x. a"
+  end
+
+  def test_urls_with_entities_and_parens
+    assert_linked "&lt;<a href=\"http://www.google.com\">http://www.google.com</a>&gt;", "&lt;http://www.google.com&gt;"
+
+    assert_linked "&lt;<a href=\"http://www.google.com\">http://www.google.com</a>&gt;)", "&lt;http://www.google.com&gt;)"
+
+    # this produces invalid output, but limits how much work we will do
+    assert_linked "&lt;<a href=\"http://www.google.com&gt;\">http://www.google.com&gt;</a>)&lt;)&lt;)&lt;)&lt;)&lt;)&lt;)", "&lt;http://www.google.com&gt;)&lt;)&lt;)&lt;)&lt;)&lt;)&lt;)"
+
+    url = "http://pokemon.com/bulbasaur"
+    assert_linked "URL is #{generate_result(url)}.", "URL is #{url}."
+    assert_linked "(URL is #{generate_result(url)}.)", "(URL is #{url}.)"
+
+    url = "www.pokemon.com/bulbasaur"
+    assert_linked "URL is #{generate_result(url)}.", "URL is #{url}."
+    assert_linked "(URL is #{generate_result(url)}.)", "(URL is #{url}.)"
+
+    url = "abc@xyz.com"
+    assert_linked "URL is #{generate_result(url, "mailto:#{url}")}.", "URL is #{url}."
+    assert_linked "(URL is #{generate_result(url, "mailto:#{url}")}.)", "(URL is #{url}.)"
+  end
+
+  def test_urls_with_parens
+    assert_linked "(<a href=\"http://example.com\">http://example.com</a>)", "(http://example.com)"
+    assert_linked "((<a href=\"http://example.com/()\">http://example.com/()</a>))", "((http://example.com/()))"
+    assert_linked "[<a href=\"http://example.com/()\">http://example.com/()</a>]", "[http://example.com/()]"
+
+    assert_linked "（<a href=\"http://example.com/\">http://example.com/</a>）", "（http://example.com/）"
+    assert_linked "【<a href=\"http://example.com/\">http://example.com/</a>】", "【http://example.com/】"
+    assert_linked "『<a href=\"http://example.com/\">http://example.com/</a>』", "『http://example.com/』"
+    assert_linked "「<a href=\"http://example.com/\">http://example.com/</a>」", "「http://example.com/」"
+    assert_linked "《<a href=\"http://example.com/\">http://example.com/</a>》", "《http://example.com/》"
+    assert_linked "〈<a href=\"http://example.com/\">http://example.com/</a>〉", "〈http://example.com/〉"
+  end
+
+  def test_urls_with_quotes
+    assert_linked "'<a href=\"http://example.com\">http://example.com</a>'", "'http://example.com'"
+    assert_linked "\"<a href=\"http://example.com\">http://example.com</a>\"\"", "\"http://example.com\"\""
+  end
+
+  def test_underscore_in_domain
+    assert_linked "http://foo_bar.com", "http://foo_bar.com"
+  end
+
+  def test_underscore_in_subdomain
+    assert_linked "<a href=\"http://foo_bar.xyz.com\">http://foo_bar.xyz.com</a>", "http://foo_bar.xyz.com"
+  end
+
+  def test_regression_84
+    assert_linked "<a href=\"https://www.keepright.atの情報をもとにエラー修正\">https://www.keepright.atの情報をもとにエラー修正</a>", "https://www.keepright.atの情報をもとにエラー修正"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rinku
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.6
 platform: ruby
 authors:
 - Vicent Marti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 description: |2
       A fast and very smart autolinking library that
       acts as a drop-in replacement for Rails `auto_link`
@@ -80,7 +80,8 @@ files:
 - rinku.gemspec
 - test/autolink_test.rb
 homepage: https://github.com/vmg/rinku
-licenses: []
+licenses:
+- ISC
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -90,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mostly autolinking