asciidoctor 1.5.1 → 1.5.2

data/test/attributes_test.rb

@@ -96,6 +96,34 @@ linus.torvalds@example.com
       assert_equal '', doc.attributes['release']
     end
 
+    test 'resolves attributes inside attribute value within header' do
+      input = <<-EOS
+= Document Title
+:big: big
+:bigfoot: {big}foot
+
+{bigfoot}
+      EOS
+
+      result = render_embedded_string input
+      assert result.include? 'bigfoot'
+    end
+
+    test 'resolves attributes and pass macro inside attribute value outside header' do
+      input = <<-EOS
+= Document Title
+
+content
+
+:big: pass:a,q[_big_]
+:bigfoot: {big}foot
+{bigfoot}
+      EOS
+
+      result = render_embedded_string input
+      assert result.include? '<em>big</em>foot'
+    end
+
     test 'resolves user-home attribute if safe mode is less than SERVER' do
       input = <<-EOS
 :imagesdir: {user-home}/etc/images
@@ -788,6 +816,20 @@ after: {counter:mycounter}
   end
 
   context 'Block attributes' do
+    test 'parses attribute names as name token' do
+      input = <<-EOS
+[normal,foo="bar",_foo="_bar",foo1="bar1",foo-foo="bar-bar",foo.foo="bar.bar"]
+content
+      EOS
+
+      block = block_from_string input
+      assert_equal 'bar', block.attr('foo') 
+      assert_equal '_bar', block.attr('_foo') 
+      assert_equal 'bar1', block.attr('foo1') 
+      assert_equal 'bar-bar', block.attr('foo-foo') 
+      assert_equal 'bar.bar', block.attr('foo.foo') 
+    end
+
     test 'positional attributes assigned to block' do
       input = <<-EOS
 [quote, author, source]

data/test/blocks_test.rb

@@ -1812,12 +1812,24 @@ video::67480300[vimeo, 400, 300, start=60, options=autoplay]
 
     test 'video macro should output custom HTML with iframe for youtube service' do
       input = <<-EOS
-video::rPQoq7ThGAU[youtube, 640, 360, start=60, options=autoplay]
+video::U8GBXvdmHT4/PLg7s6cbtAD15Das5LK9mXt_g59DLWxKUe[youtube, 640, 360, start=60, options="autoplay,modest", theme=light]
       EOS
       output = render_embedded_string input
       assert_css 'video', output, 0
       assert_css 'iframe', output, 1
-      assert_css 'iframe[src="//www.youtube.com/embed/rPQoq7ThGAU?rel=0&start=60&autoplay=1"]', output, 1
+      assert_css 'iframe[src="//www.youtube.com/embed/U8GBXvdmHT4?rel=0&start=60&autoplay=1&list=PLg7s6cbtAD15Das5LK9mXt_g59DLWxKUe&modestbranding=1&theme=light"]', output, 1
+      assert_css 'iframe[width="640"]', output, 1
+      assert_css 'iframe[height="360"]', output, 1
+    end
+
+    test 'video macro should output custom HTML with iframe for youtube service with dynamic playlist' do
+      input = <<-EOS
+video::SCZF6I-Rc4I,AsKGOeonbIs,HwrPhOp6-aM[youtube, 640, 360, start=60, options=autoplay]
+      EOS
+      output = render_embedded_string input
+      assert_css 'video', output, 0
+      assert_css 'iframe', output, 1
+      assert_css 'iframe[src="//www.youtube.com/embed/SCZF6I-Rc4I?rel=0&start=60&autoplay=1&playlist=AsKGOeonbIs,HwrPhOp6-aM"]', output, 1
       assert_css 'iframe[width="640"]', output, 1
       assert_css 'iframe[height="360"]', output, 1
     end
@@ -1949,7 +1961,7 @@ You can use icons for admonitions by setting the 'icons' attribute.
       EOS
 
       output = render_string input, :safe => Asciidoctor::SafeMode::SERVER
-      assert_css 'html > head > link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css"]', output, 1
+      assert_css 'html > head > link[rel="stylesheet"][href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"]', output, 1
       assert_xpath '//*[@class="admonitionblock tip"]//*[@class="icon"]/i[@class="fa icon-tip"]', output, 1
     end
 
@@ -1966,8 +1978,8 @@ puts "AsciiDoc, FTW!"
       EOS
 
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE
-      assert_css 'html > head > link[rel="stylesheet"][href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css"]', output, 1
-      assert_css 'html > head > script[src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.1/highlight.min.js"]', output, 1
+      assert_css 'html > head > link[rel="stylesheet"][href="http://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"]', output, 1
+      assert_css 'html > head > script[src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"]', output, 1
     end
 
     test 'should use no uri scheme for assets when asset-uri-scheme is blank' do
@@ -1983,8 +1995,8 @@ puts "AsciiDoc, FTW!"
       EOS
 
       output = render_string input, :safe => Asciidoctor::SafeMode::SAFE
-      assert_css 'html > head > link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css"]', output, 1
-      assert_css 'html > head > script[src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.1/highlight.min.js"]', output, 1
+      assert_css 'html > head > link[rel="stylesheet"][href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css"]', output, 1
+      assert_css 'html > head > script[src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"]', output, 1
     end
   end
 

data/test/document_test.rb

@@ -133,6 +133,14 @@ context 'Document' do
       assert_equal File.expand_path(File.dirname(sample_input_path)), doc.attr('docdir')
     end
 
+    test 'should not load invalid file' do
+      sample_input_path = fixture_path('hello-asciidoctor.pdf')
+      exception = assert_raises ArgumentError do
+        Asciidoctor.load_file(sample_input_path, :safe => Asciidoctor::SafeMode::SAFE)
+      end
+      assert_match(/Failed to parse source/, exception.message)
+    end if RUBY_MIN_VERSION_1_9
+
     test 'should load input IO' do
       input = StringIO.new(<<-EOS)
 Document Title
@@ -371,6 +379,7 @@ paragraph
     test 'should link to default stylesheet by default when safe mode is SECURE or greater' do
       sample_input_path = fixture_path('basic.asciidoc')
       output = Asciidoctor.convert_file sample_input_path, :header_footer => true, :to_file => false
+      assert_css 'html:root > head > link[rel="stylesheet"][href^="https://fonts.googleapis.com"]', output, 1
       assert_css 'html:root > head > link[rel="stylesheet"][href="./asciidoctor.css"]', output, 1
     end
 
@@ -382,6 +391,7 @@ text
       EOS
 
       output = Asciidoctor.render(input, :safe => Asciidoctor::SafeMode::SERVER, :header_footer => true)
+      assert_css 'html:root > head > link[rel="stylesheet"][href^="https://fonts.googleapis.com"]', output, 1
       assert_css 'html:root > head > link[rel="stylesheet"][href="./asciidoctor.css"]', output, 0
       stylenode = xmlnodes_at_css 'html:root > head > style', output, 1
       styles = stylenode.first.content
@@ -398,6 +408,7 @@ text
       EOS
 
       output = Asciidoctor.render(input, :header_footer => true)
+      assert_css 'html:root > head > link[rel="stylesheet"][href^="https://fonts.googleapis.com"]', output, 1
       assert_css 'html:root > head > link[rel="stylesheet"][href="./asciidoctor.css"]', output, 1
     end
 
@@ -409,6 +420,7 @@ text
       EOS
 
       output = Asciidoctor.render(input, :header_footer => true, :attributes => {'linkcss!' => ''})
+      assert_css 'html:root > head > link[rel="stylesheet"][href^="https://fonts.googleapis.com"]', output, 1
       assert_css 'html:root > head > link[rel="stylesheet"][href="./asciidoctor.css"]', output, 1
     end
 
@@ -431,6 +443,7 @@ text
       EOS
 
       output = Asciidoctor.render(input, :header_footer => true, :attributes => {'stylesheet!' => ''})
+      assert_css 'html:root > head > link[rel="stylesheet"][href^="https://fonts.googleapis.com"]', output, 0
       assert_css 'html:root > head > link[rel="stylesheet"]', output, 0
     end
 
@@ -442,7 +455,11 @@ text
       EOS
 
       output = Asciidoctor.render(input, :header_footer => true, :attributes => {'stylesheet' => './custom.css'})
+      assert_css 'html:root > head > link[rel="stylesheet"][href^="https://fonts.googleapis.com"]', output, 0
       assert_css 'html:root > head > link[rel="stylesheet"][href="./custom.css"]', output, 1
+
+      output = Asciidoctor.render(input, :header_footer => true, :attributes => {'stylesheet' => 'file:///home/username/custom.css'})
+      assert_css 'html:root > head > link[rel="stylesheet"][href="file:///home/username/custom.css"]', output, 1
     end
 
     test 'should resolve custom stylesheet relative to stylesdir' do
@@ -636,6 +653,34 @@ text
       assert_css 'meta[http-equiv="imagetoolbar"]', output, 1
     end
 
+    test 'should include docinfo files for html backend with custom docinfodir' do
+      sample_input_path = fixture_path('basic.asciidoc')
+
+      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+                                        :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo' => '', 'docinfodir' => 'custom-docinfodir'}
+      assert !output.empty?
+      assert_css 'script[src="bootstrap.js"]', output, 1
+      assert_css 'meta[name="robots"]', output, 0
+
+      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+                                        :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => '', 'docinfodir' => 'custom-docinfodir'}
+      assert !output.empty?
+      assert_css 'script[src="bootstrap.js"]', output, 0
+      assert_css 'meta[name="robots"]', output, 1
+
+      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+                                        :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => '', 'docinfodir' => './custom-docinfodir'}
+      assert !output.empty?
+      assert_css 'script[src="bootstrap.js"]', output, 1
+      assert_css 'meta[name="robots"]', output, 1
+
+      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+                                        :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => '', 'docinfodir' => 'custom-docinfodir/subfolder'}
+      assert !output.empty?
+      assert_css 'script[src="bootstrap.js"]', output, 0
+      assert_css 'meta[name="robots"]', output, 0
+    end
+
     test 'should include docinfo files for docbook backend' do
       sample_input_path = fixture_path('basic.asciidoc')
 
@@ -1441,6 +1486,36 @@ section body
       refute_match(RE_XMLNS_ATTRIBUTE, result)
     end
 
+    test 'docbook45 backend doctype manpage' do
+      input = <<-EOS
+= asciidoctor(1)
+
+== NAME
+
+asciidoctor - Process text
+
+== SYNOPSIS
+
+some text
+
+== First Section
+
+section body
+      EOS
+      result = render_string(input, :attributes => {'backend' => 'docbook45', 'doctype' => 'manpage'})
+      assert_xpath '/refentry', result, 1
+      assert_xpath '/refentry/refentryinfo/title[text() = "asciidoctor(1)"]', result, 1
+      assert_xpath '/refentry/refmeta/refentrytitle[text() = "asciidoctor"]', result, 1
+      assert_xpath '/refentry/refmeta/manvolnum[text() = "1"]', result, 1
+      assert_xpath '/refentry/refnamediv/refname[text() = "asciidoctor"]', result, 1
+      assert_xpath '/refentry/refnamediv/refpurpose[text() = "Process text"]', result, 1
+      assert_xpath '/refentry/refsynopsisdiv', result, 1
+      assert_xpath '/refentry/refsynopsisdiv/simpara[text() = "some text"]', result, 1
+      assert_xpath '/refentry/refsection', result, 1
+      assert_xpath '/refentry/refsection[@id = "_first_section"]/title[text() = "First Section"]', result, 1
+      assert_xpath '/refentry/refsection[@id = "_first_section"]/simpara[text() = "section body"]', result, 1
+    end
+
     test 'docbook45 backend doctype book' do
       input = <<-EOS
 = Title
@@ -1515,6 +1590,45 @@ section body
       assert_equal '_first_section', id_attr.value
     end
 
+    test 'docbook5 backend doctype manpage' do
+      input = <<-EOS
+= asciidoctor(1)
+
+== NAME
+
+asciidoctor - Process text
+
+== SYNOPSIS
+
+some text
+
+== First Section
+
+section body
+      EOS
+      result = render_string(input, :keep_namespaces => true, :attributes => {'backend' => 'docbook5', 'doctype' => 'manpage'})
+      assert_xpath '/xmlns:refentry', result, 1
+      doc = xmlnodes_at_xpath('/xmlns:refentry', result, 1).first
+      assert_equal 'http://docbook.org/ns/docbook', doc.namespaces['xmlns']
+      assert_equal 'http://www.w3.org/1999/xlink', doc.namespaces['xmlns:xlink']
+      assert_xpath '/xmlns:refentry[@version="5.0"]', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:info/xmlns:title[text() = "asciidoctor(1)"]', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:refmeta/xmlns:refentrytitle[text() = "asciidoctor"]', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:refmeta/xmlns:manvolnum[text() = "1"]', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:refnamediv/xmlns:refname[text() = "asciidoctor"]', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:refnamediv/xmlns:refpurpose[text() = "Process text"]', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:refsynopsisdiv', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:refsynopsisdiv/xmlns:simpara[text() = "some text"]', result, 1
+      assert_xpath '/xmlns:refentry/xmlns:refsection', result, 1
+      section = xmlnodes_at_xpath('/xmlns:refentry/xmlns:refsection', result, 1).first
+      # nokogiri can't make up its mind
+      id_attr = section.attribute('id') || section.attribute('xml:id')
+      refute_nil id_attr
+      refute_nil id_attr.namespace
+      assert_equal 'xml', id_attr.namespace.prefix
+      assert_equal '_first_section', id_attr.value
+    end
+
     test 'docbook5 backend doctype book' do
       input = <<-EOS
 = Title

data/test/extensions_test.rb

@@ -14,6 +14,9 @@ end
 class SampleIncludeProcessor < Asciidoctor::Extensions::IncludeProcessor
 end
 
+class SampleDocinfoProcessor < Asciidoctor::Extensions::DocinfoProcessor
+end
+
 class SampleTreeprocessor < Asciidoctor::Extensions::Treeprocessor
 end
 
@@ -114,6 +117,21 @@ class TemperatureMacro < Asciidoctor::Extensions::InlineMacroProcessor; use_dsl
   end
 end
 
+class MetaRobotsDocinfoProcessor < Asciidoctor::Extensions::DocinfoProcessor
+  def process document
+    '<meta name="robots" content="index,follow">'
+  end
+end
+
+class MetaAppDocinfoProcessor < Asciidoctor::Extensions::DocinfoProcessor
+  use_dsl
+  at_location :header
+
+  def process document
+    '<meta name="application-name" content="Asciidoctor App">'
+  end
+end
+
 class SampleExtensionGroup < Asciidoctor::Extensions::Group
   def activate registry
     registry.document.attributes['activate-method-called'] = ''
@@ -287,6 +305,19 @@ context 'Extensions' do
       assert extensions.first.process_method.is_a? ::Method
     end
 
+    test 'should instantiate docinfo processors' do
+      registry = Asciidoctor::Extensions::Registry.new
+      registry.docinfo_processor SampleDocinfoProcessor
+      registry.activate Asciidoctor::Document.new
+      assert registry.docinfo_processors?
+      assert registry.docinfo_processors?(:header)
+      extensions = registry.docinfo_processors
+      assert_equal 1, extensions.size
+      assert extensions.first.is_a? Asciidoctor::Extensions::ProcessorExtension
+      assert extensions.first.instance.is_a? SampleDocinfoProcessor
+      assert extensions.first.process_method.is_a? ::Method
+    end
+
     test 'should instantiate treeprocessors' do
       registry = Asciidoctor::Extensions::Registry.new
       registry.treeprocessor SampleTreeprocessor
@@ -614,5 +645,74 @@ content
         Asciidoctor::Extensions.unregister_all
       end
     end
+
+    test 'should add docinfo to document' do
+      input = <<-EOS
+= Document Title
+
+sample content
+      EOS
+
+      begin
+        Asciidoctor::Extensions.register do
+          docinfo_processor MetaRobotsDocinfoProcessor
+        end
+
+        doc = document_from_string input, :safe => :server
+        assert_equal '<meta name="robots" content="index,follow">', doc.docinfo
+      ensure
+        Asciidoctor::Extensions.unregister_all
+      end
+    end
+
+
+    test 'should add multiple docinfo to document' do
+      input = <<-EOS
+= Document Title
+
+sample content
+      EOS
+
+      begin
+        Asciidoctor::Extensions.register do
+          docinfo_processor MetaAppDocinfoProcessor
+          docinfo_processor MetaRobotsDocinfoProcessor, :position => :>>
+          docinfo_processor do
+            at_location :footer
+            process do |doc|
+              '<script><!-- analytics code --></script>'
+            end
+          end
+        end
+
+        doc = document_from_string input, :safe => :server
+        assert_equal '<meta name="robots" content="index,follow">
+<meta name="application-name" content="Asciidoctor App">', doc.docinfo(:header)
+        assert_equal '<script><!-- analytics code --></script>', doc.docinfo(:footer)
+      ensure
+        Asciidoctor::Extensions.unregister_all
+      end
+    end
+
+
+    test 'should append docinfo to document' do
+      begin
+        Asciidoctor::Extensions.register do
+          docinfo_processor MetaRobotsDocinfoProcessor
+        end
+        sample_input_path = fixture_path('basic.asciidoc')
+
+        output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+                                          :header_footer => true,
+                                          :safe => Asciidoctor::SafeMode::SERVER,
+                                          :attributes => {'docinfo' => ''}
+        assert !output.empty?
+        assert_css 'script[src="modernizr.js"]', output, 1
+        assert_css 'meta[name="robots"]', output, 1
+        assert_css 'meta[http-equiv="imagetoolbar"]', output, 0
+      ensure
+        Asciidoctor::Extensions.unregister_all
+      end
+    end
   end
 end

data/test/fixtures/custom-docinfodir/basic-docinfo.html

@@ -0,0 +1 @@
+<script src="bootstrap.js"></script>

data/test/fixtures/custom-docinfodir/docinfo.html

@@ -0,0 +1 @@
+<meta name="robots" content="index,follow">

data/test/invoker_test.rb

@@ -108,7 +108,8 @@ context 'Invoker' do
         invoke_cli [switch]
         actual = out.string.rstrip
       end
-      assert_equal expected, actual, %(Expected to print version when using #{switch} switch)
+      refute_nil actual
+      assert actual.start_with?(expected), %(Expected to print version when using #{switch} switch)
     end
   end
 
@@ -148,7 +149,7 @@ context 'Invoker' do
   test 'should report error if input file does not exist' do
     redirect_streams do |out, err|
       invoker = invoke_cli [], 'missing_file.asciidoc'
-      assert_match(/input file .* missing/, err.string)
+      assert_match(/input file .* missing or cannot be read/, err.string)
       assert_equal 1, invoker.code
     end
   end
@@ -156,7 +157,7 @@ context 'Invoker' do
   test 'should treat extra arguments as files' do
     redirect_streams do |out, err|
       invoker = invoke_cli %w(-o /dev/null extra arguments sample.asciidoc), nil
-      assert_match(/input file .* missing/, err.string)
+      assert_match(/input file .* missing or cannot be read/, err.string)
       assert_equal 1, invoker.code
     end
   end