asciidoctor 0.0.2 → 0.0.3

data/README.md

@@ -5,16 +5,19 @@ Asciidoctor is a pure-ruby processor for turning
 [Asciidoc](http://www.methods.co.nz/asciidoc/index.html) documents
 into HTML (and, eventually, other formats perhaps).
 
-Currently, asciidoctor uses some simple built-in ERB templates to
-style the output in a way tht roughly matches the default HTML output
-of the native Python processor.
+Asciidoctor uses simple built-in ERB templates to style the output in
+a way that roughly matches the default HTML output of the native
+Python processor. You can override this behavior by providing
+[Tilt]-compatible templates. See the Usage section for more details.
 
 Asciidoctor currently works with Ruby 1.8.7 and 1.9.3, though I don't
 know of any reason it shouldn't work with more exotic Ruby versions,
 and would welcome help in testing that out.
 
-The initial code on which asciidoctor is based was from the Git SCM
-site repo, [gitscm-next](https://github.com/github/gitscm-next).
+The initial code from which asciidoctor started was from the [Git SCM
+site repo][gitscm-next].
+
+[gitscm-next]: https://github.com/github/gitscm-next
 
 # Installation
 
@@ -49,12 +52,11 @@ Render an Asciidoc-formatted string
 
 Asciidoctor allows you to override the default template used to render
 almost any individual Asciidoc elements. If you provide a directory of
-[Tilt](https://github.com/rtomayko/tilt)-compatible templates, named
-in a way Asciidoctor can figure out which template goes with which
-element, Asciidoctor will use the templates in this directory instead
-of its built-in templates for any elements for which it finds a
-matching template.  It will use its default templates for everything
-else.
+[Tilt]-compatible templates, named in a way Asciidoctor can figure out
+which template goes with which element, Asciidoctor will use the
+templates in this directory instead of its built-in templates for any
+elements for which it finds a matching template.  It will use its
+default templates for everything else.
 
     doc = Asciidoctor::Document.new("*This* is it.", :template_dir => 'templates')
     puts doc.render
@@ -72,6 +74,8 @@ with an ERB template you'd put a file called
 
 For more usage examples, see the test suite.
 
+[Tilt]: https://github.com/rtomayko/tilt
+
 ## Contributing
 In the spirit of [free software][free-sw], **everyone** is encouraged to help
 improve this project.

data/asciidoctor.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'asciidoctor'
-  s.version           = '0.0.2'
+  s.version           = '0.0.3'
   s.date              = '2012-08-03'
   s.rubyforge_project = 'asciidoctor'
 

data/lib/asciidoctor/document.rb

@@ -30,17 +30,17 @@ class Asciidoctor::Document
     @elements = []
     @options = options
 
-    reader = Reader.new(data, &block)
+    @reader = Reader.new(data, &block)
 
     # pseudo-delegation :)
-    @defines = reader.defines
-    @references = reader.references
+    @defines = @reader.defines
+    @references = @reader.references
 
     # Now parse @lines into elements
-    while reader.has_lines?
-      reader.skip_blank
+    while @reader.has_lines?
+      @reader.skip_blank
 
-      @elements << Lexer.next_block(reader, self) if reader.has_lines?
+      @elements << Lexer.next_block(@reader, self) if @reader.has_lines?
     end
 
     Asciidoctor.debug "Found #{@elements.size} elements in this document:"
@@ -58,6 +58,11 @@ class Asciidoctor::Document
 
   end
 
+  # Make the raw source for the Document available.
+  def source
+    @reader.source if @reader
+  end
+
   # We need to be able to return some semblance of a title
   def title
     return @title if @title
@@ -72,6 +77,7 @@ class Asciidoctor::Document
 
     @title
   end
+  alias :name :title
 
   def splain
     if @header
@@ -91,19 +97,24 @@ class Asciidoctor::Document
     nil
   end
 
-  def renderer
+  def renderer(options = {})
     return @renderer if @renderer
     render_options = {}
+    # Load up relevant Document @options
     if @options[:template_dir]
       render_options[:template_dir] = @options[:template_dir]
     end
+    # Override Document @option settings with options passed in
+    render_options.merge! options
+
     @renderer = Renderer.new(render_options)
   end
 
   # Public: Render the Asciidoc document using erb templates
   #
-  def render
-    html = renderer.render('document', self, :header => @header, :preamble => @preamble)
+  def render(options = {})
+    r = renderer(options)
+    html = r.render('document', self, :header => @header, :preamble => @preamble)
   end
 
   def content

data/lib/asciidoctor/lexer.rb

@@ -148,7 +148,7 @@ class Asciidoctor::Lexer
           reader.get_line if reader.has_lines? && reader.peek_line.strip.empty?
 
           dd_segment = Reader.new(list_item_segment(reader, :alt_ending => this_dlist))
-          while dd_segment.any?
+          while dd_segment.has_lines?
             dd.blocks << next_block(dd_segment, block)
           end
 
@@ -602,7 +602,7 @@ class Asciidoctor::Lexer
 
     if !section.anchor.nil?
       anchor_id = section.anchor.match(/^\[(.*)\]/) ? $1 : section.anchor
-      @references[anchor_id] = section.anchor
+      parent.document.references[anchor_id] = section.anchor
       section.anchor = anchor_id
     end
 
@@ -633,7 +633,7 @@ class Asciidoctor::Lexer
         section_lines << this_line
         section_lines.concat reader.grab_lines_until {|line| line.match( REGEXP[:listing] ) }
         # Also grab the last line, if there is one
-        this_line = lines.shift
+        this_line = reader.get_line
         section_lines << this_line unless this_line.nil?
       else
         section_lines << this_line

data/lib/asciidoctor/reader.rb

@@ -46,6 +46,8 @@ class Asciidoctor::Reader
     @defines = {}
     @references = {}
 
+    data = data.split("\n") if data.is_a? String
+
     include_regexp = /^include::([^\[]+)\[\]\s*\n?\z/
 
     data.each do |line|

data/lib/asciidoctor/version.rb

@@ -1,3 +1,3 @@
 module Asciidoctor
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: