webby 0.9.3 → 0.9.4

data/lib/webby/helpers/ultraviolet_helper.rb

@@ -3,6 +3,20 @@
 
 if try_require 'uv'
 
+Loquacious.configuration_for(:webby) {
+  desc "Options for UltraViolet syntax highlighting."
+  uv {
+    desc 'The language to highlight (ruby, c, html, ...).'
+    lang 'ruby'
+
+    desc 'Display line numbers (true, false).'
+    line_numbers false
+
+    desc 'See the UltraViolet documentation for a list of available themes.'
+    theme 'mac_classic'
+  }
+}
+
 module Webby::Helpers
 module UltraVioletHelper
 
@@ -39,13 +53,13 @@ module UltraVioletHelper
     return if text.empty?
     
     defaults = ::Webby.site.uv
-    lang = opts.getopt(:lang, defaults[:lang])
-    line_numbers = opts.getopt(:line_numbers, defaults[:line_numbers])
-    theme = opts.getopt(:theme, defaults[:theme])
+    lang = opts.getopt(:lang, defaults.lang)
+    line_numbers = opts.getopt(:line_numbers, defaults.line_numbers)
+    theme = opts.getopt(:theme, defaults.theme)
     
-    out = '<div class="UltraViolet">'
+    out = %Q{<div class="UltraViolet">\n}
     out << Uv.parse(text, "xhtml", lang, line_numbers, theme)
-    out << '</div>'
+    out << %Q{\n</div>}
 
     # put some guards around the output (specifically for textile)
     out = _guard(out)

data/lib/webby/link_validator.rb

@@ -56,18 +56,18 @@ class LinkValidator
     @log.info "validating #{fn}"
 
     dir = ::File.dirname(fn)
-    @doc = Hpricot(::File.read(fn))
+    doc = Hpricot(::File.read(fn))
 
     ::Webby.site.xpaths.each do |xpath|
       @attr_name = nil
 
-      @doc.search(xpath).each do |element|
-        @attr_name ||= @attr_rgxp.match(xpath)[1]
-        uri = URI.parse(element.get_attribute(@attr_name))
-        validate_uri(uri, dir)
+      doc.search(xpath).each do |element|
+        attr_name ||= @attr_rgxp.match(xpath)[1]
+        uri = URI.parse(element.get_attribute(attr_name))
+        validate_uri(uri, dir, doc)
       end
     end
-    @doc = @attr_name = nil
+    return nil # side effect of original implementation
   end
 
   # Validate the the page the _uri_ refers to actually exists. The directory
@@ -80,54 +80,15 @@ class LinkValidator
   # will only take place if the LinkValidator was created with the :external
   # flag set to true.
   #
-  def validate_uri( uri, dir )
-    # for relative URIs, we can see if the file exists in the output folder
-    if uri.relative?
-      return validate_anchor(uri, @doc) if uri.path.empty?
-
-      path = if uri.path =~ %r/^\//
-          ::File.join(::Webby.site.output_dir, uri.path)
-        else
-          ::File.join(dir, uri.path)
-        end
-      path = ::File.join(path, 'index.html') if ::File.extname(path).empty?
-
-      uri_str = path.dup
-      (uri_str << '#' << uri.fragment) if uri.fragment
-      return if @valid_uris.include? uri_str
-
-      if test ?f, path
-        valid = if uri.fragment
-            validate_anchor(uri, Hpricot(::File.read(path)))
-          else true end
-        @valid_uris << uri_str if valid
-      else
-        @log.error "invalid URI '#{uri.to_s}'"
-      end
-
-    # if the URI responds to the open mehod, then try to access the URI
-    elsif uri.respond_to? :open
-      return unless @validate_externals
-      return if @valid_uris.include? uri.to_s
+  def validate_uri( uri, dir, doc )
+    # do not retry external uris that have already been validated
+    return if @valid_uris.include? uri.to_s
 
-      if @invalid_uris.include? uri.to_s
-        @log.error "could not open URI '#{uri.to_s}'"
-        return
-      end
-
-      begin
-        uri.open {|_| nil}
-        @valid_uris << uri.to_s
-      rescue Exception
-        @log.error "could not open URI '#{uri.to_s}'"
-        @invalid_uris << uri.to_s
-      end 
+    return validate_relative_uri(uri, dir, doc) if uri.relative?
+    return validate_external_uri(uri, dir, doc) if uri.respond_to? :open
 
     # otherwise, post a warning that the URI could not be validated
-    else
-      return if @valid_uris.include? uri.to_s
-      @log.warn "could not validate URI '#{uri.to_s}'"
-    end
+    @log.warn "could not validate URI '#{uri.to_s}'"
   end
 
   # Validate that the anchor fragment of the URI exists in the given
@@ -146,6 +107,53 @@ class LinkValidator
     else true end
   end
 
+  # Validate that the file pointed to by the relative URI exists in the output
+  # directory. If the URI has an anchor, validate that the anchor exists as
+  # well.
+  #
+  def validate_relative_uri( uri, dir, doc )
+    return validate_anchor(uri, doc) if uri.path.empty?
+
+    path = if uri.path =~ %r/^\//
+        ::File.join(::Webby.site.output_dir, uri.path)
+      else
+        ::File.join(dir, uri.path)
+      end
+    path = ::File.join(path, 'index.html') if ::File.extname(path).empty?
+
+    uri_str = path.dup
+    (uri_str << '#' << uri.fragment) if uri.fragment
+    return if @valid_uris.include? uri_str
+
+    if test ?f, path
+      valid = if uri.fragment
+          validate_anchor(uri, Hpricot(::File.read(path)))
+        else true end
+      @valid_uris << uri_str if valid
+    else
+      @log.error "invalid URI '#{uri.to_s}'"
+    end
+  end
+
+  # Validate that an external URI can be opened
+  #
+  def validate_external_uri( uri, dir, doc )
+    return unless @validate_externals
+
+    if @invalid_uris.include? uri.to_s
+      @log.error "could not open URI '#{uri.to_s}'"
+      return
+    end
+
+    begin
+      uri.open {|_| nil}
+      @valid_uris << uri.to_s
+    rescue Exception
+      @log.error "could not open URI '#{uri.to_s}'"
+      @invalid_uris << uri.to_s
+    end 
+  end
+
 end  # class LinkValidator
 end  # module Webby
 

data/lib/webby/renderer.rb

@@ -36,12 +36,15 @@ class Renderer
     renderer = self.new(page)
 
     loop {
-      FileUtils.mkdir_p ::File.dirname(page.destination)
+      dest = page.destination
+      FileUtils.mkdir_p ::File.dirname(dest)
       journal.create_or_update(page)
 
-      ::File.open(page.destination, 'w') do |fd|
-        fd.write(renderer._layout_page)
+      text = renderer._layout_page
+      unless text.nil?
+        ::File.open(dest, 'w') {|fd| fd.write(text)}
       end
+
       break unless renderer._next_page
     }
   end
@@ -234,10 +237,10 @@ class Renderer
   rescue ::Webby::Error => err
     logger.error "while rendering page '#{@page.path}'"
     logger.error err.message
-  rescue => err
+    return nil
+  rescue Exception => err
     logger.error "while rendering page '#{@page.path}'"
     logger.fatal err
-    exit 1
   ensure
     @content = nil
     @@stack.clear
@@ -336,7 +339,7 @@ class Renderer
   # the partial. If a full path is given, then the partial is searched for
   # in that directory.
   #
-  # Raies a Webby::Error if the partial could not be found.
+  # Raises a Webby::Error if the partial could not be found.
   #
   def _find_partial( part )
     case part

data/lib/webby/resources.rb

@@ -86,7 +86,8 @@ module Webby::Resources
     # +nil+ if no layout exists under that filename.
     #
     def find_layout( filename )
-      return if filename.nil?
+      return unless filename
+      filename = filename.to_s
 
       fn  = self.basename(filename)
       dir = ::File.dirname(filename)

data/lib/webby/resources/page.rb

@@ -49,7 +49,10 @@ class Page < Resource
     return @url unless @url.nil?
 
     @url = super
-    @url = File.dirname(@url) if filename == 'index'
+    if filename == 'index'
+      @url = File.dirname(@url)
+      @url << '/' unless %r/\/$/ =~ @url
+    end
     @url
   end
 

data/lib/webby/tasks/create.rake

@@ -13,7 +13,7 @@ namespace :create do
       page, title, dir = Webby::Builder.new_page_info
       page = Webby::Builder.create(page, :from => template,
                  :locals => {:title => title, :directory => dir})
-      exec(::Webby.editor, page) unless ::Webby.editor.nil?
+      Webby.exec_editor(page)
     end
   end  # each
 

data/lib/webby/tasks/validate.rake

@@ -1,7 +1,7 @@
 
 namespace :validate do
 
-  desc 'Validate hyperlinks (exclude exteranl sites)'
+  desc 'Validate hyperlinks (exclude external sites)'
   task :internal => :build do
     Webby::LinkValidator.validate(:external => false)
   end

data/spec/data/html/anchor.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Anchor</title>
+  </head>
+  <body>
+    <a href="#anchor"></a>
+    <a id="anchor"></a>
+  </body>
+</html>

data/spec/data/html/external.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Anchor</title>
+  </head>
+  <body>
+    <a href="http://www.google.com"></a>
+  </body>
+</html>

data/spec/data/html/invalid-relative.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Anchor</title>
+  </head>
+  <body>
+    <a href="/invalid.html"></a>
+  </body>
+</html>

data/spec/data/html/relative-anchor.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Anchor</title>
+  </head>
+  <body>
+    <a href="/anchor.html#anchor"></a>
+  </body>
+</html>

data/spec/data/html/relative-invalid-anchor.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Anchor</title>
+  </head>
+  <body>
+    <a href="/anchor.html#invalid"></a>
+  </body>
+</html>

data/spec/data/html/relative.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Anchor</title>
+  </head>
+  <body>
+    <a href="/anchor.html"></a>
+  </body>
+</html>

data/spec/data/site/tasks/tumblog.rake

@@ -1,3 +1,7 @@
+Loquacious.configuration_for(:webby) {
+  desc "The default directory where new tumblog posts will be created."
+  tumblog_dir 'blog'
+}
 
 namespace :tumblog do
 
@@ -21,7 +25,7 @@ namespace :tumblog do
       page = File.join(dir, File.basename(page))
       page = Webby::Builder.create(page, :from => template,
                  :locals => {:title => title, :directory => dir})
-      exec(::Webby.editor, page) unless ::Webby.editor.nil?
+      Webby.exec_editor(page)
     end
   end  # each
 

data/spec/spec_helper.rb

@@ -3,10 +3,17 @@
 unless defined? WEBBY_SPEC_HELPER
 WEBBY_SPEC_HELPER = true
 
-require 'rubygems'
 require 'fileutils'
 require 'stringio'
 
+begin
+  require 'fake_web'
+  $test_externals = true
+rescue LoadError
+  retry if require 'rubygems'
+  $test_externals = false
+end
+
 require File.expand_path(
     File.join(File.dirname(__FILE__), %w[.. lib webby]))
 

data/spec/webby/apps/generator_spec.rb

@@ -36,13 +36,14 @@ describe Webby::Apps::Generator do
         "content",
         "content/css",
         "content/css/blueprint",
-        "content/css/blueprint/compressed",
-        "content/css/blueprint/lib",
         "content/css/blueprint/plugins",
         "content/css/blueprint/plugins/buttons",
         "content/css/blueprint/plugins/buttons/icons",
-        "content/css/blueprint/plugins/css-classes",
         "content/css/blueprint/plugins/fancy-type",
+        "content/css/blueprint/plugins/link-icons",
+        "content/css/blueprint/plugins/link-icons/icons",
+        "content/css/blueprint/plugins/rtl",
+        "content/css/blueprint/src",
         "layouts",
         "lib",
         "templates"
@@ -51,6 +52,38 @@ describe Webby::Apps::Generator do
     h["layouts"].should == %w[layouts/default.txt]
   end
 
+  it "should return a list of all the blog files from the template" do
+    @generator.parse %w[blog foo]
+
+    h = @generator.site_files
+    h.keys.sort.should == [
+      "",
+      "content",
+      "content/css",
+      "content/css/blueprint",
+      "content/css/blueprint/plugins",
+      "content/css/blueprint/plugins/buttons",
+      "content/css/blueprint/plugins/buttons/icons",
+      "content/css/blueprint/plugins/fancy-type",
+      "content/css/blueprint/plugins/link-icons",
+      "content/css/blueprint/plugins/link-icons/icons",
+      "content/css/blueprint/plugins/rtl",
+      "content/css/blueprint/src",
+      "layouts",
+      "tasks",
+      "templates",
+      "templates/blog"
+    ]
+    h["layouts"].should == %w[layouts/default.txt]
+    h["tasks"].should == %w[tasks/blog.rake]
+    h["templates"].should == %w[templates/atom_feed.erb]
+    h["templates/blog"].should == [
+      "templates/blog/year.erb",
+      "templates/blog/post.erb",
+      "templates/blog/month.erb"
+    ]
+  end
+
   describe "when parsing command line arguments" do
 
     before :each do

data/spec/webby/apps/main_spec.rb

@@ -78,7 +78,8 @@ describe Webby::Apps::Main do
 
   describe ".parse" do
     it "should pass environment variables to the rake application" do
-      ARGV = ary = []
+      ary = ARGV
+      ARGV.replace []
       args = %w[rebuild foo BASE=http://www.example.com bar]
       @main.parse args
       ary.should == %w[rebuild BASE=http://www.example.com]

data/spec/webby/filters/basepath_spec.rb

@@ -108,13 +108,13 @@ describe Webby::Filters::BasePath do
 
   it 'is restrictive to the configured xpaths' do
     Webby.site.base = 'not a real site'
-    input = @input % ['<img src="/foo/picture.jpg" />', '<a href="/page.html">Page Title</a>']
+    input = @input % ['<foo src="/foo/picture.jpg" />', '<a href="/page.html">Page Title</a>']
 
     bp = Webby::Filters::BasePath.new(input, 'html')
     bp.filter.should == <<-HTML
 <html>
 <head>
-<img src="/foo/picture.jpg" />
+<foo src="/foo/picture.jpg" />
 </head>
 <body>
 <a href="not a real site/page.html">Page Title</a>