commonmarker 0.14.3 → 0.14.4

data/ext/commonmarker/cmark/test/spec_tests.py

@@ -19,6 +19,8 @@ if __name__ == "__main__":
             default=None, help='limit to sections matching regex pattern')
     parser.add_argument('--library-dir', dest='library_dir', nargs='?',
             default=None, help='directory containing dynamic library')
+    parser.add_argument('--extensions', dest='extensions', nargs='?',
+            default=None, help='space separated list of extensions to enable')
     parser.add_argument('--no-normalize', dest='normalize',
             action='store_const', const=False, default=True,
             help='do not normalize HTML')
@@ -39,9 +41,10 @@ def print_test_header(headertext, example_number, start_line, end_line):
     out("Example %d (lines %d-%d) %s\n" % (example_number,start_line,end_line,headertext))
 
 def do_test(converter, test, normalize, result_counts):
-    [retcode, actual_html, err] = converter(test['markdown'])
+    [retcode, actual_html, err] = converter(test['markdown'], test['extensions'])
+    actual_html = re.sub(r'\r\n', '\n', actual_html)
     if retcode == 0:
-        expected_html = test['html']
+        expected_html = re.sub(r'\r\n', '\n', test['html'])
         unicode_error = None
         if expected_html.strip() == '<IGNORE>':
             passed = True
@@ -84,6 +87,7 @@ def get_tests(specfile):
     markdown_lines = []
     html_lines = []
     state = 0  # 0 regular text, 1 markdown example, 2 html output
+    extensions = []
     headertext = ''
     tests = []
 
@@ -93,8 +97,9 @@ def get_tests(specfile):
         for line in specf:
             line_number = line_number + 1
             l = line.strip()
-            if l == "`" * 32 + " example":
+            if l.startswith("`" * 32 + " example"):
                 state = 1
+                extensions = l[32 + len(" example"):].split()
             elif l == "`" * 32:
                 state = 0
                 example_number = example_number + 1
@@ -105,7 +110,8 @@ def get_tests(specfile):
                     "example": example_number,
                     "start_line": start_line,
                     "end_line": end_line,
-                    "section": headertext})
+                    "section": headertext,
+                    "extensions": extensions})
                 start_line = 0
                 markdown_lines = []
                 html_lines = []
@@ -133,11 +139,11 @@ if __name__ == "__main__":
         pattern_re = re.compile('.')
     tests = [ test for test in all_tests if re.search(pattern_re, test['section']) and (not args.number or test['example'] == args.number) ]
     if args.dump_tests:
-        out(json.dumps(tests, ensure_ascii=False, indent=2))
+        out(json.dumps(tests, indent=2))
         exit(0)
     else:
         skipped = len(all_tests) - len(tests)
-        converter = CMark(prog=args.program, library_dir=args.library_dir).to_html
+        converter = CMark(prog=args.program, library_dir=args.library_dir, extensions=args.extensions).to_html
         result_counts = {'pass': 0, 'fail': 0, 'error': 0, 'skip': skipped}
         for test in tests:
             do_test(converter, test, args.normalize, result_counts)

data/ext/commonmarker/extconf.rb

@@ -46,7 +46,7 @@ unless sitearch =~ /^universal-darwin/
 end
 
 $LDFLAGS << " -L#{CMARK_BUILD_DIR}/src -L#{CMARK_BUILD_DIR}/extensions -lcmark -lcmarkextensions"
-$CFLAGS << " -O2 -I#{CMARK_DIR}/src -I#{CMARK_DIR}/extensions -I#{CMARK_BUILD_DIR}/src"
+$CFLAGS << " -O2 -I#{CMARK_DIR}/src -I#{CMARK_DIR}/extensions -I#{CMARK_BUILD_DIR}/src -I#{CMARK_BUILD_DIR}/extensions"
 $CFLAGS << " -DCMARK_STATIC_DEFINE"
 
 create_makefile('commonmarker/commonmarker')

data/lib/commonmarker/renderer/html_renderer.rb

@@ -155,5 +155,9 @@ module CommonMarker
     def table_cell(_)
       out(@in_header ? '<th>' : '<td>', :children, @in_header ? '</th>' : '</td>')
     end
+
+    def strikethrough(_)
+      out('<strike>', :children, '</strike>')
+    end
   end
 end

data/lib/commonmarker/version.rb

@@ -1,3 +1,3 @@
 module CommonMarker
-  VERSION = '0.14.3'.freeze
+  VERSION = '0.14.4'.freeze
 end

data/test/test_helper.rb

@@ -17,6 +17,7 @@ def open_spec_file(filename)
   state = 0 # 0 regular text, 1 markdown example, 2 html output
   headertext = ''
   tests = []
+  extensions = []
 
   header_re = Regexp.new('#+ ')
   filepath = File.join('ext', 'commonmarker', 'cmark', 'test', filename)
@@ -25,8 +26,9 @@ def open_spec_file(filename)
     line_number += 1
 
     l = line.strip
-    if l == '`' * 32 + ' example'
+    if l =~ /^`{32} example(.*)$/
       state = 1
+      extensions = $1.split
     elsif l == '`' * 32
       state = 0
       example_number += 1
@@ -37,7 +39,8 @@ def open_spec_file(filename)
         :example => example_number,
         :start_line => start_line,
         :end_line => end_line,
-        :section => headertext
+        :section => headertext,
+        :extensions => extensions.map(&:to_sym),
       }
       start_line = 0
       markdown_lines = []

data/test/test_spec.rb

@@ -6,18 +6,20 @@ class TestSpec < Minitest::Test
 
   spec.each do |testcase|
     # next unless testcase['example'] == 420
-    doc = CommonMarker.render_doc(testcase[:markdown])
+    doc = CommonMarker.render_doc(testcase[:markdown], :default, testcase[:extensions])
 
     define_method("test_to_html_example_#{testcase[:example]}") do
-      actual = doc.to_html.rstrip
+      actual = doc.to_html(:default, testcase[:extensions]).rstrip
       assert_equal testcase[:html], actual, testcase[:markdown]
     end
 
-    define_method("test_html_renderer_example_#{testcase[:example]}") do
-      actual = HtmlRenderer.new.render(doc).rstrip
-      File.write('test.txt', testcase[:html])
-      File.write('actual.txt', actual)
-      assert_equal testcase[:html], actual, testcase[:markdown]
+    unless testcase[:extensions].any?
+      define_method("test_html_renderer_example_#{testcase[:example]}") do
+        actual = HtmlRenderer.new.render(doc).rstrip
+        File.write('test.txt', testcase[:html])
+        File.write('actual.txt', actual)
+        assert_equal testcase[:html], actual, testcase[:markdown]
+      end
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-enum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement