TwP-webby 0.9.2 → 0.9.3

data/spec/data/outline/toc_range_1.out

@@ -0,0 +1,66 @@
+<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>
+</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>Eighth Header</h4>
+<h5>Ninth Header</h5>
+<h6>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/toc_range_2.out

@@ -0,0 +1,55 @@
+<ol>
+<li>
+<a href="#h1">Second Header</a>
+</li>
+<li>
+<a href="#h2">Third Header</a>
+</li>
+<li>
+<a href="#h3">Sixth Header</a>
+<ol>
+<li>
+<a href="#h3_1">Seventh Header</a>
+<ol>
+<li>
+<a href="#h3_1_1">Eighth Header</a>
+</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h4">Eleventh Header</a>
+<ol>
+<li>
+<a href="#h4_1">Twelfth Header</a>
+</li>
+<li>
+<a href="#h4_2">Thirteenth Header</a>
+</li>
+</ol>
+</li>
+<li>
+<a href="#h5">Fifteenth Header</a>
+</li>
+</ol>
+
+<h1>First Header</h1>
+<h2 id="h1"><span class="heading-num">1</span>Second Header</h2>
+<h2 id="h2"><span class="heading-num">2</span>Third Header</h2>
+
+<h1>Fourth Header</h1>
+
+<h1>Fifth Header</h1>
+<h2 id="h3"><span class="heading-num">3</span>Sixth Header</h2>
+<h3 id="h3_1"><span class="heading-num">3.1</span>Seventh Header</h3>
+<h4 id="h3_1_1"><span class="heading-num">3.1.1</span>Eighth Header</h4>
+<h5>Ninth Header</h5>
+<h6>Tenth Header</h6>
+
+<h2 id="h4"><span class="heading-num">4</span>Eleventh Header</h2>
+<h3 id="h4_1"><span class="heading-num">4.1</span>Twelfth Header</h3>
+<h3 id="h4_2"><span class="heading-num">4.2</span>Thirteenth Header</h3>
+
+<h1>Fourteenth Header</h1>
+<h2 id="h5"><span class="heading-num">5</span>Fifteenth Header</h2>

data/spec/data/outline/toc_style.out

@@ -0,0 +1,81 @@
+<ul>
+<li>
+<a href="#h1">First Header</a>
+<ul>
+<li>
+<a href="#h1_1">Second Header</a>
+</li>
+<li>
+<a href="#h1_2">Third Header</a>
+</li>
+</ul>
+</li>
+<li>
+<a href="#h2">Fourth Header</a>
+</li>
+<li>
+<a href="#h3">Fifth Header</a>
+<ul>
+<li>
+<a href="#h3_1">Sixth Header</a>
+<ul>
+<li>
+<a href="#h3_1_1">Seventh Header</a>
+<ul>
+<li>
+<a href="#h3_1_1_1">Eighth Header</a>
+<ul>
+<li>
+<a href="#h3_1_1_1_1">Ninth Header</a>
+<ul>
+<li>
+<a href="#h3_1_1_1_1_1">Tenth Header</a>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
+<a href="#h3_2">Eleventh Header</a>
+<ul>
+<li>
+<a href="#h3_2_1">Twelfth Header</a>
+</li>
+<li>
+<a href="#h3_2_2">Thirteenth Header</a>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
+<a href="#h4">Fourteenth Header</a>
+<ul>
+<li>
+<a href="#h4_1">Fifteenth Header</a>
+</li>
+</ul></li></ul>
+
+<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/spec_helper.rb

@@ -13,13 +13,13 @@ require File.expand_path(
 Spec::Runner.configure do |config|
   config.before :all do
     @pwd = Dir.pwd
-    Dir.chdir Webby.datapath
-    FileUtils.mkdir_p Webby.datapath(::Webby.site.output_dir)
+    Dir.chdir Webby.datapath('site')
+    FileUtils.mkdir_p Webby.datapath('site', ::Webby.site.output_dir)
   end
 
   config.after :all do
-    FileUtils.rm_rf(Webby.datapath(::Webby.cairn))
-    FileUtils.rm_rf(Dir.glob(Webby.datapath %w[output *]))
+    FileUtils.rm_rf(Webby.datapath('site', ::Webby.cairn))
+    FileUtils.rm_rf(Dir.glob(Webby.datapath(%w[site output *])))
     Dir.chdir @pwd
   end
 

data/spec/webby/apps/generator_spec.rb

@@ -55,8 +55,9 @@ describe Webby::Apps::Generator do
 
     before :each do
       @strio = StringIO.new
-      @generator = Webby::Apps::Generator.new
-      @generator.instance_variable_set(:@stdout, @strio)
+      ::Logging::Logger['Webby::Journal'].appenders =
+          ::Logging::Appenders::IO.new('test', @strio)
+      @generator = Webby::Apps::Generator.new(@strio)
 
       class << @strio
         def to_s

data/spec/webby/filters/basepath_spec.rb

@@ -0,0 +1,167 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+# ---------------------------------------------------------------------------
+describe Webby::Filters::BasePath do
+
+  before :all do
+    @input = <<-HTML
+<html>
+<head>
+%s
+</head>
+<body>
+%s
+</body>
+</html>
+    HTML
+  end
+
+  before :each do
+    Webby.site.base = nil
+    @xpaths = Webby.site.xpaths.dup
+  end
+
+  after :each do
+    Webby.site.xpaths = @xpaths
+  end
+
+  it 'raises an exception if a new base has not been specified' do
+    input = @input % ['', '<img src="/foo/picture.jpg" />']
+    bp = Webby::Filters::BasePath.new(input, 'html')
+
+    lambda {bp.filter}.
+        should raise_error(TypeError, "can't convert nil into String")
+  end
+
+  it 'changes nothing with an empty base path' do
+    Webby.site.base = ''
+    input = @input % ['', '<img src="/foo/picture.jpg" />']
+
+    bp = Webby::Filters::BasePath.new(input, 'html')
+    bp.filter.should == <<-HTML
+<html>
+<head>
+
+</head>
+<body>
+<img src="/foo/picture.jpg" />
+</body>
+</html>
+    HTML
+  end
+
+  it 'substitutes the base path for xpath values that have a leading slash' do
+    Webby.site.base = 'http://example.com'
+    input = @input % ['', '<img src="/foo/picture.jpg" />']
+
+    bp = Webby::Filters::BasePath.new(input, 'html')
+    bp.filter.should == <<-HTML
+<html>
+<head>
+
+</head>
+<body>
+<img src="http://example.com/foo/picture.jpg" />
+</body>
+</html>
+    HTML
+  end
+
+  it 'operates on all entities in the input string' do
+    Webby.site.base = 'http://webby.rubyforge.org'
+    input = @input % ['', %Q(<img src="/foo/picture.jpg" />\n<a href="/page.html">Page Title</a>)]
+
+    bp = Webby::Filters::BasePath.new(input, 'html')
+    bp.filter.should == <<-HTML
+<html>
+<head>
+
+</head>
+<body>
+<img src="http://webby.rubyforge.org/foo/picture.jpg" />
+<a href="http://webby.rubyforge.org/page.html">Page Title</a>
+</body>
+</html>
+    HTML
+  end
+
+  it 'only operates on entities defined in the xpaths configuration' do
+    Webby.site.xpaths.delete '/html/body//a[@href]'
+    Webby.site.base = 'http://webby.rubyforge.org'
+    input = @input % ['', %Q(<img src="/foo/picture.jpg" />\n<a href="/page.html">Page Title</a>)]
+
+    bp = Webby::Filters::BasePath.new(input, 'html')
+    bp.filter.should == <<-HTML
+<html>
+<head>
+
+</head>
+<body>
+<img src="http://webby.rubyforge.org/foo/picture.jpg" />
+<a href="/page.html">Page Title</a>
+</body>
+</html>
+    HTML
+  end
+
+  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>']
+
+    bp = Webby::Filters::BasePath.new(input, 'html')
+    bp.filter.should == <<-HTML
+<html>
+<head>
+<img src="/foo/picture.jpg" />
+</head>
+<body>
+<a href="not a real site/page.html">Page Title</a>
+</body>
+</html>
+    HTML
+  end
+
+  it 'registers a "basepath" filter in the filters module' do
+    handler = Webby::Filters._handlers['basepath']
+    handler.should_not be_nil
+    handler.arity.should == 2
+  end
+
+  it 'leaves the input text unchanged if a base path is not configured' do
+    cursor = mock("Cursor")
+    page = mock("Page")
+    cursor.stub!(:page).and_return(page)
+    page.stub!(:extension).and_return('html')
+    input = @input % ['', '<img src="/foo/picture.jpg" />']
+
+    handler = Webby::Filters._handlers['basepath']
+    output = handler.call(input, cursor)
+
+    output.should equal(input)
+  end
+
+  it 'modifies text when a base path is configured' do
+    cursor = mock("Cursor")
+    page = mock("Page")
+    cursor.stub!(:page).and_return(page)
+    page.stub!(:extension).and_return('html')
+    Webby.site.base = 'http://example.com'
+    input = @input % ['', '<img src="/foo/picture.jpg" />']
+
+    handler = Webby::Filters._handlers['basepath']
+    handler.call(input, cursor).should == <<-HTML
+<html>
+<head>
+
+</head>
+<body>
+<img src="http://example.com/foo/picture.jpg" />
+</body>
+</html>
+    HTML
+  end
+end
+
+# EOF

data/spec/webby/filters/outline_spec.rb

@@ -0,0 +1,92 @@
+
+require ::File.expand_path(
+    ::File.join(::File.dirname(__FILE__), %w[.. .. spec_helper]))
+
+# ---------------------------------------------------------------------------
+describe Webby::Filters::Outline do
+
+  before :all do
+    @input = Webby::Resources::MetaFile.read(
+                 Webby.datapath(%w[outline basic.txt]))
+  end
+
+  it 'should regsiter the outline filter handler' do
+    Webby::Filters._handlers['outline'].should_not be_nil
+  end
+
+  it 'generates outline formatting for HTML heading tags' do
+    output = File.read(Webby.datapath(%w[outline basic.out]))
+
+    outline = Webby::Filters::Outline.new(@input)
+    outline.filter.should == output
+  end
+
+  it 'starts numbering at an arbitrary value' do
+    input = @input.sub(%r/<toc \/>/, '<toc numbering_start="3" />')
+    output = File.read(Webby.datapath(%w[outline numbering.out]))
+
+    outline = Webby::Filters::Outline.new(input)
+    outline.filter.should == output
+  end
+
+  it 'limits the range of headers the table of contents covers' do
+    input = @input.sub(%r/<toc \/>/, '<toc toc_range="h1-h3" />')
+    output = File.read(Webby.datapath(%w[outline toc_range_1.out]))
+
+    outline = Webby::Filters::Outline.new(input)
+    outline.filter.should == output
+
+    input = @input.sub(%r/<toc \/>/, '<toc toc_range="h2-h4" />')
+    output = File.read(Webby.datapath(%w[outline toc_range_2.out]))
+
+    outline = Webby::Filters::Outline.new(input)
+    outline.filter.should == output
+  end
+
+  it 'uses different list styling for the table of contents' do
+    input = @input.sub(%r/<toc \/>/, '<toc toc_style="ul" />')
+    output = File.read(Webby.datapath(%w[outline toc_style.out]))
+
+    outline = Webby::Filters::Outline.new(input)
+    outline.filter.should == output
+  end
+
+  it 'performs outline numbering without creatng a table of contents' do
+    input = @input.sub(%r/<toc \/>/, '')
+    output = File.read(Webby.datapath(%w[outline numbering_only.out]))
+
+    outline = Webby::Filters::Outline.new(input)
+    outline.filter.should == output
+  end
+
+  it 'detects mis-ordered heading tags' do
+    input = <<-HTML
+      <h2>Heading Three</h2>
+      <h3>Heading Two</h3>
+      <h1>Heading One</h1>
+    HTML
+    outline = Webby::Filters::Outline.new(input)
+
+    lambda {outline.filter}.should raise_error(
+      Webby::Error, "heading tags are not in order, cannot outline"
+    )
+  end
+
+  it 'does not clobber other HTML tags' do
+    html = <<-HTML
+    <div>
+      <p>This is the title</p>
+      <toc />
+      <p>And some sampler text</p>
+    </div>
+    HTML
+    input = @input.sub(%r/<toc \/>/, html)
+    output = File.read(Webby.datapath(%w[outline no_clobber.out]))
+
+    outline = Webby::Filters::Outline.new(input)
+    outline.filter.should == output
+  end
+
+end
+
+# EOF

data/spec/webby/renderer_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path(
 describe Webby::Renderer do
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[layouts tumblog default.txt])
+             new(Webby.datapath(%w[site layouts tumblog default.txt]))
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @filename = File.join %w[content tumblog index.txt]

data/spec/webby/resources/db_spec.rb

@@ -7,7 +7,7 @@ describe Webby::Resources::DB do
 
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[layouts tumblog default.txt])
+             new(Webby.datapath %w[site layouts tumblog default.txt])
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @db = Webby::Resources::DB.new

data/spec/webby/resources/layout_spec.rb

@@ -6,7 +6,7 @@ require File.expand_path(
 describe Webby::Resources::Layout do
   before :each do
     layout = Webby::Resources::Layout.
-             new(Webby.datapath %w[layouts tumblog default.txt])
+             new(Webby.datapath %w[site layouts tumblog default.txt])
     Webby::Resources.stub!(:find_layout).and_return(layout)
 
     @default = File.join %w[layouts tumblog default.txt]