asciidoctor 0.0.7 → 0.0.9

data/test/test_helper.rb

@@ -3,7 +3,11 @@ require 'test/unit'
 
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/asciidoctor.rb"
 
-require 'mocha/setup'
+begin
+  require 'mocha/setup'
+rescue LoadError
+  require 'mocha'
+end
 require 'htmlentities'
 require 'nokogiri'
 require 'pending'
@@ -49,26 +53,86 @@ class Test::Unit::TestCase
     end
   end
 
-  def assert_xpath(xpath, html, count = nil)
-    doc = (html =~ /\s*<!DOCTYPE/) ? Nokogiri::HTML::Document.parse(html) : Nokogiri::HTML::DocumentFragment.parse(html)
-    results = doc.xpath("#{xpath.sub('/', './')}")
+  def xmlnodes_at_css(css, content, count = nil)
+    xmlnodes_at_path(:css, css, content)
+  end
+
+  def xmlnodes_at_xpath(css, content, count = nil)
+    xmlnodes_at_path(:xpath, css, content)
+  end
+
+  def xmlnodes_at_path(type, path, content, count = nil)
+    doc = xmldoc_from_string content
+    case type
+      when :xpath
+        results = doc.xpath("#{path.sub('/', './')}")
+      when :css
+        results = doc.css(path)
+    end
+    count == 1 ? results.first : results
+  end
+
+  def assert_css(css, content, count = nil)
+    assert_path(:css, css, content, count)
+  end
+
+  def assert_xpath(xpath, content, count = nil)
+    assert_path(:xpath, xpath, content, count)
+  end
+
+  def assert_path(type, path, content, count = nil)
+    case type
+    when :xpath
+      type_name = 'XPath'
+    when :css
+      type_name = 'CSS'
+    end
+
+    results = xmlnodes_at_path type, path, content
 
     if (count && results.length != count)
-      flunk "XPath #{xpath} yielded #{results.length} elements rather than #{count} for:\n#{html}"
+      flunk "#{type_name} #{path} yielded #{results.length} elements rather than #{count} for:\n#{content}"
     elsif (count.nil? && results.empty?)
-      flunk "XPath #{xpath} not found in:\n#{html}"
+      flunk "#{type_name} #{path} not found in:\n#{content}"
     else
       assert true
     end
   end
 
+  def xmldoc_from_string(content)
+    match = content.match(/\s*<!DOCTYPE (.*)/)
+    if !match
+      doc = Nokogiri::HTML::DocumentFragment.parse(content)
+    elsif match[1].start_with? 'html'
+      doc = Nokogiri::HTML::Document.parse(content)
+    else
+      doc = Nokogiri::XML::Document.parse(content)
+    end
+  end
+
   def document_from_string(src, opts = {})
     Asciidoctor::Document.new(src.lines.entries, opts)
   end
 
+  def block_from_string(src, opts = {})
+    opts[:header_footer] = false
+    doc = Asciidoctor::Document.new(src.lines.entries, opts)
+    doc.blocks.first
+  end
+
   def render_string(src, opts = {})
     document_from_string(src, opts).render
   end
+
+  def render_embedded_string(src, opts = {})
+    opts[:header_footer] = false
+    document_from_string(src, opts).render
+  end
+
+  def parse_header_metadata(source)
+    reader = Asciidoctor::Reader.new source.lines.entries
+    [Asciidoctor::Lexer.parse_header_metadata(reader), reader]
+  end
 end
 
 ###

data/test/text_test.rb

@@ -1,8 +1,28 @@
 require 'test_helper'
 
 context "Text" do
+  test "proper encoding to handle utf8 characters in document" do
+    assert_xpath "//p", example_document(:encoding).render, 1
+  end
+
+  test "proper encoding to handle utf8 characters in embedded document" do
+    assert_xpath "//p", example_document(:encoding).render(:header_footer => false), 1
+  end
+
+  # NOTE this test ensures we have the encoding line on block templates too
+  test "proper encoding to handle utf8 characters in arbitrary block" do
+    input = []
+    input << "[verse]\n"
+    input.concat(File.readlines(sample_doc_path(:encoding)))
+    doc = Asciidoctor::Document.new
+    reader = Asciidoctor::Reader.new input
+    block = Asciidoctor::Lexer.next_block(reader, doc)
+    assert_xpath '//pre', block.render.gsub(/^\s*\n/, ''), 1
+  end
+
   test 'escaped text markup' do
-    pending "Not done yet"
+    assert_match(/All your &lt;em&gt;inline&lt;\/em&gt; markup belongs to &lt;strong&gt;us&lt;\/strong&gt;!/,
+        render_string('All your <em>inline</em> markup belongs to <strong>us</strong>!'))
   end
 
   test "line breaks" do
@@ -11,8 +31,8 @@ context "Text" do
 
   test "single- and double-quoted text" do
     rendered = render_string("``Where?,'' she said, flipping through her copy of `The New Yorker.'")
-    assert_match /&ldquo;Where\?,&rdquo;/, rendered
-    assert_match /&lsquo;The New Yorker.&rsquo;/, rendered
+    assert_match(/&#8220;Where\?,&#8221;/, rendered)
+    assert_match(/&#8216;The New Yorker.&#8217;/, rendered)
   end
 
   test "separator" do
@@ -24,11 +44,15 @@ context "Text" do
     assert_xpath "//em", render_string("An 'emphatic' no")
   end
 
+  test "emphasized text with single quote" do
+    assert_xpath "//em[text()=\"Johnny#{[8217].pack('U*')}s\"]", render_string("It's 'Johnny's' phone")
+  end
+
   test "emphasized text with escaped single quote" do
     assert_xpath "//em[text()=\"Johnny's\"]", render_string("It's 'Johnny\\'s' phone")
   end
 
-  test "escaped single quote is restore as single quote" do
+  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!")
   end
 
@@ -45,11 +69,11 @@ context "Text" do
   end
 
   test "unquoted text" do
-    assert_no_match /#/, render_string("An #unquoted# word")
+    assert_no_match(/#/, render_string("An #unquoted# word"))
   end
 
   test "backtick-escaped text followed by single-quoted text" do
-    assert_match /<tt>foo<\/tt>/, render_string(%Q(run `foo` 'dog'))
+    assert_match(/<tt>foo<\/tt>/, render_string(%Q(run `foo` 'dog')))
   end
 
   context "basic styling" do

metadata

@@ -1,26 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
 - Ryan Waldron
+- Dan Allen
 - Jeremy McAnally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -29,14 +30,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  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
@@ -77,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: pending
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -93,7 +110,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pending
+  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: tilt
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -117,31 +150,45 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
+- Gemfile
 - LICENSE
 - README.asciidoc
 - Rakefile
 - asciidoctor.gemspec
 - bin/asciidoctor
 - lib/asciidoctor.rb
+- lib/asciidoctor/abstract_block.rb
+- lib/asciidoctor/abstract_node.rb
+- lib/asciidoctor/attribute_list.rb
+- lib/asciidoctor/backends/base_template.rb
+- lib/asciidoctor/backends/docbook45.rb
+- lib/asciidoctor/backends/html5.rb
 - lib/asciidoctor/block.rb
+- lib/asciidoctor/callouts.rb
 - lib/asciidoctor/debug.rb
 - lib/asciidoctor/document.rb
 - lib/asciidoctor/errors.rb
+- lib/asciidoctor/inline.rb
 - lib/asciidoctor/lexer.rb
 - lib/asciidoctor/list_item.rb
 - lib/asciidoctor/reader.rb
-- lib/asciidoctor/render_templates.rb
 - lib/asciidoctor/renderer.rb
 - lib/asciidoctor/section.rb
-- lib/asciidoctor/string.rb
+- lib/asciidoctor/substituters.rb
+- lib/asciidoctor/table.rb
 - lib/asciidoctor/version.rb
 - noof.rb
 - 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/dot.gif
+- test/fixtures/encoding.asciidoc
+- test/fixtures/include-file.asciidoc
 - test/fixtures/list_elements.asciidoc
+- test/fixtures/tip.gif
 - test/headers_test.rb
 - test/lexer_test.rb
 - test/links_test.rb
@@ -149,6 +196,9 @@ files:
 - test/paragraphs_test.rb
 - test/preamble_test.rb
 - test/reader_test.rb
+- test/renderer_test.rb
+- test/substitutions_test.rb
+- test/tables_test.rb
 - test/test_helper.rb
 - test/text_test.rb
 homepage: http://github.com/erebor/asciidoctor
@@ -178,6 +228,7 @@ specification_version: 2
 summary: Pure Ruby Asciidoc to HTML rendering.
 test_files:
 - test/attributes_test.rb
+- test/blocks_test.rb
 - test/document_test.rb
 - test/headers_test.rb
 - test/lexer_test.rb
@@ -186,4 +237,7 @@ test_files:
 - test/paragraphs_test.rb
 - test/preamble_test.rb
 - test/reader_test.rb
+- test/renderer_test.rb
+- test/substitutions_test.rb
+- test/tables_test.rb
 - test/text_test.rb

data/lib/asciidoctor/render_templates.rb

@@ -1,317 +0,0 @@
-class BaseTemplate
-  def initialize
-  end
-
-  def self.inherited(klass)
-    @template_classes ||= []
-    @template_classes << klass
-  end
-
-  def self.template_classes
-    @template_classes
-  end
-
-  # We're ignoring locals for now. Shut up.
-  def render(obj = Object.new, locals = {})
-    output = template.result(obj.instance_eval {binding})
-  end
-
-  def template
-    raise "You chilluns need to make your own template"
-  end
-end
-
-class DocumentTemplate < BaseTemplate
-  def template
-    @template ||= ::ERB.new <<-EOF
-      <!DOCTYPE html>
-      <html lang='en'>
-        <head>
-          <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
-          <meta name='generator' content='Asciidoctor <%= attr "asciidoctor-version" %>'>
-          <title><%= title ? title : (doctitle ? doctitle : '') %></title>
-        </head>
-        <body class='<%= attr :doctype %>'>
-          <div id='header'>
-            <% if doctitle %>
-              <h1><%= doctitle %></h1>
-            <% end %>
-          </div>
-          <div id='content'>
-            <%= content %>
-          </div>
-          <div id='footer'>
-            <div id='footer-text'>
-              Last updated <%= attr :localdatetime %>
-            </div>
-          </div>
-        </body>
-      </html>
-    EOF
-  end
-end
-
-class SectionPreambleTemplate < BaseTemplate
-  def template
-    @template ||= ::ERB.new <<-EOF
-      <div id='preamble'>
-        <div class='sectionbody'>
-          <%= content %>
-        </div>
-      </div>
-    EOF
-  end
-end
-
-class SectionTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='sect<%= level %>'>
-        <% if !anchor.nil? %>
-          <a name='<%= anchor %>'></a>
-        <% end %>
-        <h<%= level + 1 %> id='<%= section_id %>'><%= name %></h<%= level + 1 %>>
-        <% if level == 1 %>
-          <div class='sectionbody'><%= content %></div>
-        <% else %>
-          <%= content %>
-        <% end %>
-      </div>
-    EOF
-  end
-end
-
-class SectionAnchorTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <a name='<%= content %>'></a>
-    EOF
-  end
-end
-
-class SectionDlistTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='dlist'>
-        <dl>
-          <% content.each do |dt, dd| %>
-            <dt class='hdlist1'>
-              <% if !dt.anchor.nil? and !dt.anchor.empty? %>
-              <a id='<%= dt.anchor %>'></a>
-              <% end %>
-              <%= dt.text %>
-            </dt>
-            <% unless dd.nil? %>
-              <dd>
-                <p><%= dd.text %></p>
-                <% if !dd.blocks.empty? %>
-                <%= dd.content %> 
-                <% end %>
-              </dd>
-            <% end %>
-          <% end %>
-        </dl>
-      </div>
-    EOF
-  end
-end
-
-class SectionListingTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='listingblock'>
-        <div class='content'>
-          <div class='highlight'>
-            <pre><%= content %></pre>
-          </div>
-        </div>
-      </div>
-    EOF
-  end
-end
-
-class SectionLiteralTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='literalblock'>
-        <div class='content'>
-          <pre><tt><%= content %></tt></pre>
-        </div>
-      </div>
-    EOF
-  end
-end
-
-class SectionAdmonitionTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='admonitionblock'>
-        <table>
-          <tr>
-            <td class='icon'>
-              <% if attr? :caption %>
-              <div class='title'><%= attr :caption %></div>
-              <% end %>
-            </td>
-            <td class='content'>
-              <% if !title.nil? %>
-                <div class='title'><%= title %></div>
-              <% end %>
-              <%= content %>
-            </td>
-          </tr>
-        </table>
-      </div>
-    EOF
-  end
-end
-
-class SectionParagraphTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='paragraph'>
-        <% if !title.nil? %>
-          <div class='title'><%= title %></div>
-        <% end %>
-        <p><%= content %></p>
-      </div>
-    EOF
-  end
-end
-
-class SectionSidebarTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='sidebarblock'>
-        <div class='content'>
-          <% if !title.nil? %>
-            <div class='title'><%= title %></div>
-          <% end %>
-          <%= content %>
-        </div>
-      </div>
-    EOF
-  end
-end
-
-class SectionExampleTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='exampleblock'>
-        <div class='content'>
-          <% if !title.nil? %>
-            <div class='title'><%= title %></div>
-          <% end %>
-          <%= content %>
-        </div>
-      </div>
-    EOF
-  end
-end
-
-class SectionQuoteTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='quoteblock'>
-        <% if !title.nil? %>
-          <div class='title'><%= title %></div>
-        <% end %>
-        <div class='content'>
-          <%= content %>
-        </div>
-        <div class='attribution'>
-          <% if attr? :citetitle %>
-            <em><%= attr :citetitle %></em>
-          <% end %>
-          <% if attr? :attribution %>
-            <% if attr? :citetitle %>
-            <br/>
-            <% end %>
-            <%= "&#8212; " + attr(:attribution) %>
-          <% end %>
-        </div>
-      </div>
-    EOF
-  end
-end
-
-class SectionVerseTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='verseblock'>
-        <% if !title.nil? %>
-          <div class='title'><%= title %></div>
-        <% end %>
-        <pre class='content'><%= content %></pre>
-        <div class='attribution'>
-          <% if attr? :citetitle %>
-            <em><%= attr :citetitle %></em>
-          <% end %>
-          <% if attr? :attribution %>
-            <% if attr? :citetitle %>
-            <br/>
-            <% end %>
-            <%= "&#8212; " + attr(:attribution) %>
-          <% end %>
-        </div>
-      </div>
-    EOF
-  end
-end
-
-class SectionUlistTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='ulist'>
-        <ul>
-        <% content.each do |li| %>
-          <li>
-            <p><%= li.text %></p>
-            <% if !li.blocks.empty? %>
-            <%= li.content %>
-            <% end %>
-          </li>
-        <% end %>
-        </ul>
-      </div>
-    EOF
-  end
-end
-
-class SectionOlistTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='olist arabic'>
-        <ol class='arabic'>
-        <% content.each do |li| %>
-          <li>
-            <p><%= li.text %></p>
-            <% if !li.blocks.empty? %>
-            <%= li.content %>
-            <% end %>
-          </li>
-        <% end %>
-        </ol>
-      </div>
-    EOF
-  end
-end
-
-class SectionImageTemplate < BaseTemplate
-  def template
-    @template ||= ERB.new <<-EOF
-      <div class='imageblock'>
-        <div class='content'>
-          <% if attr :link %>
-          <a class='image' href='<%= attr :link%>'><img src='<%= attr :target %>' alt='<%= attr :alt %>'/></a>
-          <% else %>
-          <img src='<%= attr :target %>' alt='<%= attr :alt %>'/>
-          <% end %>
-        </div>
-        <% if title %>
-        <div class='title'><%= title %></div>
-        <% end %>
-      </div>
-    EOF
-  end
-end