rinku 1.0.0 → 1.1.0

data/README.markdown

@@ -18,52 +18,73 @@ The Rinku source is available at GitHub:
 
     $ git clone git://github.com/tanoku/rinku.git
 
-Rinku is a drop-in replacement for Rails `auto_link`
-----------------------------------------------------
+Rinku is a standalone library
+-----------------------------
+
+It exports a single method called `Rinku.auto_link`.
+
+~~~~ruby
+require 'rinku'
 
-And I'm a lazy bum, so I've copied and pasted the Rails API docs here.
-Yes, the Rinku API is 100% compatible.
-
-~~~~~~ruby
-# 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)     # => Once upon\na time
-#   # => "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")     # => Once upon\na time
-#   # => "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>."
+auto_link(text, mode=:all, link_attr=nil)
+auto_link(text, mode=:all, link_attr=nil) { |link_text| ... }
 ~~~~~~~~~
 
+Parses a block of text looking for "safe" urls or email addresses,
+and turns them into HTML links with the given attributes.
+
+NOTE: Currently the follow protocols are considered safe and are the
+only ones that will be autolinked.
+
+	http:// https:// ftp:// mailto://
+
+Email addresses are also autolinked by default. URLs without a protocol
+specifier but starting with `www.` will also be autolinked, defaulting to
+the `http://` protocol.
+
+- `text` is a string in plain text or HTML markup. If the string is formatted in
+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.
+
+- `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
+in each generated link, e.g.
+
+	~~~~ruby
+	auto_link('http://www.pokemon.com', :all, 'target="_blank"')
+	# => '<a href="http://www.pokemon.com" target="_blank">http://www.pokemon.com</a>'
+	~~~~
+
+	This string can be autogenerated from a hash using the Rails `tag_options` helper.
+
+- The method takes an optional block argument. If a block is passed, it will
+be yielded for each found link in the text, and its return value will be used instead
+of the name of the link. E.g.
+ 
+	~~~~ruby
+ 	auto_link('Check it out at http://www.pokemon.com') do |url|
+ 		"THE POKEMAN WEBSITEZ"
+ 	end
+ 	# => 'Check it out at <a href="http://www.pokemon.com">THE POKEMAN WEBSITEZ</a>'
+	~~~~
+
+Rinku is a drop-in replacement for Rails 3.1 `auto_link`
+----------------------------------------------------
+
+Auto-linking functionality has been removed from Rails 3.1,
+and is instead offered as a standalone gem, `rails_autolink`. You can
+choose to use Rinku instead.
+
+~~~~ruby
+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
 ----------------------
 

data/ext/rinku/autolink.c

@@ -47,6 +47,13 @@ static size_t
 autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
 {
 	char cclose, copen = 0;
+	size_t i;
+
+	for (i = 0; i < link_end; ++i)
+		if (data[i] == '<') {
+			link_end = i;
+			break;
+		}
 
 	while (link_end > 0) {
 		if (strchr("?!.,", data[link_end - 1]) != NULL)
@@ -63,11 +70,6 @@ autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
 			else
 				link_end--;
 		}
-
-		else if (data[link_end - 1] == '>') {
-			while (link_end > 0 && data[link_end] != '<')
-				link_end--;
-		}
 		else break;
 	}
 
@@ -125,11 +127,29 @@ autolink_delim(char *data, size_t link_end, size_t offset, size_t size)
 	return link_end;
 }
 
+static size_t
+check_domain(char *data, size_t size)
+{
+	size_t i, np = 0;
+
+	if (!isalnum(data[0]))
+		return 0;
+
+	for (i = 1; i < size - 1; ++i) {
+		if (data[i] == '.') np++;
+		else if (!isalnum(data[i])) break;
+	}
+
+	if (!isalnum(data[i - 1]) || np == 0)
+		return 0;
+
+	return i;
+}
+
 size_t
 ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
 {
 	size_t link_end;
-	int np = 0;
 
 	if (offset > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
 		return 0;
@@ -137,17 +157,14 @@ ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset,
 	if (size < 4 || memcmp(data, "www.", STRLEN("www.")) != 0)
 		return 0;
 
-	link_end = 0;
-	while (link_end < size && !isspace(data[link_end])) {
-		if (data[link_end] == '.')
-			np++;
-
-		link_end++;
-	}
+	link_end = check_domain(data, size);
 
-	if (np < 2)
+	if (link_end == 0)
 		return 0;
 
+	while (link_end < size && !isspace(data[link_end]))
+		link_end++;
+
 	link_end = autolink_delim(data, link_end, offset, size);
 
 	if (link_end == 0)
@@ -211,7 +228,7 @@ ups_autolink__email(size_t *rewind_p, struct buf *link, char *data, size_t offse
 size_t
 ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size)
 {
-	size_t link_end, rewind = 0;
+	size_t link_end, rewind = 0, domain_len;
 
 	if (size < 4 || data[1] != '/' || data[2] != '/')
 		return 0;
@@ -221,8 +238,13 @@ ups_autolink__url(size_t *rewind_p, struct buf *link, char *data, size_t offset,
 
 	if (!is_safe_link(data - rewind, size + rewind))
 		return 0;
+	link_end = STRLEN("://");
+
+	domain_len = check_domain(data + link_end, size - link_end);
+	if (domain_len == 0)
+		return 0;
 
-	link_end = 0;
+	link_end += domain_len;
 	while (link_end < size && !isspace(data[link_end]))
 		link_end++;
 

data/ext/rinku/autolink.h

@@ -22,7 +22,10 @@
 typedef enum {
 	AUTOLINK_URLS = (1 << 0),
 	AUTOLINK_EMAILS = (1 << 1),
-	AUTOLINK_ALL = AUTOLINK_URLS|AUTOLINK_EMAILS
+	AUTOLINK_ALL = AUTOLINK_URLS|AUTOLINK_EMAILS,
+	AUTOLINK_SANITIZE_NAMES = (1 << 2),
+	AUTOLINK_SANITIZE_URLS = (1 << 3),
+	AUTOLINK_SANITIZE = AUTOLINK_SANITIZE_NAMES|AUTOLINK_SANITIZE_URLS,
 } autolink_mode;
 
 extern size_t

data/ext/rinku/html_autolink.c

@@ -83,7 +83,7 @@ is_closing_a(const char *tag, size_t size)
 }
 
 static size_t
-skip_tags(struct buf *ob, const char *text, size_t size)
+autolink__skip_tag(struct buf *ob, char *text, size_t size)
 {
 	size_t i = 0;
 
@@ -105,6 +105,30 @@ skip_tags(struct buf *ob, const char *text, size_t size)
 	return i + 1;
 }
 
+typedef size_t (*autolink_parse_cb)(size_t *rewind, struct buf *, char *, size_t, size_t);
+
+typedef enum {
+	AUTOLINK_ACTION_NONE = 0,
+	AUTOLINK_ACTION_WWW,
+	AUTOLINK_ACTION_EMAIL,
+	AUTOLINK_ACTION_URL,
+	AUTOLINK_ACTION_SKIP_TAG
+} autolink_action;
+
+static autolink_parse_cb g_callbacks[] = {
+	NULL,
+	ups_autolink__www,	/* 1 */
+	ups_autolink__email,/* 2 */
+	ups_autolink__url,	/* 3 */
+};
+
+static const char *g_hrefs[] = {
+	NULL,
+	"<a href=\"http://",
+	"<a href=\"mailto:",
+	"<a href=\"",
+};
+
 void
 upshtml_autolink(
 	struct buf *ob,
@@ -116,38 +140,42 @@ upshtml_autolink(
 {
 	size_t i, end;
 	struct buf *link = bufnew(16);
-	const char *active_chars;
+	char active_chars[256];
+	void (*link_url_cb)(struct buf *, const struct buf *, void *);
 
 	if (!text || text->size == 0)
 		return;
 
-	switch (flags) {
-		case AUTOLINK_EMAILS:
-			active_chars = "<@";
-			break;
+	memset(active_chars, 0x0, sizeof(active_chars));
 
-		case AUTOLINK_URLS:
-			active_chars = "<w:";
+	active_chars['<'] = AUTOLINK_ACTION_SKIP_TAG;
 
-		case AUTOLINK_ALL:
-			active_chars = "<@w:";
-			break;
+	if (flags & AUTOLINK_EMAILS)
+		active_chars['@'] = AUTOLINK_ACTION_EMAIL;
 
-		default:
-			return;
+	if (flags & AUTOLINK_URLS) {
+		active_chars['w'] = AUTOLINK_ACTION_WWW;
+		active_chars['W'] = AUTOLINK_ACTION_WWW;
+		active_chars[':'] = AUTOLINK_ACTION_URL;
 	}
 
 	if (link_text_cb == NULL)
 		link_text_cb = &autolink_escape_cb;
 
+	if (link_attr != NULL) {
+		while (isspace(*link_attr))
+			link_attr++;
+	}
+
 	bufgrow(ob, text->size);
 
 	i = end = 0;
 
 	while (i < text->size) {
 		size_t rewind;
+		char action;
 
-		while (end < text->size && strchr(active_chars, text->data[end]) == NULL)
+		while (end < text->size && (action = active_chars[(int)text->data[end]]) == 0)
 			end++;
 
 		bufput(ob, text->data + i, end - i);
@@ -156,57 +184,32 @@ upshtml_autolink(
 			break;
 
 		i = end;
+		end = 0;
 		link->size = 0;
 
-		switch (text->data[i]) {
-		case '@':
-			end = ups_autolink__email(&rewind, link, text->data + i, i, text->size - i);
+		if (action == AUTOLINK_ACTION_SKIP_TAG) {
+			end = autolink__skip_tag(ob, text->data + i, text->size - i);
+		} else {
+			end = g_callbacks[(int)action](&rewind, link, text->data + i, i, text->size - i);
+
+			/* print the link */
 			if (end > 0) {
 				ob->size -= rewind;
-				BUFPUTSL(ob, "<a");
-				if (link_attr) bufputs(ob, link_attr);
-				BUFPUTSL(ob, " href=\"mailto:");
-				bufput(ob, link->data, link->size);
-				BUFPUTSL(ob, "\">");
-				link_text_cb(ob, link, payload);
-				BUFPUTSL(ob, "</a>");
-			}
-			break;
 
-		case 'w':
-			end = ups_autolink__www(&rewind, link, text->data + i, i, text->size - i);
-			if (end > 0) {
-				BUFPUTSL(ob, "<a");
-				if (link_attr) bufputs(ob, link_attr);
-				BUFPUTSL(ob, " href=\"http://");
-				bufput(ob, link->data, link->size);
-				BUFPUTSL(ob, "\">");
-				link_text_cb(ob, link, payload);
-				BUFPUTSL(ob, "</a>");
-			}
-			break;
+				bufputs(ob, g_hrefs[(int)action]);
+				autolink_escape_cb(ob, link, NULL);
+
+				if (link_attr) {
+					BUFPUTSL(ob, "\" ");
+					bufputs(ob, link_attr);
+					bufputc(ob, '>');
+				} else {
+					BUFPUTSL(ob, "\">");
+				}
 
-		case ':':
-			end = ups_autolink__url(&rewind, link, text->data + i, i, text->size - i);
-			if (end > 0) {
-				ob->size -= rewind;
-				BUFPUTSL(ob, "<a");
-				if (link_attr) bufputs(ob, link_attr);
-				BUFPUTSL(ob, " href=\"");
-				bufput(ob, link->data, link->size);
-				BUFPUTSL(ob, "\">");
 				link_text_cb(ob, link, payload);
 				BUFPUTSL(ob, "</a>");
 			}
-			break;
-
-		case '<':
-			end = skip_tags(ob, text->data + i, text->size - i);
-			break;
-
-		default:
-			end = 0;
-			break;
 		}
 
 		if (!end)
@@ -216,6 +219,8 @@ upshtml_autolink(
 			end = i;
 		} 
 	}
+
+	bufrelease(link);
 }
 
 

data/ext/rinku/rinku.c

@@ -1,6 +1,29 @@
+/*
+ * Copyright (c) 2011, Vicent Marti
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#define RSTRING_NOT_MODIFIED
+
 #include <stdio.h>
 #include "ruby.h"
 
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#else
+#define rb_enc_copy(dst, src)
+#endif
+
 #include "autolink.h"
 #include "buffer.h"
 
@@ -25,6 +48,50 @@ autolink_callback(struct buf *link_text, const struct buf *link, void *block)
 	bufput(link_text, RSTRING_PTR(rb_link_text), RSTRING_LEN(rb_link_text));
 }
 
+/*
+ * Document-method: auto_link
+ *
+ * call-seq:
+ *  auto_link(text, mode=:all, link_attr=nil)
+ *  auto_link(text, mode=:all, link_attr=nil) { |link_text| ... }
+ *
+ * Parses a block of text looking for "safe" urls or email addresses,
+ * and turns them into HTML links with the given attributes.
+ *
+ * NOTE: Currently the follow protocols are considered safe and are the
+ * only ones that will be autolinked.
+ *
+ *		http:// https:// ftp:// mailto://
+ *
+ * Email addresses are also autolinked by default. URLs without a protocol
+ * specifier but starting with 'www.' will also be autolinked, defaulting to
+ * the 'http://' protocol.
+ *
+ * +text+ is a string in plain text or HTML markup. If the string is formatted in
+ * 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.
+ *
+ * +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
+ * in each generated link, e.g.
+ *
+ *	auto_link('http://www.pokemon.com', :all, 'target="_blank"')
+ *	# => '<a href="http://www.pokemon.com" target="_blank">http://www.pokemon.com</a>'
+ *
+ * This string can be autogenerated from a hash using the Rails `tag_options` helper.
+ *
+ * +block+ The method takes an optional block argument. If a block is passed, it will
+ * be yielded for each found link in the text, and its return value will be used instead
+ * of the name of the link. E.g.
+ *
+ *	auto_link('Check it out at http://www.pokemon.com') do |url|
+ *		"THE POKEMAN WEBSITEZ"
+ *	end
+ *	# => 'Check it out at <a href="http://www.pokemon.com">THE POKEMAN WEBSITEZ</a>'
+ */
 static VALUE
 rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 {
@@ -34,10 +101,16 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 	const char *link_attr = NULL;
 	ID mode_sym;
 
-	rb_scan_args(argc, argv, "3&", &rb_text, &rb_mode, &rb_html, &rb_block);
+	rb_scan_args(argc, argv, "12&", &rb_text, &rb_mode, &rb_html, &rb_block);
 
 	Check_Type(rb_text, T_STRING);
-	Check_Type(rb_mode, T_SYMBOL);
+
+	if (!NIL_P(rb_mode)) {
+		Check_Type(rb_mode, T_SYMBOL);
+		mode_sym = SYM2ID(rb_mode);
+	} else {
+		mode_sym = rb_intern("all");
+	}
 
 	if (!NIL_P(rb_html)) {
 		Check_Type(rb_html, T_STRING);
@@ -48,8 +121,6 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 	input_buf.size = RSTRING_LEN(rb_text);
 	output_buf = bufnew(128);
 
-	mode_sym = SYM2ID(rb_mode);
-
 	if (mode_sym == rb_intern("all"))
 		link_mode = AUTOLINK_ALL;
 	else if (mode_sym == rb_intern("email_addresses"))
@@ -60,27 +131,26 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 		rb_raise(rb_eTypeError,
 			"Invalid linking mode (possible values are :all, :urls, :email_addresses)");
 
+	link_mode |= AUTOLINK_SANITIZE;
+
 	if (RTEST(rb_block))
-		upshtml_autolink(output_buf, &input_buf, AUTOLINK_ALL, link_attr, &autolink_callback, (void*)rb_block);
+		upshtml_autolink(output_buf, &input_buf, link_mode, link_attr, &autolink_callback, (void*)rb_block);
 	else
-		upshtml_autolink(output_buf, &input_buf, AUTOLINK_ALL, link_attr, NULL, NULL);
+		upshtml_autolink(output_buf, &input_buf, link_mode, link_attr, NULL, NULL);
 
 	result = rb_str_new(output_buf->data, output_buf->size);
 	bufrelease(output_buf);
 
 	/* force the input encoding */
-	if (rb_respond_to(rb_text, rb_intern("encoding"))) {
-		VALUE encoding = rb_funcall(rb_text, rb_intern("encoding"), 0);
-		rb_funcall(result, rb_intern("force_encoding"), 1, encoding);
-	}
+	rb_enc_copy(result, rb_text);
 
 	return result;
 }
 
 void Init_rinku()
 {
-    rb_cRinku = rb_define_class("Rinku", rb_cObject);
-	rb_define_singleton_method(rb_cRinku, "_auto_link", rb_rinku_autolink, -1);
+	rb_cRinku = rb_define_class("Rinku", rb_cObject);
+	rb_define_singleton_method(rb_cRinku, "auto_link", rb_rinku_autolink, -1);
 }
 
 

data/lib/rails_rinku.rb

@@ -0,0 +1,35 @@
+require 'rinku'
+
+module RailsRinku
+  class Railtie < ::Rails::Railtie
+    initializer 'rails_rinku' do |app|
+      ActiveSupport.on_load(:action_view) do
+        require 'active_support/core_ext/object/blank'
+        require 'active_support/core_ext/array/extract_options'
+        require 'active_support/core_ext/hash/reverse_merge'
+        require 'active_support/core_ext/hash/keys'
+
+        module ::ActionView
+          module Helpers # :nodoc:
+            module TextHelper
+              def auto_link(text, *args, &block)
+                return ''.html_safe if text.blank?
+
+                options = args.size == 2 ? {} : args.extract_options!
+                unless args.empty?
+                  options[:link] = args[0] || :all
+                  options[:html] = args[1] || {}
+                end
+                options.reverse_merge!(:link => :all, :html => {})
+                text = sanitize(text) unless options[:sanitize] == false
+
+                Rinku.auto_link(text, options[:link], tag_options(options[:html]), &block)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/rinku.rb

@@ -1,41 +1,5 @@
-require 'set'
-require 'cgi'
-
 class Rinku
-  def self.auto_link(text, *args, &block)
-    return '' if text.strip.empty?
-
-    options = args.size == 2 ? {} : (args.last.is_a?(::Hash) ? args.pop : {})
-    unless args.empty?
-      options[:link] = args[0] || :all
-      options[:html] = args[1] || {}
-    end
-
-    _auto_link(text, options[:link] || :all, tag_options(options[:html] || {}), &block)
-  end
-
-  private
-    BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer
-                         autoplay controls loop selected hidden scoped async
-                         defer reversed ismap seemless muted required
-                         autofocus novalidate formnovalidate open).to_set
-
-    def self.tag_options(options, escape = true)
-      unless options.empty?
-        attrs = []
-        options.each_pair do |key, value|
-          key = key.to_s
-          if BOOLEAN_ATTRIBUTES.include?(key)
-            attrs << %(#{key}="#{key}") if value
-          elsif !value.nil?
-            final_value = value.is_a?(Array) ? value.join(" ") : value
-            final_value = CGI.escapeHTML(final_value) if escape
-            attrs << %(#{key}="#{final_value}")
-          end
-        end
-        " #{attrs.sort * ' '}" unless attrs.empty?
-      end
-    end
+  VERSION = "1.1.0"
 end
 
 require 'rinku.so'

data/rinku.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rinku'
-  s.version = File.open('VERSION').read.strip
+  s.version = '1.1.0'
   s.summary = "Mostly autolinking"
   s.description = <<-EOF
     A fast and very smart autolinking library that
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     COPYING
-    VERSION
     README.markdown
     Rakefile
     ext/rinku/rinku.c
@@ -23,6 +22,7 @@ Gem::Specification.new do |s|
     ext/rinku/html_autolink.c
     ext/rinku/extconf.rb
     lib/rinku.rb
+    lib/rails_rinku.rb
     rinku.gemspec
     test/autolink_test.rb
   ]

data/test/autolink_test.rb

@@ -11,6 +11,74 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
     assert_equal expected, Rinku.auto_link(url)
   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"
+
+    assert_equal %(My pic: <a href="#{pic}"><img src="#{pic}" width="160px"></a> -- full album here #{generate_result(url)}), Rinku.auto_link("My pic: #{pic} -- full album here #{url}") { |link|
+      if link =~ /\.(jpg|gif|png|bmp|tif)$/i
+        %(<img src="#{CGI.escapeHTML link}" width="160px">)
+      else
+        CGI.escapeHTML 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"
@@ -20,11 +88,6 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
     assert_equal link, "Find ur favorite pokeman @ <a href=\"http://www.pokemon.com\">POKEMAN WEBSITE</a>"
   end
 
-  def test_link_attributes
-    assert_equal Rinku.auto_link("http://www.bash.org", :html => {:target => "_blank"}),
-      "<a target=\"_blank\" href=\"http://www.bash.org\">http://www.bash.org</a>"
-  end
-
   def test_autolink_works
     url = "http://example.com/"
     assert_linked "<a href=\"#{url}\">#{url}</a>", url
@@ -70,7 +133,7 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
             )
 
     urls.each do |url|
-      assert_linked %(<a href="#{url}">#{CGI.escapeHTML(url)}</a>), url
+      assert_linked %(<a href="#{CGI.escapeHTML url}">#{CGI.escapeHTML url}</a>), url
     end
   end
 
@@ -87,13 +150,13 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
     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    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
-    link4_result = %{<a href="#{link4_raw}">#{CGI.escapeHTML(link4_raw)}</a>}
+    link4_result = %{<a href="#{CGI.escapeHTML link4_raw}">#{CGI.escapeHTML 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    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
-    link7_result = %{<a href="#{link7_raw}">#{CGI.escapeHTML(link7_raw)}</a>}
+    link7_result = %{<a href="#{CGI.escapeHTML link7_raw}">#{CGI.escapeHTML 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'
@@ -132,4 +195,24 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
     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
+  end
+
+  def generate_result(link_text, href = nil)
+    href ||= link_text
+    %{<a href="#{CGI::escapeHTML href}">#{CGI::escapeHTML link_text}</a>}
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rinku
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - "Vicent Mart\xC3\xAD"
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 +02:00
-default_executable: 
+date: 2011-06-11 00:00:00 Z
 dependencies: []
 
 description: "    A fast and very smart autolinking library that\n    acts as a drop-in replacement for Rails `auto_link`\n"
@@ -29,7 +28,6 @@ extra_rdoc_files:
 - COPYING
 files: 
 - COPYING
-- VERSION
 - README.markdown
 - Rakefile
 - ext/rinku/rinku.c
@@ -40,9 +38,9 @@ files:
 - ext/rinku/html_autolink.c
 - ext/rinku/extconf.rb
 - lib/rinku.rb
+- lib/rails_rinku.rb
 - rinku.gemspec
 - test/autolink_test.rb
-has_rdoc: true
 homepage: http://github.com/tanoku/rinku
 licenses: []
 
@@ -72,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Mostly autolinking

data/VERSION

@@ -1 +0,0 @@
-1.0.0