TwP-webby 0.9.2 → 0.9.3

data/lib/webby/builder.rb

@@ -82,7 +82,6 @@ class Builder
       [args.page, args.title, args.dir]
     end
 
-
     private
 
     # Returns the binding in the scope of the Builder class object.
@@ -98,7 +97,7 @@ class Builder
   # layout directories.
   #
   def initialize
-    @log = Logging::Logger[self]
+    @logger = Logging::Logger[self]
   end
 
   # call-seq:
@@ -125,24 +124,25 @@ class Builder
   #
   def run( opts = {} )
     opts[:load_files] = true unless opts.has_key?(:load_files)
+    verbose = opts.getopt(:verbose, true)
 
     unless test(?d, output_dir)
-      @log.info "creating #{output_dir}"
+      journal.create output_dir
       FileUtils.mkdir output_dir
     end
 
     load_files if opts[:load_files]
 
     Resources.pages.each do |page|
-      next unless page.dirty? or opts[:rebuild]
-
-      @log.info "creating #{page.destination}"
-
-      # make sure the directory exists
-      FileUtils.mkdir_p ::File.dirname(page.destination)
+      unless page.dirty? or opts[:rebuild]
+        journal.identical(page.destination) if verbose
+        next
+      end
 
       # copy the resource to the output directory if it is static
       if page.instance_of? Resources::Static
+        FileUtils.mkdir_p ::File.dirname(page.destination)
+        journal.create_or_update(page)
         FileUtils.cp page.path, page.destination
         FileUtils.chmod 0644, page.destination
 

data/lib/webby/core_ext/kernel.rb

@@ -16,6 +16,11 @@ module Kernel
     STDERR.reopen io.last
     $stdout, $stderr = STDOUT, STDERR
   end
+
+  def journal
+    @journal ||= ::Webby::Journal.new
+  end
+
 end  # module Kernel
 
 # EOF

data/lib/webby/filters/wiki_words.rb

@@ -0,0 +1,14 @@
+
+Webby::Filters.register :wikiwords do |input, cursor|
+
+  renderer = cursor.renderer
+  input.gsub %r/\[\[([^\]]+)\]\]/ do
+    name = $1
+    renderer.link_to_page(name) {
+      %Q(<a class="missing internal">#{name}</a>)
+    }
+  end
+
+end
+
+# EOF

data/lib/webby/helpers/url_helper.rb

@@ -159,6 +159,9 @@ module UrlHelper
   #
   def link_to_page( *args )
     self.link_to(*_find_page(args))
+  rescue ::Webby::Error => err
+    return yield if block_given?
+    raise err
   end
 
   # call-seq:
@@ -184,6 +187,9 @@ module UrlHelper
     return name if @page == page
 
     self.link_to(name, page, link_opts)
+  rescue ::Webby::Error => err
+    return yield if block_given?
+    raise err
   end
 
   

data/lib/webby/journal.rb

@@ -0,0 +1,126 @@
+
+module Webby
+
+# The Journal class is used to output simple messages regarding the creation
+# and updating of files when webby applications are run. The output messages
+# will be color coded if the terminal supports the ANSI codes.
+#
+class Journal
+
+  attr_accessor :colorize
+  attr_reader :logger
+
+  # Create a new journal
+  #
+  def initialize
+    @logger = ::Logging::Logger[self]
+    @colorize = ENV.has_key?('TERM')
+  end
+
+  # Output a message of the given _type_ using the option _color_ code. The
+  # available codes are as follows:
+  #
+  # * black
+  # * red
+  # * green
+  # * yellow
+  # * blue
+  # * magenta
+  # * cyan
+  # * white
+  #
+  # The color is specified as a string or a symbol.
+  #
+  def typed_message( type, msg, color = nil )
+    type = type.to_s.rjust(13)
+    type = self.send(color, type) unless color.nil?
+    logger.info "#{type}  #{msg.to_s}"
+  end
+
+  # Output a "create" message or an "update" message depending on whether
+  # the given _page_ already has a generated output file or not.
+  #
+  def create_or_update( page )
+    if test(?e, page.destination)
+      update(page.destination)
+    else
+      create(page.destination)
+    end
+  end
+
+  # Output a create message.
+  #
+  def create( msg )
+    typed_message('create', msg, (colorize ? :green : nil))
+  end
+
+  # Output an update message.
+  #
+  def update( msg )
+    typed_message('update', msg, (colorize ? :yellow : nil))
+  end
+
+  # Output a force message.
+  #
+  def force( msg )
+    typed_message('force', msg, (colorize ? :red : nil))
+  end
+
+  # Output a skip message.
+  #
+  def skip( msg )
+    typed_message('skip', msg, (colorize ? :yellow : nil))
+  end
+
+  # Output an exists message.
+  #
+  def exists( msg )
+    typed_message('exists', msg, (colorize ? :cyan : nil))
+  end
+
+  # Output an identical message.
+  #
+  def identical( msg )
+    typed_message('identical', msg, (colorize ? :cyan : nil))
+  end
+
+  [ [ :clear        ,   0 ],
+    [ :reset        ,   0 ],     # synonym for :clear
+    [ :bold         ,   1 ],
+    [ :dark         ,   2 ],
+    [ :italic       ,   3 ],     # not widely implemented
+    [ :underline    ,   4 ],
+    [ :underscore   ,   4 ],     # synonym for :underline
+    [ :blink        ,   5 ],
+    [ :rapid_blink  ,   6 ],     # not widely implemented
+    [ :negative     ,   7 ],     # no reverse because of String#reverse
+    [ :concealed    ,   8 ],
+    [ :strikethrough,   9 ],     # not widely implemented
+    [ :black        ,  30 ],
+    [ :red          ,  31 ],
+    [ :green        ,  32 ],
+    [ :yellow       ,  33 ],
+    [ :blue         ,  34 ],
+    [ :magenta      ,  35 ],
+    [ :cyan         ,  36 ],
+    [ :white        ,  37 ],
+    [ :on_black     ,  40 ],
+    [ :on_red       ,  41 ],
+    [ :on_green     ,  42 ],
+    [ :on_yellow    ,  43 ],
+    [ :on_blue      ,  44 ],
+    [ :on_magenta   ,  45 ],
+    [ :on_cyan      ,  46 ],
+    [ :on_white     ,  47 ] ].each do |name,code|
+
+    class_eval <<-CODE
+      def #{name.to_s}( str )
+        "\e[#{code}m\#{str}\e[0m"
+      end
+    CODE
+  end
+
+end  # class Journal
+end  # module Webby
+
+# EOF

data/lib/webby/renderer.rb

@@ -36,6 +36,9 @@ class Renderer
     renderer = self.new(page)
 
     loop {
+      FileUtils.mkdir_p ::File.dirname(page.destination)
+      journal.create_or_update(page)
+
       ::File.open(page.destination, 'w') do |fd|
         fd.write(renderer._layout_page)
       end
@@ -43,6 +46,8 @@ class Renderer
     }
   end
 
+  attr_reader :logger
+
   # call-seq:
   #    Renderer.new( page )
   #
@@ -64,7 +69,7 @@ class Renderer
 
     @_bindings = []
     @_content_for = {}
-    @log = Logging::Logger[self]
+    @logger = Logging::Logger[self]
   end
 
   # call-seq:
@@ -227,11 +232,11 @@ class Renderer
 
     @content
   rescue ::Webby::Error => err
-    @log.error "while rendering page '#{@page.path}'"
-    @log.error err.message
+    logger.error "while rendering page '#{@page.path}'"
+    logger.error err.message
   rescue => err
-    @log.error "while rendering page '#{@page.path}'"
-    @log.fatal err
+    logger.error "while rendering page '#{@page.path}'"
+    logger.fatal err
     exit 1
   ensure
     @content = nil
@@ -271,7 +276,7 @@ class Renderer
       @_content_for.clear
       @_bindings.clear
     else
-      @pager.pager.done
+      @pager.pager.reset
       @pager = nil
       return false
     end

data/lib/webby/resources/meta_file.rb

@@ -74,7 +74,9 @@ class MetaFile
   # found at the beginning of the stream.
   #
   def read
-    @io.seek(meta_end || 0)
+    count = meta_end
+    @io.seek 0
+    count.times {@io.gets} unless count.nil?
     @io.read
   end
 
@@ -188,12 +190,13 @@ class MetaFile
     return unless META_SEP =~ line
 
     @io.seek 0
-    pos = nil
-    buffer = @io.gets.length
+    @io.gets
+    pos, count = nil, 1
+
     while line = @io.gets
-      buffer += line.length
+      count += 1
       if META_SEP =~ line
-        pos = buffer
+        pos = count
         @meta_count += 1
       end
     end

data/lib/webby/stelan/paginator.rb

@@ -73,7 +73,7 @@ class Paginator
   end
 
   # Finalizer method that should be called when the paginator is finished
-  def done
+  def reset
     resource._reset(@meta_data)
   end
   
@@ -92,7 +92,7 @@ class Paginator
       @offset = (number - 1) * pager.per_page
       @select = select
 
-      @pager.resource._reset
+      @pager.reset
       if number > 1
         if ::Webby.site.create_mode == 'directory'
           @pager.resource['directory'] = File.join(@pager.directory, number.to_s)

data/lib/webby/tasks/growl.rake

@@ -2,12 +2,13 @@
 unless WINDOWS
 
 task :growl do
-  Logging::Logger['Webby'].add_appenders(Logging::Appenders::Growl.new(
-    "Webby",
+  growl = Logging::Appenders::Growl.new('growl',
     :layout => Logging::Layouts::Pattern.new(:pattern => "%5l - Webby\000%m"),
     :coalesce => true,
     :separator => "\000"
-  ))
+  )
+  Logging::Logger['Webby'].add_appenders(growl)
+  Logging::Logger['Webby::Journal'].add_appenders(growl)
 end
 
 end  # unless WINDOWS

data/lib/webby.rb

@@ -7,18 +7,10 @@ require 'logging'
 require 'ostruct'
 require 'date'
 
-# Configure Webby to log to STDOUT at the 'info' level
-Logging::Logger['Webby'].level = :info
-Logging::Logger['Webby'].add_appenders(Logging::Appender.stdout)
-Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
-    :pattern      => "[%d] %5l: %m\n",    # [date] LEVEL: message
-    :date_pattern => "%H:%M:%S"           # date == HH:MM:SS
-)
-
 module Webby
 
   # :stopdoc:
-  VERSION = '0.9.2'   # :nodoc:
+  VERSION = '0.9.3'   # :nodoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   YAML_SEP = '---'
@@ -51,7 +43,8 @@ module Webby
       :tumblog_dir   => 'tumblog',
 
       # Items for running the heel webserver
-      :heel_port => 4331,
+      :use_web_server => true,
+      :heel_port      => 4331,
 
       # Items used to deploy the website
       :user       => ENV['USER'] || ENV['USERNAME'],

data/spec/data/outline/basic.out

@@ -0,0 +1,81 @@
+<ol>
+<li>
+<a href="#h1">First Header</a>
+<ol>
+<li>
+<a href="#h1_1">Second Header</a>
+</li>
+<li>
+<a href="#h1_2">Third Header</a>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h2">Fourth Header</a>
+</li>
+<li>
+<a href="#h3">Fifth Header</a>
+<ol>
+<li>
+<a href="#h3_1">Sixth Header</a>
+<ol>
+<li>
+<a href="#h3_1_1">Seventh Header</a>
+<ol>
+<li>
+<a href="#h3_1_1_1">Eighth Header</a>
+<ol>
+<li>
+<a href="#h3_1_1_1_1">Ninth Header</a>
+<ol>
+<li>
+<a href="#h3_1_1_1_1_1">Tenth Header</a>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h3_2">Eleventh Header</a>
+<ol>
+<li>
+<a href="#h3_2_1">Twelfth Header</a>
+</li>
+<li>
+<a href="#h3_2_2">Thirteenth Header</a>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h4">Fourteenth Header</a>
+<ol>
+<li>
+<a href="#h4_1">Fifteenth Header</a>
+</li>
+</ol></li></ol>
+
+<h1 id="h1"><span class="heading-num">1</span>First Header</h1>
+<h2 id="h1_1"><span class="heading-num">1.1</span>Second Header</h2>
+<h2 id="h1_2"><span class="heading-num">1.2</span>Third Header</h2>
+
+<h1 id="h2"><span class="heading-num">2</span>Fourth Header</h1>
+
+<h1 id="h3"><span class="heading-num">3</span>Fifth Header</h1>
+<h2 id="h3_1"><span class="heading-num">3.1</span>Sixth Header</h2>
+<h3 id="h3_1_1"><span class="heading-num">3.1.1</span>Seventh Header</h3>
+<h4 id="h3_1_1_1"><span class="heading-num">3.1.1.1</span>Eighth Header</h4>
+<h5 id="h3_1_1_1_1"><span class="heading-num">3.1.1.1.1</span>Ninth Header</h5>
+<h6 id="h3_1_1_1_1_1"><span class="heading-num">3.1.1.1.1.1</span>Tenth Header</h6>
+
+<h2 id="h3_2"><span class="heading-num">3.2</span>Eleventh Header</h2>
+<h3 id="h3_2_1"><span class="heading-num">3.2.1</span>Twelfth Header</h3>
+<h3 id="h3_2_2"><span class="heading-num">3.2.2</span>Thirteenth Header</h3>
+
+<h1 id="h4"><span class="heading-num">4</span>Fourteenth Header</h1>
+<h2 id="h4_1"><span class="heading-num">4.1</span>Fifteenth Header</h2>

data/spec/data/outline/basic.txt

@@ -0,0 +1,25 @@
+---
+title:  Outline Test
+filter: outline
+---
+<toc />
+
+<h1>First Header</h1>
+<h2>Second Header</h2>
+<h2>Third Header</h2>
+
+<h1>Fourth Header</h1>
+
+<h1>Fifth Header</h1>
+<h2>Sixth Header</h2>
+<h3>Seventh Header</h3>
+<h4>Eighth Header</h4>
+<h5>Ninth Header</h5>
+<h6>Tenth Header</h6>
+
+<h2>Eleventh Header</h2>
+<h3>Twelfth Header</h3>
+<h3>Thirteenth Header</h3>
+
+<h1>Fourteenth Header</h1>
+<h2>Fifteenth Header</h2>

data/spec/data/outline/no_clobber.out

@@ -0,0 +1,86 @@
+    <div>
+      <p>This is the title</p>
+      <ol>
+<li>
+<a href="#h1">First Header</a>
+<ol>
+<li>
+<a href="#h1_1">Second Header</a>
+</li>
+<li>
+<a href="#h1_2">Third Header</a>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h2">Fourth Header</a>
+</li>
+<li>
+<a href="#h3">Fifth Header</a>
+<ol>
+<li>
+<a href="#h3_1">Sixth Header</a>
+<ol>
+<li>
+<a href="#h3_1_1">Seventh Header</a>
+<ol>
+<li>
+<a href="#h3_1_1_1">Eighth Header</a>
+<ol>
+<li>
+<a href="#h3_1_1_1_1">Ninth Header</a>
+<ol>
+<li>
+<a href="#h3_1_1_1_1_1">Tenth Header</a>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h3_2">Eleventh Header</a>
+<ol>
+<li>
+<a href="#h3_2_1">Twelfth Header</a>
+</li>
+<li>
+<a href="#h3_2_2">Thirteenth Header</a>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h4">Fourteenth Header</a>
+<ol>
+<li>
+<a href="#h4_1">Fifteenth Header</a>
+</li>
+</ol></li></ol>
+      <p>And some sampler text</p>
+    </div>
+
+
+<h1 id="h1"><span class="heading-num">1</span>First Header</h1>
+<h2 id="h1_1"><span class="heading-num">1.1</span>Second Header</h2>
+<h2 id="h1_2"><span class="heading-num">1.2</span>Third Header</h2>
+
+<h1 id="h2"><span class="heading-num">2</span>Fourth Header</h1>
+
+<h1 id="h3"><span class="heading-num">3</span>Fifth Header</h1>
+<h2 id="h3_1"><span class="heading-num">3.1</span>Sixth Header</h2>
+<h3 id="h3_1_1"><span class="heading-num">3.1.1</span>Seventh Header</h3>
+<h4 id="h3_1_1_1"><span class="heading-num">3.1.1.1</span>Eighth Header</h4>
+<h5 id="h3_1_1_1_1"><span class="heading-num">3.1.1.1.1</span>Ninth Header</h5>
+<h6 id="h3_1_1_1_1_1"><span class="heading-num">3.1.1.1.1.1</span>Tenth Header</h6>
+
+<h2 id="h3_2"><span class="heading-num">3.2</span>Eleventh Header</h2>
+<h3 id="h3_2_1"><span class="heading-num">3.2.1</span>Twelfth Header</h3>
+<h3 id="h3_2_2"><span class="heading-num">3.2.2</span>Thirteenth Header</h3>
+
+<h1 id="h4"><span class="heading-num">4</span>Fourteenth Header</h1>
+<h2 id="h4_1"><span class="heading-num">4.1</span>Fifteenth Header</h2>

data/spec/data/outline/numbering.out

@@ -0,0 +1,81 @@
+<ol start="3">
+<li>
+<a href="#h3">First Header</a>
+<ol>
+<li>
+<a href="#h3_1">Second Header</a>
+</li>
+<li>
+<a href="#h3_2">Third Header</a>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h4">Fourth Header</a>
+</li>
+<li>
+<a href="#h5">Fifth Header</a>
+<ol>
+<li>
+<a href="#h5_1">Sixth Header</a>
+<ol>
+<li>
+<a href="#h5_1_1">Seventh Header</a>
+<ol>
+<li>
+<a href="#h5_1_1_1">Eighth Header</a>
+<ol>
+<li>
+<a href="#h5_1_1_1_1">Ninth Header</a>
+<ol>
+<li>
+<a href="#h5_1_1_1_1_1">Tenth Header</a>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h5_2">Eleventh Header</a>
+<ol>
+<li>
+<a href="#h5_2_1">Twelfth Header</a>
+</li>
+<li>
+<a href="#h5_2_2">Thirteenth Header</a>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h6">Fourteenth Header</a>
+<ol>
+<li>
+<a href="#h6_1">Fifteenth Header</a>
+</li>
+</ol></li></ol>
+
+<h1 id="h3"><span class="heading-num">3</span>First Header</h1>
+<h2 id="h3_1"><span class="heading-num">3.1</span>Second Header</h2>
+<h2 id="h3_2"><span class="heading-num">3.2</span>Third Header</h2>
+
+<h1 id="h4"><span class="heading-num">4</span>Fourth Header</h1>
+
+<h1 id="h5"><span class="heading-num">5</span>Fifth Header</h1>
+<h2 id="h5_1"><span class="heading-num">5.1</span>Sixth Header</h2>
+<h3 id="h5_1_1"><span class="heading-num">5.1.1</span>Seventh Header</h3>
+<h4 id="h5_1_1_1"><span class="heading-num">5.1.1.1</span>Eighth Header</h4>
+<h5 id="h5_1_1_1_1"><span class="heading-num">5.1.1.1.1</span>Ninth Header</h5>
+<h6 id="h5_1_1_1_1_1"><span class="heading-num">5.1.1.1.1.1</span>Tenth Header</h6>
+
+<h2 id="h5_2"><span class="heading-num">5.2</span>Eleventh Header</h2>
+<h3 id="h5_2_1"><span class="heading-num">5.2.1</span>Twelfth Header</h3>
+<h3 id="h5_2_2"><span class="heading-num">5.2.2</span>Thirteenth Header</h3>
+
+<h1 id="h6"><span class="heading-num">6</span>Fourteenth Header</h1>
+<h2 id="h6_1"><span class="heading-num">6.1</span>Fifteenth Header</h2>

data/spec/data/outline/numbering_only.out

@@ -0,0 +1,21 @@
+
+
+<h1 id="h1"><span class="heading-num">1</span>First Header</h1>
+<h2 id="h1_1"><span class="heading-num">1.1</span>Second Header</h2>
+<h2 id="h1_2"><span class="heading-num">1.2</span>Third Header</h2>
+
+<h1 id="h2"><span class="heading-num">2</span>Fourth Header</h1>
+
+<h1 id="h3"><span class="heading-num">3</span>Fifth Header</h1>
+<h2 id="h3_1"><span class="heading-num">3.1</span>Sixth Header</h2>
+<h3 id="h3_1_1"><span class="heading-num">3.1.1</span>Seventh Header</h3>
+<h4 id="h3_1_1_1"><span class="heading-num">3.1.1.1</span>Eighth Header</h4>
+<h5 id="h3_1_1_1_1"><span class="heading-num">3.1.1.1.1</span>Ninth Header</h5>
+<h6 id="h3_1_1_1_1_1"><span class="heading-num">3.1.1.1.1.1</span>Tenth Header</h6>
+
+<h2 id="h3_2"><span class="heading-num">3.2</span>Eleventh Header</h2>
+<h3 id="h3_2_1"><span class="heading-num">3.2.1</span>Twelfth Header</h3>
+<h3 id="h3_2_2"><span class="heading-num">3.2.2</span>Thirteenth Header</h3>
+
+<h1 id="h4"><span class="heading-num">4</span>Fourteenth Header</h1>
+<h2 id="h4_1"><span class="heading-num">4.1</span>Fifteenth Header</h2>