kramdown-asciidoc 1.0.0.alpha.2 → 1.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d272b7da83b441ebdb647887c7d9355fb05eba02b5dd3f01094bc7b089fe2a34
-  data.tar.gz: 58f6c5b345bd05e72c06a571b72cdd829766a87a33fa87b3ae0f0d7adab3b3b7
+  metadata.gz: e95a5d12ba8c16a4dffb8257066dda516b072943947fa156ef5e94914451b36d
+  data.tar.gz: 1381d930ab4aaa34f9ec2bf1ccf274357c76f061a0f4715336bacd6fee7e3124
 SHA512:
-  metadata.gz: e3f41c1b6a204e64ea4f4baf582910a0b06004dd1fe11676f6b2cb47cca317214c359a86991ba24c133aa18764df6ab1a4b06e9e107eeb31f0085d37d30e3719
-  data.tar.gz: 362e0cb506477aae3cf22b57b2be596b573259e6da83e20a0a9cfc62e0c7e63d830760975b2ddd72f360ffb59b07e0e0245dc779289153e17ef5c4af931fb5b7
+  metadata.gz: b3acf70f81410433141239ed11bfc9fb3d498eddeecffad94144a98386aac5146b80ab4609dd3b673609961fefedad7ef5f4a21e05ef34859f3d4915e5e48062
+  data.tar.gz: cdc0863d2926c1488a263ec73f067ca201038192f35b25c79872507d5da6b81ef70cf53134d40e770c9edbd6170f98079cdd0d05ddc2d33b1b1c80c0ff74b3ea

data/CHANGELOG.adoc

@@ -5,6 +5,19 @@
 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.
 
+== 1.0.0.alpha.3 (2018-05-31) - @mojavelinux
+
+=== Added
+
+* patch conversion from HTML br element to native until the fix for gettalong/kramdown#514 is released
+* preserve non-default table column alignment
+* honor image width specified in style attribute of HTML img element
+* replace empty HTML p element with paragraph containing \{blank}
+
+=== Changed
+
+* replace ndash symbol with \-- instead of \–
+
 == 1.0.0.alpha.2 (2018-05-24) - @mojavelinux
 
 === Added
@@ -13,7 +26,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 * convert HTML-based admonition blocks
 * drop HTML div element if enclosing an image
 * transfer id and class/role attributes to block image
-* pass through width attribute to image if specified on HTML img element
+* honor image width specified on width attribute of HTML img element
 
 === Changed
 

data/Gemfile

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :coverage do
+  gem 'deep-cover', git: 'https://github.com/mojavelinux/deep-cover', branch: 'no-cli', require: false
+  gem 'sass', require: false unless ENV['CI']
+end

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name} (Markdown to AsciiDoc)
 Dan Allen <https://github.com/mojavelinux>
-v1.0.0.alpha.2, 2018-05-24
+v1.0.0.alpha.3, 2018-05-31
 // Aliases:
 :project-name: Kramdown AsciiDoc
 :project-handle: kramdown-asciidoc
@@ -23,14 +23,15 @@ endif::[]
 :uri-asciidoc: https://asciidoctor.org/docs/what-is-asciidoc/#what-is-asciidoc
 :uri-asciidoctor: https://asciidoctor.org
 :uri-rvm: https://rvm.io
-:uri-install-rvm: https://rvm.io/rvm/install
-//:img-gem: https://img.shields.io/gem/v/kramdown-asciidoc.svg?label=gem
+:uri-rvm-install: https://rvm.io/rvm/install
 :uri-ci-travis: https://travis-ci.org/asciidoctor/kramdown-asciidoc
-:img-ci-travis: https://img.shields.io/travis/asciidoctor/kramdown-asciidoc/master.svg
+:uri-ci-travis-img: https://img.shields.io/travis/asciidoctor/kramdown-asciidoc/master.svg
+:uri-gem: https://rubygems.org/gems/kramdown-asciidoc
+:uri-gem-img: https://img.shields.io/gem/v/kramdown-asciidoc.svg?label=gem
 
 ifdef::status[]
-//image:{img-gem}[Gem Version,link={uri-gem}]
-image:{img-ci-travis}[Build Status (Travis CI),link={uri-ci-travis}]
+image:{uri-gem-img}[Gem Version,link={uri-gem}]
+image:{uri-ci-travis-img}[Build Status (Travis CI),link={uri-ci-travis}]
 endif::[]
 
 {uri-repo}[{project-name}] (gem: *{project-handle}*) is a Kramdown extension for converting Markdown documents to {uri-asciidoc}[AsciiDoc].
@@ -41,7 +42,7 @@ Notably, the converter generates modern AsciiDoc syntax suitable for use with {u
 To install and run {project-name}, you need Ruby 2.4 or better installed and a few RubyGems (aka gems).
 We'll explain how to install the gems in the next section.
 
-To check whether you have Ruby installed, and which version you have, run the following command:
+To check whether you have Ruby installed, and which version, run the following command:
 
  $ ruby -v
 
@@ -50,7 +51,7 @@ We generally recommend using RVM because it allows you to install gems without r
 
 == Installation
 
-{project-name} is published as a pre-release gem named {project-handle} to RubyGems.org.
+{project-name} is published to RubyGems.org as a pre-release gem named *{project-handle}*.
 
 You can install the pre-release version using the following command:
 
@@ -95,7 +96,7 @@ Next, switch to the project directory:
 
 We recommend using {uri-rvm}[RVM] when developing applications with Ruby.
 We like RVM because it keeps the dependencies required by the project isolated from the rest of your system.
-Follow the {uri-install-rvm}[installation instructions] on the RVM site to setup RVM and install Ruby.
+Follow the {uri-rvm-install}[installation instructions] on the RVM site to setup RVM and install Ruby.
 
 Once you have RVM setup, switch to the RVM-managed version of Ruby recommended by the project using this command:
 

data/lib/kramdown-asciidoc.rb

@@ -1,2 +1,13 @@
 require 'kramdown'
 require_relative 'kramdown-asciidoc/converter'
+autoload :YAML, 'yaml'
+
+# REMOVE once Kramdown > 1.16.2 is released
+class Kramdown::Parser::Html::ElementConverter
+  def convert_br el
+    el.options.clear
+    el.type = el.value.to_sym
+    el.value = ''
+    nil
+  end
+end

data/lib/kramdown-asciidoc/converter.rb

@@ -21,7 +21,6 @@ module Kramdown; module AsciiDoc
 
   def self.extract_front_matter source, attributes
     if (line_i = (lines = source.each_line).next) && line_i.chomp == '---'
-      require 'yaml' unless defined? ::YAML
       lines = lines.drop 1
       front_matter = []
       while (line = lines.shift) && line.chomp != '---'
@@ -59,7 +58,7 @@ module Kramdown; module AsciiDoc
       '’' => '`\'',
       # FIXME in the future, mdash will be three dashes in AsciiDoc; for now, down-convert
       '—' => '--',
-      '–' => '–',
+      '–' => '--',
       '…' => '...',
     }
     TYPOGRAPHIC_ENTITY_TO_MARKUP = {
@@ -72,9 +71,15 @@ module Kramdown; module AsciiDoc
       laquo_scape: '<< ',
       raquo_space: ' >>',
     }
+    TABLE_ALIGNMENTS = {
+      left: '<',
+      center: '^',
+      right: '>',
+    }
 
     ApostropheRx = /\b’\b/
     CommentPrefixRx = /^ *! ?/m
+    CssPropDelimRx = /\s*;\s*/
     ReplaceableTextRx = /[-=]>|<[-=]|\.\.\./
     StartOfLinesRx = /^/m
     TypographicSymbolRx = /[“”‘’—–…]/
@@ -154,19 +159,22 @@ module Kramdown; module AsciiDoc
       else
         prefix, suffix = '', LFx2
       end
+      if (children = el.children).empty?
+        contents = '{blank}'
       # NOTE detect plain admonition marker (e.g, Note: ...)
-      if (child_i = el.children[0] || VoidElement).type == :text && (child_i_text = child_i.value).start_with?(*ADMON_MARKERS)
+      elsif (child_i = children[0]).type == :text && (child_i_text = child_i.value).start_with?(*ADMON_MARKERS)
         marker, child_i_text = child_i_text.split ': ', 2
         child_i = clone child_i, value: %(#{ADMON_TYPE_MAP[marker]}: #{child_i_text})
-        el = clone el, children: [child_i] + (el.children.drop 1)
+        el = clone el, children: [child_i] + (children.drop 1)
         contents = inner el, opts
       # NOTE detect formatted admonition marker (e.g., *Note:* ...)
       elsif (child_i.type == :strong || child_i.type == :em) &&
           (marker_el = child_i.children[0]) && ((marker = ADMON_FORMATTED_MARKERS[marker_el.value]) ||
-          ((marker = ADMON_LABELS[marker_el.value]) && (child_ii = el.children[1] || VoidElement).type == :text &&
+          ((marker = ADMON_LABELS[marker_el.value]) && (child_ii = children[1] || VoidElement).type == :text &&
           ((child_ii_text = child_ii.value).start_with? ': ')))
-        el = clone el, children: (el.children.drop 1)
-        el.children[0] = clone child_ii, value: (child_ii_text.slice 1, child_ii_text.length) if child_ii
+        children = children.drop 1
+        children[0] = clone child_ii, value: (child_ii_text.slice 1, child_ii_text.length) if child_ii
+        el = clone el, children: children
         contents = %(#{ADMON_TYPE_MAP[marker]}:#{inner el, opts})
       else
         contents = inner el, opts
@@ -251,11 +259,16 @@ module Kramdown; module AsciiDoc
       prefix = (prev = opts[:prev]) && prev.options[:compound] ? LF : ''
       marker = opts[:parent].type == :ol ? '.' : '*'
       indent = (level = opts[:level]) - 1
-      %(#{prefix}#{indent > 0 ? (' ' * indent) : ''}#{marker * level} #{(inner el, (opts.merge rstrip: true))}#{LF})
+      %(#{prefix}#{indent > 0 ? ' ' * indent : ''}#{marker * level} #{(inner el, (opts.merge rstrip: true))}#{LF})
     end
 
     def convert_table el, opts
-      head = cols = nil
+      head = nil
+      cols = (alignments = el.options[:alignment]).size
+      if alignments.any? {|align| align == :center || align == :right }
+        colspecs = alignments.map {|align| TABLE_ALIGNMENTS[align] }.join ','
+        colspecs = %("#{colspecs}") if cols > 1
+      end
       table_buf = ['|===']
       el.children.each do |container|
         container.children.each do |row|
@@ -265,18 +278,20 @@ module Kramdown; module AsciiDoc
             cell_contents = cell_contents.gsub '|', '\|' if cell_contents.include? '|'
             row_buf << %(| #{cell_contents})
           end
-          cols ||= row_buf.size
           if container.type == :thead
             head = true
-            row_buf = [row_buf * ' ']
-            row_buf << ''
+            row_buf = [row_buf * ' ', '']
           elsif cols > 1
             row_buf << ''
           end
           table_buf.concat row_buf
         end
       end
-      table_buf.unshift %([cols=#{cols}*]) unless head || cols < 2
+      if colspecs
+        table_buf.unshift %([cols=#{colspecs}])
+      elsif !head && cols > 1
+        table_buf.unshift %([cols=#{cols}*])
+      end
       table_buf.pop if table_buf[-1] == ''
       table_buf << '|==='
       %(#{table_buf * LF}#{LFx2})
@@ -371,6 +386,14 @@ module Kramdown; module AsciiDoc
       if (width = el.attr['width'])
         macro_attrs << '' if macro_attrs.empty?
         macro_attrs << width
+      elsif (css = el.attr['style']) && (width_css = (css.split CssPropDelimRx).find {|p| p.start_with? 'width:' })
+        macro_attrs << '' if macro_attrs.empty?
+        width = (width_css.slice (width_css.index ':') + 1, width_css.length).strip
+        unless width.end_with? '%'
+          width = width.to_f
+          width = width.to_i if width == width.to_i
+        end
+        macro_attrs << width
       end
       if (url = opts[:url])
         macro_attrs << %(link=#{url})

data/lib/kramdown-asciidoc/version.rb

@@ -1,3 +1,3 @@
 module Kramdown; module AsciiDoc
-  VERSION = '1.0.0.alpha.2'
+  VERSION = '1.0.0.alpha.3'
 end; end

data/spec/fixtures/br/tag-in-table-cell.adoc

@@ -0,0 +1,4 @@
+|===
+| This is a test. +
+This is only a test.
+|===

data/spec/fixtures/br/tag-in-table-cell.md

@@ -0,0 +1 @@
+| This is a test.<br/>This is only a test. |

data/spec/fixtures/html_element/empty-p.adoc

@@ -0,0 +1,5 @@
+before
+
+{blank}
+
+after

data/spec/fixtures/html_element/empty-p.md

@@ -0,0 +1,5 @@
+before
+
+<p></p>
+
+after

data/spec/fixtures/html_element/img-with-css-width.adoc

@@ -0,0 +1 @@
+image::logo.png[,480]

data/spec/fixtures/html_element/img-with-css-width.md

@@ -0,0 +1 @@
+<img src="logo.png" style="float: right; width: 480px">

data/spec/fixtures/table/alignment.adoc

@@ -0,0 +1,12 @@
+[cols=">,^,<"]
+|===
+| Name | Index | Desc
+
+| foo
+| 1
+| bar
+
+| bim
+| 2
+| bop
+|===

data/spec/fixtures/table/alignment.md

@@ -0,0 +1,4 @@
+| Name | Index | Desc |
+|-----:|:-----:|:-----|
+| foo  | 1     | bar  |
+| bim  | 2     | bop  |

data/spec/fixtures/text/typographic_sym/ndash.adoc

@@ -1 +1 @@
-9–5 is the gig.
+9--5 is the gig.

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
-if ENV['COVERAGE'] == 'true'
+case ENV['COVERAGE']
+when 'deep'
+  ENV['DEEP_COVER'] = 'true'
+  require 'deep_cover'
+when 'true'
+  require 'deep_cover/builtin_takeover'
   require 'simplecov'
-  SimpleCov.start do
-    add_filter %w(/.bundle/ /spec/)
-    coverage_dir 'build/coverage-report'
-  end
 end
 
 require 'kramdown-asciidoc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-asciidoc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.2
+  version: 1.0.0.alpha.3
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -113,6 +113,8 @@ files:
 - spec/fixtures/blockquote/with-attribution.md
 - spec/fixtures/br/tag-followed-by-newline.adoc
 - spec/fixtures/br/tag-followed-by-newline.md
+- spec/fixtures/br/tag-in-table-cell.adoc
+- spec/fixtures/br/tag-in-table-cell.md
 - spec/fixtures/br/tag-preceded-by-space.adoc
 - spec/fixtures/br/tag-preceded-by-space.md
 - spec/fixtures/br/tag.adoc
@@ -167,12 +169,16 @@ files:
 - spec/fixtures/html_element/abbr.md
 - spec/fixtures/html_element/admonition.adoc
 - spec/fixtures/html_element/admonition.md
+- spec/fixtures/html_element/empty-p.adoc
+- spec/fixtures/html_element/empty-p.md
 - spec/fixtures/html_element/heading-with-class.adoc
 - spec/fixtures/html_element/heading-with-class.md
 - spec/fixtures/html_element/heading-with-id.adoc
 - spec/fixtures/html_element/heading-with-id.md
 - spec/fixtures/html_element/img-with-alt-and-width.adoc
 - spec/fixtures/html_element/img-with-alt-and-width.md
+- spec/fixtures/html_element/img-with-css-width.adoc
+- spec/fixtures/html_element/img-with-css-width.md
 - spec/fixtures/html_element/img-with-width.adoc
 - spec/fixtures/html_element/img-with-width.md
 - spec/fixtures/html_element/img.adoc
@@ -231,8 +237,8 @@ files:
 - spec/fixtures/p/admonition/strong-emphasis.md
 - spec/fixtures/p/multiple-lines.adoc
 - spec/fixtures/p/multiple-lines.md
-- spec/fixtures/p/multiple.adoc
-- spec/fixtures/p/multiple.md
+- spec/fixtures/p/sequential.adoc
+- spec/fixtures/p/sequential.md
 - spec/fixtures/p/single-line.adoc
 - spec/fixtures/p/single-line.md
 - spec/fixtures/root/body-only.adoc
@@ -253,6 +259,8 @@ files:
 - spec/fixtures/strong/constrained.md
 - spec/fixtures/strong/nested-emphasis.adoc
 - spec/fixtures/strong/nested-emphasis.md
+- spec/fixtures/table/alignment.adoc
+- spec/fixtures/table/alignment.md
 - spec/fixtures/table/cell-with-pipe.adoc
 - spec/fixtures/table/cell-with-pipe.md
 - spec/fixtures/table/single-column-with-header.adoc
@@ -375,6 +383,8 @@ test_files:
 - spec/fixtures/blockquote/with-attribution.md
 - spec/fixtures/br/tag-followed-by-newline.adoc
 - spec/fixtures/br/tag-followed-by-newline.md
+- spec/fixtures/br/tag-in-table-cell.adoc
+- spec/fixtures/br/tag-in-table-cell.md
 - spec/fixtures/br/tag-preceded-by-space.adoc
 - spec/fixtures/br/tag-preceded-by-space.md
 - spec/fixtures/br/tag.adoc
@@ -429,12 +439,16 @@ test_files:
 - spec/fixtures/html_element/abbr.md
 - spec/fixtures/html_element/admonition.adoc
 - spec/fixtures/html_element/admonition.md
+- spec/fixtures/html_element/empty-p.adoc
+- spec/fixtures/html_element/empty-p.md
 - spec/fixtures/html_element/heading-with-class.adoc
 - spec/fixtures/html_element/heading-with-class.md
 - spec/fixtures/html_element/heading-with-id.adoc
 - spec/fixtures/html_element/heading-with-id.md
 - spec/fixtures/html_element/img-with-alt-and-width.adoc
 - spec/fixtures/html_element/img-with-alt-and-width.md
+- spec/fixtures/html_element/img-with-css-width.adoc
+- spec/fixtures/html_element/img-with-css-width.md
 - spec/fixtures/html_element/img-with-width.adoc
 - spec/fixtures/html_element/img-with-width.md
 - spec/fixtures/html_element/img.adoc
@@ -493,8 +507,8 @@ test_files:
 - spec/fixtures/p/admonition/strong-emphasis.md
 - spec/fixtures/p/multiple-lines.adoc
 - spec/fixtures/p/multiple-lines.md
-- spec/fixtures/p/multiple.adoc
-- spec/fixtures/p/multiple.md
+- spec/fixtures/p/sequential.adoc
+- spec/fixtures/p/sequential.md
 - spec/fixtures/p/single-line.adoc
 - spec/fixtures/p/single-line.md
 - spec/fixtures/root/body-only.adoc
@@ -515,6 +529,8 @@ test_files:
 - spec/fixtures/strong/constrained.md
 - spec/fixtures/strong/nested-emphasis.adoc
 - spec/fixtures/strong/nested-emphasis.md
+- spec/fixtures/table/alignment.adoc
+- spec/fixtures/table/alignment.md
 - spec/fixtures/table/cell-with-pipe.adoc
 - spec/fixtures/table/cell-with-pipe.md
 - spec/fixtures/table/single-column-with-header.adoc