rdiscount 1.6.3 → 1.6.3.1

data/Rakefile

@@ -1,3 +1,4 @@
+require 'date'
 require 'rake/clean'
 require 'digest/md5'
 
@@ -152,31 +153,31 @@ if defined?(Gem)
   file package('.tar.gz') => %w[pkg/] + $spec.files do |f|
     sh "git archive --format=tar HEAD | gzip > #{f.name}"
   end
+end
 
-  # GEMSPEC HELPERS ==========================================================
+# GEMSPEC HELPERS ==========================================================
 
-  def source_version
-    line = File.read('lib/rdiscount.rb')[/^\s*VERSION = .*/]
-    line.match(/.*VERSION = '(.*)'/)[1]
-  end
+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
+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

data/ext/rdiscount.c

@@ -86,6 +86,35 @@ int rb_rdiscount__get_flags(VALUE ruby_obj)
   if ( rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
     flags = flags | MKD_TOC;
 
+  /* no_image */
+  if ( rb_funcall(ruby_obj, rb_intern("no_image"), 0) == Qtrue)
+    flags = flags | MKD_NOIMAGE;
+
+  /* no_links */
+  if ( rb_funcall(ruby_obj, rb_intern("no_links"), 0) == Qtrue)
+    flags = flags | MKD_NOLINKS;
+
+  /* no_tables */
+  if ( rb_funcall(ruby_obj, rb_intern("no_tables"), 0) == Qtrue)
+    flags = flags | MKD_NOTABLES;
+
+  /* strict */
+  if ( rb_funcall(ruby_obj, rb_intern("strict"), 0) == Qtrue)
+    flags = flags | MKD_STRICT;
+
+  /* autolink */
+  if ( rb_funcall(ruby_obj, rb_intern("autolink"), 0) == Qtrue)
+    flags = flags | MKD_AUTOLINK;
+
+  /* safelink */
+  if ( rb_funcall(ruby_obj, rb_intern("safelink"), 0) == Qtrue)
+    flags = flags | MKD_SAFELINK;
+
+  /* no_pseudo_protocols */
+  if ( rb_funcall(ruby_obj, rb_intern("no_pseudo_protocols"), 0) == Qtrue)
+    flags = flags | MKD_NO_EXT;
+
+
   return flags;
 }
 

data/lib/rdiscount.rb

@@ -24,7 +24,7 @@
 #   end
 #
 class RDiscount
-  VERSION = '1.6.3'
+  VERSION = '1.6.3.1'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -32,7 +32,7 @@ class RDiscount
   # Set true to have smarty-like quote translation performed.
   attr_accessor :smart
 
-  # Do not output <style> tags included in the source text.
+  # Do not output <tt><style></tt> tags included in the source text.
   attr_accessor :filter_styles
 
   # Do not output any raw HTML included in the source text.
@@ -45,6 +45,27 @@ class RDiscount
   # Enable Table Of Contents generation
   attr_accessor :generate_toc
 
+  # Do not process <tt>![]</tt> and remove <tt><img></tt> tags from the output.
+  attr_accessor :no_image
+
+  # Do not process <tt>[]</tt> and remove <tt><a></tt> tags from the output.
+  attr_accessor :no_links
+
+  # Do not process tables
+  attr_accessor :no_tables
+
+  # Disable superscript and relaxed emphasis processing.
+  attr_accessor :strict
+
+  # Convert URL in links, even if they aren't encased in <tt><></tt>
+  attr_accessor :autolink
+
+  # Don't make hyperlinks from <tt>[][]</tt> links that have unknown URL types.
+  attr_accessor :safelink
+
+  # Do not process pseudo-protocols like <tt>[](id:name)</tt>
+  attr_accessor :no_pseudo_protocols
+
   # Create a RDiscount Markdown processor. The +text+ argument
   # should be a string containing Markdown text. Additional arguments may be
   # supplied to set various processing options:
@@ -54,14 +75,17 @@ class RDiscount
   # * <tt>:filter_html</tt> - Do not output any raw HTML tags included in
   #   the source text.
   # * <tt>:fold_lines</tt> - RedCloth compatible line folding (not used).
+  # * <tt>:generate_toc</tt> - Enable Table Of Contents generation
+  # * <tt>:no_image</tt> - Do not output any <tt><img></tt> tags.
+  # * <tt>:no_links</tt> - Do not output any <tt><a></tt> tags.
+  # * <tt>:no_tables</tt> - Do not output any tables.
+  # * <tt>:strict</tt> - Disable superscript and relaxed emphasis processing.
+  # * <tt>:autolink</tt> - Greedily urlify links.
+  # * <tt>:safelink</tt> - Do not make links for unknown URL types.
+  # * <tt>:no_pseudo_protocols</tt> - Do not process pseudo-protocols.
   #
-  # NOTE: The <tt>:filter_styles</tt> extension is not yet implemented.
   def initialize(text, *extensions)
     @text  = text
-    @smart = nil
-    @filter_styles = nil
-    @filter_html = nil
-    @fold_lines = nil
     extensions.each { |e| send("#{e}=", true) }
   end
 

data/rdiscount.gemspec

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

data/test/rdiscount_test.rb

@@ -64,4 +64,43 @@ class RDiscountTest < Test::Unit::TestCase
       assert_equal input.encoding.name, output.encoding.name
     end
   end
+
+  def test_that_no_image_flag_works
+    rd = RDiscount.new(%(![dust mite](http://dust.mite/image.png) <img src="image.png" />), :no_image)
+    assert rd.to_html !~ /<img/
+  end
+
+  def test_that_no_links_flag_works
+    rd = RDiscount.new(%([This link](http://example.net/) <a href="links.html">links</a>), :no_links)
+    assert rd.to_html !~ /<a /
+  end
+
+  def test_that_no_tables_flag_works
+    rd = RDiscount.new(<<EOS, :no_tables)
+ aaa | bbbb
+-----|------
+hello|sailor
+EOS
+    assert rd.to_html !~ /<table/
+  end
+
+  def test_that_strict_flag_works
+    rd = RDiscount.new("foo_bar_baz", :strict)
+    assert_equal "<p>foo<em>bar</em>baz</p>\n", rd.to_html
+  end
+
+  def test_that_autolink_flag_works
+    rd = RDiscount.new("http://github.com/rtomayko/rdiscount", :autolink)
+    assert_equal "<p><a href=\"http://github.com/rtomayko/rdiscount\">http://github.com/rtomayko/rdiscount</a></p>\n", rd.to_html
+  end
+
+  def test_that_safelink_flag_works
+    rd = RDiscount.new("[IRC](irc://chat.freenode.org/#freenode)", :safelink)
+    assert_equal "<p>[IRC](irc://chat.freenode.org/#freenode)</p>\n", rd.to_html
+  end
+
+  def test_that_no_pseudo_protocols_flag_works
+    rd = RDiscount.new("[foo](id:bar)", :no_pseudo_protocols)
+    assert_equal "<p>[foo](id:bar)</p>\n", rd.to_html
+  end
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 6
   - 3
-  version: 1.6.3
+  - 1
+  version: 1.6.3.1
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -08:00
+date: 2010-04-20 00:00:00 -07:00
 default_executable: 
 dependencies: []