rdiscount 1.3.4 → 1.3.5

data/README.markdown

@@ -19,13 +19,13 @@ Installation, Hacking
 RDiscount Gem releases are published to RubyForge and can be installed as
 follows:
 
-  $ [sudo] gem install rdiscount
+    $ [sudo] gem install rdiscount
 
 The RDiscount sources are available via Git:
 
-  $ git clone git://github.com/rtomayko/rdiscount.git
-  $ cd rdiscount
-  $ rake --tasks
+    $ git clone git://github.com/rtomayko/rdiscount.git
+    $ cd rdiscount
+    $ rake --tasks
 
 For more information, see [the project page](http://github.com/rtomayko/rdiscount).
 
@@ -35,19 +35,19 @@ Usage
 RDiscount implements the basic protocol popularized by RedCloth and adopted
 by BlueCloth:
 
-  require 'rdiscount'
-  markdown = RDiscount.new("Hello World!")
-  puts markdown.to_html
+    require 'rdiscount'
+    markdown = RDiscount.new("Hello World!")
+    puts markdown.to_html
 
 Inject RDiscount into your BlueCloth-using code by replacing your bluecloth
 require statements with the following:
 
-  begin
-    require 'rdiscount'
-    BlueCloth = RDiscount
-  rescue LoadError
-    require 'bluecloth'
-  end
+    begin
+      require 'rdiscount'
+      BlueCloth = RDiscount
+    rescue LoadError
+      require 'bluecloth'
+    end
 
 COPYING
 -------
@@ -55,4 +55,4 @@ COPYING
 Discount is free software;  it is released under a BSD-style license
 that allows you to do as you wish with it as long as you don't attempt
 to claim it as your own work. RDiscount adopts Discount's license
-verbatim. See the file COPYING for more information.
+verbatim. See the file `COPYING` for more information.

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake/clean'
 
-task :default => 'test:unit'
+task :default => :test
 
 # PACKAGING =================================================================
 

data/ext/markdown.c

@@ -189,22 +189,45 @@ static Line *
 htmlblock(Paragraph *p, char *tag)
 {
     Line *t = p->text, *ret;
-    int closesize;
+    int closesize, tagsize;
     char close[MAXTAG+4];
 
-    if ( selfclose(t, tag) || (strlen(tag) >= MAXTAG) ) {
+    char *ps, *pse;
+    int depth;
+
+    tagsize = strlen(tag);
+
+    if ( selfclose(t, tag) || (tagsize >= MAXTAG) ) {
 	ret = t->next;
 	t->next = 0;
 	return ret;
     }
 
     closesize = sprintf(close, "</%s>", tag);
+    depth = 0;
 
     for ( ; t ; t = t->next) {
-	if ( strncasecmp(T(t->text), close, closesize) == 0 ) {
-	    ret = t->next;
-	    t->next = 0;
-	    return ret;
+	ps = T(t->text);
+	pse = ps + (S(t->text) - (tagsize + 1));
+	for ( ; ps < pse; ps++ ) {
+	    if ( *ps == '<' ) {
+	        /* check for close tag */
+	        if ( strncasecmp(ps, close, closesize) == 0 ) {
+	            depth--;
+	            if ( depth == 0 ) {
+	                ret = t->next;
+	                t->next = 0;
+	                return ret;
+	            }
+	            continue;
+	        }
+
+	        /* check for nested open tag */
+	        if ( (strncasecmp(ps + 1, tag, tagsize) == 0) &&
+	             (ps[tagsize + 1] == '>' || ps[tagsize + 1] == ' ') ) {
+	            depth++;
+	        }
+	    }
 	}
     }
     return 0;

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 
   # Original Markdown formatted text.
   attr_reader :text

data/rdiscount.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.3.4'
+  s.version = '1.3.5'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2009-03-04'
+  s.date = '2009-07-26'
   s.email = 'r@tomayko.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.has_rdoc = true

data/test/markdown_test.rb

@@ -82,6 +82,18 @@ class MarkdownTest < Test::Unit::TestCase
     assert_equal "<p><a href=\"/search?query=Markdown+Test&amp;page=2\">Page 2</a></p>\n", markdown.to_html
   end
 
+  def test_simple_inline_html
+    markdown = Markdown.new("before\n\n<div>\n  foo\n</div>\nafter")
+    assert_equal "<p>before</p>\n\n<div>\n  foo\n</div>\n\n\n<p>after</p>\n",
+      markdown.to_html
+  end
+
+  def test_that_html_blocks_do_not_require_their_own_end_tag_line
+    markdown = Markdown.new("Para 1\n\n<div><pre>HTML block\n</pre></div>\n\nPara 2 [Link](#anchor)")
+    assert_equal "<p>Para 1</p>\n\n<div><pre>HTML block\n</pre></div>\n\n\n<p>Para 2 <a href=\"#anchor\">Link</a></p>\n",
+      markdown.to_html
+  end
+
   # Build tests for each file in the MarkdownTest test suite
 
   Dir["#{MARKDOWN_TEST_DIR}/Tests/*.text"].each do |text_file|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 -08:00
+date: 2009-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +51,8 @@ files:
 - test/rdiscount_test.rb
 has_rdoc: true
 homepage: http://github.com/rtomayko/rdiscount
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -71,9 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Fast Implementation of Gruber's Markdown in C
 test_files: 
 - test/markdown_test.rb