resolves #1510 use value of docinfo attribute to enable docinfo behavior

- use docinfo attribute to enable docinfo behavior
- rename :header docinfo location to :head
- add permutation tests for docinfo

2 files changed, 26 insertions, 25 deletions

diff --git a/test/document_test.rb b/test/document_test.rb
index 0c0bddf5..7519b50f 100644
--- a/test/document_test.rb
+++ b/test/document_test.rb
@@ -753,29 +753,30 @@ text
     test 'should include docinfo files for html backend' 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' => ''}
-      assert !output.empty?
-      assert_css 'script[src="modernizr.js"]', output, 1
-      assert_css 'meta[http-equiv="imagetoolbar"]', output, 0
-      assert_css 'body > a#top', output, 0
-      assert_css 'body > script', output, 1
-
-      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
-          :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo1' => ''}
-      assert !output.empty?
-      assert_css 'script[src="modernizr.js"]', output, 0
-      assert_css 'meta[http-equiv="imagetoolbar"]', output, 1
-      assert_css 'body > a#top', output, 1
-      assert_css 'body > script', output, 0
+      cases = {
+        'docinfo'                => { :head_script => 1, :meta => 0, :top_link => 0, :footer_script => 1 },
+        'docinfo=private'        => { :head_script => 1, :meta => 0, :top_link => 0, :footer_script => 1 },
+        'docinfo1'               => { :head_script => 0, :meta => 1, :top_link => 1, :footer_script => 0 },
+        'docinfo=shared'         => { :head_script => 0, :meta => 1, :top_link => 1, :footer_script => 0 },
+        'docinfo2'               => { :head_script => 1, :meta => 1, :top_link => 1, :footer_script => 1 },
+        'docinfo docinfo2'       => { :head_script => 1, :meta => 1, :top_link => 1, :footer_script => 1 },
+        'docinfo=private,shared' => { :head_script => 1, :meta => 1, :top_link => 1, :footer_script => 1 },
+        'docinfo=private-head'   => { :head_script => 1, :meta => 0, :top_link => 0, :footer_script => 0 },
+        'docinfo=shared-head'    => { :head_script => 0, :meta => 1, :top_link => 0, :footer_script => 0 },
+        'docinfo=private-footer' => { :head_script => 0, :meta => 0, :top_link => 0, :footer_script => 1 },
+        'docinfo=shared-footer'  => { :head_script => 0, :meta => 0, :top_link => 1, :footer_script => 0 },
+        'docinfo=private-head\ ,\ shared-footer' => { :head_script => 1, :meta => 0, :top_link => 1, :footer_script => 0 }
+      }
 
-      output = Asciidoctor.convert_file sample_input_path, :to_file => false,
-          :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => {'docinfo2' => ''}
-      assert !output.empty?
-      assert_css 'script[src="modernizr.js"]', output, 1
-      assert_css 'meta[http-equiv="imagetoolbar"]', output, 1
-      assert_css 'body > a#top', output, 1
-      assert_css 'body > script', output, 1
+      cases.each do |attr_val, markup|
+        output = Asciidoctor.convert_file sample_input_path, :to_file => false,
+            :header_footer => true, :safe => Asciidoctor::SafeMode::SERVER, :attributes => %(linkcss copycss! #{attr_val})
+        assert !output.empty?
+        assert_css 'script[src="modernizr.js"]', output, markup[:head_script]
+        assert_css 'meta[http-equiv="imagetoolbar"]', output, markup[:meta]
+        assert_css 'body > a#top', output, markup[:top_link]
+        assert_css 'body > script', output, markup[:footer_script]
+      end
     end
 
     test 'should include docinfo footer even if nofooter attribute is set' do
diff --git a/test/extensions_test.rb b/test/extensions_test.rb
index 8edbed8c..d93b8b6b 100644
--- a/test/extensions_test.rb
+++ b/test/extensions_test.rb
@@ -125,7 +125,7 @@ end
 
 class MetaAppDocinfoProcessor < Asciidoctor::Extensions::DocinfoProcessor
   use_dsl
-  at_location :header
+  at_location :head
 
   def process document
     '<meta name="application-name" content="Asciidoctor App">'
@@ -310,7 +310,7 @@ context 'Extensions' do
       registry.docinfo_processor SampleDocinfoProcessor
       registry.activate Asciidoctor::Document.new
       assert registry.docinfo_processors?
-      assert registry.docinfo_processors?(:header)
+      assert registry.docinfo_processors?(:head)
       extensions = registry.docinfo_processors
       assert_equal 1, extensions.size
       assert extensions.first.is_a? Asciidoctor::Extensions::ProcessorExtension
@@ -687,7 +687,7 @@ sample content
 
         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)
+<meta name="application-name" content="Asciidoctor App">', doc.docinfo
         assert_equal '<script><!-- analytics code --></script>', doc.docinfo(:footer)
       ensure
         Asciidoctor::Extensions.unregister_all