asciidoctor 0.1.1 → 0.1.2

data/test/substitutions_test.rb

@@ -158,7 +158,7 @@ context 'Substitutions' do
     test 'single-line constrained monospaced string' do
       para = block_from_string(%q{`a few <\{monospaced\}> words`})
       # NOTE must use apply_normal_subs because constrained monospaced is handled as a passthrough
-      assert_equal '<tt>a few &lt;{monospaced}&gt; words</tt>', para.apply_normal_subs(para.buffer)
+      assert_equal '<code>a few &lt;{monospaced}&gt; words</code>', para.apply_normal_subs(para.buffer)
     end
 
     test 'escaped single-line constrained monospaced string' do
@@ -170,7 +170,7 @@ context 'Substitutions' do
     test 'multi-line constrained monospaced string' do
       para = block_from_string(%Q{`a few\n<\{monospaced\}> words`})
       # NOTE must use apply_normal_subs because constrained monospaced is handled as a passthrough
-      assert_equal "<tt>a few\n&lt;{monospaced}&gt; words</tt>", para.apply_normal_subs(para.buffer)
+      assert_equal "<code>a few\n&lt;{monospaced}&gt; words</code>", para.apply_normal_subs(para.buffer)
     end
 
     test 'single-line unconstrained strong chars' do
@@ -231,17 +231,17 @@ context 'Substitutions' do
 
     test 'single-line unconstrained monospaced chars' do
       para = block_from_string(%q{Git++Hub++})
-      assert_equal 'Git<tt>Hub</tt>', para.sub_quotes(para.buffer.join)
+      assert_equal 'Git<code>Hub</code>', para.sub_quotes(para.buffer.join)
     end
 
     test 'escaped single-line unconstrained monospaced chars' do
       para = block_from_string(%q{Git\++Hub++})
-      assert_equal 'Git+<tt>Hub</tt>+', para.sub_quotes(para.buffer.join)
+      assert_equal 'Git+<code>Hub</code>+', para.sub_quotes(para.buffer.join)
     end
 
     test 'multi-line unconstrained monospaced chars' do
       para = block_from_string(%Q{Git++\nH\nu\nb++})
-      assert_equal "Git<tt>\nH\nu\nb</tt>", para.sub_quotes(para.buffer.join)
+      assert_equal "Git<code>\nH\nu\nb</code>", para.sub_quotes(para.buffer.join)
     end
 
     test 'single-line superscript chars' do
@@ -255,8 +255,8 @@ context 'Substitutions' do
     end
 
     test 'multi-line superscript chars' do
-      para = block_from_string(%Q{x^(n\n+\n1)^})
-      assert_equal "x<sup>(n\n+\n1)</sup>", para.sub_quotes(para.buffer.join)
+      para = block_from_string(%Q{x^(n\n-\n1)^})
+      assert_equal "x<sup>(n\n-\n1)</sup>", para.sub_quotes(para.buffer.join)
     end
 
     test 'single-line subscript chars' do
@@ -286,6 +286,42 @@ context 'Substitutions' do
       assert_equal %q{<a href="/home.html">Home</a>}, para.sub_macros(para.buffer.join)
     end
 
+    test 'a mailto macro should be interpreted as a mailto link' do
+      para = block_from_string('mailto:doc.writer@asciidoc.org[]')
+      assert_equal %q{<a href="mailto:doc.writer@asciidoc.org">doc.writer@asciidoc.org</a>}, para.sub_macros(para.buffer.join)
+    end
+
+    test 'a mailto macro with text should be interpreted as a mailto link' do
+      para = block_from_string('mailto:doc.writer@asciidoc.org[Doc Writer]')
+      assert_equal %q{<a href="mailto:doc.writer@asciidoc.org">Doc Writer</a>}, para.sub_macros(para.buffer.join)
+    end
+
+    test 'a mailto macro with text and subject should be interpreted as a mailto link' do
+      para = block_from_string('mailto:doc.writer@asciidoc.org[Doc Writer, Pull request]', :attributes => {'linkattrs' => ''})
+      assert_equal %q{<a href="mailto:doc.writer@asciidoc.org?subject=Pull%20request">Doc Writer</a>}, para.sub_macros(para.buffer.join)
+    end
+
+    test 'a mailto macro with text, subject and body should be interpreted as a mailto link' do
+      para = block_from_string('mailto:doc.writer@asciidoc.org[Doc Writer, Pull request, Please accept my pull request]', :attributes => {'linkattrs' => ''})
+      assert_equal %q{<a href="mailto:doc.writer@asciidoc.org?subject=Pull%20request&amp;body=Please%20accept%20my%20pull%20request">Doc Writer</a>}, para.sub_macros(para.buffer.join)
+    end
+
+    test 'should recognize inline email addresses' do
+      para = block_from_string('doc.writer@asciidoc.org')
+      assert_equal %q{<a href="mailto:doc.writer@asciidoc.org">doc.writer@asciidoc.org</a>}, para.sub_macros(para.buffer.join)
+      para = block_from_string('<doc.writer@asciidoc.org>')
+      assert_equal %q{&lt;<a href="mailto:doc.writer@asciidoc.org">doc.writer@asciidoc.org</a>&gt;}, para.apply_normal_subs(para.buffer)
+      para = block_from_string('author+website@4fs.no')
+      assert_equal %q{<a href="mailto:author+website@4fs.no">author+website@4fs.no</a>}, para.sub_macros(para.buffer.join)
+      para = block_from_string('john@domain.uk.co')
+      assert_equal %q{<a href="mailto:john@domain.uk.co">john@domain.uk.co</a>}, para.sub_macros(para.buffer.join)
+    end
+
+    test 'should ignore escaped inline email address' do
+      para = block_from_string('\doc.writer@asciidoc.org')
+      assert_equal %q{doc.writer@asciidoc.org}, para.sub_macros(para.buffer.join)
+    end
+
     test 'a single-line raw url should be interpreted as a link' do
       para = block_from_string('http://google.com')
       assert_equal %q{<a href="http://google.com">http://google.com</a>}, para.sub_macros(para.buffer.join)
@@ -312,6 +348,11 @@ context 'Substitutions' do
       assert_equal %q{http://google.com}, para.sub_macros(para.buffer.join)
     end
 
+    test 'a comma separated list of links should not include commas in links' do
+      para = block_from_string('http://foo.com, http://bar.com, http://example.org')
+      assert_equal %q{<a href="http://foo.com">http://foo.com</a>, <a href="http://bar.com">http://bar.com</a>, <a href="http://example.org">http://example.org</a>}, para.sub_macros(para.buffer.join)
+    end
+
     test 'a single-line image macro should be interpreted as an image' do
       para = block_from_string('image:tiger.png[]')
       assert_equal %{<span class="image"><img src="tiger.png" alt="tiger"></span>}, para.sub_macros(para.buffer.join).gsub(/>\s+</, '><')
@@ -322,6 +363,11 @@ context 'Substitutions' do
       assert_equal %{<span class="image"><img src="tiger.png" alt="Tiger"></span>}, para.sub_macros(para.buffer.join).gsub(/>\s+</, '><')
     end
 
+    test 'a single-line image macro with text containing escaped square bracket should be interpreted as an image with alt text' do
+      para = block_from_string('image:tiger.png[[Another\] Tiger]')
+      assert_equal %{<span class="image"><img src="tiger.png" alt="[Another] Tiger"></span>}, para.sub_macros(para.buffer.join).gsub(/>\s+</, '><')
+    end
+
     test 'a single-line image macro with text and dimensions should be interpreted as an image with alt text and dimensions' do
       para = block_from_string('image:tiger.png[Tiger, 200, 100]')
       assert_equal %{<span class="image"><img src="tiger.png" alt="Tiger" width="200" height="100"></span>},
@@ -334,6 +380,19 @@ context 'Substitutions' do
           para.sub_macros(para.buffer.join).gsub(/>\s+</, '><')
     end
 
+    test 'a multi-line image macro with text and dimensions should be interpreted as an image with alt text and dimensions' do
+      para = block_from_string(%(image:tiger.png[Another\nAwesome\nTiger, 200,\n100]))
+      assert_equal %{<span class="image"><img src="tiger.png" alt="Another Awesome Tiger" width="200" height="100"></span>},
+          para.sub_macros(para.buffer.join).gsub(/>\s+</, '><')
+    end
+
+    test 'a block image macro should not be detected within paragraph text' do
+      para = block_from_string(%(Not an inline image macro image::tiger.png[].))
+      result = para.sub_macros(para.buffer.join)
+      assert !result.include?('<img ')
+      assert result.include?('image::tiger.png[]')
+    end
+
     test 'a single-line footnote macro should be registered and rendered as a footnote' do
       para = block_from_string('Sentence text footnote:[An example footnote.].')
       assert_equal %(Sentence text <span class="footnote">[<a id="_footnoteref_1" class="footnote" href="#_footnote_1" title="View footnote.">1</a>]</span>.), para.sub_macros(para.buffer.join)
@@ -621,12 +680,64 @@ context 'Substitutions' do
     end
 
     # NOTE placeholder is surrounded by text to prevent reader from stripping trailing boundary char (unique to test scenario)
-    # TODO add two entries to ensure index lookup is working correctly (0 indx could be ambiguous)
     test 'restore inline passthroughs with subs' do
-      para = block_from_string("some \x0" + '0' + "\x0 to study")
+      para = block_from_string("some \x0" + '0' + "\x0 to study in the \x0" + '1' + "\x0 programming language")
       para.passthroughs << {:text => '<code>{code}</code>', :subs => [:specialcharacters]}
+      para.passthroughs << {:text => '{language}', :subs => [:specialcharacters]}
       result = para.restore_passthroughs(para.buffer.join)
-      assert_equal 'some &lt;code&gt;{code}&lt;/code&gt; to study', result
+      assert_equal 'some &lt;code&gt;{code}&lt;/code&gt; to study in the {language} programming language', result
+    end
+
+    test 'complex inline passthrough macro' do
+      text_to_escape = %q{[(] <'basic form'> <'logical operator'> <'basic form'> [)]}
+      para = block_from_string %($$#{text_to_escape}$$) 
+      result = para.extract_passthroughs(para.buffer.join)
+      assert_equal 1, para.passthroughs.size
+      assert_equal text_to_escape, para.passthroughs[0][:text]
+
+      text_to_escape_escaped = %q{[(\] <'basic form'> <'logical operator'> <'basic form'> [)\]}
+      para = block_from_string %(pass:specialcharacters[#{text_to_escape_escaped}])
+      result = para.extract_passthroughs(para.buffer.join)
+      assert_equal 1, para.passthroughs.size
+      assert_equal text_to_escape, para.passthroughs[0][:text]
+    end
+  end
+
+  context 'Replacements' do
+    test 'unescapes XML entities' do
+      para = block_from_string '< &quot; &#34; &#x22; >'
+      assert_equal '&lt; &quot; &#34; &#x22; &gt;', para.apply_normal_subs(para.buffer)
+    end
+
+    test 'replaces arrows' do
+      para = block_from_string '<- -> <= => \<- \-> \<= \=>'
+      assert_equal '&#8592; &#8594; &#8656; &#8658; &lt;- -&gt; &lt;= =&gt;', para.apply_normal_subs(para.buffer.join)
+    end
+
+    test 'replaces dashes' do
+      para = block_from_string %(-- foo foo--bar foo\\--bar foo -- bar foo \\-- bar
+stuff in between
+-- foo
+stuff in between
+foo --
+stuff in between
+foo --)
+      expected = %(&#8201;&#8212;&#8201;foo foo&#8212;bar foo--bar foo&#8201;&#8212;&#8201;bar foo -- bar
+stuff in between&#8201;&#8212;&#8201;foo
+stuff in between
+foo&#8201;&#8212;&#8201;stuff in between
+foo&#8201;&#8212;&#8201;)
+      assert_equal expected, para.sub_replacements(para.buffer.join)
+    end
+
+    test 'replaces marks' do
+      para = block_from_string '(C) (R) (TM) \(C) \(R) \(TM)' 
+      assert_equal '&#169; &#174; &#8482; (C) (R) (TM)', para.sub_replacements(para.buffer.join)
+    end
+
+    test 'replaces punctuation' do
+      para = block_from_string %(John's Hideout... foo\\'bar)
+      assert_equal "John&#8217;s Hideout&#8230; foo'bar", para.sub_replacements(para.buffer.join)
     end
   end
 

data/test/tables_test.rb

@@ -14,8 +14,8 @@ context 'Tables' do
       cells = [%w(A B C), %w(a b c), %w(1 2 3)]
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table.tableblock.frame-all.grid-all[style*="width: 100%"]', output, 1
-      assert_css 'table > colgroup > col[style*="width: 33%"]', output, 3
+      assert_css 'table.tableblock.frame-all.grid-all[style*="width:100%"]', output, 1
+      assert_css 'table > colgroup > col[style*="width:33%"]', output, 3
       assert_css 'table tr', output, 3
       assert_css 'table > tbody > tr', output, 3
       assert_css 'table td', output, 9
@@ -43,6 +43,46 @@ context 'Tables' do
       assert_xpath '/table/caption/following-sibling::colgroup', output, 1
     end
 
+    test 'only increments table counter for tables that have a title' do
+      input = <<-EOS
+.First numbered table
+|=======
+|1 |2 |3
+|=======
+
+|=======
+|4 |5 |6
+|=======
+
+.Second numbered table
+|=======
+|7 |8 |9
+|=======
+      EOS
+      output = render_embedded_string input
+      assert_css 'table:root', output, 3
+      assert_xpath '(/table)[1]/caption', output, 1
+      assert_xpath '(/table)[1]/caption[text()="Table 1. First numbered table"]', output, 1
+      assert_xpath '(/table)[2]/caption', output, 0
+      assert_xpath '(/table)[3]/caption', output, 1
+      assert_xpath '(/table)[3]/caption[text()="Table 2. Second numbered table"]', output, 1
+    end
+
+    test 'renders explicit caption on simple psv table' do
+      input = <<-EOS
+[caption="All the Data. "]
+.Simple psv table
+|=======
+|A |B |C
+|a |b |c
+|1 |2 |3
+|=======
+      EOS
+      output = render_embedded_string input
+      assert_xpath '/table/caption[@class="title"][text()="All the Data. Simple psv table"]', output, 1
+      assert_xpath '/table/caption/following-sibling::colgroup', output, 1
+    end
+
     test 'ignores escaped separators' do
       input = <<-EOS
 |===
@@ -233,13 +273,13 @@ I am getting in shape!
       EOS
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table[style*="width: 80%"]', output, 1
+      assert_css 'table[style*="width:80%"]', output, 1
       assert_xpath '/table/caption[@class="title"][text()="Table 1. Horizontal and vertical source data"]', output, 1
       assert_css 'table > colgroup > col', output, 4
-      assert_css 'table > colgroup > col:nth-child(1)[@style*="width: 17%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(2)[@style*="width: 11%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(3)[@style*="width: 11%"]', output, 1
-      assert_css 'table > colgroup > col:nth-child(4)[@style*="width: 58%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(1)[@style*="width:17%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(2)[@style*="width:11%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(3)[@style*="width:11%"]', output, 1
+      assert_css 'table > colgroup > col:nth-child(4)[@style*="width:58%"]', output, 1
       assert_css 'table > thead', output, 1
       assert_css 'table > thead > tr', output, 1
       assert_css 'table > thead > tr > th', output, 4
@@ -264,7 +304,7 @@ d|9 2+>|10
       EOS
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table > colgroup > col[style*="width: 25%"]', output, 4
+      assert_css 'table > colgroup > col[style*="width:25%"]', output, 4
       assert_css 'table > tbody > tr', output, 4
       assert_css 'table > tbody > tr > td', output, 10
       assert_css 'table > tbody > tr:nth-child(1) > td', output, 4
@@ -279,14 +319,14 @@ d|9 2+>|10
       assert_css 'table tr:nth-child(1) > td:nth-child(4).halign-right.valign-top p strong', output, 1
 
       assert_css 'table tr:nth-child(2) > td:nth-child(1).halign-center.valign-top p em', output, 1
-      assert_css 'table tr:nth-child(2) > td:nth-child(2).halign-center.valign-middle[colspan="2"][rowspan="2"] p tt', output, 1
-      assert_css 'table tr:nth-child(2) > td:nth-child(3).halign-left.valign-bottom[rowspan="3"] p tt', output, 1
+      assert_css 'table tr:nth-child(2) > td:nth-child(2).halign-center.valign-middle[colspan="2"][rowspan="2"] p code', output, 1
+      assert_css 'table tr:nth-child(2) > td:nth-child(3).halign-left.valign-bottom[rowspan="3"] p code', output, 1
 
       assert_css 'table tr:nth-child(3) > td:nth-child(1).halign-center.valign-top p em', output, 1
 
       assert_css 'table tr:nth-child(4) > td:nth-child(1).halign-left.valign-top p', output, 1
       assert_css 'table tr:nth-child(4) > td:nth-child(1).halign-left.valign-top p em', output, 0
-      assert_css 'table tr:nth-child(4) > td:nth-child(2).halign-right.valign-top[colspan="2"] p tt', output, 1
+      assert_css 'table tr:nth-child(4) > td:nth-child(2).halign-right.valign-top[colspan="2"] p code', output, 1
     end
 
     test 'supports repeating cells' do
@@ -452,7 +492,7 @@ nobody:x:99:99:Nobody:/:/sbin/nologin
       EOS
       output = render_embedded_string input
       assert_css 'table', output, 1
-      assert_css 'table > colgroup > col[style*="width: 14%"]', output, 7
+      assert_css 'table > colgroup > col[style*="width:14%"]', output, 7
       assert_css 'table > tbody > tr', output, 6
       assert_xpath '//tr[4]/td[5]/p/text()', output, 0
       assert_xpath '//tr[3]/td[5]/p[text()="MySQL:Server"]', output, 1
@@ -475,7 +515,7 @@ air, moon roof, loaded",4799.00
       EOS
       output = render_embedded_string input 
       assert_css 'table', output, 1
-      assert_css 'table > colgroup > col[style*="width: 20%"]', output, 5
+      assert_css 'table > colgroup > col[style*="width:20%"]', output, 5
       assert_css 'table > thead > tr', output, 1
       assert_css 'table > tbody > tr', output, 4
       assert_xpath '((//tbody/tr)[1]/td)[4]/p[text()="ac, abs, moon"]', output, 1

data/test/test_helper.rb

@@ -67,8 +67,8 @@ class Test::Unit::TestCase
     xmlnodes_at_path(:css, css, content)
   end
 
-  def xmlnodes_at_xpath(css, content, count = nil)
-    xmlnodes_at_path(:xpath, css, content)
+  def xmlnodes_at_xpath(xpath, content, count = nil)
+    xmlnodes_at_path(:xpath, xpath, content)
   end
 
   def xmlnodes_at_path(type, path, content, count = nil)

data/test/text_test.rb

@@ -89,7 +89,7 @@ context "Text" do
   end
 
   test "backtick-escaped text followed by single-quoted text" do
-    assert_match(/<tt>foo<\/tt>/, render_string(%Q(run `foo` 'dog')))
+    assert_match(/<code>foo<\/code>/, render_string(%Q(run `foo` 'dog')))
   end
 
   context "basic styling" do
@@ -106,7 +106,7 @@ context "Text" do
     end
 
     test "monospaced" do
-      assert_xpath "//tt", @rendered
+      assert_xpath "//code", @rendered
     end
 
     test "superscript" do
@@ -118,21 +118,21 @@ context "Text" do
     end
 
     test "backticks" do
-      assert_xpath "//tt", render_string("This is `totally cool`.")
+      assert_xpath "//code", render_string("This is `totally cool`.")
     end
 
     test "nested styles" do
       rendered = render_string("Winning *big _time_* in the +city *boyeeee*+.")
 
       assert_xpath "//strong/em", rendered
-      assert_xpath "//tt/strong", rendered
+      assert_xpath "//code/strong", rendered
     end
 
     test "unconstrained quotes" do
       rendered_chars = render_string("**B**__I__++M++")
       assert_xpath "//strong", rendered_chars
       assert_xpath "//em", rendered_chars
-      assert_xpath "//tt", rendered_chars
+      assert_xpath "//code", rendered_chars
     end
   end
 end

metadata

@@ -1,134 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Waldron
 - Dan Allen
 - Jeremy McAnally
+- Jason Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pending
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -136,7 +121,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -144,35 +128,38 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A pure Ruby processor to turn Asciidoc-formatted documents into HTML
-  (and, eventually, other formats perhaps).
-email: rew@erebor.com
+description: "An open source text processor and publishing toolchain, written entirely
+  in Ruby, for converting AsciiDoc markup into HTML 5, DocBook 4.5 and other formats.
+  \n"
+email:
+- rew@erebor.com
+- dan.j.allen@gmail.com
 executables:
 - asciidoctor
+- asciidoctor-safe
 extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
 - Gemfile
 - LICENSE
-- README.asciidoc
+- README.adoc
 - Rakefile
 - asciidoctor.gemspec
 - bin/asciidoctor
 - bin/asciidoctor-safe
+- compat/asciidoc.conf
 - lib/asciidoctor.rb
 - lib/asciidoctor/abstract_block.rb
 - lib/asciidoctor/abstract_node.rb
@@ -186,11 +173,11 @@ files:
 - lib/asciidoctor/cli/options.rb
 - lib/asciidoctor/debug.rb
 - lib/asciidoctor/document.rb
-- lib/asciidoctor/errors.rb
 - lib/asciidoctor/helpers.rb
 - lib/asciidoctor/inline.rb
 - lib/asciidoctor/lexer.rb
 - lib/asciidoctor/list_item.rb
+- lib/asciidoctor/path_resolver.rb
 - lib/asciidoctor/reader.rb
 - lib/asciidoctor/renderer.rb
 - lib/asciidoctor/section.rb
@@ -199,17 +186,24 @@ files:
 - lib/asciidoctor/version.rb
 - man/asciidoctor.1
 - man/asciidoctor.ad
+- stylesheets/asciidoctor.css
 - test/attributes_test.rb
 - test/blocks_test.rb
 - test/document_test.rb
 - test/fixtures/asciidoc.txt
 - test/fixtures/asciidoc_index.txt
 - test/fixtures/ascshort.txt
+- test/fixtures/basic-docinfo.html
+- test/fixtures/basic-docinfo.xml
+- test/fixtures/basic.asciidoc
+- test/fixtures/docinfo.html
+- test/fixtures/docinfo.xml
 - test/fixtures/dot.gif
 - test/fixtures/encoding.asciidoc
 - test/fixtures/include-file.asciidoc
 - test/fixtures/list_elements.asciidoc
 - test/fixtures/sample.asciidoc
+- test/fixtures/stylesheets/custom.css
 - test/fixtures/tip.gif
 - test/invoker_test.rb
 - test/lexer_test.rb
@@ -217,6 +211,7 @@ files:
 - test/lists_test.rb
 - test/options_test.rb
 - test/paragraphs_test.rb
+- test/paths_test.rb
 - test/preamble_test.rb
 - test/reader_test.rb
 - test/renderer_test.rb
@@ -225,31 +220,31 @@ files:
 - test/tables_test.rb
 - test/test_helper.rb
 - test/text_test.rb
-homepage: http://github.com/asciidoctor
-licenses: []
+homepage: http://asciidoctor.org
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: asciidoctor
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 2
-summary: Pure Ruby Asciidoc to HTML rendering.
+summary: A native Ruby AsciiDoc syntax processor and publishing toolchain
 test_files:
 - test/attributes_test.rb
 - test/blocks_test.rb
@@ -260,6 +255,7 @@ test_files:
 - test/lists_test.rb
 - test/options_test.rb
 - test/paragraphs_test.rb
+- test/paths_test.rb
 - test/preamble_test.rb
 - test/reader_test.rb
 - test/renderer_test.rb