pith 0.0.9 → 0.0.10

data/README.markdown

@@ -30,7 +30,7 @@ Create an input directory for your site (wherever you want), and pop some files
         logo.png
       index.html.haml
 
-The only requirement is the existance of a sub-directory called "`_pith`".  Pith checks that it's present, to prevent you accidently treating your entire home-directory as website input.
+The only requirement is the existance of a subdirectory called "`_pith`".  Pith checks that it's present, to prevent you accidently treating your entire home directory as website input.
 
 Next, use the `pith build` command to convert your inputs into a functioning website.
 
@@ -39,7 +39,16 @@ Next, use the `pith build` command to convert your inputs into a functioning web
     --(copy)-->   images/logo.png
     --(haml)-->   index.html
 
-Any input file with an extension recognised by [Tilt][tilt] is considered to be a template, and will be dynamically evaluated.  Formats supported by Tilt include:
+By default, output is generated into an subdirectory called "`_out`", inside the input directory ... but the default can be easily overridden, e.g.
+
+    $ pith -i SITE -o OUTPUT build
+
+Templates
+---------
+
+Files in the input directory are considered to be "templates" if the file name ends with a template format extension recognised as such by [Tilt][tilt], e.g. "`.haml`", or "`.textile`".  These will be evaluated dynamically.  Pith strips the format extension off the file name when generating output.
+
+Formats supported by Tilt include:
 
 - [Markdown](http://daringfireball.net/projects/markdown/) (`markdown`, `md`)
 - [Textile](http://redcloth.org/hobix.com/textile/) (`textile`)
@@ -48,7 +57,12 @@ Any input file with an extension recognised by [Tilt][tilt] is considered to be
 - [Sass][sass] (`sass`)
 - [CoffeeScript](http://jashkenas.github.com/coffee-script/) (`coffee`)
 
-Anything else is just copied verbatim into the generated site.
+Any non-template input files (we call them "resources") are just copied verbatim into the output directory.
+
+Ignored files
+-------------
+
+Files or directories beginning with an underscore are ignored; that is, we don't generate corresponding output files.  They can still be used as "layout" or "partial" templates though; see below.
 
 Page metadata
 -------------
@@ -69,18 +83,16 @@ Metadata provided in the header can be referenced by template content, via the "
 
 This is especially useful in "layout" templates (see below).
     
-Partials
---------
+Partials and Layouts
+--------------------
 
 Templates can include other templates, e.g.
 
-     = include("_header.haml")
-
-Note the leading underscore ("_").  Any input file (or directory) beginning with an underscore is ignored when generating outputs.
+     = include "_header.haml"
 
 When including, you can pass local variables, e.g.
 
-    = include("_list.haml", :items => [1,2,3])
+    = include "_list.haml", :items => [1,2,3]
 
 which can be accessed in the included template:
 
@@ -88,15 +100,12 @@ which can be accessed in the included template:
       - items.each do |i|
         %li= i
 
-Layouts
--------
-
-Layout templates are a bit like partials, except that they take a block, e.g.
+In Haml templates, you can also pass a block, e.g.
 
-    = inside "_mylayout.haml" do
+    = include "_mylayout.haml" do
       %p Some content
 
-Use "`yield`" to embed the block's content within the layout:
+and access it in the template using "`yield`":
 
     !!!
     %html
@@ -106,14 +115,16 @@ Use "`yield`" to embed the block's content within the layout:
         .main
           = yield
 
-Layouts can also be specified using a "`layout`" entry in the page header, e.g.
+This way, any template can be used as a "layout".
+
+Layouts can also be applied by using a "`layout`" entry in the page header, e.g.
 
     ---
     layout: "/_mylayout.haml"
     ...
 
     Some content
-    
+
 Relative links
 --------------
 
@@ -123,7 +134,7 @@ It's sensible to use relative URIs when linking to other pages (and resources) i
 
     %img{:src => href("/images/logo.png")}
 
-Any path beginning with a slash ("/") is resolved relative to the root of the site; anything else is resolve relative to the current input-file (even if that happens to be a layout or partial).  Either way, "`href`" always returns a relative link.
+Any path beginning with a slash ("/") is resolved relative to the root of the site; anything else is resolved relative to the current input-file (even if that happens to be a layout or partial).  Either way, "`href`" always returns a relative link.
 
 There's also a "`link`" function, for even easier hyper-linking:
 

data/features/cleanup.feature

@@ -0,0 +1,14 @@
+Feature: automatic cleanup
+
+  I want old outputs removed from the output directory
+  So that they don't hang around
+
+Scenario: output without matching input
+
+  Given input file "blah.txt" exists
+  
+  When I build the site
+  And I remove input file "blah.txt"
+  And I rebuild the site
+  
+  Then output file "blah.txt" should not exist

data/features/step_definitions/build_steps.rb

@@ -30,6 +30,10 @@ When /^I change input file "([^\"]*)" to contain$/ do |path, content|
   @inputs[path] = content
 end
 
+When /^I remove input file "([^\"]*)"$/ do |path|
+  @inputs[path] = nil
+end
+
 When /^I (?:re)?build the site$/ do
   @project.logger.clear
   @project.build

data/features/step_definitions/build_steps.rb~

@@ -14,6 +14,14 @@ Given "the site is up-to-date" do
   When "I build the site"
 end
 
+Given /^the "([^\"]*)" flag is enabled$/ do |flag|
+  @project.send("#{flag}=", true)
+end
+
+Given /^the "([^\"]*)" flag is disabled$/ do |flag|
+  @project.send("#{flag}=", false)
+end
+
 When /^I change input file "([^\"]*)" to contain "([^\"]*)"$/ do |path, content|
   @inputs[path] = content
 end
@@ -22,6 +30,10 @@ When /^I change input file "([^\"]*)" to contain$/ do |path, content|
   @inputs[path] = content
 end
 
+When /^I remove input file "([^\"]*)"$/ do |path|
+  @inputs[path] = nil
+end
+
 When /^I (?:re)?build the site$/ do
   @project.logger.clear
   @project.build

data/features/support/env.rb

@@ -12,7 +12,15 @@ class DirHash
   end
 
   def []=(file, content)
-    write(file, content)
+    if content.nil?
+      remove(file)
+    else
+      write(file, content)
+    end
+  end
+
+  def remove(file)
+    (@dir + file).unlink
   end
 
   def write(file, content, options = {})

data/features/support/env.rb~

@@ -12,7 +12,15 @@ class DirHash
   end
 
   def []=(file, content)
-    write(file, content)
+    if content.nil?
+      remove(file)
+    else
+      write(file, content)
+    end
+  end
+
+  def remove(file)
+    (@dir + file).unlink
   end
 
   def write(file, content, options = {})

data/lib/pith/console_logger.rb~

@@ -11,10 +11,6 @@ module Pith
       @io.puts(message)
     end
     
-    def write(message)
-      @io.puts(message)
-    end
-    
   end
   
 end

data/lib/pith/input/abstract.rb

@@ -32,7 +32,7 @@ module Pith
       #
       def build
         return false if ignorable? || uptodate?
-        logger.info("%-14s%s" % ["--(#{type})-->", output_path])
+        logger.info("%-16s%s" % ["--(#{type})-->", output_path])
         generate_output 
       end
 

data/lib/pith/input/base.rb~

@@ -0,0 +1,74 @@
+require "pathname"
+
+module Pith
+  module Input
+
+    class Abstract
+
+      def initialize(project, path)
+        @project = project
+        @path = path
+      end
+
+      attr_reader :project, :path
+
+      # Public: Get the file-system location of this input.
+      #
+      # Returns a fully-qualified Pathname.
+      #
+      def file
+        project.input_dir + path
+      end
+
+      # Public: Get the file-system location of the corresponding output file.
+      #
+      # Returns a fully-qualified Pathname.
+      #
+      def output_file
+        project.output_dir + output_path
+      end
+
+      # Public: Generate an output file.
+      #
+      def build
+        return false if ignorable? || uptodate?
+        logger.info("%-16s%s" % ["--(#{type})-->", output_path])
+        generate_output 
+      end
+
+      # Public: Resolve a reference relative to this input.
+      #
+      # ref - a String referencing another asset
+      #
+      # A ref starting with "/" is resolved relative to the project root;
+      # anything else is resolved relative to this input.
+      #
+      # Returns a fully-qualified Pathname of the asset.
+      #
+      def resolve_path(ref)
+        ref = ref.to_str
+        if ref[0,1] == "/"
+          Pathname(ref[1..-1])
+        else
+          path.parent + ref
+        end
+      end
+
+      # Consider whether this input can be ignored.
+      #
+      # Returns true if it can.
+      #
+      def ignorable?
+        path.to_s.split("/").any? { |component| component.to_s[0,1] == "_" }
+      end
+
+      protected
+
+      def logger
+        project.logger
+      end
+
+    end
+
+  end
+end

data/lib/pith/input/resource.rb

@@ -4,6 +4,8 @@ require "pith/input/abstract"
 module Pith
   module Input
 
+    # Represents a non-template input.
+    #
     class Resource < Abstract
 
       def output_path

data/lib/pith/input/resource.rb~

@@ -0,0 +1,41 @@
+require "fileutils"
+require "pith/input/abstract"
+
+module Pith
+  module Input
+
+    class Resource < Abstract
+
+      def output_path
+        path
+      end
+      
+      def type
+        "copy"
+      end
+      
+      def uptodate?
+        FileUtils.uptodate?(output_file, [file])
+      end
+      
+      # Copy this input verbatim into the output directory
+      #
+      def generate_output
+        output_file.parent.mkpath
+        FileUtils.copy(file, output_file)
+      end
+
+      # Render this input, for inclusion within templates
+      #
+      def render(context, locals = {})
+        file.read
+      end
+
+      def meta
+        {}
+      end
+      
+    end
+
+  end
+end

data/lib/pith/input/template.rb

@@ -8,6 +8,8 @@ require "yaml"
 module Pith
   module Input
 
+    # Represents an input that should be evaluated as a template.
+    #
     class Template < Abstract
 
       def self.can_handle?(path)

data/lib/pith/input/template.rb~

@@ -10,14 +10,16 @@ module Pith
 
     class Template < Abstract
 
-      class UnrecognisedType < StandardError; end
+      def self.can_handle?(path)
+        path.to_str =~ /\.([^.]+)$/ && Tilt.registered?($1)
+      end
       
       def initialize(project, path)
+        raise(ArgumentError, "#{path} is not a template") unless Template.can_handle?(path)
         super(project, path)
-        path.to_s =~ /^(.*)\.(.*)$/
+        path.to_str =~ /^(.+)\.(.+)$/ || raise("huh?")
         @output_path = Pathname($1)
         @type = $2
-        raise(UnrecognisedType, @type) unless Tilt.registered?(@type)
         load
       end
 
@@ -88,6 +90,10 @@ module Pith
       end
 
       private
+        
+      def default_title
+        path.basename.to_s.sub(/\..*/, '').tr('_-', ' ').capitalize
+      end
 
       # Read input file, extracting YAML meta-data header, and template content.
       #

data/lib/pith/input.rb

@@ -6,6 +6,8 @@ module Pith
 
     class << self
 
+      # Construct an object representing a project input file.
+      #
       def new(project, path)
         if Template.can_handle?(path)
           Template.new(project, path)

data/lib/pith/input.rb~

@@ -1,5 +1,5 @@
 require "pith/input/template"
-require "pith/input/verbatim"
+require "pith/input/resource"
 
 module Pith
   module Input
@@ -7,9 +7,11 @@ module Pith
     class << self
 
       def new(project, path)
-        Template.new(project, path)
-      rescue Template::UnrecognisedType
-        Verbatim.new(project, path)
+        if Template.can_handle?(path)
+          Template.new(project, path)
+        else
+          Resource.new(project, path)
+        end
       end
 
     end

data/lib/pith/pathname_ext.rb

@@ -7,8 +7,10 @@ class Pathname
     utime(mtime, mtime) if mtime
   end
 
-  def glob_all(pattern)
-    Pathname.glob(self + pattern, File::FNM_DOTMATCH)
+  def all_files(pattern = "**/*")
+    Pathname.glob(self + pattern, File::FNM_DOTMATCH).select do |path|
+      path.file?
+    end
   end
   
 end

data/lib/pith/pathname_ext.rb~

@@ -0,0 +1,16 @@
+require "pathname"
+
+class Pathname
+
+  def touch(mtime = nil)
+    FileUtils.touch(self.to_s)
+    utime(mtime, mtime) if mtime
+  end
+
+  def all_files(pattern = "**/*")
+    Pathname.glob(self + pattern, File::FNM_DOTMATCH).select do |path|
+      path.file?
+    end
+  end
+  
+end

data/lib/pith/plugins/publication/input.rb~

@@ -0,0 +1,50 @@
+require "pith/input"
+require "time"
+
+module Pith
+  module Plugins
+    module Publication
+
+      module TemplateMethods
+
+        def published?
+          !published_at.nil?
+        end
+
+        def published_at
+          parse_date(meta["published"])
+        end
+
+        def updated_at
+          parse_date(meta["updated"]) || published_at
+        end
+
+        private
+
+        def parse_date(date_string)
+          Time.parse(date_string) if date_string
+        end
+
+      end
+
+    end
+  end
+end
+
+module Pith
+  module Input
+
+    class Abstract
+
+      def published?
+        false
+      end
+
+    end
+
+    class Template
+      include Pith::Plugins::Publication::TemplateMethods
+    end
+    
+  end
+end

data/lib/pith/plugins/publication/project.rb

@@ -5,6 +5,8 @@ module Pith
 
   class Project
 
+    # Return all the published inputs, in order of publication.
+    #
     def published_inputs
       inputs.select { |i| i.published? }.sort_by { |i| i.published_at }
     end

data/lib/pith/plugins/publication/project.rb~

@@ -0,0 +1,14 @@
+require "pith/project"
+require "pith/plugins/publication/input"
+
+module Pith
+
+  class Project
+
+    def published_inputs
+      inputs.select { |i| i.published? }.sort_by { |i| i.published_at }
+    end
+
+  end
+
+end

data/lib/pith/plugins/publication.rb~

@@ -0,0 +1,2 @@
+require "pith/plugins/publication/input"
+require "pith/plugins/publication/project"

data/lib/pith/project.rb

@@ -37,8 +37,7 @@ module Pith
     #   call #refresh to discard the cached data.
     #
     def inputs
-      @inputs ||= input_dir.glob_all("**/*").map do |input_file|
-        next if input_file.directory?
+      @inputs ||= input_dir.all_files.map do |input_file|
         path = input_file.relative_path_from(input_dir)
         find_or_create_input(path)
       end.compact
@@ -64,9 +63,8 @@ module Pith
     def build
       refresh
       load_config
-      inputs.each do |input| 
-        input.build
-      end
+      remove_old_outputs
+      generate_outputs
       output_dir.touch
     end
     
@@ -97,7 +95,7 @@ module Pith
 
     def config_files
       @config_files ||= begin 
-        input_dir.glob_all("_pith/**")
+        input_dir.all_files("_pith/**")
       end.to_set
     end
     
@@ -111,6 +109,23 @@ module Pith
       end
     end
     
+    def remove_old_outputs
+      valid_output_paths = inputs.map { |i| i.output_path }
+      output_dir.all_files.each do |output_file|
+        output_path = output_file.relative_path_from(output_dir)
+        unless valid_output_paths.member?(output_path)
+          logger.info("removing        #{output_path}")
+          FileUtils.rm(output_file)
+        end
+      end
+    end
+    
+    def generate_outputs
+      inputs.each do |input| 
+        input.build
+      end
+    end
+
     def input_cache
       @input_cache ||= Hash.new do |h, cache_key|
         h[cache_key] = Input.new(self, cache_key.first)

data/lib/pith/project.rb~

@@ -1,6 +1,7 @@
-require "pathname"
 require "logger"
 require "pith/input"
+require "pith/pathname_ext"
+require "pith/reference_error"
 require "tilt"
 
 module Pith
@@ -13,8 +14,21 @@ module Pith
       end
     end
     
-    attr_accessor :input_dir, :output_dir
+    attr_reader :input_dir
+    
+    def input_dir=(dir)
+      @input_dir = Pathname(dir)
+    end
+
+    attr_reader :output_dir
+
+    def output_dir=(dir)
+      @output_dir = Pathname(dir)
+    end
 
+    attr_accessor :assume_content_negotiation
+    attr_accessor :assume_directory_index
+    
     # Public: get inputs
     #
     # Returns Pith::Input objects representing the files in the input_dir.
@@ -23,8 +37,7 @@ module Pith
     #   call #refresh to discard the cached data.
     #
     def inputs
-      @inputs ||= Pathname.glob(input_dir + "**/*").map do |input_file|
-        next if input_file.directory?
+      @inputs ||= input_dir.all_files.map do |input_file|
         path = input_file.relative_path_from(input_dir)
         find_or_create_input(path)
       end.compact
@@ -42,7 +55,7 @@ module Pith
       inputs.each do |input|
         return input if input.path == path || input.output_path == path
       end
-      raise ReferenceError, "Can't find #{path.inspect}"
+      nil
     end
 
     # Public: build the project, generating output files.
@@ -50,9 +63,9 @@ module Pith
     def build
       refresh
       load_config
-      inputs.each do |input| 
-        input.build
-      end
+      remove_old_outputs
+      generate_outputs
+      output_dir.touch
     end
     
     # Public: discard cached data that is out-of-sync with the file-system.
@@ -62,6 +75,10 @@ module Pith
       @config_files = nil
     end
 
+    def last_built_at
+      output_dir.mtime
+    end
+    
     def logger
       @logger ||= Logger.new(nil)
     end
@@ -78,7 +95,7 @@ module Pith
 
     def config_files
       @config_files ||= begin 
-        Pathname.glob("#{input_dir}/_pith/**")
+        input_dir.all_files("_pith/**")
       end.to_set
     end
     
@@ -92,6 +109,23 @@ module Pith
       end
     end
     
+    def remove_old_outputs
+      valid_output_paths = inputs.map { |i| i.output_path }
+      output_dir.all_files.each do |output_file|
+        output_path = output_file.relative_path_from(output_dir)
+        unless valid_output_paths.member?(output_path)
+          logger.info("removing        #{output_path}")
+          FileUtils.rm(output_file)
+        end
+      end
+    end
+    
+    def generate_outputs
+      inputs.each do |input| 
+        input.build
+      end
+    end
+
     def input_cache
       @input_cache ||= Hash.new do |h, cache_key|
         h[cache_key] = Input.new(self, cache_key.first)
@@ -105,7 +139,5 @@ module Pith
     end
     
   end
-    
-  class ReferenceError < StandardError; end
   
 end

data/lib/pith/reference_error.rb~

@@ -0,0 +1,5 @@
+module Pith
+      
+  class ReferenceError < StandardError; end
+  
+end

data/lib/pith/render_context.rb~

@@ -1,6 +1,7 @@
-require "set"
-require "pathname"
 require "ostruct"
+require "pathname"
+require "pith/reference_error"
+require "set"
 require "tilt"
 
 module Pith
@@ -18,7 +19,7 @@ module Pith
 
     attr_reader :project
     
-    def initial_input
+    def page
       @input_stack.first
     end
 
@@ -29,7 +30,7 @@ module Pith
     def render(input, locals = {}, &block)
       with_input(input) do
         result = input.render(self, locals, &block)
-        layout_ref = current_input.meta["layout"]
+        layout_ref = input.meta["layout"]
         result = render_ref(layout_ref) { result } if layout_ref
         result
       end
@@ -51,42 +52,53 @@ module Pith
       @content_for_hash ||= Hash.new { "" }
     end
     
-    def page
-      @page ||= OpenStruct.new(initial_input.meta)
+    def relative_url_to(target_path)
+      url = target_path.relative_path_from(page.path.parent).to_str
+      url = url.sub(/index\.html$/, "") if project.assume_directory_index
+      url = url.sub(/\.html$/, "") if project.assume_content_negotiation
+      url = "./" if url.empty?
+      Pathname(url)
     end
     
     def href(target_ref)
-      relative_path_to(resolve_path(target_ref))
+      relative_url_to(resolve_reference(target_ref))
     end
 
     def link(target_ref, label = nil)
-      target_path = resolve_path(target_ref)
-      label ||= begin
-        find_input(target_path).title
-      rescue Pith::ReferenceError
-        "???"
+      target_path = resolve_reference(target_ref)
+      label ||= begin 
+        target_input = input(target_path)
+        record_dependency_on(target_input.file)
+        target_input.title
+      rescue ReferenceError
+        "???" 
       end
-      %{<a href="#{relative_path_to(target_path)}">#{label}</a>}
+      url = relative_url_to(target_path)
+      %{<a href="#{url}">#{label}</a>}
     end
-    
-    private
 
-    def relative_path_to(target_path)
-      target_path.relative_path_from(initial_input.path.parent)
+    def record_dependency_on(file)
+      @dependencies << file
     end
     
-    def resolve_path(ref)
-      current_input.resolve_path(ref)
+    private
+    
+    def resolve_reference(ref)
+      if ref.respond_to?(:output_path)
+        ref.output_path
+      else
+        current_input.resolve_path(ref)
+      end
     end
     
-    def find_input(path)
+    def input(path)
       input = project.input(path)
-      @dependencies << input.file if input
+      raise(ReferenceError, %{Can't find "#{path}"}) if input.nil?
       input
     end
     
     def with_input(input)
-      @dependencies << input.file
+      record_dependency_on(input.file)
       @input_stack.push(input)
       begin
         yield
@@ -96,9 +108,8 @@ module Pith
     end
     
     def render_ref(template_ref, locals = {}, &block)
-      template_path = resolve_path(template_ref)
-      template = find_input(template_path)
-      render(template, locals, &block)
+      template_input = input(resolve_reference(template_ref))
+      render(template_input, locals, &block)
     end
 
   end

data/lib/pith/server.rb~

@@ -7,31 +7,36 @@ module Pith
 
     def new(project)
       Rack::Builder.new do
-        use Rack::CommonLogger, project.logger
+        use Rack::CommonLogger
         use Rack::ShowExceptions
         use Rack::Lint
-        use Pith::Server::AutoBuild, project
         use Adsf::Rack::IndexFileFinder, :root => project.output_dir
+        use Pith::Server::DefaultToHtml, project.output_dir
         run Rack::Directory.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)
-        @app = app
-        @project = project
+    class DefaultToHtml
+
+      def initialize(app, root)
+        @app  = app
+        @root = root
       end
 
       def call(env)
-        @project.build
+
+        path_info = ::Rack::Utils.unescape(env["PATH_INFO"])
+        file = "#{@root}#{path_info}"
+        unless File.exist?(file)
+          if File.exist?("#{file}.html")
+            env["PATH_INFO"] += ".html"
+          end
+        end
+
         @app.call(env)
+
       end
 
     end

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.10".freeze
 end

data/lib/pith/version.rb~

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.9".freeze
 end

data/lib/pith/watcher.rb~

@@ -0,0 +1,32 @@
+module Pith
+  
+  class Watcher
+
+    DEFAULT_INTERVAL = 2
+    
+    def initialize(project, options = {})
+      @project = project
+      @interval = DEFAULT_INTERVAL
+      options.each do |k,v|
+        send("#{k}=", v)
+      end
+    end
+    
+    attr_accessor :project
+    attr_accessor :interval
+
+    def call
+      loop do
+        begin
+          project.build
+        rescue Exception => e
+          $stderr.puts "ERROR: #{e}"
+          e.backtrace.each { |line| $stderr.puts line }
+        end
+        sleep(interval)
+      end
+    end
+
+  end
+  
+end

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

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require "pith/input/abstract"
+require "pith/project"
+
+describe Pith::Input::Template do
+
+  before do
+    $input_dir.mkpath
+    @project = Pith::Project.new(:input_dir => $input_dir)
+  end
+
+  def make_input(path)
+    input_file = $input_dir + path
+    input_file.parent.mkpath
+    input_file.open("w") do |io|
+      yield io if block_given?
+    end
+    @project.input(path)
+  end
+  
+  describe ".can_handle?" do
+    
+    it "returns true for template paths" do
+      Pith::Input::Template.can_handle?("xyz.html.haml").should be_true
+      Pith::Input::Template.can_handle?("xyz.html.md").should be_true
+    end
+
+    it "handles directories" do
+      Pith::Input::Template.can_handle?("dir/xyz.haml").should be_true
+    end
+
+    it "accepts Pathname objects" do
+      Pith::Input::Template.can_handle?(Pathname("xyz.html.haml")).should be_true
+    end
+
+    it "returns false for non-template paths" do
+      Pith::Input::Template.can_handle?("foo.html").should be_false
+      Pith::Input::Template.can_handle?("foo").should be_false
+    end
+    
+  end
+  
+  describe "#title" do
+    
+    it "is based on last component of filename" do
+      @input = make_input("dir/some_page.html.haml")
+      @input.title.should == "Some page"
+    end
+
+    it "can be over-ridden in metadata" do
+      @input = make_input("dir/some_page.html.haml") do |i|
+        i.puts "---"
+        i.puts "title: Blah blah"
+        i.puts "..."
+      end
+      @input.title.should == "Blah blah"
+    end
+  
+  end
+
+  describe "#output_path" do
+    
+    it "excludes the template-type extension" do
+      @input = make_input("dir/some_page.html.haml")
+      @input.output_path.should == Pathname("dir/some_page.html")
+    end
+    
+  end
+
+end

data/spec/pith/plugins/publication_spec.rb~

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require "pith/plugins/publication"
+
+describe Pith::Plugins::Publication::TemplateMethods do
+
+  before do
+    @template = OpenStruct.new(:meta => {})
+    @template.extend(Pith::Plugins::Publication::TemplateMethods)
+  end
+
+  describe "#published_at" do
+
+    it "defaults to nil" do
+      @template.published_at.should be_nil
+    end
+    
+    it "is derived by parsing the 'published' meta-field" do
+      @template.meta["published"] = "25 Dec 1999 22:30"
+      @template.published_at.should == Time.local(1999, 12, 25, 22, 30)
+    end
+
+  end
+
+  describe "#updated_at" do
+
+    it "defaults to #published_at" do
+      @template.meta["published"] = "25 Dec 1999 22:30"
+      @template.updated_at.should == Time.local(1999, 12, 25, 22, 30)
+    end
+    
+    it "can be overridden with an 'updated' meta-field" do
+      @template.meta["published"] = "25 Dec 1999 22:30"
+      @template.meta["published"] = "1 Jan 2000 03:00"
+      @template.updated_at.should == Time.local(2000, 1, 1, 3, 0)
+    end
+
+  end
+  
+end

data/spec/pith/project_spec.rb~

@@ -17,9 +17,9 @@ describe Pith::Project do
         @input_file.touch
       end
 
-      it "constructs an Verbatim object" do
+      it "constructs an Resource object" do
         @input = @project.input("input.txt")
-        @input.should be_kind_of(Pith::Input::Verbatim)
+        @input.should be_kind_of(Pith::Input::Resource)
         @input.file.should == @input_file
       end
       
@@ -55,10 +55,8 @@ describe Pith::Project do
 
     describe "(with an invalid input path)" do
       
-      it "complains" do
-        lambda do
-          @project.input("bogus.path")
-        end.should raise_error(Pith::ReferenceError)
+      it "returns nil" do
+        @project.input("bogus.path").should be_nil
       end
       
     end
@@ -112,4 +110,28 @@ describe Pith::Project do
 
   end
 
+  describe "when an input file is removed" do
+
+    before do
+      @input_file = $input_dir + "input.html.haml"
+      @input_file.touch(Time.now - 10)
+    end
+
+    describe "a second call to #input" do 
+      it "returns nil" do
+
+        first_time = @project.input("input.html.haml")
+        first_time.should_not be_nil
+
+        FileUtils.rm(@input_file)
+
+        @project.refresh
+        second_time = @project.input("input.html.haml")
+        second_time.should be_nil
+
+      end
+    end
+
+  end
+
 end

data/spec/spec_helper.rb~

@@ -1,16 +1,6 @@
 require "rubygems"
 
 require "fileutils"
-require "pathname"
-
-class Pathname
-  
-  def touch(mtime = nil)
-    FileUtils.touch(self.to_s)
-    utime(mtime, mtime) if mtime
-  end
-  
-end
   
 $project_dir = Pathname(__FILE__).expand_path.parent.parent
 $tmp_dir = $project_dir + "tmp"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pith
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-19 00:00:00 +10:00
+date: 2010-10-01 00:00:00 +10:00
 default_executable: pith
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,9 @@ files:
 - lib/pith/console_logger.rb~
 - lib/pith/input/abstract.rb
 - lib/pith/input/abstract.rb~
+- lib/pith/input/base.rb~
 - lib/pith/input/resource.rb
+- lib/pith/input/resource.rb~
 - lib/pith/input/template.rb
 - lib/pith/input/template.rb~
 - lib/pith/input/verbatim.rb~
@@ -120,12 +122,17 @@ files:
 - lib/pith/input.rb~
 - lib/pith/metadata.rb~
 - lib/pith/pathname_ext.rb
+- lib/pith/pathname_ext.rb~
 - lib/pith/plugins/publication/input.rb
+- lib/pith/plugins/publication/input.rb~
 - lib/pith/plugins/publication/project.rb
+- lib/pith/plugins/publication/project.rb~
 - lib/pith/plugins/publication.rb
+- lib/pith/plugins/publication.rb~
 - lib/pith/project.rb
 - lib/pith/project.rb~
 - lib/pith/reference_error.rb
+- lib/pith/reference_error.rb~
 - lib/pith/render_context.rb
 - lib/pith/render_context.rb~
 - lib/pith/server.rb
@@ -133,6 +140,7 @@ files:
 - lib/pith/version.rb
 - lib/pith/version.rb~
 - lib/pith/watcher.rb
+- lib/pith/watcher.rb~
 - lib/pith.rb
 - lib/pith.rb~
 - sample/_layouts/standard.haml
@@ -146,12 +154,15 @@ files:
 - Rakefile
 - spec/pith/input/abstract_spec.rb~
 - spec/pith/input/template_spec.rb
+- spec/pith/input/template_spec.rb~
 - spec/pith/metadata_spec.rb~
 - spec/pith/plugins/publication_spec.rb
+- spec/pith/plugins/publication_spec.rb~
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~
 - spec/spec_helper.rb
 - spec/spec_helper.rb~
+- features/cleanup.feature
 - features/content_for.feature
 - features/content_for.feature~
 - features/haml.feature
@@ -222,12 +233,15 @@ test_files:
 - Rakefile
 - spec/pith/input/abstract_spec.rb~
 - spec/pith/input/template_spec.rb
+- spec/pith/input/template_spec.rb~
 - spec/pith/metadata_spec.rb~
 - spec/pith/plugins/publication_spec.rb
+- spec/pith/plugins/publication_spec.rb~
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~
 - spec/spec_helper.rb
 - spec/spec_helper.rb~
+- features/cleanup.feature
 - features/content_for.feature
 - features/content_for.feature~
 - features/haml.feature