greenmat 3.2.2.2 → 3.5.1.2

data/test/safe_render_test.rb

@@ -2,34 +2,33 @@ require 'test_helper'
 
 class SafeRenderTest < Greenmat::TestCase
   def setup
-    @render = Greenmat::Render::Safe
-    @parser = Greenmat::Markdown.new(@render, fenced_code_blocks: true)
+    @renderer = Greenmat::Render::Safe
   end
 
   def test_safe_links_only_is_enabled_by_default
     markdown = "[foo](javascript:alert('foo'))"
-    output   = @parser.render(markdown)
+    output   = render(markdown)
 
     assert_not_match %r{a href}, output
   end
 
   def test_escape_html_is_enabled_by_default
     markdown = "<p>Hello world!</p>"
-    output   = @parser.render(markdown)
+    output   = render(markdown)
 
     assert_match %r{&lt;}, output
   end
 
   def test_html_escaping_in_code_blocks
     markdown = "~~~\n<p>Hello!</p>\n~~~"
-    output   = @parser.render(markdown)
+    output   = render(markdown)
 
     assert_match %r{&lt;p&gt;}, output
   end
 
   def test_lang_class_is_removed
     markdown = "~~~ruby\nclass Foo; end\n~~~"
-    output   = @parser.render(markdown)
+    output   = render(markdown, with: [:fenced_code_blocks])
 
     assert_not_match %r{ruby}, output
   end

data/test/smarty_html_test.rb

@@ -3,43 +3,49 @@ require 'test_helper'
 
 class SmartyHTMLTest < Greenmat::TestCase
   def setup
-    @smarty_markdown = Greenmat::Markdown.new(Greenmat::Render::SmartyHTML)
+    @renderer = Greenmat::Render::SmartyHTML
   end
 
   def test_that_smartyhtml_converts_single_quotes
-    markdown = @smarty_markdown.render("They're not for sale.")
-    assert_equal "<p>They&rsquo;re not for sale.</p>\n", markdown
+    markdown = render("They're not for sale.")
+    assert_equal "<p>They&rsquo;re not for sale.</p>", markdown
   end
 
   def test_that_smartyhtml_converts_double_quotes
-    rd = @smarty_markdown.render(%("Quoted text"))
-    assert_equal %(<p>&ldquo;Quoted text&rdquo;</p>\n), rd
+    rd = render(%("Quoted text"))
+    assert_equal %(<p>&ldquo;Quoted text&rdquo;</p>), rd
   end
 
   def test_that_smartyhtml_converts_double_hyphen
-    rd = @smarty_markdown.render("double hyphen -- ndash")
-    assert_equal "<p>double hyphen &ndash; ndash</p>\n", rd
+    rd = render("double hyphen -- ndash")
+    assert_equal "<p>double hyphen &ndash; ndash</p>", rd
   end
 
   def test_that_smartyhtml_converts_triple_hyphen
-    rd = @smarty_markdown.render("triple hyphen --- mdash")
-    assert_equal "<p>triple hyphen &mdash; mdash</p>\n", rd
+    rd = render("triple hyphen --- mdash")
+    assert_equal "<p>triple hyphen &mdash; mdash</p>", rd
   end
 
   def test_that_smartyhtml_ignores_double_hyphen_in_code
-    rd = @smarty_markdown.render("double hyphen in `--option`")
-    assert_equal "<p>double hyphen in <code>--option</code></p>\n", rd
+    rd = render("double hyphen in `--option`")
+    assert_equal "<p>double hyphen in <code>--option</code></p>", rd
   end
 
   def test_that_smartyhtml_ignores_pre
-    rd = @smarty_markdown.render("    It's a test of \"pre\"\n")
+    rd = render("    It's a test of \"pre\"\n")
     expected = "It&#39;s a test of &quot;pre&quot;"
     assert rd.include?(expected), "\"#{rd}\" should contain \"#{expected}\""
   end
 
   def test_that_smartyhtml_ignores_code
-    rd = @smarty_markdown.render("`It's a test of \"code\"`\n")
+    rd = render("`It's a test of \"code\"`\n")
     expected = "It&#39;s a test of &quot;code&quot;"
     assert rd.include?(expected), "\"#{rd}\" should contain \"#{expected}\""
   end
+
+  def test_that_smartyhtml_ignores_links_for_single_quotes
+    output = render("[John](link)'s cat")
+    expected = %(<p><a href="link">John</a>&rsquo;s cat</p>)
+    assert_equal expected, output
+  end
 end

data/test/smarty_pants_test.rb

@@ -45,4 +45,14 @@ class SmartyPantsTest < Greenmat::TestCase
     rd = @pants.render("<p>Hopin' that this bug gets some fixin'.</p>")
     assert_equal "<p>Hopin&rsquo; that this bug gets some fixin&rsquo;.</p>", rd
   end
+
+  def test_that_is_not_confused_by_fractions
+    rd = @pants.render('I am 1/4... of the way to 1/4/2000')
+    assert_equal "I am &frac14;&hellip; of the way to 1/4/2000", rd
+  end
+
+  def test_that_smart_converts_multiple_single_quotes
+    rd = @pants.render(%(<p>'First' and 'second' and 'third'</p>))
+    assert_equal %(<p>&lsquo;First&rsquo; and &lsquo;second&rsquo; and &lsquo;third&rsquo;</p>), rd
+  end
 end

data/test/stripdown_render_test.rb

@@ -3,37 +3,66 @@ require 'test_helper'
 
 class StripDownRender < Greenmat::TestCase
   def setup
-    @parser = Greenmat::Markdown.new(Greenmat::Render::StripDown)
+    @renderer = Greenmat::Render::StripDown
   end
 
   def test_titles
     markdown = "# Foo bar"
-    output   = @parser.render(markdown)
+    output   = render(markdown)
 
-    assert_equal "Foo bar\n", output
+    assert_equal "Foo bar", output
   end
 
   def test_code_blocks
     markdown = "\tclass Foo\n\tend"
-    output   = @parser.render(markdown)
+    output   = render(markdown)
 
-    assert_equal "class Foo\nend\n", output
+    assert_equal "class Foo\nend", output
   end
 
   def test_images
     markdown = "Look at this ![picture](http://example.org/picture.png)\n" \
                "And this: ![](http://example.org/image.jpg)"
     expected = "Look at this picture http://example.org/picture.png\n" \
-               "And this: http://example.org/image.jpg\n"
-    output   = @parser.render(markdown)
+               "And this: http://example.org/image.jpg"
+    output   = render(markdown)
 
     assert_equal expected, output
   end
 
   def test_links
     markdown = "Here's an [example](https://github.com)"
-    expected = "Here's an example (https://github.com)\n"
-    output   = @parser.render(markdown)
+    expected = "Here's an example (https://github.com)"
+    output   = render(markdown)
+
+    assert_equal expected, output
+  end
+
+  def test_tables
+    markdown = "| Left-Aligned  | Centre Aligned  | Right Aligned |\n" \
+               "| :------------ |:---------------:| -----:|\n" \
+               "| col 3 is      | some wordy text | $1600 |\n" \
+               "| col 2 is      | centered        |   $12 |"
+    expected = "Left-Aligned\tCentre Aligned\tRight Aligned\t\n" \
+               "col 3 is\tsome wordy text\t$1600\t\n" \
+               "col 2 is\tcentered\t$12\t"
+    output   = render(markdown, with: [:tables])
+
+    assert_equal expected, output
+  end
+
+  def test_highlight
+    markdown = "==Hello world!=="
+    expected = "Hello world!"
+    output   = render(markdown, with: [:highlight])
+
+    assert_equal expected, output
+  end
+
+  def test_with_quote_option_enabled
+    markdown = %(A common idiom is "Hello world")
+    expected = %(A common idiom is Hello world)
+    output   = render(markdown, with: [:quote])
 
     assert_equal expected, output
   end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 # coding: UTF-8
-Encoding.default_internal = 'UTF-8' if defined? Encoding
+$:.unshift(File.expand_path('../../lib', __FILE__))
+Encoding.default_internal = 'UTF-8'
 
 gem 'test-unit', '>= 2' # necessary when not using bundle exec
 
@@ -9,21 +10,41 @@ require 'nokogiri'
 require 'greenmat'
 require 'greenmat/render_strip'
 require 'greenmat/render_man'
-require 'greenmat/compat'
 
 class Greenmat::TestCase < Test::Unit::TestCase
-  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
+  def assert_renders(html, markdown)
+    assert_equal html, render(markdown)
   end
 
-  def assert_renders(html, markdown)
-    html_equal html, parser.render(markdown)
+  def render(markdown, options = {})
+    options = options.fetch(:with, {})
+
+    if options.kind_of?(Array)
+      options = Hash[options.map {|o| [o, true]}]
+    end
+
+    render = begin
+      renderer.new(options)
+    rescue ArgumentError
+      renderer.new
+    end
+
+    parser = Greenmat::Markdown.new(render, options)
+
+    parser.render(markdown).chomp
   end
 
   private
 
-  def parser
-    @parser ||= Greenmat::Markdown.new(Greenmat::Render::HTML)
+  def renderer
+    @renderer ||= Greenmat::Render::HTML
+  end
+
+  # Imported from Active Support
+  class ::String
+    def strip_heredoc
+      indent = scan(/^ *(?=\S)/).min.size || 0
+      gsub(/^[ \t]{#{indent}}/, '')
+    end
   end
 end

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: greenmat
 version: !ruby/object:Gem::Version
-  version: 3.2.2.2
+  version: 3.5.1.2
 platform: ruby
 authors:
 - Natacha Porté
 - Vicent Martí
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -31,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.2.1
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 3.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 3.2.3
 description: A Markdown parser for Qiita, based on Redcarpet.
 email: nkymyj@gmail.com
 executables:
@@ -120,6 +134,7 @@ 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
@@ -215,6 +230,7 @@ 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
@@ -230,7 +246,7 @@ homepage: https://github.com/increments/greenmat
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,9 +261,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Markdown parser for Qiita, based on Redcarpet.
 test_files:
@@ -340,6 +355,7 @@ 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