redcarpet 2.0.0b3 → 2.0.0b4

data/ext/redcarpet/redcarpet.h

@@ -1,4 +1,4 @@
-#ifndef __REDCARPET_H__ 
+#ifndef __REDCARPET_H__
 #define __REDCARPET_H__
 
 #define RSTRING_NOT_MODIFIED
@@ -6,9 +6,10 @@
 #include <stdio.h>
 
 #ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
+#	include <ruby/encoding.h>
+#	define redcarpet_str_new(data, size) rb_enc_str_new(data, size, rb_utf8_encoding())
 #else
-#define rb_enc_copy(dst, src)
+#	define redcarpet_str_new(data, size) rb_str_new(data, size)
 #endif
 
 #include "markdown.h"

data/ext/redcarpet/stack.c

@@ -0,0 +1,81 @@
+#include "stack.h"
+#include <string.h>
+
+int
+stack_grow(struct stack *st, size_t new_size)
+{
+	void **new_st;
+
+	if (st->asize >= new_size)
+		return 0;
+
+	new_st = realloc(st->item, new_size * sizeof(void *));
+	if (new_st == NULL)
+		return -1;
+
+	memset(new_st + st->asize, 0x0,
+		(new_size - st->asize) * sizeof(void *));
+
+	st->item = new_st;
+	st->asize = new_size;
+
+	if (st->size > new_size)
+		st->size = new_size;
+
+	return 0;
+}
+
+void
+stack_free(struct stack *st)
+{
+	if (!st)
+		return;
+
+	free(st->item);
+
+	st->item = NULL;
+	st->size = 0;
+	st->asize = 0;
+}
+
+int
+stack_init(struct stack *st, size_t initial_size)
+{
+	st->item = NULL;
+	st->size = 0;
+	st->asize = 0;
+
+	if (!initial_size)
+		initial_size = 8;
+
+	return stack_grow(st, initial_size);
+}
+
+void *
+stack_pop(struct stack *st)
+{
+	if (!st->size)
+		return NULL;
+
+	return st->item[st->size--];
+}
+
+int
+stack_push(struct stack *st, void *item)
+{
+	if (stack_grow(st, st->size * 2) < 0)
+		return -1;
+
+	st->item[st->size++] = item;
+	return 0;
+}
+
+void *
+stack_top(struct stack *st)
+{
+	if (!st->size)
+		return NULL;
+
+	return st->item[st->size - 1];
+}
+

data/ext/redcarpet/stack.h

@@ -0,0 +1,21 @@
+#ifndef __CR_STACK_H__
+#define __CR_STACK_H__
+
+#include <stdlib.h>
+
+struct stack {
+	void **item;
+	size_t size;
+	size_t asize;
+};
+
+void stack_free(struct stack *);
+int stack_grow(struct stack *, size_t);
+int stack_init(struct stack *, size_t);
+
+int stack_push(struct stack *, void *);
+
+void *stack_pop(struct stack *);
+void *stack_top(struct stack *);
+
+#endif

data/lib/redcarpet.rb

@@ -1,29 +1,10 @@
 require 'redcarpet.so'
 
 module Redcarpet
-  VERSION = '2.0.0b3'
+  VERSION = '2.0.0b4'
 
   class Markdown
-    # Available Markdown extensions
-    attr_accessor :no_intra_emphasis
-    attr_accessor :tables
-    attr_accessor :fenced_code_blocks
-    attr_accessor :autolink
-    attr_accessor :strikethrough
-    attr_accessor :lax_html_blocks
-    attr_accessor :space_after_headers
-    attr_accessor :superscript
-
-    attr_accessor :renderer
-
-    def initialize(renderer, extensions={})
-      if renderer.instance_of? Class
-        renderer = renderer.new
-      end
-
-      @renderer = renderer
-      extensions.each_pair { |k, v| send("#{k}=", v) }
-    end
+    attr_reader :renderer
   end
 
   module Render
@@ -41,7 +22,7 @@ module Redcarpet
     end
 
     # SmartyPants Mixin module
-    # 
+    #
     # Implements SmartyPants.postprocess, which
     # performs smartypants replacements on the HTML file,
     # once it has been fully rendered.
@@ -61,7 +42,7 @@ module Redcarpet
     #   end
     #
     #   # Standalone
-    #   Redcarpet::Render::SmartyPants.postprocess("you're")
+    #   Redcarpet::Render::SmartyPants.render("you're")
     #
     module SmartyPants
       extend self

data/redcarpet.gemspec

@@ -1,9 +1,10 @@
+# encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '2.0.0b3'
+  s.version = '2.0.0b4'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
-  s.date = '2011-08-09'
+  s.date = '2011-09-08'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]
@@ -13,8 +14,6 @@ Gem::Specification.new do |s|
     README.markdown
     Rakefile
     bin/redcarpet
-    ext/redcarpet/array.c
-    ext/redcarpet/array.h
     ext/redcarpet/autolink.c
     ext/redcarpet/autolink.h
     ext/redcarpet/buffer.c
@@ -22,12 +21,15 @@ Gem::Specification.new do |s|
     ext/redcarpet/extconf.rb
     ext/redcarpet/html.c
     ext/redcarpet/html.h
+    ext/redcarpet/html_blocks.h
     ext/redcarpet/html_smartypants.c
     ext/redcarpet/markdown.c
     ext/redcarpet/markdown.h
     ext/redcarpet/rc_markdown.c
     ext/redcarpet/rc_render.c
     ext/redcarpet/redcarpet.h
+    ext/redcarpet/stack.c
+    ext/redcarpet/stack.h
     lib/redcarpet.rb
     lib/redcarpet/render_man.rb
     redcarpet.gemspec

data/test/redcarpet_test.rb

@@ -2,6 +2,10 @@
 rootdir = File.dirname(File.dirname(__FILE__))
 $LOAD_PATH.unshift "#{rootdir}/lib"
 
+if defined? Encoding
+  Encoding.default_internal = 'UTF-8'
+end
+
 require 'test/unit'
 require 'redcarpet'
 require 'redcarpet/render_man'
@@ -9,7 +13,7 @@ require 'nokogiri'
 
 def html_equal(html_a, html_b)
   assert_equal Nokogiri::HTML::DocumentFragment.parse(html_a).to_html,
-               Nokogiri::HTML::DocumentFragment.parse(html_b).to_html
+    Nokogiri::HTML::DocumentFragment.parse(html_b).to_html
 end
 
 class SmartyPantsTest < Test::Unit::TestCase
@@ -19,38 +23,32 @@ class SmartyPantsTest < Test::Unit::TestCase
 
   def test_that_smart_converts_single_quotes_in_words_that_end_in_re
     markdown = @pants.render("<p>They're not for sale.</p>")
-    html_equal "<p>They&rsquo;re not for sale.</p>", markdown
+    assert_equal "<p>They&rsquo;re not for sale.</p>", markdown
   end
 
   def test_that_smart_converts_single_quotes_in_words_that_end_in_ll
     markdown = @pants.render("<p>Well that'll be the day</p>")
-    html_equal "<p>Well that&rsquo;ll be the day</p>", markdown
+    assert_equal "<p>Well that&rsquo;ll be the day</p>", markdown
   end
 
   def test_that_smart_converts_double_quotes_to_curly_quotes
     rd = @pants.render(%(<p>"Quoted text"</p>))
-    html_equal %(<p>&ldquo;Quoted text&rdquo;</p>), rd
+    assert_equal %(<p>&ldquo;Quoted text&rdquo;</p>), rd
   end
 
   def test_that_smart_gives_ve_suffix_a_rsquo
     rd = @pants.render("<p>I've been meaning to tell you ..</p>")
-    html_equal "<p>I&rsquo;ve been meaning to tell you ..</p>\n", rd
+    assert_equal "<p>I&rsquo;ve been meaning to tell you ..</p>", rd
   end
 
   def test_that_smart_gives_m_suffix_a_rsquo
     rd = @pants.render("<p>I'm not kidding</p>")
-    html_equal "<p>I&rsquo;m not kidding</p>\n", rd
+    assert_equal "<p>I&rsquo;m not kidding</p>", rd
   end
 
   def test_that_smart_gives_d_suffix_a_rsquo
     rd = @pants.render("<p>what'd you say?</p>")
-    html_equal "<p>what&rsquo;d you say?</p>\n", rd
-  end
-end
-
-class SmartyHTMLTests < SmartyPantsTest
-  def setup
-    @pants = Redcarpet::Markdown.new Redcarpet::Render::SmartyHTML
+    assert_equal "<p>what&rsquo;d you say?</p>", rd
   end
 end
 
@@ -59,34 +57,38 @@ class HTMLRenderTest < Test::Unit::TestCase
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
     @rndr = {
       :no_html => Redcarpet::Render::HTML.new(:filter_html => true),
-      :no_image => Redcarpet::Render::HTML.new(:no_image => true),
+      :no_images => Redcarpet::Render::HTML.new(:no_images => true),
       :no_links => Redcarpet::Render::HTML.new(:no_links => true),
       :safe_links => Redcarpet::Render::HTML.new(:safe_links_only => true),
     }
   end
 
+  def render_with(rndr, text)
+    Redcarpet::Markdown.new(rndr).render(text)
+  end
+
   def test_that_filter_html_works
-    markdown = @markdown.render_with(@rndr[:no_html], 'Through <em>NO</em> <script>DOUBLE NO</script>')
+    markdown = render_with(@rndr[:no_html], 'Through <em>NO</em> <script>DOUBLE NO</script>')
     html_equal "<p>Through NO DOUBLE NO</p>", markdown
   end
 
   def test_filter_html_doesnt_break_two_space_hard_break
-    markdown = @markdown.render_with(@rndr[:no_html], "Lorem,  \nipsum\n")
+    markdown = render_with(@rndr[:no_html], "Lorem,  \nipsum\n")
     html_equal "<p>Lorem,<br/>\nipsum</p>\n", markdown
   end
 
   def test_that_no_image_flag_works
-    rd = @markdown.render_with(@rndr[:no_image], %(![dust mite](http://dust.mite/image.png) <img src="image.png" />))
+    rd = render_with(@rndr[:no_images], %(![dust mite](http://dust.mite/image.png) <img src="image.png" />))
     assert rd !~ /<img/
   end
 
   def test_that_no_links_flag_works
-    rd = @markdown.render_with(@rndr[:no_links], %([This link](http://example.net/) <a href="links.html">links</a>))
+    rd = render_with(@rndr[:no_links], %([This link](http://example.net/) <a href="links.html">links</a>))
     assert rd !~ /<a /
   end
 
   def test_that_safelink_flag_works
-    rd = @markdown.render_with(@rndr[:safe_links], "[IRC](irc://chat.freenode.org/#freenode)")
+    rd = render_with(@rndr[:safe_links], "[IRC](irc://chat.freenode.org/#freenode)")
     html_equal "<p>[IRC](irc://chat.freenode.org/#freenode)</p>\n", rd
   end
 
@@ -98,6 +100,10 @@ class MarkdownTest < Test::Unit::TestCase
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
   end
 
+  def render_with(flags, text)
+    Redcarpet::Markdown.new(Redcarpet::Render::HTML, flags).render(text)
+  end
+
   def test_that_simple_one_liner_goes_to_html
     assert_respond_to @markdown, :render
     html_equal "<p>Hello World.</p>", @markdown.render("Hello World.")
@@ -109,8 +115,7 @@ class MarkdownTest < Test::Unit::TestCase
   end
 
   def test_that_inline_markdown_starts_and_ends_correctly
-    @markdown.no_intra_emphasis = true
-    markdown = @markdown.render('_start _ foo_bar bar_baz _ end_ *italic* **bold** <a>_blah_</a>')
+    markdown = render_with({:no_intra_emphasis => true}, '_start _ foo_bar bar_baz _ end_ *italic* **bold** <a>_blah_</a>')
 
     html_equal "<p><em>start _ foo_bar bar_baz _ end</em> <em>italic</em> <strong>bold</strong> <a><em>blah</em></a></p>", markdown
 
@@ -147,8 +152,7 @@ class MarkdownTest < Test::Unit::TestCase
   end
 
   def test_para_before_block_html_should_not_wrap_in_p_tag
-    @markdown.lax_html_blocks = true
-    markdown = @markdown.render(
+    markdown = render_with({:lax_html_blocks => true},
       "Things to watch out for\n" +
       "<ul>\n<li>Blah</li>\n</ul>\n")
 
@@ -165,17 +169,15 @@ class MarkdownTest < Test::Unit::TestCase
   end
 
   def test_that_intra_emphasis_works
-    rd = @markdown.render("foo_bar_baz")
+    rd = render_with({}, "foo_bar_baz")
     html_equal "<p>foo<em>bar</em>baz</p>\n", rd
 
-    @markdown.no_intra_emphasis = true
-    rd = @markdown.render("foo_bar_baz")
+    rd = render_with({:no_intra_emphasis => true},"foo_bar_baz")
     html_equal "<p>foo_bar_baz</p>\n", rd
   end
 
   def test_that_autolink_flag_works
-    @markdown.autolink = true
-    rd = @markdown.render("http://github.com/rtomayko/rdiscount")
+    rd = render_with({:autolink => true}, "http://github.com/rtomayko/rdiscount")
     html_equal "<p><a href=\"http://github.com/rtomayko/rdiscount\">http://github.com/rtomayko/rdiscount</a></p>\n", rd
   end
 
@@ -199,8 +201,7 @@ class MarkdownTest < Test::Unit::TestCase
   end
 
   def test_whitespace_after_urls
-    @markdown.autolink = true
-    rd = @markdown.render("Japan: http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm (yes, japan)")
+    rd = render_with({:autolink => true}, "Japan: http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm (yes, japan)")
     exp = %{<p>Japan: <a href="http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm">http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm</a> (yes, japan)</p>}
     html_equal exp, rd
   end
@@ -235,19 +236,17 @@ class MarkdownTest < Test::Unit::TestCase
 hello|sailor
 EOS
 
-    assert @markdown.render(text) !~ /<table/
+    assert render_with({}, text) !~ /<table/
 
-    @markdown.tables = true
-    assert @markdown.render(text) =~ /<table/
+    assert render_with({:tables => true}, text) =~ /<table/
   end
 
   def test_strikethrough_flag_works
     text = "this is ~some~ striked ~~text~~"
 
-    assert @markdown.render(text) !~ /<del/
+    assert render_with({}, text) !~ /<del/
 
-    @markdown.strikethrough = true
-    assert @markdown.render(text) =~ /<del/
+    assert render_with({:strikethrough => true}, text) =~ /<del/
   end
 
   def test_that_fenced_flag_works
@@ -260,10 +259,9 @@ This is some awesome code
 ~~~
 fenced
 
-    assert @markdown.render(text) !~ /<code/
+    assert render_with({}, text) !~ /<code/
 
-    @markdown.fenced_code_blocks = true
-    assert @markdown.render(text) =~ /<code/
+    assert render_with({:fenced_code_blocks => true}, text) =~ /<code/
   end
 
   def test_that_headers_are_linkable
@@ -272,16 +270,14 @@ fenced
   end
 
   def test_autolinking_with_ent_chars
-    @markdown.autolink = true
-    markdown = @markdown.render(<<text)
+    markdown = render_with({:autolink => true}, <<text)
 This a stupid link: https://github.com/rtomayko/tilt/issues?milestone=1&state=open
 text
     html_equal "<p>This a stupid link: <a href=\"https://github.com/rtomayko/tilt/issues?milestone=1&state=open\">https://github.com/rtomayko/tilt/issues?milestone=1&amp;state=open</a></p>\n", markdown
   end
 
   def test_spaced_headers
-    @markdown.space_after_headers = true
-    rd = @markdown.render("#123 a header yes\n")
+    rd = render_with({:space_after_headers => true}, "#123 a header yes\n")
     assert rd !~ /<h1>/
   end
 end

metadata

@@ -1,43 +1,52 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: redcarpet
-version: !ruby/object:Gem::Version
-  version: 2.0.0b3
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 5
+  segments: 
+  - 2
+  - 0
+  - 0
+  - b
+  - 4
+  version: 2.0.0b4
 platform: ruby
-authors:
-- Natacha Porté
-- Vicent Martí
+authors: 
+- "Natacha Port\xC3\xA9"
+- "Vicent Mart\xC3\xAD"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-09 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &70234078705880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70234078705880
+  version_requirements: *id001
 description: A fast, safe and extensible Markdown to (X)HTML parser
 email: vicent@github.com
-executables:
+executables: 
 - redcarpet
-extensions:
+extensions: 
 - ext/redcarpet/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - COPYING
-files:
+files: 
 - COPYING
 - README.markdown
 - Rakefile
 - bin/redcarpet
-- ext/redcarpet/array.c
-- ext/redcarpet/array.h
 - ext/redcarpet/autolink.c
 - ext/redcarpet/autolink.h
 - ext/redcarpet/buffer.c
@@ -45,39 +54,53 @@ files:
 - ext/redcarpet/extconf.rb
 - ext/redcarpet/html.c
 - ext/redcarpet/html.h
+- ext/redcarpet/html_blocks.h
 - ext/redcarpet/html_smartypants.c
 - ext/redcarpet/markdown.c
 - ext/redcarpet/markdown.h
 - ext/redcarpet/rc_markdown.c
 - ext/redcarpet/rc_render.c
 - ext/redcarpet/redcarpet.h
+- ext/redcarpet/stack.c
+- ext/redcarpet/stack.h
 - lib/redcarpet.rb
 - lib/redcarpet/render_man.rb
 - redcarpet.gemspec
 - test/redcarpet_test.rb
 homepage: http://github.com/tanoku/redcarpet
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Markdown that smells nice
-test_files:
+test_files: 
 - test/redcarpet_test.rb