pith 0.0.2 → 0.0.3

data/lib/pith/project.rb

@@ -19,17 +19,16 @@ module Pith
       Pathname.glob(input_dir + "**/*").map do |input_file|
         next if input_file.directory?
         path = input_file.relative_path_from(input_dir)
-        input(path)
+        input_cache[path]
       end.compact
     end
     
     def input(path)
-      @input_cache ||= Hash.new do |h, path|
-        h[path] = Input.new(self, path)
+      path = Pathname(path)
+      inputs.each do |input|
+        return input if input.path == path || input.output_path == path
       end
-      input = @input_cache[path]
-      raise %{can't locate "#{path}"} unless input.full_path.file?
-      input
+      raise ReferenceError, "Can't find #{path.inspect}"
     end
     
     def build
@@ -62,7 +61,15 @@ module Pith
         eval(config_file.read, binding, config_file)
       end
     end
-  
+
+    def input_cache
+      @input_cache ||= Hash.new do |h, path|
+        h[path] = Input.new(self, path)
+      end
+    end
+
   end
   
+  class ReferenceError < StandardError; end
+  
 end

data/lib/pith/project.rb~

@@ -17,34 +17,59 @@ module Pith
     
     def inputs
       Pathname.glob(input_dir + "**/*").map do |input_file|
-        unless input_file.directory?
-          path = input_file.relative_path_from(input_dir)
-          Input.new(self, path)
-        end 
+        next if input_file.directory?
+        path = input_file.relative_path_from(input_dir)
+        input_cache[path]
       end.compact
     end
     
-    def input(name)
-      input_dir + name
+    def input(path)
+      path = Pathname(path)
+      inputs.each do |input|
+        return input if input.path == path || input.output_path == path
+      end
+      raise ReferenceError, "Can't find #{path.inspect}"
     end
     
     def build
+      load_config
       inputs.each do |input| 
         input.build
       end
     end
-
-    def serve
-      require "pith/server"
-      Pith::Server.run(self)
-    end
     
     def logger
       @logger ||= Logger.new(nil)
     end
     
     attr_writer :logger
+
+    def helpers(&block)
+      helper_module.module_eval(&block)
+    end
+    
+    def helper_module
+      @helper_module ||= Module.new
+    end
+    
+    private
     
+    def load_config
+      config_file = input_dir + "_pith/config.rb"
+      project = self
+      if config_file.exist?
+        eval(config_file.read, binding, config_file)
+      end
+    end
+
+    def input_cache
+      @input_cache ||= Hash.new do |h, path|
+        h[path] = Input.new(self, path)
+      end
+    end
+
   end
   
+  class ReferenceError < StandardError; end
+  
 end

data/lib/pith/render_context.rb

@@ -8,15 +8,14 @@ module Pith
     
     include Tilt::CompileSite
     
-    def self.can_render?(extension)
-      Tilt.registered?(extension)
-    end
-    
     def initialize(project)
+      @project = project
       @input_stack = []
       @rendered_inputs = Set.new
       self.extend(project.helper_module)
     end
+
+    attr_reader :project
     
     def initial_input
       @input_stack.first
@@ -29,21 +28,25 @@ module Pith
     def render(input, locals = {}, &block)
       @rendered_inputs << input
       with_input(input) do
-        Tilt.new(input.full_path).render(self, locals, &block)
+        result = input.render(self, locals, &block)
+        layout_ref = current_input.meta["layout"]
+        result = render_ref(layout_ref) { result } if layout_ref
+        result
       end
     end
 
     attr_reader :rendered_inputs
     
-    def include(name, locals = {}, &block)
-      included_input = current_input.relative_input(name)
+    def include(template_ref, locals = {}, &block)
       content_block = if block_given?
         content = capture_haml(&block)
         proc { content }
       end
-      render(included_input, locals, &content_block)
+      render_ref(template_ref, locals, &content_block)
     end
     
+    alias :inside :include
+    
     def content_for
       @content_for_hash ||= Hash.new { "" }
     end
@@ -52,16 +55,29 @@ module Pith
       initial_input.meta || {}
     end
     
-    def href(name)
-      target_path = current_input.relative_path(name)
-      target_path.relative_path_from(initial_input.path.parent)
+    def href(target_ref)
+      relative_path_to(resolve_path(target_ref))
     end
 
-    def link(target, label)
-      %{<a href="#{href(target)}">#{label}</a>}
+    def link(target_ref, label = nil)
+      target_path = resolve_path(target_ref)
+      label ||= begin
+        project.input(target_path).title
+      rescue Pith::ReferenceError
+        "???"
+      end
+      %{<a href="#{relative_path_to(target_path)}">#{label}</a>}
     end
     
     private
+
+    def relative_path_to(target_path)
+      target_path.relative_path_from(initial_input.path.parent)
+    end
+    
+    def resolve_path(ref)
+      current_input.resolve_path(ref)
+    end
     
     def with_input(input)
       @input_stack.push(input)
@@ -71,6 +87,11 @@ module Pith
         @input_stack.pop
       end
     end
+    
+    def render_ref(template_ref, locals = {}, &block)
+      template = project.input(resolve_path(template_ref))
+      render(template, locals, &block)
+    end
 
   end
   

data/lib/pith/render_context.rb~

@@ -1,3 +1,4 @@
+require "set"
 require "pathname"
 require "tilt"
 
@@ -7,10 +8,19 @@ module Pith
     
     include Tilt::CompileSite
     
-    def initialize(input)
-      @input_stack = [input]
+    def self.can_render?(extension)
+      Tilt.registered?(extension)
     end
     
+    def initialize(project)
+      @project = project
+      @input_stack = []
+      @rendered_inputs = Set.new
+      self.extend(project.helper_module)
+    end
+
+    attr_reader :project
+    
     def initial_input
       @input_stack.first
     end
@@ -19,19 +29,28 @@ module Pith
       @input_stack.last
     end
     
-    def include(name, locals = {}, &block)
-      including_input = current_input
-      included_input = including_input.relative_input(name)
-      with_input(included_input) do
-        content_block = if block_given?
-          content = with_input(including_input) do
-            capture_haml(&block)
-          end
-          proc { content }
+    def render_input(input, locals = {}, &block)
+      @rendered_inputs << input
+      with_input(input) do
+        rendered = Tilt.new(input.file).render(self, locals, &block)
+        layout_ref = current_input.meta["layout"]
+        if layout_ref
+          render_ref(layout_ref) { rendered }
+        else
+          rendered
         end
-        current_input.render(self, locals, &content_block)
       end
     end
+
+    attr_reader :rendered_inputs
+    
+    def include(template_ref, locals = {}, &block)
+      content_block = if block_given?
+        content = capture_haml(&block)
+        proc { content }
+      end
+      render_ref(template_ref, locals, &content_block)
+    end
     
     def content_for
       @content_for_hash ||= Hash.new { "" }
@@ -41,16 +60,29 @@ module Pith
       initial_input.meta || {}
     end
     
-    def href(name)
-      target_path = current_input.relative_path(name)
-      target_path.relative_path_from(initial_input.path.parent)
+    def href(target_ref)
+      relative_path_to(resolve_path(target_ref))
     end
 
-    def link(target, label)
-      %{<a href="#{href(target)}">#{label}</a>}
+    def link(target_ref, label = nil)
+      target_path = resolve_path(target_ref)
+      label ||= begin
+        project.input(target_path).title
+      rescue Pith::ReferenceError
+        "???"
+      end
+      %{<a href="#{relative_path_to(target_path)}">#{label}</a>}
     end
     
     private
+
+    def relative_path_to(target_path)
+      target_path.relative_path_from(initial_input.path.parent)
+    end
+    
+    def resolve_path(ref)
+      current_input.resolve_path(ref)
+    end
     
     def with_input(input)
       @input_stack.push(input)
@@ -60,6 +92,11 @@ module Pith
         @input_stack.pop
       end
     end
+    
+    def render_ref(template_ref, locals = {}, &block)
+      template = project.input(resolve_path(template_ref))
+      render_input(template, locals, &block)
+    end
 
   end
   

data/lib/pith/server.rb

@@ -1,6 +1,5 @@
 require "rack"
 require "adsf/rack"
-require "logger"
 
 module Pith
 

data/lib/pith/server.rb~

@@ -1,31 +1,27 @@
 require "rack"
 require "adsf/rack"
-require "logger"
 
 module Pith
 
   module Server
 
-    class << self
-
-      def new(project)
-        Rack::Builder.new do
-          use Rack::CommonLogger, project.logger
-          use Rack::ShowExceptions
-          use Rack::Lint
-          use Pith::Server::AutoBuild, project
-          use Adsf::Rack::IndexFileFinder, :root => project.output_dir
-          run Rack::File.new(project.output_dir)
-        end
-      end
-
-      def run(project)
-        app = new(project)
-        Rack::Handler.get("thin").run(app, :Port => 4321)
+    def new(project)
+      Rack::Builder.new do
+        use Rack::CommonLogger, project.logger
+        use Rack::ShowExceptions
+        use Rack::Lint
+        use Pith::Server::AutoBuild, project
+        use Adsf::Rack::IndexFileFinder, :root => project.output_dir
+        run Rack::File.new(project.output_dir)
       end
+    end
 
+    def run(project, options = {})
+      Rack::Handler.get("thin").run(new(project), options)
     end
 
+    extend self
+    
     class AutoBuild
 
       def initialize(app, project)

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.0.2".freeze
+  VERSION = "0.0.3".freeze
 end

data/lib/pith/version.rb~

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.0.2a".freeze
+  VERSION = "0.0.2".freeze
 end

data/lib/pith.rb~

@@ -1,2 +1 @@
-require 'pith/console_logger'
 require 'pith/project'

data/sample/_out/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <link href='stylesheets/app.css' rel='stylesheet' type='text/css' />
+  </head>
+  <body>
+    <ol class='tabs'>
+      <li><a href="index.html">Introduction</a></li>
+    </ol>
+    <div class='box'>
+      <p>This is my site.  Do you like it?</p>
+    </div>
+  </body>
+</html>

data/sample/_out/stylesheets/app.css

@@ -0,0 +1,38 @@
+.sidebar {
+  width: 19%;
+  float: right; }
+
+.main {
+  width: 79%; }
+
+.box {
+  -moz-border-radius: 0.5em;
+  -webkit-border-radius: 0.5em;
+  border: 2px solid grey;
+  padding: 0.5em; }
+  .box .heading {
+    font-size: 120%;
+    border-bottom: 1px solid #aaaaaa;
+    font-weight: bold;
+    margin-bottom: 0.5em; }
+
+ol.tabs {
+  position: relative;
+  padding: 0;
+  margin: 0 0 -2px 1em;
+  list-style-type: none; }
+  ol.tabs li {
+    display: inline-block;
+    border: 2px solid grey;
+    -moz-border-radius-topleft: 0.5em;
+    -webkit-border-top-left-radius: 0.5em;
+    -moz-border-radius-topright: 0.5em;
+    -webkit-border-top-right-radius: 0.5em;
+    background: #cccccc;
+    padding: 0.5em; }
+    ol.tabs li.current {
+      border-bottom: 2px solid white;
+      background: white; }
+    ol.tabs li a {
+      color: inherit;
+      text-decoration: none; }

data/sample/index.html.haml

@@ -1,8 +1,7 @@
-= include "_layouts/standard.haml" do
+= inside "_layouts/standard.haml" do
 
   %ol.tabs
     %li= link "index.html", "Introduction"
 
   .box 
     %p This is my site.  Do you like it?
-

data/spec/pith/input/abstract_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require "pith/input/abstract"
+require "pith/project"
+
+describe Pith::Input::Abstract do
+
+  before do
+    $input_dir.mkpath
+    @project = Pith::Project.new(:input_dir => $input_dir)
+    @input_file = $input_dir + "some_page.html.haml"
+    @input_file.touch
+  end
+      
+  describe "#title" do
+    
+    it "is based on last component of filename" do
+      @project.input("some_page.html").title.should == "Some page"
+    end
+
+    it "can be over-ridden in metadata" do
+      @input_file.open("w") do |i|
+        i.puts "-# ---"
+        i.puts "-# title: Blah blah"
+        i.puts "-# ..."
+      end
+      @project.input("some_page.html").title.should == "Blah blah"
+    end
+  
+  end
+  
+end

data/spec/pith/input/abstract_spec.rb~

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require "pith/input/abstract"
+require "pith/project"
+
+describe Pith::Input::Abstract do
+
+  before do
+    $input_dir.mkpath
+    @project = Pith::Project.new(:input_dir => $input_dir)
+    @input_file = $input_dir + "some_page.html.haml"
+    @input_file.touch
+  end
+      
+  describe "#title" do
+    
+    it "is based on last component of filename" do
+      @project.input("some_page.html").title.should == "Some page"
+    end
+
+    it "can be over-ridden in metadata" do
+      @input_file.open("w") do |i|
+        i.puts "-# ---"
+        i.puts "-# title: Blah blah"
+        i.puts "-# ..."
+      end
+      @project.input("some_page.html").title.should == "Blah blah"
+    end
+  
+  end
+  
+end

data/spec/pith/metadata_spec.rb

@@ -9,7 +9,7 @@ describe Pith::Metadata do
     Pith::Metadata.extract_from(StringIO.new(@input))
   end
   
-  describe "with input containing no YAML metadata" do
+  describe "when input contains no YAML metadata" do
     
     before do
       @input = "%p Blah blah"
@@ -21,7 +21,7 @@ describe Pith::Metadata do
     
   end
 
-  describe "with input containing YAML metadata" do
+  describe "when input contains YAML metadata" do
     
     before do
       @input = <<-HAML.gsub(/^ +/, '')

data/spec/pith/project_spec.rb

@@ -13,14 +13,14 @@ describe Pith::Project do
     describe "(with a non-template input path)" do
 
       before do
-        @input_path = $input_dir + "input.txt"
-        @input_path.touch
+        @input_file = $input_dir + "input.txt"
+        @input_file.touch
       end
 
       it "constructs an Verbatim object" do
         @input = @project.input("input.txt")
         @input.should be_kind_of(Pith::Input::Verbatim)
-        @input.full_path.should == @input_path
+        @input.file.should == @input_file
       end
 
       it "returns the same Input output every time" do
@@ -34,14 +34,27 @@ describe Pith::Project do
     describe "(with a template input path)" do
 
       before do
-        @input_path = $input_dir + "input.haml"
-        @input_path.touch
+        @input_file = $input_dir + "input.html.haml"
+        @input_file.touch
       end
 
       it "constructs an Template object" do
-        @input = @project.input("input.haml")
+        @input = @project.input("input.html.haml")
         @input.should be_kind_of(Pith::Input::Template)
-        @input.full_path.should == @input_path
+        @input.file.should == @input_file
+      end
+      
+    end
+
+    describe "(with a template ouput path)" do
+      
+      before do
+        @input_file = $input_dir + "input.html.haml"
+        @input_file.touch
+      end
+
+      it "can also be used to locate the Template" do
+        @project.input("input.html").should == @project.input("input.html.haml")
       end
       
     end
@@ -51,7 +64,7 @@ describe Pith::Project do
       it "complains" do
         lambda do
           @project.input("bogus.path")
-        end.should raise_error
+        end.should raise_error(Pith::ReferenceError)
       end
       
     end

data/spec/pith/project_spec.rb~

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'pith/project'
+
+describe Pith::Project do
+  
+  before do
+    $input_dir.mkpath
+    @project = Pith::Project.new(:input_dir => $input_dir)
+  end
+
+  describe "#input" do
+
+    describe "(with a non-template input path)" do
+
+      before do
+        @input_file = $input_dir + "input.txt"
+        @input_file.touch
+      end
+
+      it "constructs an Verbatim object" do
+        @input = @project.input("input.txt")
+        @input.should be_kind_of(Pith::Input::Verbatim)
+        @input.file.should == @input_file
+      end
+
+      it "returns the same Input output every time" do
+        first_time = @project.input("input.txt")
+        second_time = @project.input("input.txt")
+        second_time.should equal(first_time)
+      end
+      
+    end
+
+    describe "(with a template input path)" do
+
+      before do
+        @input_file = $input_dir + "input.html.haml"
+        @input_file.touch
+      end
+
+      it "constructs an Template object" do
+        @input = @project.input("input.html.haml")
+        @input.should be_kind_of(Pith::Input::Template)
+        @input.file.should == @input_file
+      end
+      
+    end
+
+    describe "(with a template ouput path)" do
+      
+      before do
+        @input_file = $input_dir + "input.html.haml"
+        @input_file.touch
+      end
+
+      it "can also be used to locate the Template" do
+        @project.input("input.html").should == @project.input("input.html.haml")
+      end
+      
+    end
+
+    describe "(with an invalid input path)" do
+      
+      it "complains" do
+        lambda do
+          @project.input("bogus.path")
+        end.should raise_error(Pith::ReferenceError)
+      end
+      
+    end
+    
+  end
+  
+end