rdiscount 1.5.5 → 1.5.8

data/Rakefile

@@ -1,75 +1,28 @@
 require 'rake/clean'
+require 'digest/md5'
 
 task :default => :test
 
-# PACKAGING =================================================================
-
-require 'rubygems/specification'
-$spec = eval(File.read('rdiscount.gemspec'))
-
-def package(ext='')
-  "pkg/rdiscount-#{$spec.version}" + ext
-end
-
-desc 'Build packages'
-task :package => %w[.gem .tar.gz].map {|e| package(e)}
-
-desc 'Build and install as local gem'
-task :install => package('.gem') do
-  sh "gem install #{package('.gem')}"
-end
-
-directory 'pkg/'
-
-file package('.gem') => %w[pkg/ rdiscount.gemspec] + $spec.files do |f|
-  sh "gem build rdiscount.gemspec"
-  mv File.basename(f.name), f.name
-end
-
-file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
-  sh "git archive --format=tar HEAD | gzip > #{f.name}"
-end
-
-# GEMSPEC HELPERS ==========================================================
-
-def source_version
-  line = File.read('lib/rdiscount.rb')[/^\s*VERSION = .*/]
-  line.match(/.*VERSION = '(.*)'/)[1]
-end
-
-file 'rdiscount.gemspec' => FileList['Rakefile','lib/rdiscount.rb'] do |f|
-  # read spec file and split out manifest section
-  spec = File.read(f.name)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-  head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
-  head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject{ |file| file =~ /^\./ || file =~ /^test\/MarkdownTest/ }.
-    map{ |file| "    #{file}" }.
-    join("\n")
-  # piece file back together and write...
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head,manifest,tail].join("  # = MANIFEST =\n")
-  File.open(f.name, 'w') { |io| io.write(spec) }
-  puts "updated #{f.name}"
-end
-
 # ==========================================================
 # Ruby Extension
 # ==========================================================
 
 DLEXT = Config::CONFIG['DLEXT']
+RUBYDIGEST = Digest::MD5.hexdigest(`#{RUBY} --version`)
 
-file 'ext/Makefile' => FileList['ext/{*.c,*.h,*.rb}'] do
+file 'ext/Makefile' => FileList['ext/*.{c,h,rb}'] do
   chdir('ext') { ruby 'extconf.rb' }
 end
 CLEAN.include 'ext/Makefile', 'ext/mkmf.log'
 
-file "ext/rdiscount.#{DLEXT}" => FileList['ext/Makefile', 'ext/*.{c,h,rb}'] do |f|
-  sh 'cd ext && make'
+file "ext/ruby-#{RUBYDIGEST}" do |f|
+  rm_f FileList["ext/ruby-*"]
+  touch f.name
+end
+CLEAN.include "ext/ruby-*"
+
+file "ext/rdiscount.#{DLEXT}" => FileList["ext/Makefile", "ext/ruby-#{RUBYDIGEST}"] do |f|
+  sh 'cd ext && make clean && make'
 end
 CLEAN.include 'ext/*.{o,bundle,so,dll}'
 
@@ -84,18 +37,12 @@ task :build => "lib/rdiscount.#{DLEXT}"
 # Testing
 # ==========================================================
 
-def runner
-  if system("type turn 2>/dev/null 1>&2")
-    "turn"
-  else
-    "testrb"
-  end
-end
-
-desc 'Run unit tests'
-task 'test:unit' => [:build] do |t|
-  sh "#{runner} test/markdown_test.rb test/rdiscount_test.rb"
+require 'rake/testtask'
+Rake::TestTask.new('test:unit') do |t|
+  t.test_files = FileList['test/*_test.rb']
+  t.ruby_opts += ['-rubygems'] if defined? Gem
 end
+task 'test:unit' => [:build]
 
 desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
 task 'test:conformance' => [:build] do |t|
@@ -136,37 +83,14 @@ task :doc => 'doc/index.html'
 
 file 'doc/index.html' => FileList['lib/*.rb'] do |f|
   sh((<<-end).gsub(/\s+/, ' '))
-    hanna --charset utf8 \
-          --fmt html \
-          --inline-source \
-          --line-numbers \
-          --main RDiscount \
-          --op doc \
-          --title 'RDiscount API Documentation' \
+    hanna --charset utf8 --fmt html --inline-source --line-numbers \
+          --main RDiscount --op doc --title 'RDiscount API Documentation' \
           #{f.prerequisites.join(' ')}
   end
 end
 
 CLEAN.include 'doc'
 
-
-# ==========================================================
-# Rubyforge
-# ==========================================================
-
-desc 'Publish new release to rubyforge'
-task :release => [package('.gem'), package('.tar.gz')] do |t|
-  sh <<-end
-    rubyforge add_release wink rdiscount #{$spec.version} #{package('.gem')} &&
-    rubyforge add_file    wink rdiscount #{$spec.version} #{package('.tar.gz')}
-  end
-end
-
-desc 'Publish API docs to rubyforge'
-task :publish => :doc do |t|
-  sh 'scp -rp doc/. rubyforge.org:/var/www/gforge-projects/wink/rdiscount'
-end
-
 # ==========================================================
 # Update package's Discount sources
 # ==========================================================
@@ -200,3 +124,59 @@ file 'discount' do |f|
   TEXT
   fail "discount sources required."
 end
+
+# PACKAGING =================================================================
+
+if defined?(Gem)
+  $spec = eval(File.read('rdiscount.gemspec'))
+
+  def package(ext='')
+    "pkg/rdiscount-#{$spec.version}" + ext
+  end
+
+  desc 'Build packages'
+  task :package => %w[.gem .tar.gz].map {|e| package(e)}
+
+  desc 'Build and install as local gem'
+  task :install => package('.gem') do
+    sh "gem install #{package('.gem')}"
+  end
+
+  directory 'pkg/'
+
+  file package('.gem') => %w[pkg/ rdiscount.gemspec] + $spec.files do |f|
+    sh "gem build rdiscount.gemspec"
+    mv File.basename(f.name), f.name
+  end
+
+  file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
+    sh "git archive --format=tar HEAD | gzip > #{f.name}"
+  end
+
+  # GEMSPEC HELPERS ==========================================================
+
+  def source_version
+    line = File.read('lib/rdiscount.rb')[/^\s*VERSION = .*/]
+    line.match(/.*VERSION = '(.*)'/)[1]
+  end
+
+  file 'rdiscount.gemspec' => FileList['Rakefile','lib/rdiscount.rb'] do |f|
+    # read spec file and split out manifest section
+    spec = File.read(f.name)
+    head, manifest, tail = spec.split("  # = MANIFEST =\n")
+    head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
+    head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
+    # determine file list from git ls-files
+    files = `git ls-files`.
+      split("\n").
+      sort.
+      reject{ |file| file =~ /^\./ || file =~ /^test\/MarkdownTest/ }.
+      map{ |file| "    #{file}" }.
+      join("\n")
+    # piece file back together and write...
+    manifest = "  s.files = %w[\n#{files}\n  ]\n"
+    spec = [head,manifest,tail].join("  # = MANIFEST =\n")
+    File.open(f.name, 'w') { |io| io.write(spec) }
+    puts "updated #{f.name}"
+  end
+end

data/ext/generate.c

@@ -632,9 +632,9 @@ linkyformat(MMIOT *f, Cstring text, int image, Footnote *ref)
 	
 	Qstring(tag->link_sfx, f);
 
-	if ( tag->WxH && ref->height && ref->width ) {
-	    Qprintf(f," height=\"%d\"", ref->height);
-	    Qprintf(f, " width=\"%d\"", ref->width);
+	if ( tag->WxH) {
+	    if ( ref->height) Qprintf(f," height=\"%d\"", ref->height);
+	    if ( ref->width) Qprintf(f, " width=\"%d\"", ref->width);
 	}
 
 	if ( S(ref->title) ) {
@@ -667,7 +667,7 @@ linkylinky(int image, MMIOT *f)
     int status = 0;
 
     CREATE(name);
-    bzero(&key, sizeof key);
+    memset(&key, 0, sizeof key);
 
     if ( linkylabel(f, &name) ) {
 	if ( peek(f,1) == '(' ) {
@@ -869,9 +869,19 @@ maybe_tag_or_link(MMIOT *f)
 
     if ( size ) {
 	if ( maybetag || (size >= 3 && strncmp(cursor(f), "!--", 3) == 0) ) {
+
+	    /* It is not a html tag unless we find the closing '>' in
+	     * the same block.
+	     */
+	    while ( (c = peek(f, size+1)) != '>' )
+		if ( c == EOF )
+		    return 0;
+		else
+		    size++;
+	    
 	    Qstring(forbidden_tag(f) ? "&lt;" : "<", f);
 	    while ( ((c = peek(f, 1)) != EOF) && (c != '>') )
-		cputc(pull(f), f);
+		Qchar(pull(f), f);
 	    return 1;
 	}
 	else if ( !isspace(c) && process_possible_link(f, size) ) {
@@ -973,6 +983,9 @@ static struct smarties {
     { '\'', "'t>",      "rsquo",  0 },
     { '\'', "'re>",     "rsquo",  0 },
     { '\'', "'ll>",     "rsquo",  0 },
+    { '\'', "'ve>",     "rsquo",  0 },
+    { '\'', "'m>",      "rsquo",  0 },
+    { '\'', "'d>",      "rsquo",  0 },
     { '-',  "--",       "mdash",  1 },
     { '-',  "<->",      "ndash",  0 },
     { '.',  "...",      "hellip", 2 },
@@ -1331,7 +1344,7 @@ printtable(Paragraph *pp, MMIOT *f)
     int hcols;
     char *p;
 
-    if ( !(pp->text && pp->text->next && pp->text->next->next) )
+    if ( !(pp->text && pp->text->next) )
 	return 0;
 
     hdr = pp->text;

data/ext/markdown.c

@@ -230,6 +230,8 @@ htmlblock(Paragraph *p, struct kw *tag)
 			    /* consume trailing gunk in close tag */
 			    c = flogetc(&f);
 			}
+			if ( !f.t )
+			    return 0;
 			ret = f.t->next;
 			f.t->next = 0;
 			return ret;
@@ -269,17 +271,24 @@ istable(Line *t)
 {
     char *p;
     Line *dashes = t->next;
+    int contains = 0;	/* found character bits; 0x01 is |, 0x02 is - */
     
     /* two lines, first must contain | */
     if ( !(dashes && memchr(T(t->text), '|', S(t->text))) )
 	return 0;
 
-    /* second line must be only whitespace, |, -, or - */
+    /* second line must contain - or | and nothing
+     * else except for whitespace or :
+     */
     for ( p = T(dashes->text)+S(dashes->text)-1; p >= T(dashes->text); --p)
-	if ( ! ((*p == '|') || (*p == ':') || (*p == '-') || isspace(*p)) )
+	if ( *p == '|' )
+	    contains |= 0x01;
+	else if ( *p == '-' )
+	    contains |= 0x02;
+	else if ( ! ((*p == ':') || isspace(*p)) )
 	    return 0;
 
-    return 1;
+    return (contains & 0x03);
 }
 
 
@@ -379,7 +388,11 @@ ishdr(Line *t, int *htyp)
 	char *q = T(t->next->text);
 
 	if ( (*q == '=') || (*q == '-') ) {
-	    for (i=1; i < S(t->next->text); i++)
+	    /* find trailing space on === line */
+	    int e = S(t->next->text) - 1;
+	    while (e > 1 && q[e] == ' ') e--;
+
+	    for (i=1; i <= e; i++)
 		if ( q[0] != q[i] )
 		    return 0;
 	    *htyp = SETEXT;

data/ext/rdiscount.c

@@ -10,6 +10,7 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
     /* grab char pointer to markdown input text */
     char *res;
     int szres;
+    VALUE encoding;
     VALUE text = rb_funcall(self, rb_intern("text"), 0);
     VALUE buf = rb_str_buf_new(1024);
     Check_Type(text, T_STRING);
@@ -28,6 +29,13 @@ rb_rdiscount_to_html(int argc, VALUE *argv, VALUE self)
     }
     mkd_cleanup(doc);
 
+
+    /* force the input encoding */
+    if ( rb_respond_to(text, rb_intern("encoding")) ) {
+      encoding = rb_funcall(text, rb_intern("encoding"), 0);
+      rb_funcall(buf, rb_intern("force_encoding"), 1, encoding);
+    }
+
     return buf;
 }
 

data/lib/rdiscount.rb

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

data/rdiscount.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'rdiscount'
-  s.version = '1.5.5'
+  s.version = '1.5.8'
   s.summary = "Fast Implementation of Gruber's Markdown in C"
-  s.date = '2009-11-13'
+  s.date = '2010-02-03'
   s.email = 'r@tomayko.com'
   s.homepage = 'http://github.com/rtomayko/rdiscount'
   s.has_rdoc = true
-  s.authors = ["Ryan Tomayko", "Andrew White"]
+  s.authors = ["Ryan Tomayko", "David Loren Parsons", "Andrew White"]
   # = MANIFEST =
   s.files = %w[
     COPYING

data/test/markdown_test.rb

@@ -111,13 +111,35 @@ class MarkdownTest < Test::Unit::TestCase
       markdown.to_html
   end
 
+  def test_ul_with_zero_space_indent
+    markdown = Markdown.new("- foo\n\n- bar\n\n  baz\n")
+    assert_equal "<ul><li><p>foo</p></li><li><p>bar</p><p>baz</p></li></ul>",
+      markdown.to_html.gsub("\n", "")
+  end
+
+  def test_ul_with_single_space_indent
+    markdown = Markdown.new(" - foo\n\n - bar\n\n   baz\n")
+    assert_equal "<ul><li><p>foo</p></li><li><p>bar</p><p>baz</p></li></ul>",
+      markdown.to_html.gsub("\n", "")
+  end
+
+  # http://github.com/rtomayko/rdiscount/issues/#issue/13
+  def test_headings_with_trailing_space
+    text = "The Ant-Sugar Tales \n"         +
+           "=================== \n\n"        +
+           "By Candice Yellowflower   \n"
+    markdown = Markdown.new(text)
+    assert_equal "<h1>The Ant-Sugar Tales </h1>\n\n<p>By Candice Yellowflower <br/>\n</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|
 
     basename = File.basename(text_file).sub(/\.text$/, '')
     html_file = text_file.sub(/text$/, 'html')
-    method_name = basename.gsub(/[-,]/, '').gsub(/\s+/, '_').downcase
+    method_name = basename.gsub(/[-,()]/, '').gsub(/\s+/, '_').downcase
 
     define_method "test_#{method_name}" do
       markdown = Markdown.new(File.read(text_file))
@@ -125,7 +147,7 @@ class MarkdownTest < Test::Unit::TestCase
       assert_not_nil actual_html
     end
 
-    define_method "test_#{method_name}_with_smarty_enabled" do
+    define_method "test_#{method_name}_smart" do
       markdown = Markdown.new(File.read(text_file), :smart)
       actual_html = markdown.to_html
       assert_not_nil actual_html

data/test/rdiscount_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 rootdir = File.dirname(File.dirname(__FILE__))
 $LOAD_PATH.unshift "#{rootdir}/lib"
 
@@ -29,6 +30,21 @@ class RDiscountTest < Test::Unit::TestCase
     assert_equal %(<h1>Heading</h1>\n\n<p>&ldquo;Quoted text&rdquo;</p>\n), rd.to_html
   end
 
+  def test_that_smart_gives_ve_suffix_a_rsquo
+    rd = RDiscount.new("I've been meaning to tell you ..", :smart)
+    assert_equal "<p>I&rsquo;ve been meaning to tell you ..</p>\n", rd.to_html
+  end
+
+  def test_that_smart_gives_m_suffix_a_rsquo
+    rd = RDiscount.new("I'm not kidding", :smart)
+    assert_equal "<p>I&rsquo;m not kidding</p>\n", rd.to_html
+  end
+
+  def test_that_smart_gives_d_suffix_a_rsquo
+    rd = RDiscount.new("what'd you say?", :smart)
+    assert_equal "<p>what&rsquo;d you say?</p>\n", rd.to_html
+  end
+
   def test_that_generate_toc_sets_toc_ids
     rd = RDiscount.new("# Level 1\n\n## Level 2", :generate_toc)
     assert rd.generate_toc
@@ -40,4 +56,12 @@ class RDiscountTest < Test::Unit::TestCase
     exp = %(<ul>\n <li><a href="#Level+1">Level 1</a>\n  <ul>\n  <li><a href="#Level+2">Level 2</a>  </li>\n  </ul>\n </li>\n </ul>)
     assert_equal exp, rd.toc_content.strip
   end
+
+  if "".respond_to?(:encoding)
+    def test_should_return_string_in_same_encoding_as_input
+      input = "Yogācāra"
+      output = RDiscount.new(input).to_html
+      assert_equal input.encoding.name, output.encoding.name
+    end
+  end
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: rdiscount
 version: !ruby/object:Gem::Version 
-  version: 1.5.5
+  version: 1.5.8
 platform: ruby
 authors: 
 - Ryan Tomayko
+- David Loren Parsons
 - Andrew White
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -08:00
+date: 2010-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: []