bluecloth 2.0.3 → 2.0.4

data/ext/markdown.c

@@ -35,7 +35,8 @@ static struct kw blocktags[] = { KW("!--"), KW("STYLE"), KW("SCRIPT"),
 				 KW("H6"), KW("IFRAME"), KW("LISTING"), KW("NOBR"),
 				 KW("UL"), KW("P"), KW("OL"), KW("DL"),
 				 KW("PLAINTEXT"), KW("PRE"), KW("TABLE"),
-				 KW("WBR"), KW("XMP"), SC("HR"), SC("BR") };
+				 KW("WBR"), KW("XMP"), SC("HR"), SC("BR"),
+				 KW("MAP") };
 #define SZTAGS	(sizeof blocktags / sizeof blocktags[0])
 #define MAXTAG	11 /* sizeof "BLOCKQUOTE" */
 
@@ -127,10 +128,10 @@ skipempty(Line *p)
 
 
 void
-___mkd_tidy(Line *t)
+___mkd_tidy(Cstring *t)
 {
-    while ( S(t->text) && isspace(T(t->text)[S(t->text)-1]) )
-	--S(t->text);
+    while ( S(*t) && isspace(T(*t)[S(*t)-1]) )
+	--S(*t);
 }
 
 
@@ -337,7 +338,7 @@ ishdr(Line *t, int *htyp)
 
     /* ANY leading `#`'s make this into an ETX header
      */
-    if ( i ) {
+    if ( i && (i < S(t->text) || i > 1) ) {
 	*htyp = ETX;
 	return 1;
     }
@@ -871,7 +872,7 @@ compile(Line *ptr, int toplevel, MMIOT *f)
 		/* HORRIBLE STANDARDS KLUDGE: the first line of every block
 		 * has trailing whitespace trimmed off.
 		 */
-		___mkd_tidy(p->text);
+		___mkd_tidy(&p->text->text);
 	    }
 	    
 	    ptr = codeblock(p);

data/ext/markdown.h

@@ -11,6 +11,7 @@ typedef struct footnote {
     Cstring link;		/* what this footnote points to */
     Cstring title;		/* what it's called (TITLE= attribute) */
     int height, width;		/* dimensions (for image link) */
+    int dealloc;		/* deallocation needed? */
 } Footnote;
 
 /* each input line is read into a Line, which contains the line,
@@ -75,6 +76,8 @@ typedef struct mmiot {
 #define CDATA_OUTPUT	0x0080
 #define TOC		0x1000
 #define MKD_1_COMPAT	0x2000
+#define AUTOLINK	0x4000
+#define SAFELINK	0x8000
 #define USER_FLAGS	0xF0FF
 #define EMBEDDED	DENY_A|DENY_IMG|NO_PSEUDO_PROTO|CDATA_OUTPUT
     char *base;
@@ -129,6 +132,7 @@ extern Document *mkd_string(char*,int, int);
 extern void ___mkd_freeLine(Line *);
 extern void ___mkd_freeLines(Line *);
 extern void ___mkd_freeParagraph(Paragraph *);
+extern void ___mkd_freefootnote(Footnote *);
 extern void ___mkd_freefootnotes(MMIOT *);
 extern void ___mkd_initmmiot(MMIOT *, void *);
 extern void ___mkd_freemmiot(MMIOT *, void *);
@@ -136,6 +140,6 @@ extern void ___mkd_freeLineRange(Line *, Line *);
 extern void ___mkd_xml(char *, int, FILE *);
 extern void ___mkd_reparse(char *, int, int, MMIOT*);
 extern void ___mkd_emblock(MMIOT*);
-extern void ___mkd_tidy(Line *);
+extern void ___mkd_tidy(Cstring *);
 
 #endif/*_MARKDOWN_D*/

data/ext/mkdio.c

@@ -113,7 +113,7 @@ populate(getc_func getc, void* ctx, int flags)
 	    queue(a, &line);
 	    S(line) = 0;
 	}
-	else
+	else if ( isprint(c) || isspace(c) || (c & 0x80) )
 	    EXPAND(line) = c;
     }
 

data/ext/mkdio.h

@@ -65,6 +65,8 @@ extern char markdown_version[];
 #define MKD_CDATA	0x0080	/* generate code for xml ![CDATA[...]] */
 #define MKD_TOC		0x1000	/* do table-of-contents processing */
 #define MKD_1_COMPAT	0x2000	/* compatability with MarkdownTest_1.0 */
+#define MKD_AUTOLINK	0x4000	/* make http://foo.com link even without <>s */
+#define MKD_SAFELINK	0x8000	/* paranoid check for link protocol */
 #define MKD_EMBED	MKD_NOLINKS|MKD_NOIMAGE|MKD_TAGTEXT
 
 /* special flags for mkd_in() and mkd_string()

data/ext/resource.c

@@ -55,6 +55,17 @@ ___mkd_freeParagraph(Paragraph *p)
 }
 
 
+/* bye bye footnote.
+ */
+void
+___mkd_freefootnote(Footnote *f)
+{
+    DELETE(f->tag);
+    DELETE(f->link);
+    DELETE(f->title);
+}
+
+
 /* bye bye footnotes.
  */
 void
@@ -63,11 +74,8 @@ ___mkd_freefootnotes(MMIOT *f)
     int i;
 
     if ( f->footnotes ) {
-	for (i=0; i < S(*f->footnotes); i++) {
-	    DELETE(T(*f->footnotes)[i].tag);
-	    DELETE(T(*f->footnotes)[i].link);
-	    DELETE(T(*f->footnotes)[i].title);
-	}
+	for (i=0; i < S(*f->footnotes); i++)
+	    ___mkd_freefootnote( &T(*f->footnotes)[i] );
 	DELETE(*f->footnotes);
 	free(f->footnotes);
     }

data/lib/bluecloth.rb

@@ -18,7 +18,7 @@
 # 
 # == Version
 #
-#  $Id: bluecloth.rb 118 2009-05-14 15:26:02Z deveiant $
+#  $Id: bluecloth.rb 123 2009-06-15 13:15:54Z deveiant $
 # 
 # == License
 # 
@@ -29,13 +29,13 @@
 class BlueCloth
 
 	# Release Version
-	VERSION = '2.0.3'
+	VERSION = '2.0.4'
 
 	# SVN Revision
-	SVNREV = %q$Rev: 118 $
+	SVNREV = %q$Rev: 123 $
 
 	# SVN Id tag
-	SVNID = %q$Id: bluecloth.rb 118 2009-05-14 15:26:02Z deveiant $
+	SVNID = %q$Id: bluecloth.rb 123 2009-06-15 13:15:54Z deveiant $
 
 	# The defaults for all supported options.
 	DEFAULT_OPTIONS = {
@@ -47,6 +47,8 @@ class BlueCloth
 		:header_labels   => false,
 		:escape_html     => false,
 		:strict_mode     => true,
+		:auto_links      => false,
+		:safe_links      => false,
 	}.freeze
 
 	# The number of characters of the original markdown source to include in the 
@@ -85,6 +87,8 @@ class BlueCloth
         if   opthash[:escape_html]     then flags |= MKD_NOHTML;   end
         if   opthash[:strict_mode]     then flags |= MKD_STRICT;   end
         if   opthash[:tagtext_mode]    then flags |= MKD_TAGTEXT;  end
+        if   opthash[:auto_links]      then flags |= MKD_AUTOLINK; end
+        if   opthash[:safe_links]      then flags |= MKD_SAFELINK; end
 
 		return flags
 	end
@@ -105,6 +109,8 @@ class BlueCloth
         if  ( flags & MKD_NOHTML   ).nonzero? then opthash[:escape_html]     = true; end
         if  ( flags & MKD_STRICT   ).nonzero? then opthash[:strict_mode]     = true; end
         if  ( flags & MKD_TAGTEXT  ).nonzero? then opthash[:tagtext_mode]    = true; end
+        if  ( flags & MKD_AUTOLINK ).nonzero? then opthash[:auto_links]      = true; end
+        if  ( flags & MKD_SAFELINK ).nonzero? then opthash[:safe_links]      = true; end
 
 		return opthash
 	end

data/rake/helpers.rb

@@ -78,7 +78,7 @@ def run( *cmd )
 	else
 		trace( cmd )
 	end
-	
+
 	if $dryrun
 		$stderr.puts "(dry run mode)"
 	else
@@ -108,7 +108,7 @@ def pipeto( *cmd )
 		$stderr.puts "(dry run mode)"
 	else
 		open( '|-', 'w+' ) do |io|
-		
+
 			# Parent
 			if io
 				yield( io )
@@ -138,19 +138,19 @@ def download( sourceuri, targetfile=nil )
 		targetpath.open( File::WRONLY|File::TRUNC|File::CREAT, 0644 ) do |ofh|
 			log "Downloading..."
 			buf = ''
-		
+
 			while ifh.read( 16384, buf )
 				until buf.empty?
 					bytes = ofh.write( buf )
 					buf.slice!( 0, bytes )
 				end
 			end
-			
+
 			log "Done."
 		end
-		
+
 	end
-	
+
 	return targetpath
 ensure
 	$stdout.sync = oldsync
@@ -187,13 +187,13 @@ end
 ### line-endings, color reset, etc.
 def colorize( *args )
 	string = ''
-	
+
 	if block_given?
 		string = yield
 	else
 		string = args.shift
 	end
-	
+
 	ending = string[/(\s)$/] || ''
 	string = string.rstrip
 
@@ -275,7 +275,7 @@ def prompt_for_multiple_values( label, default=nil )
 
     results = []
     result = nil
-    
+
     begin
         result = readline( make_prompt_string("> ") )
 		if result.nil? || result.empty?
@@ -284,7 +284,7 @@ def prompt_for_multiple_values( label, default=nil )
         	results << result 
 		end
     end until result.nil? || result.empty?
-    
+
     return results.flatten
 end
 
@@ -307,7 +307,7 @@ def noecho( masked=false )
 	ensure
 		Termios.tcsetattr( $stdin, Termios::TCSANOW, term )
 	end
-	
+
 	return rval
 end
 
@@ -350,7 +350,7 @@ alias :prompt_for_confirmation :ask_for_confirmation
 ### those will be returned in an Array, else the whole matching line is returned.
 def find_pattern_in_file( regexp, file )
 	rval = nil
-	
+
 	File.open( file, 'r' ).each do |line|
 		if (( match = regexp.match(line) ))
 			rval = match.captures.empty? ? match[0] : match.captures
@@ -368,7 +368,7 @@ end
 ### is returned.
 def find_pattern_in_pipe( regexp, *cmd )
 	output = []
-	
+
 	log( cmd.collect {|part| part =~ /\s/ ? part.inspect : part} ) 
 	Open3.popen3( *cmd ) do |stdin, stdout, stderr|
 		stdin.close
@@ -376,7 +376,7 @@ def find_pattern_in_pipe( regexp, *cmd )
 		output << stdout.gets until stdout.eof?
 		output << stderr.gets until stderr.eof?
 	end
-	
+
 	result = output.find { |line| regexp.match(line) } 
 	return $1 || result
 end
@@ -403,10 +403,10 @@ end
 ### Log a subdirectory change, execute a block, and exit the subdirectory
 def in_subdirectory( subdir )
 	block = Proc.new
-	
+
 	log "Entering #{subdir}"
 	Dir.chdir( subdir, &block )
 	log "Leaving #{subdir}"
 end
-	
+
 

data/rake/svn.rb

@@ -1,6 +1,6 @@
 # 
 # Subversion Rake Tasks
-# $Id: svn.rb 95 2009-04-02 15:21:01Z deveiant $
+# $Id: svn.rb 105 2009-06-01 19:20:12Z deveiant $
 # 
 # Authors:
 # * Michael Granger <ged@FaerieMUD.org>
@@ -392,14 +392,15 @@ namespace :svn do
 	desc "Copy the HEAD revision of the current #{SVN_TRUNK_DIR}/ to #{SVN_BRANCHES_DIR} with a " +
 	     "user-specified name."
 	task :branch, [:name] do |task, args|
-		unless args.name
-			args.name = prompt( "Branch name" ) or abort
+		branchname = args.name
+		unless branchname
+			branchname = prompt( "Branch name" ) or abort
 		end
 		
 		svninfo      = get_svn_info()
 		svntrunk     = Pathname.new( svninfo['Repository Root'] ) + SVN_TRUNK_DIR
 		svnbranchdir = Pathname.new( svninfo['Repository Root'] ) + SVN_BRANCHES_DIR
-		svnbranch    = svnbranchdir + args.name
+		svnbranch    = svnbranchdir + branchname
 
 		desc = "Making a new branch: #{svnbranch}"
 		ask_for_confirmation( desc ) do

data/spec/bluecloth/links_spec.rb

@@ -4,10 +4,10 @@
 BEGIN {
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
-	
+
 	libdir = basedir + 'lib'
 	extdir = basedir + 'ext'
-	
+
 	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
 	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
 }
@@ -47,7 +47,7 @@ describe BlueCloth, "links" do
 	it "supports reference-style links with no title" do
 		the_indented_markdown( <<-"---" ).should be_transformed_into(<<-"---").without_indentation
 		An [example][ex] reference-style link.
-		
+
 		  [ex]: http://www.bluefi.com/
 		---
 		<p>An <a href="http://www.bluefi.com/">example</a> reference-style link.</p>

data/spec/bluecloth_spec.rb

@@ -80,6 +80,40 @@ describe BlueCloth do
 		the_markdown( input, :smartypants => true ).should be_transformed_into( expected )
 	end
 
+	it "correctly applies the :auto_links option to the output" do
+		the_indented_markdown( <<-"---", :auto_links => true ).should be_transformed_into(<<-"---").without_indentation
+		I wonder how many people have
+		http://google.com/ as their home page.
+		---
+		<p>I wonder how many people have
+		<a href="http://google.com/">http://google.com/</a> as their home page.</p>
+		---
+	end
+
+	it "doesn't form links for protocols it doesn't know about under :safe_links mode" do
+		the_indented_markdown( <<-"---", :safe_links => true ).should be_transformed_into(<<-"---").without_indentation
+		This is an example 
+		[of something](javascript:do_something_bad(\\)) 
+		you might want to prevent.
+		---
+		<p>This is an example
+		[of something](javascript:do_something_bad())
+		you might want to prevent.</p>
+		---
+	end
+
+	it "forms links for protocols it doesn't know about when not under :safe_links mode" do
+		the_indented_markdown( <<-"---", :safe_links => false ).should be_transformed_into(<<-"---").without_indentation
+		This is an example 
+		[of something](javascript:do_something_benign(\\)) 
+		you might want to allow.
+		---
+		<p>This is an example
+		<a href="javascript:do_something_benign()">of something</a>
+		you might want to allow.</p>
+		---
+	end
+
 
 	describe "Discount extensions" do
 

data/spec/discount_spec.rb

@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname.new( __FILE__ ).dirname.parent
+
+	libdir = basedir + 'lib'
+	extdir = basedir + 'ext'
+
+	$LOAD_PATH.unshift( libdir ) unless $LOAD_PATH.include?( libdir )
+	$LOAD_PATH.unshift( extdir ) unless $LOAD_PATH.include?( extdir )
+}
+
+require 'rubygems'
+require 'spec'
+require 'bluecloth'
+
+require 'spec/lib/helpers'
+require 'spec/lib/constants'
+require 'spec/lib/matchers'
+
+
+#####################################################################
+###	C O N T E X T S
+#####################################################################
+
+describe BlueCloth, "implementation of Discount-specific features" do
+	include BlueCloth::TestConstants,
+		BlueCloth::Matchers
+
+	before( :all ) do
+		@basedir = Pathname.new( __FILE__ ).dirname.parent
+		@datadir = @basedir + 'spec/data'
+	end
+
+
+	describe "pseudo-protocols" do
+
+		it "renders abbr: links as <abbr> phrases" do
+			the_indented_markdown( <<-"---", :pseudoprotocols => true ).should be_transformed_into(<<-"---").without_indentation
+			The [ASPCA](abbr:American Society for the Prevention of Cruelty to Animals).
+			---
+			<p>The <abbr title="American Society for the Prevention of Cruelty to Animals">ASPCA</abbr>.</p>
+			---
+		end
+
+		it "renders id: links as anchors with an ID" do
+			the_markdown( "[foo](id:bar)", :pseudoprotocols => true ).
+				should be_transformed_into( '<p><a id="bar">foo</a></p>' )
+		end
+
+		it "renders class: links as SPANs with a CLASS" do
+			the_markdown( "[foo](class:bar)", :pseudoprotocols => true ).
+				should be_transformed_into( '<p><span class="bar">foo</span></p>' )
+		end
+
+		it "renders raw: links as-is with no syntax expansion" do
+			the_markdown( "[foo](raw:bar)", :pseudoprotocols => true ).
+				should be_transformed_into( '<p>bar</p>' )
+		end
+
+	end
+end
+
+
+__END__
+