asciidoctor 1.5.7.1 → 1.5.8

data/test/test_helper.rb

@@ -19,6 +19,7 @@ require 'tmpdir'
 
 autoload :FileUtils, 'fileutils'
 autoload :Pathname,  'pathname'
+autoload :Open3, 'open3'
 
 RE_XMLNS_ATTRIBUTE = / xmlns="[^"]+"/
 RE_DOCTYPE = /\s*<!DOCTYPE (.*)/
@@ -193,7 +194,7 @@ class Minitest::Test
     doc.blocks.first
   end
 
-  def render_string(src, opts = {})
+  def convert_string(src, opts = {})
     keep_namespaces = opts.delete(:keep_namespaces)
     if keep_namespaces
       document_from_string(src, opts).convert
@@ -205,12 +206,12 @@ class Minitest::Test
     end
   end
 
-  def render_embedded_string(src, opts = {})
+  def convert_string_to_embedded(src, opts = {})
     opts[:header_footer] = false
     document_from_string(src, opts).convert
   end
 
-  def render_inline_string(src, opts = {})
+  def convert_inline_string(src, opts = {})
     opts[:doctype] = :inline
     document_from_string(src, opts).convert
   end

data/test/text_test.rb

@@ -53,28 +53,28 @@ include::fixtures/encoding.asciidoc[tags=romé]
 
   test 'escaped text markup' do
     assert_match(/All your <em>inline<\/em> markup belongs to <strong>us<\/strong>!/,
-        render_string('All your <em>inline</em> markup belongs to <strong>us</strong>!'))
+        convert_string('All your <em>inline</em> markup belongs to <strong>us</strong>!'))
   end
 
   test "line breaks" do
-    assert_xpath "//br", render_string("Well this is +\njust fine and dandy, isn't it?"), 1
+    assert_xpath "//br", convert_string("Well this is +\njust fine and dandy, isn't it?"), 1
   end
 
   test 'single- and double-quoted text' do
-    rendered = render_embedded_string(%q(``Where?,'' she said, flipping through her copy of `The New Yorker.'), :attributes => {'compat-mode' => ''})
-    assert_match(/&#8220;Where\?,&#8221;/, rendered)
-    assert_match(/&#8216;The New Yorker.&#8217;/, rendered)
+    output = convert_string_to_embedded(%q(``Where?,'' she said, flipping through her copy of `The New Yorker.'), :attributes => {'compat-mode' => ''})
+    assert_match(/&#8220;Where\?,&#8221;/, output)
+    assert_match(/&#8216;The New Yorker.&#8217;/, output)
 
-    rendered = render_embedded_string(%q("`Where?,`" she said, flipping through her copy of '`The New Yorker.`'))
-    assert_match(/&#8220;Where\?,&#8221;/, rendered)
-    assert_match(/&#8216;The New Yorker.&#8217;/, rendered)
+    output = convert_string_to_embedded(%q("`Where?,`" she said, flipping through her copy of '`The New Yorker.`'))
+    assert_match(/&#8220;Where\?,&#8221;/, output)
+    assert_match(/&#8216;The New Yorker.&#8217;/, output)
   end
 
   test 'multiple double-quoted text on a single line' do
     assert_equal '&#8220;Our business is constantly changing&#8221; or &#8220;We need faster time to market.&#8221;',
-        render_embedded_string(%q(``Our business is constantly changing'' or ``We need faster time to market.''), :doctype => :inline, :attributes => {'compat-mode' => ''})
+        convert_inline_string(%q(``Our business is constantly changing'' or ``We need faster time to market.''), :attributes => {'compat-mode' => ''})
     assert_equal '&#8220;Our business is constantly changing&#8221; or &#8220;We need faster time to market.&#8221;',
-        render_embedded_string(%q("`Our business is constantly changing`" or "`We need faster time to market.`"), :doctype => :inline)
+        convert_inline_string(%q("`Our business is constantly changing`" or "`We need faster time to market.`"))
   end
 
   test 'horizontal rule' do
@@ -85,7 +85,7 @@ This line is separated by a horizontal rule...
 
 ...from this line.
     EOS
-    output = render_embedded_string input
+    output = convert_string_to_embedded input
     assert_xpath "//hr", output, 1
     assert_xpath "/*[@class='paragraph']", output, 2
     assert_xpath "(/*[@class='paragraph'])[1]/following-sibling::hr", output, 1
@@ -118,7 +118,7 @@ This line is separated by a horizontal rule...
 
 ...from this line.
         EOS
-        output = render_embedded_string input
+        output = convert_string_to_embedded input
         assert_xpath "//hr", output, 1
         assert_xpath "/*[@class='paragraph']", output, 2
         assert_xpath "(/*[@class='paragraph'])[1]/following-sibling::hr", output, 1
@@ -151,7 +151,7 @@ This line is separated by something that is not a horizontal rule...
 
 ...from this line.
         EOS
-        output = render_embedded_string input
+        output = convert_string_to_embedded input
         assert_xpath '//hr', output, 0
       end
     end
@@ -176,134 +176,134 @@ This line is separated by something that is not a horizontal rule...
 
 ...from this line.
         EOS
-        output = render_embedded_string input
+        output = convert_string_to_embedded input
         assert_xpath '//hr', output, 0
       end
     end
   end
 
   test "emphasized text using underscore characters" do
-    assert_xpath "//em", render_string("An _emphatic_ no")
+    assert_xpath "//em", convert_string("An _emphatic_ no")
   end
 
   test 'emphasized text with single quote using apostrophe characters' do
     rsquo = decode_char 8217
-    assert_xpath %(//em[text()="Johnny#{rsquo}s"]), render_string(%q(It's 'Johnny's' phone), :attributes => {'compat-mode' => ''})
-    assert_xpath %(//p[text()="It#{rsquo}s 'Johnny#{rsquo}s' phone"]), render_string(%q(It's 'Johnny's' phone))
+    assert_xpath %(//em[text()="Johnny#{rsquo}s"]), convert_string(%q(It's 'Johnny's' phone), :attributes => {'compat-mode' => ''})
+    assert_xpath %(//p[text()="It#{rsquo}s 'Johnny#{rsquo}s' phone"]), convert_string(%q(It's 'Johnny's' phone))
   end
 
   test 'emphasized text with escaped single quote using apostrophe characters' do
-    assert_xpath %(//em[text()="Johnny's"]), render_string(%q(It's 'Johnny\\'s' phone), :attributes => {'compat-mode' => ''})
-    assert_xpath %(//p[text()="It's 'Johnny's' phone"]), render_string(%q(It\\'s 'Johnny\\'s' phone))
+    assert_xpath %(//em[text()="Johnny's"]), convert_string(%q(It's 'Johnny\\'s' phone), :attributes => {'compat-mode' => ''})
+    assert_xpath %(//p[text()="It's 'Johnny's' phone"]), convert_string(%q(It\\'s 'Johnny\\'s' phone))
   end
 
   test "escaped single quote is restored as single quote" do
-    assert_xpath "//p[contains(text(), \"Let's do it!\")]", render_string("Let\\'s do it!")
+    assert_xpath "//p[contains(text(), \"Let's do it!\")]", convert_string("Let\\'s do it!")
   end
 
   test 'unescape escaped single quote emphasis in compat mode only' do
-    assert_xpath %(//p[text()="A 'single quoted string' example"]), render_embedded_string(%(A \\'single quoted string' example), :attributes => {'compat-mode' => ''})
-    assert_xpath %(//p[text()="'single quoted string'"]), render_embedded_string(%(\\'single quoted string'), :attributes => {'compat-mode' => ''})
+    assert_xpath %(//p[text()="A 'single quoted string' example"]), convert_string_to_embedded(%(A \\'single quoted string' example), :attributes => {'compat-mode' => ''})
+    assert_xpath %(//p[text()="'single quoted string'"]), convert_string_to_embedded(%(\\'single quoted string'), :attributes => {'compat-mode' => ''})
 
-    assert_xpath %(//p[text()="A \\'single quoted string' example"]), render_embedded_string(%(A \\'single quoted string' example))
-    assert_xpath %(//p[text()="\\'single quoted string'"]), render_embedded_string(%(\\'single quoted string'))
+    assert_xpath %(//p[text()="A \\'single quoted string' example"]), convert_string_to_embedded(%(A \\'single quoted string' example))
+    assert_xpath %(//p[text()="\\'single quoted string'"]), convert_string_to_embedded(%(\\'single quoted string'))
   end
 
   test "emphasized text at end of line" do
-    assert_xpath "//em", render_string("This library is _awesome_")
+    assert_xpath "//em", convert_string("This library is _awesome_")
   end
 
   test "emphasized text at beginning of line" do
-    assert_xpath "//em", render_string("_drop_ it")
+    assert_xpath "//em", convert_string("_drop_ it")
   end
 
   test "emphasized text across line" do
-    assert_xpath "//em", render_string("_check it_")
+    assert_xpath "//em", convert_string("_check it_")
   end
 
   test "unquoted text" do
-    refute_match(/#/, render_string("An #unquoted# word"))
+    refute_match(/#/, convert_string("An #unquoted# word"))
   end
 
   test 'backticks and straight quotes in text' do
     backslash = '\\'
-    assert_equal %q(run <code>foo</code> <em>dog</em>), render_embedded_string(%q(run `foo` 'dog'), :doctype => :inline, :attributes => {'compat-mode' => ''})
-    assert_equal %q(run <code>foo</code> 'dog'), render_embedded_string(%q(run `foo` 'dog'), :doctype => :inline)
-    assert_equal %q(run `foo` 'dog'), render_embedded_string(%(run #{backslash}`foo` 'dog'), :doctype => :inline)
-    assert_equal %q(run &#8216;foo` 'dog&#8217;), render_embedded_string(%q(run '`foo` 'dog`'), :doctype => :inline)
-    assert_equal %q(run '`foo` 'dog`'), render_embedded_string(%(run #{backslash}'`foo` 'dog#{backslash}`'), :doctype => :inline)
+    assert_equal %q(run <code>foo</code> <em>dog</em>), convert_inline_string(%q(run `foo` 'dog'), :attributes => {'compat-mode' => ''})
+    assert_equal %q(run <code>foo</code> 'dog'), convert_inline_string(%q(run `foo` 'dog'))
+    assert_equal %q(run `foo` 'dog'), convert_inline_string(%(run #{backslash}`foo` 'dog'))
+    assert_equal %q(run &#8216;foo` 'dog&#8217;), convert_inline_string(%q(run '`foo` 'dog`'))
+    assert_equal %q(run '`foo` 'dog`'), convert_inline_string(%(run #{backslash}'`foo` 'dog#{backslash}`'))
   end
 
   test 'plus characters inside single plus passthrough' do
-    assert_xpath '//p[text()="+"]', render_embedded_string('+++')
-    assert_xpath '//p[text()="+="]', render_embedded_string('++=+')
+    assert_xpath '//p[text()="+"]', convert_string_to_embedded('+++')
+    assert_xpath '//p[text()="+="]', convert_string_to_embedded('++=+')
   end
 
   test 'plus passthrough escapes entity reference' do
-    assert_match(/&amp;#44;/, render_embedded_string('+&#44;+'))
-    assert_match(/one&amp;#44;two/, render_embedded_string('one++&#44;++two'))
+    assert_match(/&amp;#44;/, convert_string_to_embedded('+&#44;+'))
+    assert_match(/one&amp;#44;two/, convert_string_to_embedded('one++&#44;++two'))
   end
 
   context "basic styling" do
     setup do
-      @rendered = render_string("A *BOLD* word.  An _italic_ word.  A `mono` word.  ^superscript!^ and some ~subscript~.")
+      @output = convert_string("A *BOLD* word.  An _italic_ word.  A `mono` word.  ^superscript!^ and some ~subscript~.")
     end
 
     test "strong" do
-      assert_xpath "//strong", @rendered, 1
+      assert_xpath "//strong", @output, 1
     end
 
     test "italic" do
-      assert_xpath "//em", @rendered, 1
+      assert_xpath "//em", @output, 1
     end
 
     test "monospaced" do
-      assert_xpath "//code", @rendered, 1
+      assert_xpath "//code", @output, 1
     end
 
     test "superscript" do
-      assert_xpath "//sup", @rendered, 1
+      assert_xpath "//sup", @output, 1
     end
 
     test "subscript" do
-      assert_xpath "//sub", @rendered, 1
+      assert_xpath "//sub", @output, 1
     end
 
     test "passthrough" do
-      assert_xpath "//code", render_string("This is +passed through+."), 0
-      assert_xpath "//code", render_string("This is +passed through and monospaced+.", :attributes => {'compat-mode' => ''}), 1
+      assert_xpath "//code", convert_string("This is +passed through+."), 0
+      assert_xpath "//code", convert_string("This is +passed through and monospaced+.", :attributes => {'compat-mode' => ''}), 1
     end
 
     test "nested styles" do
-      rendered = render_string("Winning *big _time_* in the +city *boyeeee*+.", :attributes => {'compat-mode' => ''})
+      output = convert_string("Winning *big _time_* in the +city *boyeeee*+.", :attributes => {'compat-mode' => ''})
 
-      assert_xpath "//strong/em", rendered
-      assert_xpath "//code/strong", rendered
+      assert_xpath "//strong/em", output
+      assert_xpath "//code/strong", output
 
-      rendered = render_string("Winning *big _time_* in the `city *boyeeee*`.")
+      output = convert_string("Winning *big _time_* in the `city *boyeeee*`.")
 
-      assert_xpath "//strong/em", rendered
-      assert_xpath "//code/strong", rendered
+      assert_xpath "//strong/em", output
+      assert_xpath "//code/strong", output
     end
 
     test 'unconstrained quotes' do
-      rendered_chars = render_string('**B**__I__++M++[role]++M++', :attributes => {'compat-mode' => ''})
-      assert_xpath '//strong', rendered_chars, 1
-      assert_xpath '//em', rendered_chars, 1
-      assert_xpath '//code[not(@class)]', rendered_chars, 1
-      assert_xpath '//code[@class="role"]', rendered_chars, 1
-
-      rendered_chars = render_string('**B**__I__``M``[role]``M``')
-      assert_xpath '//strong', rendered_chars, 1
-      assert_xpath '//em', rendered_chars, 1
-      assert_xpath '//code[not(@class)]', rendered_chars, 1
-      assert_xpath '//code[@class="role"]', rendered_chars, 1
+      output = convert_string('**B**__I__++M++[role]++M++', :attributes => {'compat-mode' => ''})
+      assert_xpath '//strong', output, 1
+      assert_xpath '//em', output, 1
+      assert_xpath '//code[not(@class)]', output, 1
+      assert_xpath '//code[@class="role"]', output, 1
+
+      output = convert_string('**B**__I__``M``[role]``M``')
+      assert_xpath '//strong', output, 1
+      assert_xpath '//em', output, 1
+      assert_xpath '//code[not(@class)]', output, 1
+      assert_xpath '//code[@class="role"]', output, 1
     end
   end
 
   test 'should format Asian characters as words' do
-    assert_xpath '//strong', (render_embedded_string 'bold *要* bold')
-    assert_xpath '//strong', (render_embedded_string 'bold *素* bold')
-    assert_xpath '//strong', (render_embedded_string 'bold *要素* bold')
+    assert_xpath '//strong', (convert_string_to_embedded 'bold *要* bold')
+    assert_xpath '//strong', (convert_string_to_embedded 'bold *素* bold')
+    assert_xpath '//strong', (convert_string_to_embedded 'bold *要素* bold')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 1.5.7.1
+  version: 1.5.8
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -91,14 +91,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,28 +133,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +187,7 @@ files:
 - CONTRIBUTING.adoc
 - Gemfile
 - LICENSE
+- README-de.adoc
 - README-fr.adoc
 - README-jp.adoc
 - README-zh_CN.adoc
@@ -235,6 +222,7 @@ files:
 - data/locale/attributes-ru.adoc
 - data/locale/attributes-sr.adoc
 - data/locale/attributes-sr_Latn.adoc
+- data/locale/attributes-sv.adoc
 - data/locale/attributes-tr.adoc
 - data/locale/attributes-uk.adoc
 - data/locale/attributes-zh_CN.adoc
@@ -267,6 +255,7 @@ files:
 - lib/asciidoctor/converter/template.rb
 - lib/asciidoctor/core_ext.rb
 - lib/asciidoctor/core_ext/1.8.7/base64/strict_encode64.rb
+- lib/asciidoctor/core_ext/1.8.7/concurrent/hash.rb
 - lib/asciidoctor/core_ext/1.8.7/hash/key.rb
 - lib/asciidoctor/core_ext/1.8.7/io/binread.rb
 - lib/asciidoctor/core_ext/1.8.7/io/write.rb
@@ -295,6 +284,7 @@ files:
 - man/asciidoctor.1
 - man/asciidoctor.adoc
 - test/api_test.rb
+- test/attribute_list_test.rb
 - test/attributes_test.rb
 - test/blocks_test.rb
 - test/converter_test.rb
@@ -323,6 +313,7 @@ files:
 - test/fixtures/docinfo-footer.xml
 - test/fixtures/docinfo.html
 - test/fixtures/docinfo.xml
+- test/fixtures/doctime-localtime.adoc
 - test/fixtures/dot.gif
 - test/fixtures/encoding.asciidoc
 - test/fixtures/file-with-missing-include.adoc
@@ -340,6 +331,7 @@ files:
 - test/fixtures/parent-include-restricted.adoc
 - test/fixtures/parent-include.adoc
 - test/fixtures/sample.asciidoc
+- test/fixtures/section-a.adoc
 - test/fixtures/stylesheets/custom.css
 - test/fixtures/subdir/index.adoc
 - test/fixtures/subdir/inner-include.adoc
@@ -392,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain
@@ -404,6 +396,7 @@ test_files:
 - features/text_formatting.feature
 - features/xref.feature
 - test/api_test.rb
+- test/attribute_list_test.rb
 - test/attributes_test.rb
 - test/blocks_test.rb
 - test/converter_test.rb
@@ -432,6 +425,7 @@ test_files:
 - test/fixtures/docinfo-footer.xml
 - test/fixtures/docinfo.html
 - test/fixtures/docinfo.xml
+- test/fixtures/doctime-localtime.adoc
 - test/fixtures/dot.gif
 - test/fixtures/encoding.asciidoc
 - test/fixtures/file-with-missing-include.adoc
@@ -449,6 +443,7 @@ test_files:
 - test/fixtures/parent-include-restricted.adoc
 - test/fixtures/parent-include.adoc
 - test/fixtures/sample.asciidoc
+- test/fixtures/section-a.adoc
 - test/fixtures/stylesheets/custom.css
 - test/fixtures/subdir/index.adoc
 - test/fixtures/subdir/inner-include.adoc