commonmarker 0.5.1 → 0.6.0

data/ext/commonmarker/cmark/why-cmark-and-not-x.md

@@ -0,0 +1,104 @@
+Why use `cmark` and not X?
+==========================
+
+`hoedown`
+---------
+
+`hoedown` (which derives from `sundown`) is slightly faster
+than `cmark` in our benchmarks (0.21s vs. 0.29s).  But both
+are much faster than any other available implementations.
+
+`hoedown` boasts of including "protection against all possible
+DOS attacks," but there are some chinks in the armor:
+
+    % time python -c 'print(("[" * 50000) + "a" + ("]" * 50000))' | cmark
+    ...
+    user 0m0.073s
+    % time python -c 'print(("[" * 50000) + "a" + ("]" * 50000))' | hoedown
+    ...
+    0m17.84s
+
+`hoedown` has many parsing bugs.  Here is a selection (as of
+v3.0.3):
+
+    % hoedown
+    - one
+      - two
+        1. three
+    ^D
+    <ul>
+    <li>one
+
+    <ul>
+    <li>two</li>
+    <li>three</li>
+    </ul></li>
+    </ul>
+
+
+    % hoedown
+    ## hi\###
+    ^D
+    <h2>hi\</h2>
+
+
+    % hoedown
+    [ΑΓΩ]: /φου
+
+    [αγω]
+    ^D
+    <p>[αγω]</p>
+
+
+    % hoedown
+    ```
+    [foo]: /url
+    ```
+
+    [foo]
+    ^D
+    <p>```</p>
+
+    <p>```</p>
+
+    <p><a href="/url">foo</a></p>
+
+
+    % hoedown
+    [foo](url "ti\*tle")
+    ^D
+    <p><a href="url" title="ti\*tle">foo</a></p>
+
+
+    % ./hoedown
+    - one
+     - two
+      - three
+       - four
+    ^D
+    <ul>
+    <li>one
+
+    <ul>
+    <li>two</li>
+    <li>three</li>
+    <li>four</li>
+    </ul></li>
+    </ul>
+
+
+`discount`
+----------
+
+`cmark` is about six times faster.
+
+`kramdown`
+----------
+
+`cmark` is about a hundred times faster.
+
+`kramdown` also gets tied in knots by pathological input like
+
+    python -c 'print(("[" * 50000) + "a" + ("]" * 50000))'
+
+

data/lib/commonmarker/config.rb

@@ -6,18 +6,18 @@ module CommonMarker
       include Ruby::Enum
 
       define :default, 0
-      define :normalize, 4
-      define :validate_utf8, 16
-      define :smart, 8
+      define :normalize, (1 << 8)
+      define :validate_utf8, (1 << 9)
+      define :smart, (1 << 10)
     end
 
     class Render
       include Ruby::Enum
 
       define :default, 0
-      define :sourcepos, 1
-      define :hardbreaks, 2
-      define :safe, 32
+      define :sourcepos, (1 << 1)
+      define :hardbreaks, (1 << 2)
+      define :safe, (1 << 3)
     end
 
     def self.process_options(option, type)

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
@@ -252,7 +252,6 @@ files:
 - ext/commonmarker/cmark/man/man3/cmark.3
 - ext/commonmarker/cmark/nmake.bat
 - ext/commonmarker/cmark/src/CMakeLists.txt
-- ext/commonmarker/cmark/src/bench.h
 - ext/commonmarker/cmark/src/blocks.c
 - ext/commonmarker/cmark/src/buffer.c
 - ext/commonmarker/cmark/src/buffer.h
@@ -348,6 +347,7 @@ files:
 - ext/commonmarker/cmark/test/cmark.py
 - ext/commonmarker/cmark/test/normalize.py
 - ext/commonmarker/cmark/test/pathological_tests.py
+- ext/commonmarker/cmark/test/roundtrip.bat
 - ext/commonmarker/cmark/test/roundtrip.sh
 - ext/commonmarker/cmark/test/smart_punct.txt
 - ext/commonmarker/cmark/test/spec.txt
@@ -355,7 +355,7 @@ files:
 - ext/commonmarker/cmark/toolchain-mingw32.cmake
 - ext/commonmarker/cmark/tools/make_entities_inc.py
 - ext/commonmarker/cmark/tools/mkcasefold.pl
-- ext/commonmarker/cmark/wrappers/wrapper.lua
+- ext/commonmarker/cmark/why-cmark-and-not-x.md
 - ext/commonmarker/cmark/wrappers/wrapper.py
 - ext/commonmarker/cmark/wrappers/wrapper.rb
 - ext/commonmarker/cmark/wrappers/wrapper.rkt
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: CommonMark parser and renderer. Written in C, wrapped in Ruby.

data/ext/commonmarker/cmark/src/bench.h

@@ -1,27 +0,0 @@
-#ifndef CMARK_BENCH_H
-#define CMARK_BENCH_H
-
-#include <stdio.h>
-#include <time.h>
-
-#ifdef TIMER
-float _cmark_start_time;
-float _cmark_end_time;
-float _cmark_save_time;
-
-#define start_timer()                                                          \
-  _cmark_save_time = _cmark_start_time;                                        \
-  _cmark_start_time = (float)clock() / CLOCKS_PER_SEC
-
-#define end_timer(M)                                                           \
-  _cmark_end_time = (float)clock() / CLOCKS_PER_SEC;                           \
-  fprintf(stderr, "[TIME] (%s:%d) %4.f ns " M "\n", __FILE__, __LINE__,        \
-          (_cmark_end_time - _cmark_start_time) * 1000000);                    \
-  _cmark_start_time = _cmark_save_time;
-
-#else
-#define start_timer()
-#define end_timer(M)
-#endif
-
-#endif

data/ext/commonmarker/cmark/wrappers/wrapper.lua

@@ -1,239 +0,0 @@
-#!/usr/bin/env luajit
-
-local ffi = require("ffi")
-
-cmark = ffi.load("libcmark")
-
-ffi.cdef[[
-char *cmark_markdown_to_html(const char *text, int len, int options);
-
-typedef enum {
-	/* Error status */
-	CMARK_NODE_NONE,
-
-	/* Block */
-	CMARK_NODE_DOCUMENT,
-	CMARK_NODE_BLOCK_QUOTE,
-	CMARK_NODE_LIST,
-	CMARK_NODE_ITEM,
-	CMARK_NODE_CODE_BLOCK,
-	CMARK_NODE_HTML,
-	CMARK_NODE_PARAGRAPH,
-	CMARK_NODE_HEADER,
-	CMARK_NODE_HRULE,
-
-	CMARK_NODE_FIRST_BLOCK = CMARK_NODE_DOCUMENT,
-	CMARK_NODE_LAST_BLOCK  = CMARK_NODE_HRULE,
-
-	/* Inline */
-	CMARK_NODE_TEXT,
-	CMARK_NODE_SOFTBREAK,
-	CMARK_NODE_LINEBREAK,
-	CMARK_NODE_CODE,
-	CMARK_NODE_INLINE_HTML,
-	CMARK_NODE_EMPH,
-	CMARK_NODE_STRONG,
-	CMARK_NODE_LINK,
-	CMARK_NODE_IMAGE,
-
-	CMARK_NODE_FIRST_INLINE = CMARK_NODE_TEXT,
-	CMARK_NODE_LAST_INLINE  = CMARK_NODE_IMAGE,
-} cmark_node_type;
-
-
-typedef enum {
-	CMARK_NO_LIST,
-	CMARK_BULLET_LIST,
-	CMARK_ORDERED_LIST
-}  cmark_list_type;
-
-typedef enum {
-	CMARK_NO_DELIM,
-	CMARK_PERIOD_DELIM,
-	CMARK_PAREN_DELIM
-} cmark_delim_type;
-
-typedef struct cmark_node cmark_node;
-typedef struct cmark_parser cmark_parser;
-typedef struct cmark_iter cmark_iter;
-
-typedef enum {
-	CMARK_EVENT_NONE,
-	CMARK_EVENT_DONE,
-	CMARK_EVENT_ENTER,
-	CMARK_EVENT_EXIT
-} cmark_event_type;
-
-cmark_node*
-cmark_node_new(cmark_node_type type);
-
-void
-cmark_node_free(cmark_node *node);
-
-cmark_node*
-cmark_node_next(cmark_node *node);
-
-cmark_node*
-cmark_node_previous(cmark_node *node);
-
-cmark_node*
-cmark_node_parent(cmark_node *node);
-
-cmark_node*
-cmark_node_first_child(cmark_node *node);
-
-cmark_node*
-cmark_node_last_child(cmark_node *node);
-
-cmark_iter*
-cmark_iter_new(cmark_node *root);
-
-void
-cmark_iter_free(cmark_iter *iter);
-
-cmark_event_type
-cmark_iter_next(cmark_iter *iter);
-
-cmark_node*
-cmark_iter_get_node(cmark_iter *iter);
-
-cmark_event_type
-cmark_iter_get_event_type(cmark_iter *iter);
-
-cmark_node*
-cmark_iter_get_root(cmark_iter *iter);
-
-void
-cmark_iter_reset(cmark_iter *iter, cmark_node *current,
-                 cmark_event_type event_type);
-
-void*
-cmark_node_get_user_data(cmark_node *node);
-
-int
-cmark_node_set_user_data(cmark_node *node, void *user_data);
-
-cmark_node_type
-cmark_node_get_type(cmark_node *node);
-
-const char*
-cmark_node_get_type_string(cmark_node *node);
-
-const char*
-cmark_node_get_literal(cmark_node *node);
-
-int
-cmark_node_set_literal(cmark_node *node, const char *content);
-
-int
-cmark_node_get_header_level(cmark_node *node);
-
-int
-cmark_node_set_header_level(cmark_node *node, int level);
-
-cmark_list_type
-cmark_node_get_list_type(cmark_node *node);
-
-int
-cmark_node_set_list_type(cmark_node *node, cmark_list_type type);
-
-cmark_delim_type
-cmark_node_get_list_delim(cmark_node *node);
-
-int
-cmark_node_set_list_delim(cmark_node *node, cmark_delim_type delim);
-
-int
-cmark_node_get_list_start(cmark_node *node);
-
-int
-cmark_node_set_list_start(cmark_node *node, int start);
-
-int
-cmark_node_get_list_tight(cmark_node *node);
-
-int
-cmark_node_set_list_tight(cmark_node *node, int tight);
-
-const char*
-cmark_node_get_fence_info(cmark_node *node);
-
-int
-cmark_node_set_fence_info(cmark_node *node, const char *info);
-
-const char*
-cmark_node_get_url(cmark_node *node);
-
-int
-cmark_node_set_url(cmark_node *node, const char *url);
-
-const char*
-cmark_node_get_title(cmark_node *node);
-
-int
-cmark_node_set_title(cmark_node *node, const char *title);
-
-int
-cmark_node_get_start_line(cmark_node *node);
-
-int
-cmark_node_get_start_column(cmark_node *node);
-
-int
-cmark_node_get_end_line(cmark_node *node);
-
-int
-cmark_node_get_end_column(cmark_node *node);
-
-void
-cmark_node_unlink(cmark_node *node);
-
-int
-cmark_node_insert_before(cmark_node *node, cmark_node *sibling);
-
-int
-cmark_node_insert_after(cmark_node *node, cmark_node *sibling);
-
-int
-cmark_node_prepend_child(cmark_node *node, cmark_node *child);
-
-int
-cmark_node_append_child(cmark_node *node, cmark_node *child);
-
-void
-cmark_consolidate_text_nodes(cmark_node *root);
-
-cmark_parser *cmark_parser_new(int options);
-
-void cmark_parser_free(cmark_parser *parser);
-
-void cmark_parser_feed(cmark_parser *parser, const char *buffer, size_t len);
-
-cmark_node *cmark_parser_finish(cmark_parser *parser);
-
-cmark_node *cmark_parse_document(const char *buffer, size_t len, int options);
-
-char *cmark_render_xml(cmark_node *root, int options);
-
-char *cmark_render_html(cmark_node *root, int options);
-
-char *cmark_render_man(cmark_node *root, int options);
-
-char *cmark_render_commonmark(cmark_node *root, int options, int width);
-
-extern const int cmark_version;
-
-extern const char cmark_version_string[];
-
-        ]]
-
-CMARK_OPT_DEFAULT = 0
-CMARK_OPT_SOURCEPOS = 1
-CMARK_OPT_HARDBREAKS = 2
-CMARK_OPT_NORMALIZE = 4
-CMARK_OPT_SMART = 8
-
-local inp = io.read("*all")
-local doc = cmark.cmark_parse_document(inp, string.len(inp), CMARK_OPT_SMART)
-local html = ffi.string(cmark.cmark_render_html(doc, CMARK_OPT_DEFAULT))
-print(html)