rdiscount 1.2.7.1 → 1.2.9

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 task :default => 'test:unit'
 
 DLEXT = Config::CONFIG['DLEXT']
-VERS = '1.2.7.1'
+VERS = '1.2.9'
 
 spec =
   Gem::Specification.new do |s|
@@ -135,32 +135,11 @@ task :publish => :doc do |t|
 end
 
 # ==========================================================
-# Discount Submodule
+# Update package's Discount sources
 # ==========================================================
 
-namespace :submodule do
-  desc 'Init the upstream submodule'
-  task :init do |t|
-    unless File.exist? 'discount/markdown.c'
-      rm_rf 'discount'
-      sh 'git submodule init discount'
-      sh 'git submodule update discount'
-    end
-  end
-
-  desc 'Update the discount submodule'
-  task :update => :init do
-    sh 'git submodule update discount' unless File.symlink?('discount')
-  end
-
-  file 'discount/markdown.c' do
-    Rake::Task['submodule:init'].invoke
-  end
-  task :exist => 'discount/markdown.c'
-end
-
 desc 'Gather required discount sources into extension directory'
-task :gather => 'submodule:exist' do |t|
+task :gather => 'discount' do |t|
   files =
     FileList[
       'discount/{markdown,mkdio,amalloc,cstring}.h',
@@ -171,3 +150,20 @@ task :gather => 'submodule:exist' do |t|
     :verbose => true
 end
 
+# best. task. ever.
+file 'discount' do |f|
+  STDERR.puts((<<-TEXT).gsub(/^ +/, ''))
+    Sorry, this operation requires a human. Tell your human to:
+
+    Grab a discount tarball from:
+    http://www.pell.portland.or.us/~orc/Code/discount/
+
+    Extract here with something like:
+    tar xvzf discount-1.2.9.tar.gz
+
+    Create a discount symlink pointing at the version directory:
+    ln -hsf discount-1.2.9 discount
+
+  TEXT
+  fail "discount sources required."
+end

data/ext/config.h

@@ -6,3 +6,4 @@
 #define TABSTOP 4
 #define COINTOSS() (random()&1)
 #define INITRNG(x) srandom((unsigned int)x)
+#define RELAXED_EMPHASIS 1

data/ext/generate.c

@@ -642,11 +642,11 @@ cputc(int c, MMIOT *f)
  * convert an email address to a string of nonsense
  */
 static void
-mangle(unsigned char *s, int len, MMIOT *f)
+mangle(char *s, int len, MMIOT *f)
 {
     while ( len-- > 0 ) {
 	Qstring("&#", f);
-	Qprintf(f, COINTOSS() ? "x%02x;" : "%02d;", *s++);
+	Qprintf(f, COINTOSS() ? "x%02x;" : "%02d;", *((unsigned char*)(s++)) );
     }
 }
 
@@ -659,6 +659,9 @@ forbidden_tag(MMIOT *f)
 {
     int c = toupper(peek(f, 1));
 
+    if ( f->flags & DENY_HTML )
+	return 1;
+
     if ( c == 'A' && (f->flags & DENY_A) && !isalnum(peek(f,2)) )
 	return 1;
     if ( c == 'I' && (f->flags & DENY_IMG)
@@ -941,29 +944,25 @@ text(MMIOT *f)
 		    }
 		    break;
 #endif
-	case '*':
-	case '_':   if ( tag_text(f) || (isthisspace(f,-1) && isthisspace(f,1)) || (isalnum(peek(f,-1)) && isalnum(peek(f,1))) )
-			Qchar(c, f);
+	case '_':
 #if RELAXED_EMPHASIS
-		    else if ( peek(f,1) == c ) {
-			for ( rep = 1; peek(f,1) == c; pull(f) )
-			    ++rep;
-
-			Qem(f, c, rep);
-		    }
-		    else if ( (isthisspace(f,-1) && isthisspace(f,1))
-			   || (isalnum(peek(f,-1)) && isalnum(peek(f,1))) )
+		    /* If RELAXED_EMPHASIS, underscores don't count when
+		     * they're in the middle of a word.
+		     */
+		    if ( (isthisspace(f,-1) && isthisspace(f,1))
+			    || (isalnum(peek(f,-1)) && isalnum(peek(f,1))) ) {
 			Qchar(c, f);
-		    else {
-			Qem(f, c, 1);
+			break;
 		    }
-#else
+		    /* else fall into the regular old emphasis case */
+#endif
+	case '*':   if ( tag_text(f) )
+			Qchar(c, f);
 		    else {
 			for (rep = 1; peek(f,1) == c; pull(f) )
 			    ++rep;
 			Qem(f,c,rep);
 		    }
-#endif
 		    break;
 	
 	case '`':   if ( tag_text(f) )

data/ext/markdown.c

@@ -411,6 +411,9 @@ headerblock(Paragraph *pp, int htyp)
 
 	    pp->hnumber = i;
 
+	    while ( (i < S(p->text)) && isspace(T(p->text)[i]) )
+		++i;
+
 	    CLIP(p->text, 0, i);
 
 	    for (j=S(p->text); j && (T(p->text)[j-1] == '#'); --j)
@@ -762,7 +765,7 @@ compile(Line *ptr, int toplevel, MMIOT *f)
     ptr = consume(ptr, &para);
 
     while ( ptr ) {
-	if ( toplevel && (key = isopentag(ptr)) ) {
+	if ( toplevel && !(f->flags & DENY_HTML) && (key = isopentag(ptr)) ) {
 	    p = Pp(&d, ptr, strcmp(key, "STYLE") == 0 ? STYLE : HTML);
 	    if ( strcmp(key, "!--") == 0 )
 		ptr = comment(p, key);

data/ext/markdown.h

@@ -67,6 +67,7 @@ typedef struct mmiot {
 #define DENY_A		0x0001
 #define DENY_IMG	0x0002
 #define DENY_SMARTY	0x0004
+#define DENY_HTML	0x0008
 #define INSIDE_TAG	0x0020
 #define NO_PSEUDO_PROTO	0x0040
 #define CDATA_OUTPUT	0x0080

data/ext/mkdio.c

@@ -41,7 +41,7 @@ queue(Document* a, Cstring *line)
     unsigned char c;
     int xp = 0;
     int           size = S(*line);
-    unsigned char *str = T(*line);
+    unsigned char *str = (unsigned char*)T(*line);
 
     CREATE(p->text);
     ATTACH(a->content, p);
@@ -68,6 +68,7 @@ queue(Document* a, Cstring *line)
 }
 
 
+#ifdef PANDOC_HEADER
 /* trim leading blanks from a header line
  */
 static void
@@ -76,6 +77,7 @@ snip(Line *p)
     CLIP(p->text, 0, 1);
     p->dle = mkd_firstnonblank(p);
 }
+#endif
 
 
 /* build a Document from any old input.

data/ext/mkdio.h

@@ -45,6 +45,7 @@ extern char markdown_version[];
 #define MKD_NOLINKS	0x0001	/* don't do link processing, block <a> tags  */
 #define MKD_NOIMAGE	0x0002	/* don't do image processing, block <img> */
 #define MKD_NOPANTS	0x0004	/* don't run smartypants() */
+#define MKD_NOHTML	0x0008	/* don't allow raw html through AT ALL */
 #define MKD_TAGTEXT	0x0020	/* don't expand `_` and `*` */
 #define MKD_NO_EXT	0x0040	/* don't allow pseudo-protocols */
 #define MKD_CDATA	0x0080	/* generate code for xml ![CDATA[...]] */

data/ext/rdiscount.c

@@ -5,16 +5,11 @@
 
 static VALUE rb_cRDiscount;
 
-static ID id_text;
-static ID id_smart;
-static ID id_notes;
-
-
 static VALUE
 rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 {
     /* grab char pointer to markdown input text */
-    VALUE text = rb_funcall(self, id_text, 0);
+    VALUE text = rb_funcall(self, rb_intern("text"), 0);
     Check_Type(text, T_STRING);
 
     /* allocate a ruby string buffer and wrap it in a stream */
@@ -23,9 +18,15 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 
     /* compile flags */
     int flags = MKD_TABSTOP | MKD_NOHEADER;
-    if (rb_funcall(self, id_smart, 0) != Qtrue )
+
+    /* smart */
+    if ( rb_funcall(self, rb_intern("smart"), 0) != Qtrue )
         flags = flags | MKD_NOPANTS;
 
+    /* filter_html */
+    if ( rb_funcall(self, rb_intern("filter_html"), 0) == Qtrue )
+        flags = flags | MKD_NOHTML;
+
     MMIOT *doc = mkd_string(RSTRING(text)->ptr, RSTRING(text)->len, flags);
     markdown(doc, stream, flags);
 
@@ -36,11 +37,6 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
 
 void Init_rdiscount()
 {
-    /* Initialize frequently used Symbols */
-    id_text  = rb_intern("text");
-    id_smart = rb_intern("smart");
-    id_notes = rb_intern("notes");
-
     rb_cRDiscount = rb_define_class("RDiscount", rb_cObject);
     rb_define_method(rb_cRDiscount, "to_html", rb_rdiscount_to_html, -1);
 }

data/lib/rdiscount.rb

@@ -31,8 +31,11 @@ class RDiscount
   # Set true to have smarty-like quote translation performed.
   attr_accessor :smart
 
-  # BlueCloth compatible output filtering.
-  attr_accessor :filter_styles, :filter_html
+  # Do not output <style> tags included in the source text.
+  attr_accessor :filter_styles
+
+  # Do not output any raw HTML included in the source text.
+  attr_accessor :filter_html
 
   # RedCloth compatible line folding -- not used for Markdown but
   # included for compatibility.
@@ -48,8 +51,7 @@ class RDiscount
   #   the source text.
   # * <tt>:fold_lines</tt> - RedCloth compatible line folding (not used).
   #
-  # NOTE: The <tt>:filter_styles</tt> and <tt>:filter_html</tt> extensions
-  # are not yet implemented.
+  # NOTE: The <tt>:filter_styles</tt> extension is not yet implemented.
   def initialize(text, *extensions)
     @text  = text
     @smart = nil

data/test/markdown_test.rb

@@ -30,6 +30,11 @@ class MarkdownTest < Test::Unit::TestCase
     assert_equal "<p><em>start _ foo_bar bar_baz _ end</em> <em>italic</em> <strong>bold</strong> <a><em>blah</em></a></p>", markdown.to_html.strip
   end
 
+  def test_that_filter_html_works
+    markdown = Markdown.new('Through <em>NO</em> <script>DOUBLE NO</script>', :filter_html)
+    assert_equal "<p>Through &lt;em>NO&lt;/em> &lt;script>DOUBLE NO&lt;/script></p>", markdown.to_html.strip
+  end
+
   def test_that_bluecloth_restrictions_are_supported
     markdown = Markdown.new('Hello World.')
     [:filter_html, :filter_styles].each do |restriction|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.2.7.1
+  version: 1.2.9
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-09 00:00:00 -07:00
+date: 2008-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: []