pith 0.0.6 → 0.0.7

data/README.markdown

@@ -6,15 +6,10 @@ Pith is a static website generator, written in Ruby.
 Using Pith, you can:
 
 * Lay-out your page designs in [Haml][haml], ERb, or Liquid.
-
 * Style things up using [Sass][sass].
-
 * Succintly add content using Markdown or Textile.
-
 * Encapsulate common markup in "layout" and "partial" templates.
-
 * Easily link pages (and resources) using relative links.
-
 * Test changes quickly using the built-in web-server.
 
 Install it
@@ -35,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 you entire home-directory as website input.
+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.
 
 Next, use the `pith build` command to convert your inputs into a functioning website.
 
@@ -55,6 +50,25 @@ Any input file with an extension recognised by [Tilt][tilt] is considered to be
 
 Anything else is just copied verbatim into the generated site.
 
+Page metadata
+-------------
+
+A YAML header can be provided at the top of any template, defining page metadata.  The header is introduced by a first line containing three dashes, and terminated by a line containing three dots.
+
+    ---
+    title: "All about fish"
+    ...
+
+Metadata provided in the header can be referenced by template content, via the "`page`" object:
+
+    %html
+      %head
+        %title= page.title
+      %body
+        %h1= page.title
+
+This is especially useful in "layout" templates (see below).
+    
 Partials
 --------
 
@@ -92,6 +106,14 @@ 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.
+
+    ---
+    layout: "/_mylayout.haml"
+    ...
+
+    Some content
+    
 Relative links
 --------------
 

data/bin/pith

@@ -8,15 +8,17 @@ require "pathname"
 require "pith/version"
 
 $input_dir = Pathname(".")
+$interval = 2
+$port = 4321
 
 BANNER = <<EOF
 usage: pith [OPTIONS] [COMMAND]
 
   Commands: (default: "build")
 
-    build       Generate the website into OUTPUT_DIR.
-
-    serve       Serve the website via HTTP, re-generating as required.
+    build       Generate the website (into OUTPUT_DIR)
+    watch       Monitor INPUT_DIR, and incrementally rebuild OUTPUT_DIR
+    serve       Serve the generated website at "http://localhost:#{$port}"
 
 EOF
 
@@ -24,12 +26,18 @@ OptionParser.new do |opts|
   opts.banner = BANNER
   opts.version = Pith::VERSION
   opts.separator "  Options:"
-  opts.on("-i", "--input INPUT_DIR", 'Input directory', '  (default: ".")') do |dir|
+  opts.on("-i", "--input INPUT_DIR",      %[Input directory   (default: ".")]) do |dir|
     $input_dir = Pathname(dir)
   end
-  opts.on("-o", "--output OUTPUT_DIR", 'Output directory', '  (default: "INPUT_DIR/_out")') do |dir|
+  opts.on("-o", "--output OUTPUT_DIR",    %[Output directory  (default: "INPUT_DIR/_out")]) do |dir|
     $output_dir = Pathname(dir)
   end
+  opts.on("-n", "--interval N", Integer,  %[Rebuild interval  (default: #{$interval})]) do |n|
+    $interval = n
+  end
+  opts.on("-p", "--port N", Integer,      %[Web-server port   (default: #{$port})]) do |port|
+    $port = port
+  end
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -46,6 +54,8 @@ unless $output_dir
   $output_dir = $input_dir + "_out"
 end
 
+puts %{Generating to "#{$output_dir}"}
+
 require "pith/project"
 require "pith/console_logger"
 
@@ -53,16 +63,32 @@ require "pith/console_logger"
 @project.logger = Pith::ConsoleLogger.new
 
 def build
-  puts %{Generating to "#{$output_dir}"}
   @project.build
 end
 
+def watch
+  loop do
+    begin
+      build
+    rescue Exception => e
+      $stderr.puts "ERROR: #{e}"
+      e.backtrace.each { |line| $stderr.puts line }
+    end
+    sleep($interval)
+  end
+end
+
 def serve
+
   require "pith/server"
-  port = 4321
+  server = Pith::Server.new(@project)
+  
   build
-  puts %{Taking the Pith at "http://localhost:#{port}"}
-  Pith::Server.run(@project, :Port => port)
+  Thread.new { watch }
+
+  puts %{>>> Now taking the Pith at "http://localhost:#{$port}"}
+  Rack::Handler.default.run(server, :Port => $port)
+
 end
 
 action = ARGV.shift || "build"

data/features/metadata.feature

@@ -10,7 +10,7 @@ Scenario: use meta-data from YAML comment
     ---
     title: PAGE TITLE
     ---
-    %h1= meta["title"]
+    %h1= page.meta["title"]
     """
 
   When I build the site
@@ -24,7 +24,7 @@ Scenario: corrupt meta-data
   Given input file "page.html.haml" contains
     """
     ---
-    title: "This" is no well-formed YAML
+    title: "This" is not well-formed YAML
     ...
     %p PAGE BODY
     """

data/features/relative_linking.feature

@@ -3,6 +3,11 @@ Feature: linking between files
   I want to be able to generate relative reference to other pages
   So that the generated site is re-locateable
 
+Background:
+
+  Given the "assume_content_negotiation" flag is disabled
+  And   the "assume_directory_index" flag is disabled
+
 Scenario: link from one top-level page to another
 
   Given input file "index.html.haml" contains 
@@ -107,3 +112,65 @@ Scenario: use "title" meta-data attribute in link
     """
     <a href="page.html">Title from meta-data</a>
     """
+
+Scenario: link to an Input object
+
+  Given input file "subdir/page.html.haml" contains
+    """
+    = link(project.input("help.html"))
+    """
+
+  And input file "help.html.haml" contains
+    """
+    ---
+    title: "Help!"
+    ...
+    """
+
+  When I build the site
+  Then output file "subdir/page.html" should contain
+    """
+    <a href="../help.html">Help!</a>
+    """
+
+Scenario: link to a missing resource
+
+  Given input file "index.html.haml" contains 
+    """
+    = link("missing_page.html")
+    """
+   
+  When I build the site
+  Then output file "index.html" should contain
+    """
+    <a href="missing_page.html">???</a>
+    """
+
+Scenario: assume content negotiation
+
+  Given the "assume_content_negotiation" flag is enabled
+  And input file "index.html.haml" contains 
+    """
+    = link("page.html", "Page")
+    """
+   
+  When I build the site
+  Then output file "index.html" should contain
+    """
+    <a href="page">Page</a>
+    """
+
+Scenario: link to an index page
+
+  Given the "assume_directory_index" flag is enabled
+
+  And input file "page.html.haml" contains 
+    """
+    = link("stuff/index.html", "Stuff")
+    """
+   
+  When I build the site
+  Then output file "page.html" should contain
+    """
+    <a href="stuff/">Stuff</a>
+    """

data/features/{verbatim.feature → resources.feature}

@@ -5,28 +5,42 @@ Feature: unrecognised input files are copied into output intact
   
 Scenario: text file
 
-  Given input file "verbatim.txt" contains
+  Given input file "resource.txt" contains
     """
     Blah de blah
     """
     
   When I build the site
   
-  Then output file "verbatim.txt" should contain
+  Then output file "resource.txt" should contain
     """
     Blah de blah
     """
 
 Scenario: file in subdirectory
 
-  Given input file "blah/verbatim.txt" contains
+  Given input file "blah/resource.txt" contains
     """
     Blah de blah
     """
     
   When I build the site
   
-  Then output file "blah/verbatim.txt" should contain
+  Then output file "blah/resource.txt" should contain
     """
     Blah de blah
     """
+
+Scenario: dot-file
+
+  Given input file ".htaccess" contains
+    """
+    DirectoryIndex index.html
+    """
+    
+  When I build the site
+  
+  Then output file ".htaccess" should contain
+    """
+    DirectoryIndex index.html
+    """

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

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

@@ -20,11 +20,15 @@ module Pith
         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 a corresponding output file.
+      # Public: Generate an output file.
       #
       def build
         return false if ignorable? || uptodate?
@@ -59,10 +63,6 @@ module Pith
       end
 
       protected
-        
-      def default_title
-        path.to_s.sub(/\..*/, '').tr('_-', ' ').capitalize
-      end
 
       def logger
         project.logger

data/lib/pith/input/{verbatim.rb → resource.rb}

@@ -4,7 +4,7 @@ require "pith/input/abstract"
 module Pith
   module Input
 
-    class Verbatim < Abstract
+    class Resource < Abstract
 
       def output_path
         path

data/lib/pith/input/template.rb

@@ -88,6 +88,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/template.rb~

@@ -28,7 +28,7 @@ module Pith
       # Return true unless output needs to be re-generated.
       #
       def uptodate?
-        all_input_files && FileUtils.uptodate?(output_file, all_input_files)
+        dependencies && FileUtils.uptodate?(output_file, dependencies)
       end
 
       # Generate output for this template
@@ -39,7 +39,7 @@ module Pith
         output_file.open("w") do |out|
           out.puts(render_context.render(self))
         end
-        remember_dependencies(render_context.referenced_inputs)
+        @dependencies = render_context.dependencies
       end
 
       # Render this input using Tilt
@@ -112,11 +112,7 @@ module Pith
         end
       end
       
-      def remember_dependencies(referenced_inputs)
-        @all_input_files = referenced_inputs.map { |input| input.file }
-      end
-
-      attr_accessor :all_input_files
+      attr_accessor :dependencies
 
     end
 

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
@@ -9,7 +9,7 @@ module Pith
       def new(project, path)
         Template.new(project, path)
       rescue Template::UnrecognisedType
-        Verbatim.new(project, path)
+        Resource.new(project, path)
       end
 
     end

data/lib/pith/pathname_ext.rb

@@ -0,0 +1,14 @@
+require "pathname"
+
+class Pathname
+
+  def touch(mtime = nil)
+    FileUtils.touch(self.to_s)
+    utime(mtime, mtime) if mtime
+  end
+
+  def glob_all(pattern)
+    Pathname.glob(self + pattern, File::FNM_DOTMATCH)
+  end
+  
+end

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,20 @@ module Pith
       end
     end
     
-    attr_accessor :input_dir, :output_dir
+    attr_reader :input_dir
 
+    attr_accessor :output_dir
+    attr_accessor :assume_content_negotiation
+    attr_accessor :assume_directory_index
+    
+    def input_dir=(dir)
+      @input_dir = Pathname(dir)
+    end
+
+    def output_dir=(dir)
+      @output_dir = Pathname(dir)
+    end
+    
     # Public: get inputs
     #
     # Returns Pith::Input objects representing the files in the input_dir.
@@ -23,7 +36,7 @@ module Pith
     #   call #refresh to discard the cached data.
     #
     def inputs
-      @inputs ||= Pathname.glob(input_dir + "**/*").map do |input_file|
+      @inputs ||= input_dir.glob_all("**/*").map do |input_file|
         next if input_file.directory?
         path = input_file.relative_path_from(input_dir)
         find_or_create_input(path)
@@ -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.
@@ -53,6 +66,7 @@ module Pith
       inputs.each do |input| 
         input.build
       end
+      output_dir.touch
     end
     
     # Public: discard cached data that is out-of-sync with the file-system.
@@ -62,6 +76,10 @@ module Pith
       @config_files = nil
     end
 
+    def last_built_at
+      output_dir.mtime
+    end
+    
     def logger
       @logger ||= Logger.new(nil)
     end
@@ -78,7 +96,7 @@ module Pith
 
     def config_files
       @config_files ||= begin 
-        Pathname.glob("#{input_dir}/_pith/**")
+        input_dir.glob_all("_pith/**")
       end.to_set
     end
     
@@ -105,7 +123,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,5 +1,7 @@
-require "set"
+require "ostruct"
 require "pathname"
+require "pith/reference_error"
+require "set"
 require "tilt"
 
 module Pith
@@ -17,7 +19,7 @@ module Pith
 
     attr_reader :project
     
-    def initial_input
+    def page
       @input_stack.first
     end
 
@@ -28,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
@@ -50,37 +52,42 @@ module Pith
       @content_for_hash ||= Hash.new { "" }
     end
     
-    def meta
-      initial_input.meta || {}
+    def relative_url_to(target_path)
+      url = target_path.relative_path_from(page.path.parent)
+      url = url.sub(/index\.html$/, "") if project.assume_directory_index
+      url = url.sub(/\.html$/, "") if project.assume_content_negotiation
+      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 
+        input(target_path).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)
-    end
-    
-    def resolve_path(ref)
-      current_input.resolve_path(ref)
+    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?
+      @dependencies << input.file
       input
     end
     
@@ -95,9 +102,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/render_context.rb~

@@ -1,5 +1,6 @@
 require "set"
 require "pathname"
+require "ostruct"
 require "tilt"
 
 module Pith
@@ -11,7 +12,7 @@ module Pith
     def initialize(project)
       @project = project
       @input_stack = []
-      @referenced_inputs = project.config_files.dup
+      @dependencies = project.config_files.dup
       self.extend(project.helper_module)
     end
 
@@ -34,7 +35,7 @@ module Pith
       end
     end
 
-    attr_reader :referenced_inputs
+    attr_reader :dependencies
     
     def include(template_ref, locals = {}, &block)
       content_block = if block_given?
@@ -50,8 +51,8 @@ module Pith
       @content_for_hash ||= Hash.new { "" }
     end
     
-    def meta
-      initial_input.meta || {}
+    def page
+      @page ||= OpenStruct.new(initial_input.meta)
     end
     
     def href(target_ref)
@@ -80,12 +81,12 @@ module Pith
     
     def find_input(path)
       input = project.input(path)
-      @referenced_inputs << input if input
+      @dependencies << input.file if input
       input
     end
     
     def with_input(input)
-      @referenced_inputs << input
+      @dependencies << input.file
       @input_stack.push(input)
       begin
         yield

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.6".freeze
+  VERSION = "0.0.7".freeze
 end

data/lib/pith/version.rb~

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

data/spec/pith/input/template_spec.rb

@@ -0,0 +1,48 @@
+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 "#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/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: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +10:00
+date: 2010-09-09 00:00:00 +10:00
 default_executable: pith
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,15 +96,17 @@ files:
 - lib/pith/console_logger.rb~
 - lib/pith/input/abstract.rb
 - lib/pith/input/abstract.rb~
+- lib/pith/input/resource.rb
 - lib/pith/input/template.rb
 - lib/pith/input/template.rb~
-- lib/pith/input/verbatim.rb
 - lib/pith/input/verbatim.rb~
 - lib/pith/input.rb
 - lib/pith/input.rb~
 - lib/pith/metadata.rb~
+- lib/pith/pathname_ext.rb
 - lib/pith/project.rb
 - lib/pith/project.rb~
+- lib/pith/reference_error.rb
 - lib/pith/render_context.rb
 - lib/pith/render_context.rb~
 - lib/pith/server.rb
@@ -122,8 +124,8 @@ files:
 - sample/stylesheets/app.css.sass
 - README.markdown
 - Rakefile
-- spec/pith/input/abstract_spec.rb
 - spec/pith/input/abstract_spec.rb~
+- spec/pith/input/template_spec.rb
 - spec/pith/metadata_spec.rb~
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~
@@ -148,6 +150,7 @@ files:
 - features/metadata.feature~
 - features/relative_linking.feature
 - features/relative_linking.feature~
+- features/resources.feature
 - features/step_definitions/build_steps.rb
 - features/step_definitions/build_steps.rb~
 - features/support/env.rb
@@ -156,7 +159,6 @@ files:
 - features/support/rspec_matchers.rb~
 - features/textile.feature
 - features/textile.feature~
-- features/verbatim.feature
 - features/verbatim.feature~
 - cucumber.yml
 - bin/pith
@@ -196,8 +198,8 @@ specification_version: 3
 summary: A static website generator
 test_files: 
 - Rakefile
-- spec/pith/input/abstract_spec.rb
 - spec/pith/input/abstract_spec.rb~
+- spec/pith/input/template_spec.rb
 - spec/pith/metadata_spec.rb~
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~
@@ -222,6 +224,7 @@ test_files:
 - features/metadata.feature~
 - features/relative_linking.feature
 - features/relative_linking.feature~
+- features/resources.feature
 - features/step_definitions/build_steps.rb
 - features/step_definitions/build_steps.rb~
 - features/support/env.rb
@@ -230,6 +233,5 @@ test_files:
 - features/support/rspec_matchers.rb~
 - features/textile.feature
 - features/textile.feature~
-- features/verbatim.feature
 - features/verbatim.feature~
 - cucumber.yml

data/spec/pith/input/abstract_spec.rb

@@ -1,31 +0,0 @@
-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