redcarpet 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357df7331e4bc2256b21132e897105ce6241494b
-  data.tar.gz: 28ce2d2ad837940fff06c2a4ee3a6b501fc3d6fe
+  metadata.gz: 4549cbe772995b6ab432142d20b4e4de5c45229c
+  data.tar.gz: b80438cae22fe723e749a432fcaaa7656f7f660b
 SHA512:
-  metadata.gz: 2971c2bea2d9117e85e87ee9d889b6ef466fedff78c35286847bba884ca4591c7e672b12032f371bff8a02cb308a703689982b6056cc0ca90d6bb8eaf9f1f3af
-  data.tar.gz: 987022b77e2b3bdbf6b87191c9b90056da7c1eed3a30b29f510ab6bbbd0268d040d08399a67237cbde425656ea5704867c086b7d400c4458ae4a868da7c6ee5c
+  metadata.gz: 0a04dd8f57fdeb53ecb79c28e680915c607d6e4b95b7888b7b3bc86ea1729d9b1aeccf710b00d1849989ce940aaccdc126e796d17acbbdd3ca3e8b924e756673
+  data.tar.gz: fe26df7e15e06d3a34e5a253000d5cfc8c0c77e2b5cd56ad04f0484af90349bfbb84e1b5d80df3ac189a3509c1b46d8f56e9f8d4033b00350410775856f6d63a

data/ext/redcarpet/html.c

@@ -264,56 +264,35 @@ rndr_linebreak(struct buf *ob, void *opaque)
 	return 1;
 }
 
-char *header_anchor(const struct buf *buffer)
+static void
+rndr_header_anchor(struct buf *out, const struct buf *anchor)
 {
-	size_t i = 0, j, k, size = buffer->size;
-
-	char text[size];
-	strcpy(text, bufcstr(buffer));
-
-	char raw_string[size];
+	static const char *STRIPPED = " -&+$,/:;=?@\"#{}|^~[]`\\*()%.!'";
 
-	/* Strip down the inline HTML markup if needed */
-	if (strchr(text, '<') < strchr(text, '>')) {
-		char* part = strtok(text, "<>");
-
-		/* Once every two times, the yielded token is the
-		   content of a HTML tag so we don't need to copy it */
-		for (k = 0; part != NULL; k++) {
-			if (k == 0)
-				strcpy(raw_string, part);
-			else if (k % 2 == 0)
-				strcat(raw_string, part);
+	const uint8_t *a = anchor->data;
+	const size_t size = anchor->size;
+	size_t i = 0;
+	int stripped = 0, inserted = 0;
 
-			part = strtok(NULL, "<>");
+	for (; i < size; ++i) {
+		if (a[i] == '<') {
+			while (i < size && a[i] != '>')
+				i++;
+		}
+		else if (strchr(STRIPPED, a[i])) {
+			if (inserted && !stripped)
+				bufputc(out, '-');
+			stripped = 1;
+		}
+		else {
+			bufputc(out, tolower(a[i]));
+			stripped = 0;
+			inserted++;
 		}
-
-		size = strlen(raw_string);
-	} else {
-		strcpy(raw_string, text);
-	}
-
-	char* heading = malloc(size * sizeof(char));
-
-	/* Remove leading stripped chars */
-	while (STRIPPED_CHAR(raw_string[i])) i++;
-
-	/* Dasherize the string removing extra white spaces
-	   and stripped chars */
-	for (j = 0; i < size; i++, j++) {
-		while ((i+1) < size && STRIPPED_CHAR(raw_string[i]) && STRIPPED_CHAR(raw_string[i+1]))
-			i++;
-
-		if (STRIPPED_CHAR(raw_string[i]) && i == size - 1)
-			break;
-		else if (STRIPPED_CHAR(raw_string[i]))
-			heading[j] = '-';
-		else
-			heading[j] = tolower(raw_string[i]);
 	}
 
-	heading[j++] = '\0';
-	return heading;
+	if (stripped)
+		out->size--;
 }
 
 static void
@@ -324,8 +303,11 @@ rndr_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 	if (ob->size)
 		bufputc(ob, '\n');
 
-	if ((options->flags & HTML_TOC) && (level <= options->toc_data.nesting_level))
-		bufprintf(ob, "<h%d id=\"%s\">", level, header_anchor(text));
+	if ((options->flags & HTML_TOC) && (level <= options->toc_data.nesting_level)) {
+		bufprintf(ob, "<h%d id=\"", level);
+		rndr_header_anchor(ob, text);
+		BUFPUTSL(ob, "\">");
+	}
 	else
 		bufprintf(ob, "<h%d>", level);
 
@@ -694,7 +676,9 @@ toc_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 			BUFPUTSL(ob,"</li>\n<li>\n");
 		}
 
-		bufprintf(ob, "<a href=\"#%s\">", header_anchor(text));
+		bufprintf(ob, "<a href=\"#");
+		rndr_header_anchor(ob, text);
+		BUFPUTSL(ob, "\">");
 
 		if (text) {
 			if (options->flags & HTML_ESCAPE)

data/ext/redcarpet/html.h

@@ -70,12 +70,6 @@ sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *optio
 extern void
 sdhtml_smartypants(struct buf *ob, const uint8_t *text, size_t size);
 
-/* header method used internally in Redcarpet */
-char *header_anchor(const struct buf *buffer);
-
-#define STRIPPED_CHARS " -&+$,/:;=?@\"#{}|^~[]`\\*()%.!'"
-#define STRIPPED_CHAR(x) (strchr(STRIPPED_CHARS, x) != NULL)
-
 #ifdef __cplusplus
 }
 #endif

data/lib/redcarpet.rb

@@ -2,7 +2,7 @@ require 'redcarpet.so'
 require 'redcarpet/compat'
 
 module Redcarpet
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 
   class Markdown
     attr_reader :renderer

data/redcarpet.gemspec

@@ -1,10 +1,10 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '3.3.1'
+  s.version = '3.3.2'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
-  s.date = '2015-06-07'
+  s.date = '2015-06-22'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/vmg/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcarpet
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Natacha Porté
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
 description: A fast, safe and extensible Markdown to (X)HTML parser
@@ -103,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Markdown that smells nice