greenmat 3.2.0.2 → 3.2.2.0

data/test/markdown_test.rb

@@ -18,37 +18,37 @@ class MarkdownTest < Greenmat::TestCase
 
   def test_that_simple_one_liner_goes_to_html
     assert_respond_to @markdown, :render
-    assert_equal "<p>Hello World.</p>\n", @markdown.render("Hello World.")
+    html_equal "<p>Hello World.</p>\n", @markdown.render("Hello World.")
   end
 
   def test_that_inline_markdown_goes_to_html
     markdown = @markdown.render('_Hello World_!')
-    assert_equal "<p><em>Hello World</em>!</p>\n", markdown
+    html_equal "<p><em>Hello World</em>!</p>\n", markdown
   end
 
   def test_that_inline_markdown_starts_and_ends_correctly
     markdown = render_with({:no_intra_emphasis => true}, '_start _ foo_bar bar_baz _ end_ *italic* **bold** <a>_blah_</a>')
 
-    assert_equal "<p><em>start _ foo_bar bar_baz _ end</em> <em>italic</em> <strong>bold</strong> <a><em>blah</em></a></p>\n", markdown
+    html_equal "<p><em>start _ foo_bar bar_baz _ end</em> <em>italic</em> <strong>bold</strong> <a><em>blah</em></a></p>\n", markdown
 
     markdown = @markdown.render("Run 'rake radiant:extensions:rbac_base:migrate'")
-    assert_equal "<p>Run &#39;rake radiant:extensions:rbac_base:migrate&#39;</p>\n", markdown
+    html_equal "<p>Run 'rake radiant:extensions:rbac_base:migrate'</p>\n", markdown
   end
 
   def test_that_urls_are_not_doubly_escaped
     markdown = @markdown.render('[Page 2](/search?query=Markdown+Test&page=2)')
-    assert_equal "<p><a href=\"/search?query=Markdown+Test&amp;page=2\">Page 2</a></p>\n", markdown
+    html_equal "<p><a href=\"/search?query=Markdown+Test&amp;page=2\">Page 2</a></p>\n", markdown
   end
 
   def test_simple_inline_html
     #markdown = Markdown.new("before\n\n<div>\n  foo\n</div>\nafter")
     markdown = @markdown.render("before\n\n<div>\n  foo\n</div>\n\nafter")
-    assert_equal "<p>before</p>\n\n<div>\n  foo\n</div>\n\n<p>after</p>\n", markdown
+    html_equal "<p>before</p>\n\n<div>\n  foo\n</div>\n\n<p>after</p>\n", markdown
   end
 
   def test_that_html_blocks_do_not_require_their_own_end_tag_line
     markdown = @markdown.render("Para 1\n\n<div><pre>HTML block\n</pre></div>\n\nPara 2 [Link](#anchor)")
-    assert_equal "<p>Para 1</p>\n\n<div><pre>HTML block\n</pre></div>\n\n<p>Para 2 <a href=\"#anchor\">Link</a></p>\n",
+    html_equal "<p>Para 1</p>\n\n<div><pre>HTML block\n</pre></div>\n\n<p>Para 2 <a href=\"#anchor\">Link</a></p>\n",
       markdown
   end
 
@@ -58,8 +58,8 @@ class MarkdownTest < Greenmat::TestCase
       "A wise man once said:\n\n" +
       " > Isn't it wonderful just to be alive.\n"
     )
-    assert_equal "<p>A wise man once said:</p>\n\n" +
-      "<blockquote>\n<p>Isn&#39;t it wonderful just to be alive.</p>\n</blockquote>\n",
+    html_equal "<p>A wise man once said:</p>\n\n" +
+      "<blockquote><p>Isn't it wonderful just to be alive.</p>\n</blockquote>\n",
       markdown
   end
 
@@ -68,7 +68,7 @@ class MarkdownTest < Greenmat::TestCase
       "Things to watch out for\n" +
       "<ul>\n<li>Blah</li>\n</ul>\n")
 
-    assert_equal "<p>Things to watch out for</p>\n\n" +
+    html_equal "<p>Things to watch out for</p>\n\n" +
       "<ul>\n<li>Blah</li>\n</ul>\n", markdown
   end
 
@@ -90,7 +90,7 @@ MARKDOWN
 
 <p>This paragraph is not part of the list.</p>
 HTML
-    assert_equal expected, @markdown.render(text)
+    html_equal expected, @markdown.render(text)
   end
 
   # http://github.com/rtomayko/rdiscount/issues/#issue/13
@@ -98,37 +98,37 @@ HTML
     text = "The Ant-Sugar Tales \n"         +
            "=================== \n\n"        +
            "By Candice Yellowflower   \n"
-    assert_equal "<h1>The Ant-Sugar Tales </h1>\n\n<p>By Candice Yellowflower   </p>\n", @markdown.render(text)
+    html_equal "<h1>The Ant-Sugar Tales </h1>\n\n<p>By Candice Yellowflower   </p>\n", @markdown.render(text)
   end
 
   def test_that_intra_emphasis_works
     rd = render_with({}, "foo_bar_baz")
-    assert_equal "<p>foo<em>bar</em>baz</p>\n", rd
+    html_equal "<p>foo<em>bar</em>baz</p>\n", rd
 
     rd = render_with({:no_intra_emphasis => true},"foo_bar_baz")
-    assert_equal "<p>foo_bar_baz</p>\n", rd
+    html_equal "<p>foo_bar_baz</p>\n", rd
   end
 
   def test_that_autolink_flag_works
     rd = render_with({:autolink => true}, "http://github.com/rtomayko/rdiscount")
-    assert_equal "<p><a href=\"http://github.com/rtomayko/rdiscount\">http://github.com/rtomayko/rdiscount</a></p>\n", rd
+    html_equal "<p><a href=\"http://github.com/rtomayko/rdiscount\">http://github.com/rtomayko/rdiscount</a></p>\n", rd
   end
 
   def test_that_tags_can_have_dashes_and_underscores
     rd = @markdown.render("foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b>")
-    assert_equal "<p>foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b></p>\n", rd
+    html_equal "<p>foo <asdf-qwerty>bar</asdf-qwerty> and <a_b>baz</a_b></p>\n", rd
   end
 
   def test_link_syntax_is_not_processed_within_code_blocks
     markdown = @markdown.render("    This is a code block\n    This is a link [[1]] inside\n")
-    assert_equal "<pre><code>This is a code block\nThis is a link [[1]] inside\n</code></pre>\n",
+    html_equal "<pre><code>This is a code block\nThis is a link [[1]] inside\n</code></pre>\n",
       markdown
   end
 
   def test_whitespace_after_urls
     rd = render_with({:autolink => true}, "Japan: http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm (yes, japan)")
     exp = %{<p>Japan: <a href="http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm">http://www.abc.net.au/news/events/japan-quake-2011/beforeafter.htm</a> (yes, japan)</p>\n}
-    assert_equal exp, rd
+    html_equal exp, rd
   end
 
   def test_memory_leak_when_parsing_char_links
@@ -147,7 +147,7 @@ HTML
   end
 
   def test_infinite_loop_in_header
-    assert_equal "<h1>Body</h1>\n", @markdown.render(<<-header)
+    html_equal "<h1>Body</h1>\n", @markdown.render(<<-header)
 ######
 #Body#
 ######
@@ -155,8 +155,8 @@ HTML
   end
 
   def test_a_hyphen_and_a_equal_should_not_be_converted_to_heading
-    assert_equal "<p>-</p>\n", @markdown.render("-")
-    assert_equal "<p>=</p>\n", @markdown.render("=")
+    html_equal "<p>-</p>\n", @markdown.render("-")
+    html_equal "<p>=</p>\n", @markdown.render("=")
   end
 
   def test_that_tables_flag_works
@@ -243,32 +243,6 @@ fenced
     assert !out.include?("<pre><code>")
   end
 
-  def test_that_indented_code_preserves_references
-    text = <<indented
-This is normal text
-
-    Link to [Google][1]
-
-    [1]: http://google.com
-indented
-    out = Greenmat::Markdown.new(Greenmat::Render::HTML, :fenced_code_blocks => true).render(text)
-    assert out.include?("[1]: http://google.com")
-  end
-
-  def test_that_fenced_flag_preserves_references
-    text = <<fenced
-This is normal text
-
-```
-Link to [Google][1]
-
-[1]: http://google.com
-```
-fenced
-    out = Greenmat::Markdown.new(Greenmat::Render::HTML, :fenced_code_blocks => true).render(text)
-    assert out.include?("[1]: http://google.com")
-  end
-
   def test_that_indented_flag_works
     text = <<indented
 This is a simple text
@@ -285,14 +259,14 @@ indented
 
   def test_that_headers_are_linkable
     markdown = @markdown.render('### Hello [GitHub](http://github.com)')
-    assert_equal "<h3>Hello <a href=\"http://github.com\">GitHub</a></h3>\n", markdown
+    html_equal "<h3>Hello <a href=\"http://github.com\">GitHub</a></h3>\n", markdown
   end
 
   def test_autolinking_with_ent_chars
     markdown = render_with({:autolink => true}, <<text)
 This a stupid link: https://github.com/rtomayko/tilt/issues?milestone=1&state=open
 text
-    assert_equal "<p>This a stupid link: <a href=\"https://github.com/rtomayko/tilt/issues?milestone=1&amp;state=open\">https://github.com/rtomayko/tilt/issues?milestone=1&amp;state=open</a></p>\n", markdown
+    html_equal "<p>This a stupid link: <a href=\"https://github.com/rtomayko/tilt/issues?milestone=1&state=open\">https://github.com/rtomayko/tilt/issues?milestone=1&amp;state=open</a></p>\n", markdown
   end
 
   def test_spaced_headers
@@ -318,13 +292,13 @@ text
 
   def test_emphasis_escaping
     markdown = @markdown.render("**foo\\*** _dd\\_dd_")
-    assert_equal "<p><strong>foo*</strong> <em>dd_dd</em></p>\n", markdown
+    html_equal "<p><strong>foo*</strong> <em>dd_dd</em></p>\n", markdown
   end
 
   def test_char_escaping_when_highlighting
     markdown = "==attribute\\==="
     output = render_with({highlight: true}, markdown)
-    assert_equal "<p><mark>attribute=</mark></p>\n", output
+    html_equal "<p><mark>attribute=</mark></p>\n", output
   end
 
   def test_ordered_lists_with_lax_spacing
@@ -337,6 +311,6 @@ text
 
   def test_references_with_tabs_after_colon
     markdown = @markdown.render("[Link][id]\n[id]:\t\t\thttp://google.es")
-    assert_equal "<p><a href=\"http://google.es\">Link</a></p>\n", markdown
+    html_equal "<p><a href=\"http://google.es\">Link</a></p>\n", markdown
   end
 end

data/test/test_helper.rb

@@ -1,33 +1,29 @@
 # coding: UTF-8
 Encoding.default_internal = 'UTF-8' if defined? Encoding
 
+gem 'test-unit', '>= 2' # necessary when not using bundle exec
+
 require 'test/unit'
+require 'nokogiri'
 
 require 'greenmat'
 require 'greenmat/render_strip'
 require 'greenmat/render_man'
+require 'greenmat/compat'
 
 class Greenmat::TestCase < Test::Unit::TestCase
-  def assert_renders(html, markdown)
-    assert_equal html, render(markdown)
+  def html_equal(html_a, html_b)
+    assert_equal Nokogiri::HTML::DocumentFragment.parse(html_a).to_html,
+      Nokogiri::HTML::DocumentFragment.parse(html_b).to_html
   end
 
-  def render(markdown, options = {})
-    options = options.fetch(:with, {})
-
-    if options.kind_of?(Array)
-      options = Hash[options.map {|o| [o, true]}]
-    end
-
-    render = renderer.new(options)
-    parser = Greenmat::Markdown.new(render, options)
-
-    parser.render(markdown)
+  def assert_renders(html, markdown)
+    html_equal html, parser.render(markdown)
   end
 
   private
 
-  def renderer
-    @renderer ||= Greenmat::Render::HTML
+  def parser
+    @parser ||= Greenmat::Markdown.new(Greenmat::Render::HTML)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenmat
 version: !ruby/object:Gem::Version
-  version: 3.2.0.2
+  version: 3.2.2.0
 platform: ruby
 authors:
 - Natacha Porté
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 2.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 2.5.4
 description: A Markdown parser for Qiita, based on Redcarpet.
 email: nkymyj@gmail.com
 executables:
@@ -106,7 +120,6 @@ files:
 - ext/greenmat/stack.h
 - greenmat.gemspec
 - lib/greenmat.rb
-- lib/greenmat/cli.rb
 - lib/greenmat/compat.rb
 - lib/greenmat/render_man.rb
 - lib/greenmat/render_strip.rb
@@ -203,7 +216,6 @@ files:
 - test/benchmark.rb
 - test/custom_render_test.rb
 - test/fixtures/benchmark.md
-- test/greenmat_bin_test.rb
 - test/greenmat_compat_test.rb
 - test/html5_test.rb
 - test/html_render_test.rb
@@ -329,7 +341,6 @@ test_files:
 - test/benchmark.rb
 - test/custom_render_test.rb
 - test/fixtures/benchmark.md
-- test/greenmat_bin_test.rb
 - test/greenmat_compat_test.rb
 - test/html5_test.rb
 - test/html_render_test.rb

data/lib/greenmat/cli.rb

@@ -1,86 +0,0 @@
-require 'greenmat'
-require 'optparse'
-
-module Greenmat
-  # This class aims at easing the creation of custom
-  # binary for your needs. For example, you can add new
-  # options or change the existing ones. The parsing
-  # is handled by Ruby's OptionParser. For instance:
-  #
-  #   class Custom::CLI < Greenmat::CLI
-  #     def self.options_parser
-  #       super.tap do |opts|
-  #         opts.on("--rainbow") do
-  #           @@options[:rainbow] = true
-  #         end
-  #       end
-  #     end
-  #
-  #     def self.render_object
-  #       @@options[:rainbow] ? RainbowRender : super
-  #     end
-  #   end
-  class CLI
-    def self.options_parser
-      @@options = {
-        render_extensions: {},
-        parse_extensions: {},
-        smarty_pants: false
-      }
-
-      OptionParser.new do |opts|
-        opts.banner = "Usage: greenmat [--parse <extension>...] " \
-                      "[--render <extension>...] [--smarty] <file>..."
-
-        opts.on("--parse EXTENSION", "Enable a parsing extension") do |ext|
-          ext = ext.gsub('-', '_').to_sym
-          @@options[:parse_extensions][ext] = true
-        end
-
-        opts.on("--render EXTENSION", "Enable a rendering extension") do |ext|
-          ext = ext.gsub('-', '_').to_sym
-          @@options[:render_extensions][ext] = true
-        end
-
-        opts.on("--smarty", "Enable Smarty Pants") do
-          @@options[:smarty_pants] = true
-        end
-
-        opts.on_tail("-v", "--version", "Display the current version") do
-          STDOUT.write "Greenmat #{Greenmat::VERSION}"
-          exit
-        end
-
-        opts.on_tail("-h", "--help", "Display this help message") do
-          puts opts
-          exit
-        end
-      end
-    end
-
-    def self.process(args)
-      self.legacy_parse!(args)
-      self.options_parser.parse!(args)
-      STDOUT.write parser_object.render(ARGF.read)
-    end
-
-    def self.render_object
-      @@options[:smarty_pants] ? Render::SmartyHTML : Render::HTML
-    end
-
-    def self.parser_object
-      renderer = render_object.new(@@options[:render_extensions])
-      Greenmat::Markdown.new(renderer, @@options[:parse_extensions])
-    end
-
-    def self.legacy_parse!(args) # :nodoc:
-      # Workaround for backward compatibility as OptionParser
-      # doesn't support the --flag-OPTION syntax.
-      args.select {|a| a =~ /--(parse|render)-/ }.each do |arg|
-        args.delete(arg)
-        arg = arg.partition(/\b-/)
-        args.push(arg.first, arg.last)
-      end
-    end
-  end
-end

data/test/greenmat_bin_test.rb

@@ -1,80 +0,0 @@
-require 'test_helper'
-require 'tempfile'
-
-class GreenmatBinTest < Greenmat::TestCase
-  def setup
-    @fixture_file = Tempfile.new('bin')
-    @fixture_path = @fixture_file.path
-
-    @fixture_file.write "A ==simple== fixture file -- with " \
-                        "a [link](https://github.com)."
-    @fixture_file.rewind
-  end
-
-  def teardown
-    @fixture_file.unlink
-  end
-
-  def test_vanilla_bin
-    run_bin(@fixture_path)
-
-    expected = "<p>A ==simple== fixture file -- with " \
-               "a <a href=\"https://github.com\">link</a>.</p>\n"
-
-    assert_equal expected, @output
-  end
-
-  def test_enabling_a_parse_option
-    run_bin("--parse", "highlight", @fixture_path)
-
-    assert_output "<mark>"
-    refute_output "=="
-  end
-
-  def test_enabling_a_render_option
-    run_bin("--render", "no-links", @fixture_path)
-
-    assert_output "[link]"
-    refute_output "</a>"
-  end
-
-  def test_enabling_smarty_pants
-    run_bin("--smarty", @fixture_path)
-
-    assert_output "&ndash"
-    refute_output "--"
-  end
-
-  def test_version_option
-    run_bin("--version")
-    assert_output "Greenmat #{Greenmat::VERSION}"
-  end
-
-  def test_legacy_option_parsing
-    run_bin("--parse-highlight", "--render-no-links", @fixture_path)
-
-    assert_output "<mark>"
-    refute_output "=="
-
-    assert_output "[link]"
-    refute_output "</a>"
-  end
-
-  private
-
-  def run_bin(*args)
-    bin_path = File.expand_path('../../bin/greenmat', __FILE__)
-
-    IO.popen("#{bin_path} #{args.join(" ")}") do |stream|
-      @output = stream.read
-    end
-  end
-
-  def assert_output(pattern)
-    assert_match pattern, @output
-  end
-
-  def refute_output(pattern)
-    refute_match Regexp.new(pattern), @output
-  end
-end