zendesk-rinku 1.7.0 → 1.7.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjJhYWM1MmUzNzc3MDI5NzliOWYxMDg0MWUyZTQzYzUxNzU0NmQ4Yw==
+    OTBhY2IxNDFiMWFkOGQxMzUzMjQ4MjlkYmMzZWI4MjhiODYwNGI3OQ==
   data.tar.gz: !binary |-
-    ZDg3N2VhMzc0MDc5MDQ1ZGFmYzAwNjJiNDk2MDVhYmQ4ZjA2OWViYg==
+    OTQ1M2Y3MjE0Nzc5ODdjNmZjODVkYmVhMzdlNzc5OTlkZDUzOTA0OA==
 SHA512:
   metadata.gz: !binary |-
-    NTI4ODlhMjg1OTRlODc3OGRhMDlmMDM2ZGYxMzk5YWFhMjdlYzE3M2NkZjUz
-    Nzg1NTFiZGEyMzQ2ZDkzZDA0NzIwYTE2YmRmM2IzMmRiNzg4ZDU3YWJjOTcw
-    YjgwYmI5ZGVmNjJmMjBjOGYzNDg5NWM3MDUwMGUzNjVmMTM4NDc=
+    ODg4NDIxOGZjNjJkMDc2ODFmODFkZTNlNGVmZDQ1YjkyYTg4ZGY1ZDM2NTM1
+    ZWE1ZjViMTJlNWVjOWU1YjVhOWRkZWJjNGY1ZWFhMzg3M2E4MzRkOGRkMjI4
+    NmVlOTJmNjg5ZDkxNWQ4MTFkOTkwODk3OTQwYjdhYjYwYzZmNWQ=
   data.tar.gz: !binary |-
-    OTYxZTNmYjlkNWU3NGZjZmMxZDYxMmIzYjNkMWQ2YmIwNWY1M2MyOGYxYmZh
-    Yjc1ZWUwNjgxOWU1Y2JkN2NkY2ZiYzU5OGFmNWM3OGU1MDBjZjQ5ZmFlMjBi
-    NDkxNTRkYTc2NTM0Nzg1NTY0ZThmYmZhNDhjMDkxOWU2NTUwZWI=
+    YmQ1MjBkNWYzMWQ4NWU4MDI4NDg3ZmRiNDhlMTMwNzFjN2E3MTE4NjdhMDhm
+    MGE2MDhkZjdmYTZjZGM5N2RmOGMwZmU3ZGFmYmFkN2ZhZmE2Yzg2YTNhZDRm
+    ZDk2M2RlN2IyMjkwY2UzZTE2ZDgxYzViMTZlZWQxOTZlMDhkYjY=

data/Rakefile

@@ -50,7 +50,7 @@ file package('.gem') => %w[pkg/ rinku.gemspec] + $spec.files do |f|
 end
 
 # GEMSPEC HELPERS ==========================================================
-task :gather => 'sundown/src/autolink.h' do |t|
+task :gather => 'sundown:checkout' do |t|
   files =
     FileList[
       'sundown/src/{buffer,autolink}.h',
@@ -61,7 +61,9 @@ task :gather => 'sundown/src/autolink.h' do |t|
     :verbose => true
 end
 
-
-file 'sundown/src/autolink.h' do |t|
-  abort "The Sundown submodule is required."
+task 'sundown:checkout' do |t|
+  unless File.exists?('sundown/src/markdown.h')
+    sh 'git submodule init'
+    sh 'git submodule update'
+  end
 end

data/ext/rinku/autolink.c

@@ -20,7 +20,18 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include "ruby.h"
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#define isalnum(s) rb_isalnum(s)
+#define isspace(s) rb_isspace(s)
+#define isalpha(s) rb_isalpha(s)
+#define ispunct(s) rb_ispunct(s)
+#else
 #include <ctype.h>
+#endif
+
 
 #if defined(_WIN32)
 #define strncasecmp	_strnicmp
@@ -49,7 +60,7 @@ sd_autolink_issafe(const uint8_t *link, size_t link_len)
 }
 
 static size_t
-autolink_delim(uint8_t *data, size_t link_end, size_t offset, size_t size)
+autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 {
 	uint8_t cclose, copen = 0;
 	size_t i;
@@ -163,13 +174,13 @@ sd_autolink__www(
 	size_t *rewind_p,
 	struct buf *link,
 	uint8_t *data,
-	size_t offset,
+	size_t max_rewind,
 	size_t size,
 	unsigned int flags)
 {
 	size_t link_end;
 
-	if (offset > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
+	if (max_rewind > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
 		return 0;
 
 	if (size < 4 || memcmp(data, "www.", strlen("www.")) != 0)
@@ -183,7 +194,7 @@ sd_autolink__www(
 	while (link_end < size && !isspace(data[link_end]))
 		link_end++;
 
-	link_end = autolink_delim(data, link_end, offset, size);
+	link_end = autolink_delim(data, link_end, max_rewind, size);
 
 	if (link_end == 0)
 		return 0;
@@ -199,14 +210,14 @@ sd_autolink__email(
 	size_t *rewind_p,
 	struct buf *link,
 	uint8_t *data,
-	size_t offset,
+	size_t max_rewind,
 	size_t size,
 	unsigned int flags)
 {
 	size_t link_end, rewind;
 	int nb = 0, np = 0;
 
-	for (rewind = 0; rewind < offset; ++rewind) {
+	for (rewind = 0; rewind < max_rewind; ++rewind) {
 		uint8_t c = data[-rewind - 1];
 
 		if (isalnum(c))
@@ -238,7 +249,7 @@ sd_autolink__email(
 	if (link_end < 2 || nb != 1 || np == 0)
 		return 0;
 
-	link_end = autolink_delim(data, link_end, offset, size);
+	link_end = autolink_delim(data, link_end, max_rewind, size);
 
 	if (link_end == 0)
 		return 0;
@@ -254,7 +265,7 @@ sd_autolink__url(
 	size_t *rewind_p,
 	struct buf *link,
 	uint8_t *data,
-	size_t offset,
+	size_t max_rewind,
 	size_t size,
 	unsigned int flags)
 {
@@ -263,7 +274,7 @@ sd_autolink__url(
 	if (size < 4 || data[1] != '/' || data[2] != '/')
 		return 0;
 
-	while (rewind < offset && isalpha(data[-rewind - 1]))
+	while (rewind < max_rewind && isalpha(data[-rewind - 1]))
 		rewind++;
 
 	if (!sd_autolink_issafe(data - rewind, size + rewind))
@@ -283,7 +294,7 @@ sd_autolink__url(
 	while (link_end < size && !isspace(data[link_end]))
 		link_end++;
 
-	link_end = autolink_delim(data, link_end, offset, size);
+	link_end = autolink_delim(data, link_end, max_rewind, size);
 
 	if (link_end == 0)
 		return 0;
@@ -293,4 +304,3 @@ sd_autolink__url(
 
 	return link_end;
 }
-

data/ext/rinku/rinku.c

@@ -24,6 +24,8 @@
 #include <ruby/encoding.h>
 #else
 #define rb_enc_copy(dst, src)
+#define rb_enc_set_index(str, idx)
+#define rb_enc_get_index(str) 1
 #endif
 
 #include "autolink.h"
@@ -74,7 +76,7 @@ static const char *g_hrefs[] = {
 };
 
 static void
-autolink__print(struct buf *ob, const struct buf *link, void *payload)
+autolink__print(struct buf *ob, const struct buf *link, void *payload, int enc_index)
 {
 	bufput(ob, link->data, link->size);
 }
@@ -191,10 +193,11 @@ rinku_autolink(
 	unsigned int flags,
 	const char *link_attr,
 	const char **skip_tags,
-	void (*link_text_cb)(struct buf *ob, const struct buf *link, void *payload),
+	void (*link_text_cb)(struct buf *ob, const struct buf *link, void *payload, int enc_index),
+	int enc_index,
 	void *payload)
 {
-	size_t i, end;
+	size_t i, end, last_link_found = 0;
 	struct buf *link = bufnew(16);
 	char active_chars[256];
 	void (*link_url_cb)(struct buf *, const struct buf *, void *);
@@ -249,8 +252,11 @@ rinku_autolink(
 		}
 
 		link->size = 0;
+
 		link_end = g_callbacks[(int)action](
-			&rewind, link, (uint8_t *)text + end, end, size - end, flags);
+			&rewind, link, (uint8_t *)text + end,
+			end - last_link_found,
+			size - end, flags);
 
 		/* print the link */
 		if (link_end > 0) {
@@ -267,12 +273,12 @@ rinku_autolink(
 				BUFPUTSL(ob, "\">");
 			}
 
-			link_text_cb(ob, link, payload);
+			link_text_cb(ob, link, payload, enc_index);
 			BUFPUTSL(ob, "</a>");
 
 			link_count++;
 			i = end + link_end;
-			end = i;
+			last_link_found = end = i;
 		} else {
 			end = end + 1;
 		}
@@ -287,10 +293,11 @@ rinku_autolink(
  * Ruby code
  */
 static void
-autolink_callback(struct buf *link_text, const struct buf *link, void *block)
+autolink_callback(struct buf *link_text, const struct buf *link, void *block, int enc_index)
 {
 	VALUE rb_link, rb_link_text;
 	rb_link = rb_str_new(link->data, link->size);
+	rb_enc_set_index(rb_link, enc_index);
 	rb_link_text = rb_funcall((VALUE)block, rb_intern("call"), 1, rb_link);
 	Check_Type(rb_link_text, T_STRING);
 	bufput(link_text, RSTRING_PTR(rb_link_text), RSTRING_LEN(rb_link_text));
@@ -346,8 +353,8 @@ const char **rinku_load_tags(VALUE rb_skip)
  * HTML, Rinku is smart enough to skip the links that are already enclosed in `<a>`
  * tags.`
  *
- * -   `mode` is a symbol, either `:all`, `:urls` or `:email_addresses`, 
- * which specifies which kind of links will be auto-linked. 
+ * -   `mode` is a symbol, either `:all`, `:urls` or `:email_addresses`,
+ * which specifies which kind of links will be auto-linked.
  *
  * -   `link_attr` is a string containing the link attributes for each link that
  * will be generated. These attributes are not sanitized and will be include as-is
@@ -392,7 +399,7 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 	ID mode_sym;
 
 	rb_scan_args(argc, argv, "14&", &rb_text, &rb_mode,
-		&rb_html, &rb_skip, &rb_flags, &rb_block); 
+		&rb_html, &rb_skip, &rb_flags, &rb_block);
 
 	Check_Type(rb_text, T_STRING);
 
@@ -434,6 +441,7 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 		rb_raise(rb_eTypeError,
 			"Invalid linking mode (possible values are :all, :urls, :email_addresses)");
 
+
 	count = rinku_autolink(
 		output_buf,
 		RSTRING_PTR(rb_text),
@@ -443,6 +451,7 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 		link_attr,
 		skip_tags,
 		RTEST(rb_block) ? &autolink_callback : NULL,
+		rb_enc_get_index(rb_text),
 		(void*)rb_block);
 
 	if (count == 0)
@@ -465,4 +474,3 @@ void RUBY_EXPORT Init_rinku()
 	rb_define_method(rb_mRinku, "auto_link", rb_rinku_autolink, -1);
 	rb_define_const(rb_mRinku, "AUTOLINK_SHORT_DOMAINS", INT2FIX(SD_AUTOLINK_SHORT_DOMAINS));
 }
-

data/lib/rinku.rb

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

data/rinku.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'zendesk-rinku'
-  s.version = '1.7.0'
+  s.version = '1.7.2.1'
   s.summary = "Mostly autolinking"
   s.description = <<-EOF
     A fast and very smart autolinking library that
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   EOF
   s.email = 'shajith@zendesk.com'
   s.homepage = 'http://github.com/shajith/rinku'
-  s.authors = ["Shajith Chacko", "Vicent Marti"]
+  s.authors = ["Vicent Marti", "Shajith Chacko"]
   # = MANIFEST =
   s.files = %w[
     COPYING

data/test/autolink_test.rb

@@ -15,6 +15,10 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
     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";//)
@@ -32,7 +36,7 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
     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)
@@ -138,7 +142,7 @@ This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>
     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  
+  end
 
   def test_block
     link = Rinku.auto_link("Find ur favorite pokeman @ http://www.pokemon.com") do |url|
@@ -149,6 +153,12 @@ This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>
     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
@@ -285,6 +295,19 @@ This is just a test. <a href="http://www.pokemon.com">http://www.pokemon.com</a>
       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)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zendesk-rinku
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2.1
 platform: ruby
 authors:
-- Shajith Chacko
 - Vicent Marti
+- Shajith Chacko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+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