asciidoctor 1.5.6.2 → 1.5.7

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
-ASCIIDOCTOR_PROJECT_DIR = File.dirname File.dirname(__FILE__)
+ASCIIDOCTOR_TEST_DIR = File.expand_path File.dirname __FILE__
+ASCIIDOCTOR_PROJECT_DIR = File.dirname ASCIIDOCTOR_TEST_DIR
 Dir.chdir ASCIIDOCTOR_PROJECT_DIR
 
 if RUBY_VERSION < '1.9'
@@ -12,6 +13,7 @@ require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
 
 require 'socket'
 require 'nokogiri'
+require 'tempfile'
 require 'tmpdir'
 
 autoload :FileUtils, 'fileutils'
@@ -31,7 +33,7 @@ class Minitest::Test
   end
 
   def disk_root
-    "#{windows? ? File.expand_path(__FILE__).split('/').first : nil}/"
+    %(#{windows? ? ASCIIDOCTOR_PROJECT_DIR.split('/')[0] : ''}/)
   end
 
   def empty_document options = {}
@@ -60,29 +62,20 @@ class Minitest::Test
     fixture_path(name)
   end
 
-  def fixture_path(name)
-    File.join(File.expand_path(File.dirname(__FILE__)), 'fixtures', name)
+  def testdir
+    ASCIIDOCTOR_TEST_DIR
   end
 
-  def example_document(name, opts = {})
-    document_from_string IO.read(sample_doc_path(name)), opts
+  def fixturedir
+    File.join testdir, 'fixtures'
   end
 
-  def assert_difference(expression, difference = 1, message = nil, &block)
-    expressions = [expression]
-
-    exps = expressions.map { |e|
-      e.respond_to?(:call) ? e : lambda { eval(e, block.binding) }
-    }
-    before = exps.map { |e| e.call }
-
-    yield
+  def fixture_path name
+    File.join fixturedir, name
+  end
 
-    expressions.zip(exps).each_with_index do |(code, e), i|
-      error  = "#{code.inspect} didn't change by #{difference}"
-      error  = "#{message}.\n#{error}" if message
-      assert_equal(before[i] + difference, e.call, error)
-    end
+  def example_document(name, opts = {})
+    document_from_string IO.read(sample_doc_path(name)), opts
   end
 
   def xmlnodes_at_css(css, content, count = nil)
@@ -143,6 +136,35 @@ class Minitest::Test
     end
   end
 
+  def assert_message logger, severity, expected_message, kind = String, idx = nil
+    unless idx
+      assert_equal 1, logger.messages.size
+      idx = 0
+    end
+    message = logger.messages[idx]
+    assert_equal severity, message[:severity]
+    assert_kind_of kind, message[:message]
+    if kind == String
+      actual_message = message[:message]
+    else
+      refute_nil message[:message][:source_location]
+      actual_message = message[:message].inspect
+    end
+    if expected_message.start_with? '~'
+      assert_includes actual_message, expected_message[1..-1]
+    else
+      assert_equal expected_message, actual_message
+    end
+  end
+
+  def assert_messages logger, expected_messages
+    assert_equal expected_messages.size, logger.messages.size
+    expected_messages.each_with_index do |expected_message_details, idx|
+      severity, expected_message, kind = expected_message_details
+      assert_message logger, severity, expected_message, (kind || String), idx
+    end
+  end
+
   def xmldoc_from_string(content)
     if content.match(RE_XMLNS_ATTRIBUTE)
       Nokogiri::XML::Document.parse(content)
@@ -173,10 +195,10 @@ class Minitest::Test
   def render_string(src, opts = {})
     keep_namespaces = opts.delete(:keep_namespaces)
     if keep_namespaces
-      document_from_string(src, opts).render
+      document_from_string(src, opts).convert
     else
       # this is required because nokogiri is ignorant
-      result = document_from_string(src, opts).render
+      result = document_from_string(src, opts).convert
       result = result.sub(RE_XMLNS_ATTRIBUTE, '') if result
       result
     end
@@ -184,12 +206,12 @@ class Minitest::Test
 
   def render_embedded_string(src, opts = {})
     opts[:header_footer] = false
-    document_from_string(src, opts).render
+    document_from_string(src, opts).convert
   end
 
   def render_inline_string(src, opts = {})
     opts[:doctype] = :inline
-    document_from_string(src, opts).render
+    document_from_string(src, opts).convert
   end
 
   def parse_header_metadata(source, doc = nil)
@@ -211,7 +233,6 @@ class Minitest::Test
     end
     if (template_dir = ENV['TEMPLATE_DIR'])
       opts[:template_dir] = template_dir unless opts.has_key? :template_dir
-      #opts[:template_dir] = File.join(File.dirname(__FILE__), '..', '..', 'asciidoctor-backends', 'erb') unless opts.has_key? :template_dir
     end
     nil
   end
@@ -230,14 +251,13 @@ class Minitest::Test
   end
 
   def invoke_cli_with_filenames(argv = [], filenames = [], &block)
-
     filepaths = Array.new
 
-    filenames.each { |filename|
-      if filenames.nil?|| ::Pathname.new(filename).absolute?
-        filepaths.push(filename)
+    filenames.each {|filename|
+      if filenames.nil? || ::Pathname.new(filename).absolute?
+        filepaths << filename
       else
-        filepaths.push(File.join(File.dirname(__FILE__), 'fixtures', filename))
+        filepaths << (fixture_path filename)
       end
     }
 
@@ -255,7 +275,7 @@ class Minitest::Test
     if filename.nil? || filename == '-' || ::Pathname.new(filename).absolute?
       filepath = filename
     else
-      filepath = File.join(File.dirname(__FILE__), 'fixtures', filename)
+      filepath = fixture_path filename
     end
     invoker = Asciidoctor::Cli::Invoker.new(argv + [filepath])
     if buffers
@@ -268,9 +288,14 @@ class Minitest::Test
   def redirect_streams
     old_stdout, $stdout = $stdout, (tmp_stdout = ::StringIO.new)
     old_stderr, $stderr = $stderr, (tmp_stderr = ::StringIO.new)
+    old_logger = Asciidoctor::LoggerManager.logger
+    old_logger_level = old_logger.level
+    new_logger = (Asciidoctor::LoggerManager.logger = Asciidoctor::Logger.new $stderr)
+    new_logger.level = old_logger_level
     yield tmp_stdout, tmp_stderr
   ensure
     $stdout, $stderr = old_stdout, old_stderr
+    Asciidoctor::LoggerManager.logger = old_logger
   end
 
   def resolve_localhost
@@ -278,9 +303,29 @@ class Minitest::Test
         Socket.ip_address_list.find {|addr| addr.ipv4? }.ip_address
   end
 
+  def using_memory_logger
+    old_logger = Asciidoctor::LoggerManager.logger
+    memory_logger = Asciidoctor::MemoryLogger.new
+    begin
+      Asciidoctor::LoggerManager.logger = memory_logger
+      yield memory_logger
+    ensure
+      Asciidoctor::LoggerManager.logger = old_logger
+    end
+  end
+
+  def in_verbose_mode
+    begin
+      old_verbose, $VERBOSE = $VERBOSE, true
+      yield
+    ensure
+      $VERBOSE = old_verbose
+    end
+  end
+
   def using_test_webserver host = resolve_localhost, port = 9876
     server = TCPServer.new host, port
-    base_dir = File.expand_path File.dirname __FILE__
+    base_dir = testdir
     t = Thread.new do
       while (session = server.accept)
         request = session.gets

data/test/text_test.rb

@@ -6,25 +6,25 @@ end
 
 context "Text" do
   test "proper encoding to handle utf8 characters in document using html backend" do
-    output = example_document(:encoding).render
+    output = example_document(:encoding).convert
     assert_xpath '//p', output, 4
     assert_xpath '//a', output, 1
   end
 
   test "proper encoding to handle utf8 characters in embedded document using html backend" do
-    output = example_document(:encoding, :header_footer => false).render
+    output = example_document(:encoding, :header_footer => false).convert
     assert_xpath '//p', output, 4
     assert_xpath '//a', output, 1
   end
 
   test "proper encoding to handle utf8 characters in document using docbook45 backend" do
-    output = example_document(:encoding, :attributes => {'backend' => 'docbook45', 'xmlns' => ''}).render
+    output = example_document(:encoding, :attributes => {'backend' => 'docbook45', 'xmlns' => ''}).convert
     assert_xpath '//xmlns:simpara', output, 4
     assert_xpath '//xmlns:ulink', output, 1
   end
 
   test "proper encoding to handle utf8 characters in embedded document using docbook45 backend" do
-    output = example_document(:encoding, :header_footer => false, :attributes => {'backend' => 'docbook45'}).render
+    output = example_document(:encoding, :header_footer => false, :attributes => {'backend' => 'docbook45'}).convert
     assert_xpath '//simpara', output, 4
     assert_xpath '//ulink', output, 1
   end
@@ -37,17 +37,17 @@ context "Text" do
     doc = empty_document
     reader = Asciidoctor::PreprocessorReader.new doc, input, nil, :normalize => true
     block = Asciidoctor::Parser.next_block(reader, doc)
-    assert_xpath '//pre', block.render.gsub(/^\s*\n/, ''), 1
+    assert_xpath '//pre', block.convert.gsub(/^\s*\n/, ''), 1
   end
 
   test 'proper encoding to handle utf8 characters from included file' do
     input = <<-EOS
 include::fixtures/encoding.asciidoc[tags=romé]
     EOS
-    doc = empty_safe_document :base_dir => File.expand_path(File.dirname(__FILE__))
+    doc = empty_safe_document :base_dir => testdir
     reader = Asciidoctor::PreprocessorReader.new doc, input, nil, :normalize => true
     block = Asciidoctor::Parser.next_block(reader, doc)
-    output = block.render
+    output = block.convert
     assert_css '.paragraph', output, 1
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 1.5.6.2
+  version: 1.5.7
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -201,10 +201,44 @@ files:
 - CONTRIBUTING.adoc
 - Gemfile
 - LICENSE
+- README-fr.adoc
+- README-jp.adoc
+- README-zh_CN.adoc
+- README.adoc
 - Rakefile
 - asciidoctor.gemspec
 - bin/asciidoctor
 - bin/asciidoctor-safe
+- data/locale/attributes-ar.adoc
+- data/locale/attributes-bg.adoc
+- data/locale/attributes-ca.adoc
+- data/locale/attributes-cs.adoc
+- data/locale/attributes-da.adoc
+- data/locale/attributes-de.adoc
+- data/locale/attributes-en.adoc
+- data/locale/attributes-es.adoc
+- data/locale/attributes-fa.adoc
+- data/locale/attributes-fi.adoc
+- data/locale/attributes-fr.adoc
+- data/locale/attributes-hu.adoc
+- data/locale/attributes-id.adoc
+- data/locale/attributes-it.adoc
+- data/locale/attributes-ja.adoc
+- data/locale/attributes-kr.adoc
+- data/locale/attributes-nb.adoc
+- data/locale/attributes-nl.adoc
+- data/locale/attributes-nn.adoc
+- data/locale/attributes-pl.adoc
+- data/locale/attributes-pt.adoc
+- data/locale/attributes-pt_BR.adoc
+- data/locale/attributes-ro.adoc
+- data/locale/attributes-ru.adoc
+- data/locale/attributes-sr.adoc
+- data/locale/attributes-sr_Latn.adoc
+- data/locale/attributes-tr.adoc
+- data/locale/attributes-uk.adoc
+- data/locale/attributes-zh_CN.adoc
+- data/locale/attributes-zh_TW.adoc
 - data/locale/attributes.adoc
 - data/stylesheets/asciidoctor-default.css
 - data/stylesheets/coderay-asciidoctor.css
@@ -232,6 +266,7 @@ files:
 - lib/asciidoctor/converter/manpage.rb
 - 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/hash/key.rb
 - lib/asciidoctor/core_ext/1.8.7/io/binread.rb
 - lib/asciidoctor/core_ext/1.8.7/io/write.rb
@@ -247,6 +282,7 @@ files:
 - lib/asciidoctor/helpers.rb
 - lib/asciidoctor/inline.rb
 - lib/asciidoctor/list.rb
+- lib/asciidoctor/logging.rb
 - lib/asciidoctor/parser.rb
 - lib/asciidoctor/path_resolver.rb
 - lib/asciidoctor/reader.rb
@@ -258,6 +294,7 @@ files:
 - lib/asciidoctor/version.rb
 - man/asciidoctor.1
 - man/asciidoctor.adoc
+- test/api_test.rb
 - test/attributes_test.rb
 - test/blocks_test.rb
 - test/converter_test.rb
@@ -288,25 +325,36 @@ files:
 - test/fixtures/docinfo.xml
 - test/fixtures/dot.gif
 - test/fixtures/encoding.asciidoc
+- test/fixtures/file-with-missing-include.adoc
 - test/fixtures/grandchild-include.adoc
 - test/fixtures/hello-asciidoctor.pdf
 - test/fixtures/include-file.asciidoc
+- test/fixtures/include-file.jsx
 - test/fixtures/include-file.ml
 - test/fixtures/include-file.xml
+- test/fixtures/lists.adoc
 - test/fixtures/master.adoc
 - test/fixtures/mismatched-end-tag.adoc
+- test/fixtures/other-chapters.adoc
+- test/fixtures/outer-include.adoc
 - test/fixtures/parent-include-restricted.adoc
 - test/fixtures/parent-include.adoc
 - test/fixtures/sample.asciidoc
 - test/fixtures/stylesheets/custom.css
+- test/fixtures/subdir/index.adoc
+- test/fixtures/subdir/inner-include.adoc
+- test/fixtures/subdir/middle-include.adoc
 - test/fixtures/subs-docinfo.html
 - test/fixtures/subs.adoc
 - test/fixtures/tagged-class-enclosed.rb
 - test/fixtures/tagged-class.rb
 - test/fixtures/tip.gif
+- test/fixtures/unclosed-tag.adoc
+- test/fixtures/unexpected-end-tag.adoc
 - test/invoker_test.rb
 - test/links_test.rb
 - test/lists_test.rb
+- test/logger_test.rb
 - test/manpage_test.rb
 - test/options_test.rb
 - test/paragraphs_test.rb
@@ -322,7 +370,11 @@ files:
 homepage: http://asciidoctor.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/asciidoctor/asciidoctor/issues
+  changelog_uri: https://github.com/asciidoctor/asciidoctor/blob/master/CHANGELOG.adoc
+  mailing_list_uri: http://discuss.asciidoctor.org
+  source_code_uri: https://github.com/asciidoctor/asciidoctor
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -351,6 +403,7 @@ test_files:
 - features/step_definitions.rb
 - features/text_formatting.feature
 - features/xref.feature
+- test/api_test.rb
 - test/attributes_test.rb
 - test/blocks_test.rb
 - test/converter_test.rb
@@ -381,25 +434,36 @@ test_files:
 - test/fixtures/docinfo.xml
 - test/fixtures/dot.gif
 - test/fixtures/encoding.asciidoc
+- test/fixtures/file-with-missing-include.adoc
 - test/fixtures/grandchild-include.adoc
 - test/fixtures/hello-asciidoctor.pdf
 - test/fixtures/include-file.asciidoc
+- test/fixtures/include-file.jsx
 - test/fixtures/include-file.ml
 - test/fixtures/include-file.xml
+- test/fixtures/lists.adoc
 - test/fixtures/master.adoc
 - test/fixtures/mismatched-end-tag.adoc
+- test/fixtures/other-chapters.adoc
+- test/fixtures/outer-include.adoc
 - test/fixtures/parent-include-restricted.adoc
 - test/fixtures/parent-include.adoc
 - test/fixtures/sample.asciidoc
 - test/fixtures/stylesheets/custom.css
+- test/fixtures/subdir/index.adoc
+- test/fixtures/subdir/inner-include.adoc
+- test/fixtures/subdir/middle-include.adoc
 - test/fixtures/subs-docinfo.html
 - test/fixtures/subs.adoc
 - test/fixtures/tagged-class-enclosed.rb
 - test/fixtures/tagged-class.rb
 - test/fixtures/tip.gif
+- test/fixtures/unclosed-tag.adoc
+- test/fixtures/unexpected-end-tag.adoc
 - test/invoker_test.rb
 - test/links_test.rb
 - test/lists_test.rb
+- test/logger_test.rb
 - test/manpage_test.rb
 - test/options_test.rb
 - test/paragraphs_test.rb