kramdown-asciidoc 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0108c05d441dbc4125ed5fa6f51d152ae238d769cf5add12a0c35000c237e4
-  data.tar.gz: 77fec67f63c28cb7611c45aaca839292cb19686e8d9e02cd87ed31a129fd939a
+  metadata.gz: e2f299ca0d156093eca0b0bf206f13bbedb23604e4f6a237b2b5aa16faa76eb0
+  data.tar.gz: 7bc8f03b29ecc1986f25c53858a3f4920b3ff3ba8a1d4b3313cee73c4be0dcaa
 SHA512:
-  metadata.gz: 309476de155735f63f125bf1c91349f2d261b02c4e69b0ca5e154381893ec6d340429f348d14dd42e08ec4039db7d531a5de36e13089ee2e4ff9609696e161a7
-  data.tar.gz: e4e265aae1a393d0f1b2038bce02aae9ffaa24d4b8e219458bf557ff219c3629c27d9788a9b1a69115d1e1522b60ec28d3771884cc68c2cfc4dbfa52f15f35b0
+  metadata.gz: 3d67ddef393d8155a0362ca7c8f0a997cf16f232f1293c13c8cb49ffa08009353224fa9703a25a4f1ab3b3b3dc4b048b56721b15d344695ec025ab3c8223efbe
+  data.tar.gz: 3ad990caafd8c8dd4eb0854e1af5095be820b735feff16d28aeac09b98967aabbefc43d6ecae35bda318d8cfdf65a691ea1e34e6b8a060337b17086b4a58e61e

data/CHANGELOG.adoc

@@ -5,6 +5,24 @@
 This document provides a high-level view of the changes to {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.0.1 (2022-06-29) - @mojavelinux
+
+=== Fixed
+
+* Fix crash when fenced code block is empty and does not specify a language (#93)
+* Fix crash when input contains `<script>` tag (#98)
+* Fix crash if blockquote ends with nested block (#96)
+* Handle text that maps to an abbreviation (#97)
+* Handle front matter value that is parsed as a date or datetime (#95)
+
+=== Changed
+
+* Add JRuby 9.3 to CI matrix
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.1[git tag] | {url-repo}/compare/v2.0.0\...v2.0.1[full diff]
+
 == 2.0.0 (2021-07-11) - @mojavelinux
 
 === Added

data/Gemfile

@@ -12,9 +12,9 @@ group :docs do
 end unless without.include? 'docs'
 
 group :lint do
-  gem 'rubocop', '~> 1.18.0', require: false
+  gem 'rubocop', '~> 1.28.0', require: false
   gem 'rubocop-rake', '~> 0.6.0', require: false
-  gem 'rubocop-rspec', '~> 2.4.0', require: false
+  gem 'rubocop-rspec', '~> 2.10.0', require: false
 end unless without.include? 'lint'
 
 group :coverage do

data/LICENSE.adoc

@@ -1,6 +1,6 @@
 .The MIT License
 ....
-Copyright (C) 2016-2019 OpenDevise Inc. (on behalf of the Asciidoctor Project)
+Copyright (C) 2016-2021 OpenDevise Inc. and the individual contributors to {project-name}.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name} (Markdown to AsciiDoc)
 Dan Allen <https://github.com/mojavelinux>
-v2.0.0, 2021-07-11
+v2.0.1, 2022-06-29
 // Aliases:
 :project-name: Kramdown AsciiDoc
 :project-handle: kramdown-asciidoc
@@ -367,7 +367,7 @@ To avoid having to do this, or make the `kramdoc` command available from anywher
 
 == Copyright
 
-Copyright (C) 2016-2019 OpenDevise Inc. (on behalf of the Asciidoctor Project).
+Copyright (C) 2016-2021 OpenDevise Inc. and the individual contributors to {project-name}.
 Free use of this software is granted under the terms of the MIT License.
 
 See the link:LICENSE.adoc[LICENSE] file for details.

data/bin/kramdoc

@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-kramdown_asciidoc = File.absolute_path '../lib/kramdown-asciidoc', __dir__
-if File.exist? kramdown_asciidoc
+if File.file? (kramdown_asciidoc = File.join (File.dirname __dir__), 'lib/kramdown-asciidoc.rb')
   require kramdown_asciidoc
 else
   require 'kramdown-asciidoc'
 end
-
 require 'kramdown-asciidoc/cli'
 
 exit Kramdown::AsciiDoc::Cli.run

data/kramdown-asciidoc.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'rspec', '~> 3.10.0'
+  s.add_development_dependency 'rspec', '~> 3.11.0'
 end

data/lib/kramdown-asciidoc/api.rb

@@ -27,7 +27,10 @@ module AsciiDoc
   # @option opts [Symbol] :wrap (:preserve) the line wrapping behavior to apply (:preserve, :ventilate, or :none).
   # @option opts [Integer] :heading_offset (0) the heading offset to apply to heading levels.
   # @option opts [Boolean] :auto_links (true) whether to allow raw URLs to be recognized as links.
-  # @option opts [Hash] :attributes ({}) AsciiDoc attributes to add to the document header of the output document.
+  # @option opts [Hash] :attributes ({}) additional AsciiDoc attributes to add to header of output document; reserved
+  #   attributes, like stem, may be overridden; some attributes may impact conversion, such as idprefix and idseparator
+  # @option opts [String] :imagesdir (nil) the prefix to remove from image references found in the Markdown document;
+  #   if not specified, the value of the imagesdir attribute is used
   # @option opts [Symbol] :encode (true) whether to reencode the source to UTF-8.
   # @option opts [Array<Proc>] :preprocessors ([]) a list of preprocessors functions to execute on the cleaned Markdown source.
   # @option opts [Array<Proc>] :postprocessors ([]) a list of functions through which to run the output document.
@@ -82,7 +85,10 @@ module AsciiDoc
   # @option opts [Symbol] :wrap (:preserve) the line wrapping behavior to apply (:preserve, :ventilate, or :none).
   # @option opts [Integer] :heading_offset (0) the heading offset to apply to heading levels.
   # @option opts [Boolean] :auto_links (true) whether to allow raw URLs to be recognized as links.
-  # @option opts [Hash] :attributes ({}) AsciiDoc attributes to add to the document header of the output document.
+  # @option opts [Hash] :attributes ({}) additional AsciiDoc attributes to add to header of output document; reserved
+  #   attributes, like stem, may be overridden; some attributes may impact conversion, such as idprefix and idseparator
+  # @option opts [String] :imagesdir (nil) the prefix to remove from image references found in the Markdown document;
+  #   if not specified, the value of the imagesdir attribute is used
   # @option opts [Array<Proc>] :preprocessors ([]) a list of preprocessors functions to execute on the cleaned Markdown source.
   # @option opts [Array<Proc>] :postprocessors ([]) a list of functions through which to run the output document.
   # @option opts [Proc] :postprocess (nil) a function through which to run the output document (if :postprocessors is falsy).

data/lib/kramdown-asciidoc/cli.rb

@@ -15,7 +15,7 @@ module AsciiDoc
       opt_parser = ::OptionParser.new do |opts|
         opts.program_name = 'kramdoc'
         opts.banner = <<~EOS
-        Usage: #{opts.program_name} [OPTION]... FILE...
+        Usage: #{opts.program_name} [OPTION]... FILE
 
         Converts Markdown to AsciiDoc.
 
@@ -87,10 +87,8 @@ module AsciiDoc
       if args.empty?
         opt_parser.warn 'Please specify a Markdown file to convert.'
         $stdout.write opt_parser.help
-        return 1
-      end
-
-      if args.size == 1
+        1
+      elsif args.size == 1
         options[:input_file] = args[0]
         [0, options]
       else
@@ -120,8 +118,8 @@ module AsciiDoc
         ::Kramdoc.convert_file input_file, options
       end
       0
-    rescue ::IOError => e
-      $stderr.write %(kramdoc: #{e.message}\n)
+    rescue ::IOError
+      $stderr.write %(kramdoc: #{$!.message}\n)
       1
     end
   end

data/lib/kramdown-asciidoc/converter.rb

@@ -206,7 +206,7 @@ module AsciiDoc
       if contents[0].start_with?(*ADMON_MARKERS_ASCIIDOC) && !(contents.include? '')
         writer.add_lines contents
       else
-        if contents.size > 1 && (contents[-1].start_with? '-- ')
+        if contents.size > 1 && ::String === (last_line = contents[-1]) && (last_line.start_with? '-- ')
           attribution = (attribution_line = contents.pop).slice 3, attribution_line.length
           writer.add_line %([,#{attribution}])
           # NOTE there will be at least one non-blank line, but coerce .to_s just to be safe
@@ -228,18 +228,19 @@ module AsciiDoc
         writer.start_block
       end
       lines = el.value.rstrip.split LF
+      first_line = lines[0]
       if (lang = el.attr['class'])
         # NOTE Kramdown always prefixes class with language-
         # TODO remap lang if requested
         writer.add_line %([,#{lang = lang.slice 9, lang.length}])
-      elsif (prompt = lines[0].start_with? '$ ')
+      elsif (prompt = first_line && (first_line.start_with? '$ '))
         writer.add_line %([,#{lang = 'console'}]) if lines.include? ''
       end
       if lang || (el.options[:fenced] && !prompt)
         writer.add_line '----'
         writer.add_lines lines
         writer.add_line '----'
-      elsif !prompt && ((lines.include? '') || (ListMarkerRx.match? lines[0]))
+      elsif !prompt && ((lines.include? '') || (first_line && (ListMarkerRx.match? first_line)))
         writer.add_line '....'
         writer.add_lines lines
         writer.add_line '....'
@@ -487,6 +488,10 @@ module AsciiDoc
       next_el && next_el.type == :text && (WordRx.match? next_el.value.chr)
     end
 
+    def convert_abbreviation el, opts
+      opts[:writer].append el.value
+    end
+
     def convert_text el, opts
       text = escape_replacements el.value
       if text.include? '++'
@@ -546,7 +551,11 @@ module AsciiDoc
     end
 
     def convert_html_element el, opts
-      if (tag = el.value) == 'div' && (child_i = el.children[0]) && child_i.options[:transparent] && (child_i_i = child_i.children[0])
+      if (tag = el.value) == 'script'
+        opts[:writer].start_block
+        opts[:writer].add_lines ['++++', '<script>', el.children[0].value.strip, '</script>', '++++']
+        return
+      elsif tag == 'div' && (child_i = el.children[0]) && child_i.options[:transparent] && (child_i_i = child_i.children[0])
         if child_i_i.value == 'span' && ((role = el.attr['class'].to_s).start_with? 'note') && child_i_i.attr['class'] == 'notetitle'
           marker = ADMON_FORMATTED_MARKERS[(to_element child_i_i.children[0]).value] || 'Note'
           lines = compose_text (child_i.children.drop 1), parent: child_i, strip: true, split: true, wrap: @wrap

data/lib/kramdown-asciidoc/core_ext/yaml.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+autoload :Date, 'time'
+autoload :Time, 'time'
+
+unless (YAML.method :safe_load).parameters.include? [:key, :aliases]
+  YAML.singleton_class.prepend (Module.new do
+    def safe_load yaml, permitted_classes: [], permitted_symbols: [], aliases: false, filename: nil
+      super yaml, permitted_classes, permitted_symbols, aliases, filename
+    end
+  end)
+end

data/lib/kramdown-asciidoc/preprocessors.rb

@@ -18,7 +18,7 @@ module AsciiDoc
         end
         return source unless line && line.chomp == '---' && !(front_matter.include? ?\n)
         lines.shift while (line = lines[0]) && line == ?\n
-        (::YAML.safe_load front_matter.join).each do |key, val|
+        (::YAML.safe_load front_matter.join, permitted_classes: [::Date, ::Time]).each do |key, val|
           if key == 'layout'
             attributes['page-layout'] = val unless val == 'default'
           else

data/lib/kramdown-asciidoc/version.rb

@@ -2,6 +2,6 @@
 
 module Kramdown
 module AsciiDoc
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end
 end

data/lib/kramdown-asciidoc.rb

@@ -4,6 +4,7 @@ require 'kramdown'
 require_relative 'kramdown-asciidoc/kramdown_ext/parser/base'
 require_relative 'kramdown-asciidoc/kramdown_ext/parser/html'
 require_relative 'kramdown-asciidoc/core_ext/regexp/is_match'
+require_relative 'kramdown-asciidoc/core_ext/yaml'
 require_relative 'kramdown-asciidoc/preprocessors'
 require_relative 'kramdown-asciidoc/writer'
 require_relative 'kramdown-asciidoc/converter'
@@ -13,4 +14,3 @@ Kramdown::Converter::Asciidoc = Kramdown::AsciiDoc::Converter
 # add Kramdoc alias
 Kramdoc = Kramdown::AsciiDoc
 autoload :Pathname, 'pathname'
-autoload :YAML, 'yaml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-asciidoc
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-11 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 description: A kramdown extension for converting Markdown documents to AsciiDoc.
 email:
 - dan.j.allen@gmail.com
@@ -100,6 +100,7 @@ files:
 - lib/kramdown-asciidoc/cli.rb
 - lib/kramdown-asciidoc/converter.rb
 - lib/kramdown-asciidoc/core_ext/regexp/is_match.rb
+- lib/kramdown-asciidoc/core_ext/yaml.rb
 - lib/kramdown-asciidoc/kramdown_ext/parser/base.rb
 - lib/kramdown-asciidoc/kramdown_ext/parser/html.rb
 - lib/kramdown-asciidoc/preprocessors.rb
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A Markdown to AsciiDoc converter based on kramdown