rinku 1.1.0 → 1.2.0

data/Rakefile

@@ -56,8 +56,7 @@ task :gather => 'upskirt/src/markdown.h' do |t|
   files =
     FileList[
       'upskirt/src/{buffer,autolink}.h',
-      'upskirt/src/{buffer,autolink}.c',
-      'upskirt/html/html_autolink.c'
+      'upskirt/src/{buffer,autolink}.c'
     ]
   cp files, 'ext/rinku/',
     :preserve => true,

data/ext/rinku/autolink.h

@@ -19,15 +19,6 @@
 
 #include "buffer.h"
 
-typedef enum {
-	AUTOLINK_URLS = (1 << 0),
-	AUTOLINK_EMAILS = (1 << 1),
-	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
 ups_autolink__www(size_t *rewind_p, struct buf *link, char *data, size_t offset, size_t size);
 

data/ext/rinku/rinku.c

@@ -27,17 +27,223 @@
 #include "autolink.h"
 #include "buffer.h"
 
-static VALUE rb_cRinku;
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+static VALUE rb_mRinku;
+
+typedef enum {
+	AUTOLINK_URLS = (1 << 0),
+	AUTOLINK_EMAILS = (1 << 1),
+	AUTOLINK_ALL = AUTOLINK_URLS|AUTOLINK_EMAILS
+} autolink_mode;
+
+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=\"",
+};
+
+static void
+autolink_escape_cb(struct buf *ob, const struct buf *text, void *unused)
+{
+	size_t  i = 0, org;
+
+	while (i < text->size) {
+		org = i;
+
+		while (i < text->size &&
+			text->data[i] != '<' &&
+			text->data[i] != '>' &&
+			text->data[i] != '&' &&
+			text->data[i] != '"')
+			i++;
+
+		if (i > org)
+			bufput(ob, text->data + org, i - org);
+
+		if (i >= text->size)
+			break;
+
+		switch (text->data[i]) {
+			case '<': BUFPUTSL(ob, "&lt;"); break;
+			case '>': BUFPUTSL(ob, "&gt;"); break;
+			case '&': BUFPUTSL(ob, "&amp;"); break;
+			case '"': BUFPUTSL(ob, "&quot;"); break;
+			default: bufputc(ob, text->data[i]); break;
+		}
+
+		i++;
+	}
+}
+
+static inline int
+is_closing_a(const char *tag, size_t size)
+{
+	size_t i;
+
+	if (tag[0] != '<' || size < STRLEN("</a>") || tag[1] != '/')
+		return 0;
+
+	i = 2;
+
+	while (i < size && isspace(tag[i]))
+		i++;
+
+	if (i == size || tag[i] != 'a')
+		return 0;
+
+	i++;
+
+	while (i < size && isspace(tag[i]))
+		i++;
+
+	if (i == size || tag[i] != '>')
+		return 0;
+
+	return i;
+}
+
+static size_t
+autolink__skip_tag(struct buf *ob, char *text, size_t size)
+{
+	size_t i = 0;
+
+	while (i < size && text[i] != '>')
+		i++;
+
+	if (size > 3 && text[1] == 'a' && isspace(text[2])) {
+		while (i < size) {
+			size_t tag_len = is_closing_a(text + i, size - i);
+			if (tag_len) {
+				i += tag_len;
+				break;
+			}
+			i++;
+		}
+	}
 
-extern void
-upshtml_autolink(
+	return i + 1;
+}
+
+int
+rinku_autolink(
 	struct buf *ob,
 	struct buf *text,
 	unsigned int flags,
 	const char *link_attr,
 	void (*link_text_cb)(struct buf *ob, const struct buf *link, void *payload),
-	void *payload);
+	void *payload)
+{
+	size_t i, end;
+	struct buf *link = bufnew(16);
+	char active_chars[256];
+	void (*link_url_cb)(struct buf *, const struct buf *, void *);
+	int link_count = 0;
+
+	if (!text || text->size == 0)
+		return;
+
+	memset(active_chars, 0x0, sizeof(active_chars));
+
+	active_chars['<'] = AUTOLINK_ACTION_SKIP_TAG;
+
+	if (flags & AUTOLINK_EMAILS)
+		active_chars['@'] = AUTOLINK_ACTION_EMAIL;
+
+	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, link_end;
+		char action;
+
+		while (end < text->size && (action = active_chars[(int)text->data[end]]) == 0)
+			end++;
+
+		if (end == text->size) {
+			if (link_count > 0)
+				bufput(ob, text->data + i, end - i);
+			break;
+		}
 
+		if (action == AUTOLINK_ACTION_SKIP_TAG) {
+			end += autolink__skip_tag(ob, text->data + end, text->size - end);
+			continue;
+		}
+
+		link->size = 0;
+		link_end = g_callbacks[(int)action](&rewind, link, text->data + end, end, text->size - end);
+
+		/* print the link */
+		if (link_end > 0) {
+			bufput(ob, text->data + i, end - i - rewind);
+
+			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, "\">");
+			}
+
+			link_text_cb(ob, link, payload);
+			BUFPUTSL(ob, "</a>");
+
+			link_count++;
+			i = end + link_end;
+			end = i;
+		} else {
+			end = end + 1;
+		}
+	}
+
+	bufrelease(link);
+	return link_count;
+}
+
+
+/**
+ * Ruby code
+ */
 static void
 autolink_callback(struct buf *link_text, const struct buf *link, void *block)
 {
@@ -97,7 +303,7 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 {
 	VALUE result, rb_text, rb_mode, rb_html, rb_block;
 	struct buf input_buf = {0, 0, 0, 0, 0}, *output_buf;
-	int link_mode;
+	int link_mode, count;
 	const char *link_attr = NULL;
 	ID mode_sym;
 
@@ -119,7 +325,7 @@ rb_rinku_autolink(int argc, VALUE *argv, VALUE self)
 
 	input_buf.data = RSTRING_PTR(rb_text);
 	input_buf.size = RSTRING_LEN(rb_text);
-	output_buf = bufnew(128);
+	output_buf = bufnew(32);
 
 	if (mode_sym == rb_intern("all"))
 		link_mode = AUTOLINK_ALL;
@@ -131,26 +337,29 @@ 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;
+	count = rinku_autolink(
+		output_buf,
+		&input_buf,
+		link_mode,
+		link_attr,
+		RTEST(rb_block) ? &autolink_callback : NULL,
+		(void*)rb_block);
 
-	if (RTEST(rb_block))
-		upshtml_autolink(output_buf, &input_buf, link_mode, link_attr, &autolink_callback, (void*)rb_block);
-	else
-		upshtml_autolink(output_buf, &input_buf, link_mode, link_attr, NULL, NULL);
+	if (count == 0)
+		result = rb_text;
+	else {
+		result = rb_str_new(output_buf->data, output_buf->size);
+		rb_enc_copy(result, rb_text);
+	}
 
-	result = rb_str_new(output_buf->data, output_buf->size);
 	bufrelease(output_buf);
-
-	/* force the input 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_mRinku = rb_define_module("Rinku");
+	rb_define_method(rb_mRinku, "auto_link", rb_rinku_autolink, -1);
 }
 
 

data/lib/rails_rinku.rb

@@ -1,35 +1,21 @@
 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'
+  def auto_link(text, *args, &block)
+    return ''.html_safe if text.blank?
 
-        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
+    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
 
+module ActionView::Helpers::TextHelper
+ include RailsRinku
+end

data/lib/rinku.rb

@@ -1,5 +1,6 @@
-class Rinku
-  VERSION = "1.1.0"
+module Rinku
+  VERSION = "1.2.0"
+  extend self
 end
 
 require 'rinku.so'

data/rinku.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rinku'
-  s.version = '1.1.0'
+  s.version = '1.2.0'
   s.summary = "Mostly autolinking"
   s.description = <<-EOF
     A fast and very smart autolinking library that
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
     ext/rinku/autolink.h
     ext/rinku/buffer.c
     ext/rinku/buffer.h
-    ext/rinku/html_autolink.c
     ext/rinku/extconf.rb
     lib/rinku.rb
     lib/rails_rinku.rb

data/test/autolink_test.rb

@@ -28,7 +28,7 @@ class RedcarpetAutolinkTest < Test::Unit::TestCase
     assert_equal "{link: #{link3_result}}", Rinku.auto_link("{link: #{link3_raw}}")
   end
 
-def test_auto_link_with_multiple_trailing_punctuations
+  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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rinku
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Vicent Mart\xC3\xAD"
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 Z
+date: 2011-06-11 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: "    A fast and very smart autolinking library that\n    acts as a drop-in replacement for Rails `auto_link`\n"
@@ -35,12 +36,12 @@ files:
 - ext/rinku/autolink.h
 - ext/rinku/buffer.c
 - ext/rinku/buffer.h
-- 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: []
 
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mostly autolinking

data/ext/rinku/html_autolink.c

@@ -1,226 +0,0 @@
-/*
- * 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.
- */
-
-#include "autolink.h"
-#include "buffer.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-
-static void
-autolink_escape_cb(struct buf *ob, const struct buf *text, void *unused)
-{
-	size_t  i = 0, org;
-
-	while (i < text->size) {
-		org = i;
-
-		while (i < text->size &&
-			text->data[i] != '<' &&
-			text->data[i] != '>' &&
-			text->data[i] != '&' &&
-			text->data[i] != '"')
-			i++;
-
-		if (i > org)
-			bufput(ob, text->data + org, i - org);
-
-		if (i >= text->size)
-			break;
-
-		switch (text->data[i]) {
-			case '<': BUFPUTSL(ob, "&lt;"); break;
-			case '>': BUFPUTSL(ob, "&gt;"); break;
-			case '&': BUFPUTSL(ob, "&amp;"); break;
-			case '"': BUFPUTSL(ob, "&quot;"); break;
-			default: bufputc(ob, text->data[i]); break;
-		}
-
-		i++;
-	}
-}
-
-static inline int
-is_closing_a(const char *tag, size_t size)
-{
-	size_t i;
-
-	if (tag[0] != '<' || size < STRLEN("</a>") || tag[1] != '/')
-		return 0;
-
-	i = 2;
-
-	while (i < size && isspace(tag[i]))
-		i++;
-
-	if (i == size || tag[i] != 'a')
-		return 0;
-
-	i++;
-
-	while (i < size && isspace(tag[i]))
-		i++;
-
-	if (i == size || tag[i] != '>')
-		return 0;
-
-	return i;
-}
-
-static size_t
-autolink__skip_tag(struct buf *ob, char *text, size_t size)
-{
-	size_t i = 0;
-
-	while (i < size && text[i] != '>')
-		i++;
-
-	if (size > 3 && text[1] == 'a' && isspace(text[2])) {
-		while (i < size) {
-			size_t tag_len = is_closing_a(text + i, size - i);
-			if (tag_len) {
-				i += tag_len;
-				break;
-			}
-			i++;
-		}
-	}
-
-	bufput(ob, text, i + 1);
-	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,
-	struct buf *text,
-	unsigned int flags,
-	const char *link_attr,
-	void (*link_text_cb)(struct buf *ob, const struct buf *link, void *payload),
-	void *payload)
-{
-	size_t i, end;
-	struct buf *link = bufnew(16);
-	char active_chars[256];
-	void (*link_url_cb)(struct buf *, const struct buf *, void *);
-
-	if (!text || text->size == 0)
-		return;
-
-	memset(active_chars, 0x0, sizeof(active_chars));
-
-	active_chars['<'] = AUTOLINK_ACTION_SKIP_TAG;
-
-	if (flags & AUTOLINK_EMAILS)
-		active_chars['@'] = AUTOLINK_ACTION_EMAIL;
-
-	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 && (action = active_chars[(int)text->data[end]]) == 0)
-			end++;
-
-		bufput(ob, text->data + i, end - i);
-
-		if (end >= text->size)
-			break;
-
-		i = end;
-		end = 0;
-		link->size = 0;
-
-		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;
-
-				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, "\">");
-				}
-
-				link_text_cb(ob, link, payload);
-				BUFPUTSL(ob, "</a>");
-			}
-		}
-
-		if (!end)
-			end = i + 1;
-		else { 
-			i += end;
-			end = i;
-		} 
-	}
-
-	bufrelease(link);
-}
-
-