bluecloth 2.0.7 → 2.0.9

data/ChangeLog

@@ -1,4 +1,34 @@
-128[tip]   ba2087a764a2   2010-01-25 13:35 -0800   ged
+138[tip]   486a5a2a8cd2   2010-09-23 07:15 -0700   ged
+  Bump version, update the Windows build to use 1.9.2 instead of 1.9.1.
+
+137   1caa0c888dfe   2010-09-17 15:03 -0700   ged
+  Updated to Discount 1.6.8, caught up with some Discount flags
+
+136   d21afe457b3a   2010-09-17 14:12 -0700   ged
+  Trying to add a spec to test #68.
+
+135   eb11956b000d   2010-09-17 13:48 -0700   ged
+  Tried to add a spec to test #67.
+
+134   055519ec5f78   2010-09-17 13:42 -0700   ged
+  Cleanup, 1.9.2 compatibility, bugfixes.
+
+133   3122e81da65b   2010-09-17 13:25 -0700   ged
+  Convert to tidy-ext for testing instead of the ffi one (1.9.x compatibility)
+
+132   3f36f96bfb8e   2010-08-16 11:50 -0700   ged
+  Install extension in arch-specific subdir [RPS]
+
+131   8ccd2cfe599e   2010-08-11 09:54 -0600   ged
+  Bump version to 2.0.8
+
+130   f2d6de73c6d6   2010-08-11 09:54 -0600   ged
+  Updated to Discount 1.6.6; add HTML5 tag support.
+
+129   7b1630a0f3b2   2010-08-11 09:27 -0600   ged
+  Updated for Discount 1.6.4, build system updates.
+
+128   ba2087a764a2   2010-01-25 13:35 -0800   ged
   Added tag 2.0.7 for changeset 2e54366aeac1
 
 127[2.0.7]   2e54366aeac1   2010-01-25 13:35 -0800   ged
@@ -40,15 +70,15 @@
 115   b715702c19f7   2010-01-02 15:08 -0800   ged
   Adding a minimal test case for #60.
 
-114:113,112   617e767c1331   2010-01-02 14:49 -0800   ged
+114:112,113   617e767c1331   2010-01-02 14:49 -0800   ged
   Added spec for #56 so I can close it.
 
-113:111   5c81c9a5012f   2010-01-01 10:54 -0800   ged
-  Build with rake-compiler, fix some bugs.
-
-112   8be386ec10a8   2009-11-04 15:56 -0800   ged
+113:111   8be386ec10a8   2009-11-04 15:56 -0800   ged
   Updated build files.
 
+112   5c81c9a5012f   2010-01-01 10:54 -0800   ged
+  Build with rake-compiler, fix some bugs.
+
 111   ce4fb0ebf7c0   2009-08-03 12:58 -0700   ged
   * Updated to Discount 1.5 (+bugfixes)
 

data/Rakefile

@@ -11,12 +11,14 @@
 #
 
 BEGIN {
+	require 'rbconfig'
 	require 'pathname'
 	basedir = Pathname.new( __FILE__ ).dirname
 
 	libdir = basedir + "lib"
-	extdir = basedir + "ext"
+	extdir = libdir + Config::CONFIG['sitearch']
 
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
 	$LOAD_PATH.unshift( extdir.to_s ) unless $LOAD_PATH.include?( extdir.to_s )
 }
@@ -73,10 +75,10 @@ if VERSION_FILE.exist? && buildrev = ENV['CC_BUILD_LABEL']
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ] + '.' + buildrev
 elsif VERSION_FILE.exist?
 	PKG_VERSION = VERSION_FILE.read[ /VERSION\s*=\s*['"](\d+\.\d+\.\d+)['"]/, 1 ]
-else
-	PKG_VERSION = '0.0.0'
 end
 
+PKG_VERSION = '0.0.0' unless defined?( PKG_VERSION ) && !PKG_VERSION.nil?
+
 PKG_FILE_NAME = "#{PKG_NAME.downcase}-#{PKG_VERSION}"
 GEM_FILE_NAME = "#{PKG_FILE_NAME}.gem"
 
@@ -90,7 +92,7 @@ EXTCONF       = EXTDIR + 'extconf.rb'
 
 ARTIFACTS_DIR = Pathname.new( CC_BUILD_ARTIFACTS )
 
-TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README LICENSE] )
+TEXT_FILES    = Rake::FileList.new( %w[Rakefile ChangeLog README* LICENSE] )
 BIN_FILES     = Rake::FileList.new( "#{BINDIR}/*" )
 LIB_FILES     = Rake::FileList.new( "#{LIBDIR}/**/*.rb" )
 EXT_FILES     = Rake::FileList.new( "#{EXTDIR}/**/*.{c,h,rb}" )
@@ -166,26 +168,37 @@ if !RAKE_TASKDIR.exist?
 end
 
 require RAKE_TASKDIR + 'helpers.rb'
+include RakefileHelpers
 
 # Set the build ID if the mercurial executable is available
 if hg = which( 'hg' )
-	id = IO.read('|-') or exec hg.to_s, 'id', '-n'
-	PKG_BUILD = 'pre' + (id.chomp[ /^[[:xdigit:]]+/ ] || '1')
+	id = `#{hg} id -n`.chomp
+	PKG_BUILD = "pre%03d" % [(id.chomp[ /^[[:xdigit:]]+/ ] || '1')]
 else
-	PKG_BUILD = 'pre0'
+	PKG_BUILD = 'pre000'
 end
 SNAPSHOT_PKG_NAME = "#{PKG_FILE_NAME}.#{PKG_BUILD}"
 SNAPSHOT_GEM_NAME = "#{SNAPSHOT_PKG_NAME}.gem"
 
 # Documentation constants
-RDOCDIR = DOCSDIR + 'api'
+API_DOCSDIR = DOCSDIR + 'api'
+README_FILE = TEXT_FILES.find {|path| path =~ /^README/ } || 'README'
 RDOC_OPTIONS = [
-	'-w', '4',
-	'-HN',
-	'-i', '.',
-	'-m', 'README',
-	'-t', PKG_NAME,
-	'-W', 'http://deveiate.org/projects/BlueCloth/browser/'
+	'--tab-width=4',
+	'--show-hash',
+	'--include', BASEDIR.to_s,
+	"--main=#{README_FILE}",
+	"--title=#{PKG_NAME}",
+  ]
+YARD_OPTIONS = [
+	'--use-cache',
+	'--no-private',
+	'--protected',
+	'-r', README_FILE,
+	'--exclude', 'extconf\\.rb',
+	'--files', 'ChangeLog,LICENSE',
+	'--output-dir', API_DOCSDIR.to_s,
+	'--title', "#{PKG_NAME} #{PKG_VERSION}",
   ]
 
 # Release constants
@@ -199,22 +212,25 @@ PROJECT_DOCDIR = "#{PROJECT_PUBDIR}/#{PKG_NAME}"
 PROJECT_SCPPUBURL = "#{PROJECT_HOST}:#{PROJECT_PUBDIR}"
 PROJECT_SCPDOCURL = "#{PROJECT_HOST}:#{PROJECT_DOCDIR}"
 
+GEM_PUBHOST = 'rubygems.org'
+
 # Gem dependencies: gemname => version
 DEPENDENCIES = {
 }
 
 # Developer Gem dependencies: gemname => version
 DEVELOPMENT_DEPENDENCIES = {
-	'rake'        => '>= 0.8.7',
-	'rcodetools'  => '>= 0.7.0.0',
-	'rcov'        => '>= 0.8.1.2.0',
-	'rdoc'        => '>= 2.4.3',
-	'RedCloth'    => '>= 4.0.3',
-	'rspec'       => '>= 1.2.6',
-	'termios'     => '>= 0',
-	'text-format' => '>= 1.0.0',
-	'tmail'       => '>= 1.2.3.1',
-	'diff-lcs'    => '>= 1.1.2',
+	'rake'         => '>= 0.8.7',
+	'rcodetools'   => '>= 0.7.0.0',
+	'rcov'         => '>= 0.8.1.2.0',
+	'rdoc'         => '>= 2.4.3',
+	'RedCloth'     => '>= 4.0.3',
+	'rspec'        => '>= 1.2.6',
+	'ruby-termios' => '>= 0.9.6',
+	'text-format'  => '>= 1.0.0',
+	'tmail'        => '>= 1.2.3.1',
+	'diff-lcs'     => '>= 1.1.2',
+	'tidy-ext' => '>= 0.1.10',
 	'rake-compiler' => '>= 0.7.0',
 }
 
@@ -241,7 +257,7 @@ GEMSPEC   = Gem::Specification.new do |gem|
 
 	gem.has_rdoc          = true
 	gem.rdoc_options      = RDOC_OPTIONS
-	gem.extra_rdoc_files  = %w[ChangeLog README LICENSE]
+	gem.extra_rdoc_files  = TEXT_FILES - [ 'Rakefile' ]
 
 	gem.bindir            = BINDIR.relative_path_from(BASEDIR).to_s
 	gem.executables       = BIN_FILES.select {|pn| File.executable?(pn) }.
@@ -255,6 +271,10 @@ GEMSPEC   = Gem::Specification.new do |gem|
 	gem.files             = RELEASE_FILES
 	gem.test_files        = SPEC_FILES
 
+	# signing key and certificate chain
+	gem.signing_key       = '/Volumes/Keys/ged-private_gem_key.pem'
+	gem.cert_chain        = [File.expand_path('~/.gem/ged-public_gem_cert.pem')]
+
 	DEPENDENCIES.each do |name, version|
 		version = '>= 0' if version.length.zero?
 		gem.add_runtime_dependency( name, version )
@@ -295,7 +315,7 @@ import LOCAL_RAKEFILE if LOCAL_RAKEFILE.exist?
 #####################################################################
 
 ### Default task
-task :default  => [:clean, :local, :spec, :rdoc, :package]
+task :default  => [:clean, :local, :spec, :apidocs, :package]
 
 ### Task the local Rakefile can append to -- no-op by default
 task :local

data/Rakefile.local

@@ -1,11 +1,17 @@
 #!rake
 
+require 'rbconfig'
 require 'rake/extensiontask'
 
 # C extension constants
-EXT_MAKEFILE       = EXTDIR + 'Makefile'
-EXT_SOURCES        = FileList[ EXTDIR + '*.c' ]
-EXT_SO             = EXTDIR + "bluecloth_ext.#{CONFIG['DLEXT']}"
+ARCH = Config::CONFIG['arch']
+ARCHLIBDIR = LIBDIR + ARCH
+
+EXT_MAKEFILE = EXTDIR + 'Makefile'
+EXT_SOURCES  = FileList[ EXTDIR + '*.c' ]
+EXT_SO       = EXTDIR + "bluecloth_ext.#{CONFIG['DLEXT']}"
+
+
 
 GEMSPEC.extra_rdoc_files << 'LICENSE.discount'
 DOCFILES << 'LICENSE.discount'
@@ -25,13 +31,14 @@ namespace :spec do
 	task :text  => [ :compile ]
 end
 
-ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
+
+ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.2'
 
 Rake::ExtensionTask.new do |ext|
 	ext.name = 'bluecloth_ext'
 	ext.gem_spec = GEMSPEC
-	ext.ext_dir = 'ext'
-	ext.lib_dir = 'lib'
+	ext.ext_dir = EXTDIR.to_s
+	ext.lib_dir = LIBDIR.to_s
 	ext.source_pattern = "*.{c,h}"
 	ext.cross_compile = true
 	ext.cross_platform = %w[i386-mswin32 i386-mingw32]

data/ext/VERSION

@@ -1 +1 @@
-1.5.8
+1.6.8

data/ext/bluecloth.c

@@ -1,6 +1,6 @@
 /* 
  * BlueCloth -- a Ruby implementation of Markdown
- * $Id$
+ * $Id: bluecloth.c,v 1caa0c888dfe 2010/09/17 22:03:06 ged $
  * 
  * = Authors
  * 
@@ -32,11 +32,11 @@ VALUE bluecloth_default_opthash;
 static MMIOT *
 bluecloth_alloc( VALUE text, int flags ) {
 	MMIOT *document;
-	
+
 	document = mkd_string( RSTRING_PTR(text), RSTRING_LEN(text), flags );
 	if ( !document )
 		rb_raise( rb_eRuntimeError, "Failed to create a BlueCloth object for: %s", RSTRING_PTR(text) );
-	
+
 	return document;
 }
 
@@ -44,7 +44,7 @@ bluecloth_alloc( VALUE text, int flags ) {
 /*
  * GC Free function
  */
-static void 
+static void
 bluecloth_gc_free( MMIOT *document ) {
 	if ( document ) {
 		mkd_cleanup( document );
@@ -100,7 +100,7 @@ bluecloth_check_ptr( VALUE self ) {
 		rb_raise( rb_eTypeError, "wrong argument type %s (expected BlueCloth object)",
 				  rb_class2name(CLASS_OF( self )) );
     }
-	
+
 	return DATA_PTR( self );
 }
 
@@ -181,11 +181,11 @@ bluecloth_s_discount_version( VALUE klass ) {
  *   superscript notation. Defaults to +true+.
  * 
  */
-static VALUE 
+static VALUE
 bluecloth_initialize( int argc, VALUE *argv, VALUE self ) {
 	if ( !bluecloth_check_ptr(self) ) {
 		MMIOT *document;
-		VALUE text, textcopy, optflags, fullhash, opthash = Qnil;
+		VALUE text, utf8text, optflags, fullhash, opthash = Qnil;
 		int flags = 0;
 
 		rb_scan_args( argc, argv, "02", &text, &opthash );
@@ -201,7 +201,7 @@ bluecloth_initialize( int argc, VALUE *argv, VALUE self ) {
 			text = rb_str_new( "", 0 );
 		}
 		else {
-			text = rb_obj_as_string( text );
+			text = rb_obj_dup( rb_obj_as_string(text) );
 		}
 
 		/* Merge the options hash with the defaults and turn it into a flags int */
@@ -210,13 +210,21 @@ bluecloth_initialize( int argc, VALUE *argv, VALUE self ) {
 		fullhash = rb_funcall( bluecloth_cBlueCloth, rb_intern("opthash_from_flags"), 1, optflags );
 
 		flags = NUM2INT( optflags );
+
+#ifdef M17N_SUPPORTED
+		bluecloth_debug( "Bytes before utf8ification: %s",
+			RSTRING_PTR(rb_funcall(text, rb_intern("dump"), 0, Qnil)) );
+		utf8text = rb_str_export_to_enc( rb_str_dup(text), rb_utf8_encoding() );
+		DATA_PTR( self ) = document = bluecloth_alloc( utf8text, flags );
+#else
 		DATA_PTR( self ) = document = bluecloth_alloc( text, flags );
+#endif /* M17N_SUPPORTED */
+
 		if ( !mkd_compile(document, flags) )
 			rb_raise( rb_eRuntimeError, "Failed to compile markdown" );
 
-		textcopy = rb_str_dup( text );
-		OBJ_FREEZE( textcopy );
-		rb_iv_set( self, "@text", textcopy );
+		OBJ_FREEZE( text );
+		rb_iv_set( self, "@text", text );
 		OBJ_FREEZE( fullhash );
 		rb_iv_set( self, "@options", fullhash );
 
@@ -242,12 +250,20 @@ bluecloth_to_html( VALUE self ) {
 	VALUE result = Qnil;
 
 	bluecloth_debug( "Compiling document %p", document );
-	
+
 	if ( (length = mkd_document( document, &output )) != EOF ) {
-		bluecloth_debug( "Pointer to results: %p, length = %d", output, length );
+#ifdef M17N_SUPPORTED
+		VALUE orig_encoding = rb_obj_encoding( rb_iv_get(self, "@text") );
+		VALUE utf8_result = rb_enc_str_new( output, length, rb_utf8_encoding() );
+		result = rb_str_encode( utf8_result, orig_encoding, 0, Qnil );
+		bluecloth_debug( "Bytes after un-utf8ification (if necessary): %s",
+			RSTRING_PTR(rb_funcall(result, rb_intern("dump"), 0, Qnil)) );
+#else
 		result = rb_str_new( output, length );
+#endif /* M17N_SUPPORTED */
 
 		OBJ_INFECT( result, self );
+
 		return result;
 	} else {
 		return Qnil;
@@ -283,7 +299,7 @@ bluecloth_header( VALUE self ) {
 	VALUE fieldstring, headers = rb_hash_new();
 
 	bluecloth_debug( "Fetching pandoc headers for document %p", document );
-	
+
 	if ( (field = mkd_doc_title(document)) ) {
 		fieldstring = rb_str_new2( field );
 		OBJ_INFECT( fieldstring, self );
@@ -312,6 +328,9 @@ bluecloth_header( VALUE self ) {
 void Init_bluecloth_ext( void ) {
 	bluecloth_cBlueCloth = rb_define_class( "BlueCloth", rb_cObject );
 
+	mkd_with_html5_tags();
+	mkd_initialize();
+
 	rb_define_alloc_func( bluecloth_cBlueCloth, bluecloth_s_allocate );
 	rb_define_singleton_method( bluecloth_cBlueCloth, "discount_version", 
 		bluecloth_s_discount_version, 0 );
@@ -321,10 +340,10 @@ void Init_bluecloth_ext( void ) {
 	rb_define_method( bluecloth_cBlueCloth, "to_html", bluecloth_to_html, 0 );
 	rb_define_method( bluecloth_cBlueCloth, "header", bluecloth_header, 0 );
 	rb_define_alias( bluecloth_cBlueCloth, "pandoc_header", "header" );
-	
+
 	/* The original Markdown text the object was constructed with */
 	rb_define_attr( bluecloth_cBlueCloth, "text", 1, 0 );
-	
+
 	/* The options hash that describes the options in effect when the object was created */
 	rb_define_attr( bluecloth_cBlueCloth, "options", 1, 0 );
 
@@ -339,22 +358,28 @@ void Init_bluecloth_ext( void ) {
 
 	/* Do not do Smartypants-style mangling of quotes, dashes, or ellipses. */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_NOPANTS",  INT2FIX(MKD_NOPANTS) );
-	
+
 	/* Escape all opening angle brackets in the input text instead of allowing block-level HTML */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_NOHTML",   INT2FIX(MKD_NOHTML) );
 
 	/* disable SUPERSCRIPT, RELAXED_EMPHASIS */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_STRICT",   INT2FIX(MKD_STRICT) );
-	
+
 	/* process text inside an html tag; no <em>, no <bold>, no html or [] expansion */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_TAGTEXT",  INT2FIX(MKD_TAGTEXT) );
-	
+
 	/* don't allow pseudo-protocols */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_NO_EXT",   INT2FIX(MKD_NO_EXT) );
-	
+
+	/* disallow tables */
+	rb_define_const( bluecloth_cBlueCloth, "MKD_NOTABLES", INT2FIX(MKD_NOTABLES) );
+
+	/* forbid ~~strikethrough~~ */
+	rb_define_const( bluecloth_cBlueCloth, "MKD_NOSTRIKETHROUGH", INT2FIX(MKD_NOSTRIKETHROUGH) );
+
 	/* do table-of-contents processing */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_TOC",      INT2FIX(MKD_TOC) );
-	
+
 	/* MarkdownTest 1.0 Compatibility Mode */
 	rb_define_const( bluecloth_cBlueCloth, "MKD_1_COMPAT", INT2FIX(MKD_1_COMPAT) );
 

data/ext/bluecloth.h

@@ -1,6 +1,6 @@
 /* 
  * BlueCloth -- a Ruby implementation of Markdown
- * $Id$
+ * $Id: bluecloth.h,v 055519ec5f78 2010/09/17 20:42:27 ged $
  * 
  */
 
@@ -8,12 +8,23 @@
 #define BLUECLOTH_H
 
 #include "config.h"
+#include "assert.h"
 
 #include "mkdio.h"
 #include "ruby.h"
 
-#ifdef HAVE_RUBY_ENCODING_H
+void mkd_initialize  		_(( void ));
+void mkd_with_html5_tags	_(( void ));
+
+#if defined(HAVE_RUBY_ENCODING_H) && HAVE_RUBY_ENCODING_H
+#	define M17N_SUPPORTED
 #	include "ruby/encoding.h"
 #endif
 
+/* Replace the macro from encoding.h that refers to static 'rb_encoding_list' */
+#ifdef ENC_FROM_ENCINDEX
+#undef ENC_FROM_ENCINDEX
+#define ENC_FROM_ENCINDEX(idx) (rb_enc_from_index(idx))
+#endif
+
 #endif