rinku 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d97faec12db81c05ee7700322b7ad7b72a1d883
-  data.tar.gz: 4b606e2f512b27c6203c18b8abdb3bc31d232435
+SHA256:
+  metadata.gz: 20e9884a2e337d4058ce73eaa6be94c3c7ab49d464d4d5121de480f3ce08297a
+  data.tar.gz: a42374d316c4138d29391f0bb1ce928d9db9cc2b213ed3801bd8a22b199f95fc
 SHA512:
-  metadata.gz: 7425f53947c3bc6c91bf794f80a0d7829b3d3c40fc1c04c389139264cd7478a49950020f475b97a7ff863cc845ae3bcd9e39aac0f53f89ddb15a4a61b27442a0
-  data.tar.gz: 7b10ef7ed9c9e58489e93886574f1739ee8a03075e767d11b74fbe0fd4b08fcb93348d0b4a1df95e037b77282e7ec782eac712a49c558765ca77fe8ff74d6d48
+  metadata.gz: 016fdc90a1ce59adae6158424b1d762f6f3d49be0bb55472651417091727cd6a10ef8f7fc8b79a90bea3457d656205bc65c748df752b00e4517b01c810400969
+  data.tar.gz: 4b30082da4e29825b5eae3ad07ce88f7a2f5c98fff1f1a1569a70affbdac954a35fdcc90be50154aacaf2a4b8cf2264647783c6d70a04356ce702389f11983fb

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)
 {
@@ -160,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) {

data/lib/rinku.rb

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

data/rinku.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rinku'
-  s.version = '2.0.4'
+  s.version = '2.0.5'
   s.summary = "Mostly autolinking"
   s.description = <<-EOF
     A fast and very smart autolinking library that

data/test/autolink_test.rb

@@ -430,4 +430,12 @@ This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>
     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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rinku
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Vicent Marti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mostly autolinking