pith 0.0.3 → 0.0.5

data/bin/pith

@@ -1,8 +1,11 @@
 #! /usr/bin/env ruby
 
+$: << File.expand_path("../../lib", __FILE__)
+
 require "rubygems"
 require "optparse"
 require "pathname"
+require "pith/version"
 
 $input_dir = Pathname(".")
 
@@ -19,6 +22,7 @@ EOF
 
 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|
     $input_dir = Pathname(dir)
@@ -37,8 +41,6 @@ unless $output_dir
   puts %{Generating to "#{$output_dir}"}
 end
 
-$: << File.expand_path("../../lib", __FILE__)
-
 require "pith/project"
 require "pith/console_logger"
 

data/features/layouts.feature

@@ -46,9 +46,9 @@ Scenario: Layout specified in meta-data
 
   Given input file "index.html.haml" contains
     """
-    -# ---
-    -# layout: layouts/_simple.haml
-    -#...
+    ---
+    layout: layouts/_simple.haml
+    ...
     blah blah
     """
   And input file "layouts/_simple.haml" contains 

data/features/metadata.feature

@@ -7,9 +7,9 @@ Scenario: use meta-data from YAML comment
 
   Given input file "page.html.haml" contains
     """
-    -# ---
-    -# title: PAGE TITLE
-    -# ...
+    ---
+    title: PAGE TITLE
+    ---
     %h1= meta["title"]
     """
 
@@ -18,3 +18,19 @@ Scenario: use meta-data from YAML comment
     """
     <h1>PAGE TITLE</h1>
     """
+
+Scenario: corrupt meta-data
+
+  Given input file "page.html.haml" contains
+    """
+    ---
+    title: "This" is no well-formed YAML
+    ...
+    %p PAGE BODY
+    """
+
+  When I build the site
+  Then output file "page.html" should contain
+    """
+    <p>PAGE BODY</p>
+    """

data/features/relative_linking.feature

@@ -95,9 +95,9 @@ Scenario: use "title" meta-data attribute in link
 
   And input file "page.html.haml" contains
     """
-    -# ---
-    -# title: "Title from meta-data"
-    -# ...
+    ---
+    title: "Title from meta-data"
+    ...
     Target content
     """
 

data/features/support/env.rb

@@ -46,6 +46,9 @@ class InternalLogger
     write(message)
   end
 
+  alias :warn :info
+  alias :debug :info
+  
   def write(message)
     @messages << message
   end

data/features/support/env.rb~

@@ -46,6 +46,9 @@ class InternalLogger
     write(message)
   end
 
+  alias :warn :info
+  alias :debug :info
+  
   def write(message)
     @messages << message
   end

data/lib/pith/input/abstract.rb

@@ -1,5 +1,4 @@
 require "pathname"
-require "pith/metadata"
 
 module Pith
   module Input
@@ -25,56 +24,11 @@ module Pith
         project.output_dir + output_path
       end
 
-      # Public: Get YAML metadata declared in the header of of a template.
-      # 
-      # The first line of the template must end with "---".  Any preceding characters
-      # are considered to be a comment prefix, and are stripped from the following
-      # lines.  The metadata block ends when the comment block ends, or a line ending
-      # with "..." is encountered.
-      #
-      # Examples
-      #
-      #   Given input starting with:
-      #
-      #     -# ---
-      #     -# published: 2008-09-15
-      #     -# ...
-      #
-      #   input.meta
-      #   #=> { "published" => "2008-09-15" }
-      #  
-      # Returns a Hash.
-      #
-      def meta
-        if @metadata.nil?
-          file.open do |io|
-            @metadata = Pith::Metadata.extract_from(io).freeze
-          end
-        end
-        @metadata
-      end
-
-      # Public: Get page title.
-      #
-      # The default title is based on the input file-name, sans-extension, capitalised,
-      # but can be overridden by providing a "title" in the metadata block.
-      #
-      # Examples
-      #
-      #  input.path.to_s
-      #  #=> "some_page.html.haml"
-      #  input.title
-      #  #=> "Some page"
-      # 
-      def title
-        meta["title"] || default_title
-      end
-      
       # Public: Generate a corresponding output file.
       #
       def build
         return false if ignorable? || uptodate?
-        logger.info("%-36s%-14s%s" % [path, "--(#{type})-->", output_path])
+        logger.info("%-14s%s" % ["--(#{type})-->", output_path])
         generate_output 
       end
 

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

@@ -1,5 +1,4 @@
 require "pathname"
-require "pith/metadata"
 
 module Pith
   module Input
@@ -25,56 +24,11 @@ module Pith
         project.output_dir + output_path
       end
 
-      # Public: Get YAML metadata declared in the header of of a template.
-      # 
-      # The first line of the template must end with "---".  Any preceding characters
-      # are considered to be a comment prefix, and are stripped from the following
-      # lines.  The metadata block ends when the comment block ends, or a line ending
-      # with "..." is encountered.
-      #
-      # Examples
-      #
-      #   Given input starting with:
-      #
-      #     -# ---
-      #     -# published: 2008-09-15
-      #     -# ...
-      #
-      #   input.meta
-      #   #=> { "published" => "2008-09-15" }
-      #  
-      # Returns a Hash.
-      #
-      def meta
-        if @metadata.nil?
-          file.open do |io|
-            @metadata = Pith::Metadata.extract_from(io).freeze
-          end
-        end
-        @metadata
-      end
-
-      # Public: Get page title.
-      #
-      # The default title is based on the input file-name, sans-extension, capitalised,
-      # but can be overridden by providing a "title" in the metadata block.
-      #
-      # Examples
-      #
-      #  input.path.to_s
-      #  #=> "some_page.html.haml"
-      #  input.title
-      #  #=> "Some page"
-      # 
-      def title
-        meta["title"] || default_title
-      end
-      
       # Public: Generate a corresponding output file.
       #
       def build
         return false if ignorable? || uptodate?
-        logger.info("%-36s%-14s%s" % [path, "--(#{type})-->", output_path])
+        logger.info("%-14s%s" % ["--(#{type})-->", output_path])
         generate_output 
       end
 

data/lib/pith/input/template.rb

@@ -3,6 +3,7 @@ require "pathname"
 require "pith/input/abstract"
 require "pith/render_context"
 require "tilt"
+require "yaml"
 
 module Pith
   module Input
@@ -17,10 +18,15 @@ module Pith
         @output_path = Pathname($1)
         @type = $2
         raise(UnrecognisedType, @type) unless Tilt.registered?(@type)
+        load
       end
 
       attr_reader :output_path, :type
 
+      # Check whether output is up-to-date.
+      #
+      # Return true unless output needs to be re-generated.
+      #
       def uptodate?
         all_input_files && FileUtils.uptodate?(output_file, all_input_files)
       end
@@ -33,19 +39,81 @@ module Pith
         output_file.open("w") do |out|
           out.puts(render_context.render(self))
         end
-        remember_dependencies(render_context.rendered_inputs)
+        remember_dependencies(render_context.referenced_inputs)
       end
 
       # Render this input using Tilt
       #
       def render(context, locals = {}, &block)
-        Tilt.new(file).render(context, locals, &block)
+        @tilt_template.render(context, locals, &block)
+      end
+      
+      # Public: Get YAML metadata declared in the header of of a template.
+      # 
+      # If the first line of the template starts with "---" it is considered to be
+      # the start of a YAML 'document', which is loaded and returned.
+      #
+      # Examples
+      #
+      #   Given input starting with:
+      #
+      #     ---
+      #     published: 2008-09-15
+      #     ...
+      #     OTHER STUFF
+      #
+      #   input.meta
+      #   #=> { "published" => "2008-09-15" }
+      #  
+      # Returns a Hash.
+      #
+      def meta
+        @meta
+      end
+
+      # Public: Get page title.
+      #
+      # The default title is based on the input file-name, sans-extension, capitalised,
+      # but can be overridden by providing a "title" in the metadata block.
+      #
+      # Examples
+      #
+      #  input.path.to_s
+      #  #=> "some_page.html.haml"
+      #  input.title
+      #  #=> "Some page"
+      # 
+      def title
+        meta["title"] || default_title
       end
 
       private
 
-      def remember_dependencies(rendered_inputs)
-        @all_input_files = rendered_inputs.map { |input| input.file }
+      # Read input file, extracting YAML meta-data header, and template content.
+      #
+      def load
+        @meta = {}
+        file.open do |input|
+          header = input.gets
+          if header =~ /^---/
+            while line = input.gets
+              break if line =~ /^(---|\.\.\.)/
+              header << line
+            end
+            begin
+              @meta = YAML.load(header)
+            rescue
+              logger.warn "#{file}:1: badly-formed YAML header"
+            end
+          else
+            input.rewind
+          end
+          @tilt_template = Tilt.new(file, input.lineno + 1) { input.read }
+        end
+      end
+      
+      def remember_dependencies(referenced_inputs)
+        @all_input_files = referenced_inputs.map { |input| input.file }
       end
 
       attr_accessor :all_input_files

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

@@ -2,38 +2,116 @@ require "fileutils"
 require "pathname"
 require "pith/input/abstract"
 require "pith/render_context"
+require "tilt"
+require "yaml"
 
 module Pith
   module Input
 
     class Template < Abstract
 
+      class UnrecognisedType < StandardError; end
+      
       def initialize(project, path)
         super(project, path)
         path.to_s =~ /^(.*)\.(.*)$/
         @output_path = Pathname($1)
         @type = $2
+        raise(UnrecognisedType, @type) unless Tilt.registered?(@type)
+        load
       end
 
       attr_reader :output_path, :type
 
+      # Check whether output is up-to-date.
+      #
+      # Return true unless output needs to be re-generated.
+      #
       def uptodate?
         all_input_files && FileUtils.uptodate?(output_file, all_input_files)
       end
 
-      # Render this input using Tilt
+      # Generate output for this template
       #
       def generate_output
         output_file.parent.mkpath
         render_context = RenderContext.new(project)
         output_file.open("w") do |out|
-          out.puts(render_context.render_input(self))
+          out.puts(render_context.render(self))
         end
         remember_dependencies(render_context.rendered_inputs)
       end
 
+      # Render this input using Tilt
+      #
+      def render(context, locals = {}, &block)
+        @tilt_template.render(context, locals, &block)
+      end
+      
+      # Public: Get YAML metadata declared in the header of of a template.
+      # 
+      # If the first line of the template starts with "---" it is considered to be
+      # the start of a YAML 'document', which is loaded and returned.
+      #
+      # Examples
+      #
+      #   Given input starting with:
+      #
+      #     ---
+      #     published: 2008-09-15
+      #     ...
+      #     OTHER STUFF
+      #
+      #   input.meta
+      #   #=> { "published" => "2008-09-15" }
+      #  
+      # Returns a Hash.
+      #
+      def meta
+        @meta
+      end
+
+      # Public: Get page title.
+      #
+      # The default title is based on the input file-name, sans-extension, capitalised,
+      # but can be overridden by providing a "title" in the metadata block.
+      #
+      # Examples
+      #
+      #  input.path.to_s
+      #  #=> "some_page.html.haml"
+      #  input.title
+      #  #=> "Some page"
+      # 
+      def title
+        meta["title"] || default_title
+      end
+
       private
 
+      # Read input file, extracting YAML meta-data header, and template content.
+      #
+      def load
+        @meta = {}
+        file.open do |input|
+          header = input.gets
+          if header =~ /^---/
+            while line = input.gets
+              break if line =~ /^(---|\.\.\.)/
+              header << line
+            end
+            begin
+              @meta = YAML.load(header)
+            rescue
+              logger.warn "#{file}:1: badly-formed YAML header"
+            end
+          else
+            input.rewind
+          end
+          @tilt_template = Tilt.new(file, input.lineno + 1) { input.read }
+        end
+      end
+      
       def remember_dependencies(rendered_inputs)
         @all_input_files = rendered_inputs.map { |input| input.file }
       end

data/lib/pith/input.rb~

@@ -7,11 +7,9 @@ module Pith
     class << self
 
       def new(project, path)
-        if path.to_s =~ /^(.*)\.(.*)$/ && RenderContext.can_render?($2)
-          Template.new(project, path)
-        else
-          Verbatim.new(project, path)
-        end
+        Template.new(project, path)
+      rescue Template::UnrecognisedType
+        Verbatim.new(project, path)
       end
 
     end

data/lib/pith/project.rb

@@ -14,15 +14,29 @@ module Pith
     end
     
     attr_accessor :input_dir, :output_dir
-    
+
+    # Public: get inputs
+    #
+    # Returns Pith::Input objects representing the files in the input_dir.
+    #
+    # The list of inputs is cached after first load; 
+    #   call #refresh to discard the cached data.
+    #
     def inputs
-      Pathname.glob(input_dir + "**/*").map do |input_file|
+      @inputs ||= Pathname.glob(input_dir + "**/*").map do |input_file|
         next if input_file.directory?
         path = input_file.relative_path_from(input_dir)
-        input_cache[path]
+        find_or_create_input(path)
       end.compact
     end
-    
+
+    # Public: find an input.
+    #
+    # path - an path relative to either input_dir or output_dir
+    #
+    # Returns the first input whose input_path or output_path matches.
+    # Returns nil if no match is found.
+    #
     def input(path)
       path = Pathname(path)
       inputs.each do |input|
@@ -30,14 +44,23 @@ module Pith
       end
       raise ReferenceError, "Can't find #{path.inspect}"
     end
-    
+
+    # Public: build the project, generating output files.
+    #
     def build
+      refresh
       load_config
       inputs.each do |input| 
         input.build
       end
     end
     
+    # Public: discard cached data that is out-of-sync with the file-system.
+    #
+    def refresh
+      @inputs = nil
+    end
+
     def logger
       @logger ||= Logger.new(nil)
     end
@@ -63,13 +86,19 @@ module Pith
     end
 
     def input_cache
-      @input_cache ||= Hash.new do |h, path|
-        h[path] = Input.new(self, path)
+      @input_cache ||= Hash.new do |h, cache_key|
+        h[cache_key] = Input.new(self, cache_key.first)
       end
     end
 
+    def find_or_create_input(path)
+      file = input_dir + path
+      cache_key = [path, file.mtime]
+      input_cache[cache_key]
+    end
+    
   end
-  
+    
   class ReferenceError < StandardError; end
   
 end

data/lib/pith/project.rb~

@@ -14,15 +14,29 @@ module Pith
     end
     
     attr_accessor :input_dir, :output_dir
-    
+
+    # Public: get inputs
+    #
+    # Returns Pith::Input objects representing the files in the input_dir.
+    #
+    # The list of inputs is cached after first load; 
+    #   call #refresh to discard the cached data.
+    #
     def inputs
-      Pathname.glob(input_dir + "**/*").map do |input_file|
+      @inputs ||= Pathname.glob(input_dir + "**/*").map do |input_file|
         next if input_file.directory?
         path = input_file.relative_path_from(input_dir)
-        input_cache[path]
+        find_or_create_input(path)
       end.compact
     end
-    
+
+    # Public: find an input.
+    #
+    # path - an path relative to either input_dir or output_dir
+    #
+    # Returns the first input whose input_path or output_path matches.
+    # Returns nil if no match is found.
+    #
     def input(path)
       path = Pathname(path)
       inputs.each do |input|
@@ -30,14 +44,23 @@ module Pith
       end
       raise ReferenceError, "Can't find #{path.inspect}"
     end
-    
+
+    # Public: build the project, generating output files.
+    #
     def build
+      refresh
       load_config
       inputs.each do |input| 
         input.build
       end
     end
     
+    # Public: discard cached data that is out-of-sync with the file-system.
+    #
+    def refresh
+      @inputs = nil
+    end
+
     def logger
       @logger ||= Logger.new(nil)
     end
@@ -63,13 +86,19 @@ module Pith
     end
 
     def input_cache
-      @input_cache ||= Hash.new do |h, path|
-        h[path] = Input.new(self, path)
+      @input_cache ||= Hash.new do |h, cache_key|
+        h[cache_key] = Input.new(self, cache_key.first)
       end
     end
 
+    def find_or_create_input(path)
+      file = input_dir + path
+      cache_key = [path, file.mtime]
+      input_cache[cache_key]
+    end
+    
   end
-  
+    
   class ReferenceError < StandardError; end
   
 end

data/lib/pith/render_context.rb

@@ -11,7 +11,7 @@ module Pith
     def initialize(project)
       @project = project
       @input_stack = []
-      @rendered_inputs = Set.new
+      @referenced_inputs = Set.new
       self.extend(project.helper_module)
     end
 
@@ -26,7 +26,6 @@ module Pith
     end
     
     def render(input, locals = {}, &block)
-      @rendered_inputs << input
       with_input(input) do
         result = input.render(self, locals, &block)
         layout_ref = current_input.meta["layout"]
@@ -35,7 +34,7 @@ module Pith
       end
     end
 
-    attr_reader :rendered_inputs
+    attr_reader :referenced_inputs
     
     def include(template_ref, locals = {}, &block)
       content_block = if block_given?
@@ -62,7 +61,7 @@ module Pith
     def link(target_ref, label = nil)
       target_path = resolve_path(target_ref)
       label ||= begin
-        project.input(target_path).title
+        find_input(target_path).title
       rescue Pith::ReferenceError
         "???"
       end
@@ -79,7 +78,14 @@ module Pith
       current_input.resolve_path(ref)
     end
     
+    def find_input(path)
+      input = project.input(path)
+      @referenced_inputs << input if input
+      input
+    end
+    
     def with_input(input)
+      @referenced_inputs << input
       @input_stack.push(input)
       begin
         yield
@@ -89,7 +95,8 @@ module Pith
     end
     
     def render_ref(template_ref, locals = {}, &block)
-      template = project.input(resolve_path(template_ref))
+      template_path = resolve_path(template_ref)
+      template = find_input(template_path)
       render(template, locals, &block)
     end
 

data/lib/pith/render_context.rb~

@@ -8,10 +8,6 @@ module Pith
     
     include Tilt::CompileSite
     
-    def self.can_render?(extension)
-      Tilt.registered?(extension)
-    end
-    
     def initialize(project)
       @project = project
       @input_stack = []
@@ -29,16 +25,13 @@ module Pith
       @input_stack.last
     end
     
-    def render_input(input, locals = {}, &block)
+    def render(input, locals = {}, &block)
       @rendered_inputs << input
       with_input(input) do
-        rendered = Tilt.new(input.file).render(self, locals, &block)
+        result = input.render(self, locals, &block)
         layout_ref = current_input.meta["layout"]
-        if layout_ref
-          render_ref(layout_ref) { rendered }
-        else
-          rendered
-        end
+        result = render_ref(layout_ref) { result } if layout_ref
+        result
       end
     end
 
@@ -52,6 +45,8 @@ module Pith
       render_ref(template_ref, locals, &content_block)
     end
     
+    alias :inside :include
+    
     def content_for
       @content_for_hash ||= Hash.new { "" }
     end
@@ -95,7 +90,7 @@ module Pith
     
     def render_ref(template_ref, locals = {}, &block)
       template = project.input(resolve_path(template_ref))
-      render_input(template, locals, &block)
+      render(template, locals, &block)
     end
 
   end

data/lib/pith/server.rb

@@ -12,7 +12,7 @@ module Pith
         use Rack::Lint
         use Pith::Server::AutoBuild, project
         use Adsf::Rack::IndexFileFinder, :root => project.output_dir
-        run Rack::File.new(project.output_dir)
+        run Rack::Directory.new(project.output_dir)
       end
     end
 

data/lib/pith/server.rb~

@@ -12,7 +12,7 @@ module Pith
         use Rack::Lint
         use Pith::Server::AutoBuild, project
         use Adsf::Rack::IndexFileFinder, :root => project.output_dir
-        run Rack::File.new(project.output_dir)
+        run Rack::Directory.new(project.output_dir)
       end
     end
 

data/lib/pith/version.rb

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

data/lib/pith/version.rb~

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

data/sample/_out/blah/deblah.txt

@@ -0,0 +1 @@
+dsfsdf

data/sample/_out/features/stuff.html

@@ -0,0 +1 @@
+

data/spec/pith/input/abstract_spec.rb

@@ -19,9 +19,9 @@ describe Pith::Input::Abstract do
 
     it "can be over-ridden in metadata" do
       @input_file.open("w") do |i|
-        i.puts "-# ---"
-        i.puts "-# title: Blah blah"
-        i.puts "-# ..."
+        i.puts "---"
+        i.puts "title: Blah blah"
+        i.puts "..."
       end
       @project.input("some_page.html").title.should == "Blah blah"
     end

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

@@ -19,9 +19,9 @@ describe Pith::Input::Abstract do
 
     it "can be over-ridden in metadata" do
       @input_file.open("w") do |i|
-        i.puts "-# ---"
-        i.puts "-# title: Blah blah"
-        i.puts "-# ..."
+        i.puts "---"
+        i.puts "title: Blah blah"
+        i.puts "..."
       end
       @project.input("some_page.html").title.should == "Blah blah"
     end

data/spec/pith/project_spec.rb

@@ -22,12 +22,6 @@ describe Pith::Project do
         @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
 
@@ -71,4 +65,51 @@ describe Pith::Project do
     
   end
   
+  describe "when an input file is unchanged" do
+
+    before do
+      @input_file = $input_dir + "input.html.haml"
+      @input_file.touch
+    end
+
+    describe "a second call to #input" do
+      it "returns the same Input object" do
+
+        first_time = @project.input("input.html.haml")
+        first_time.should_not be_nil
+
+        @project.refresh
+        second_time = @project.input("input.html.haml")
+        second_time.should equal(first_time)
+
+      end
+    end
+
+  end
+
+  describe "when an input file is changed" 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 a different Input object" do
+
+        first_time = @project.input("input.html.haml")
+        first_time.should_not be_nil
+
+        @input_file.touch(Time.now)
+
+        @project.refresh
+        second_time = @project.input("input.html.haml")
+        second_time.should_not be_nil
+        second_time.should_not equal(first_time)
+
+      end
+    end
+
+  end
+
 end

data/spec/pith/project_spec.rb~

@@ -22,12 +22,6 @@ describe Pith::Project do
         @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
 
@@ -71,4 +65,51 @@ describe Pith::Project do
     
   end
   
+  describe "when an input file is unchanged" do
+
+    before do
+      @input_file = $input_dir + "input.html.haml"
+      @input_file.touch
+    end
+
+    describe "a second call to #input" do
+      it "returns the same Input object" do
+
+        first_time = @project.input("input.html.haml")
+        first_time.should_not be_nil
+
+        @project.refresh
+        second_time = @project.input("input.html.haml")
+        second_time.should equal(first_time)
+
+      end
+    end
+
+  end
+
+  describe "when an input file is changed" 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 a different Input object" do
+
+        first_time = @project.input("input.html.haml")
+        first_time.should_not be_nil
+
+        @input_file.touch(Time.now)
+
+        @project.refresh
+        second_time = @project.input("input.html.haml")
+        second_time.should_not be_nil
+        second_time.should_not equal(first_time)
+
+      end
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -5,8 +5,9 @@ require "pathname"
 
 class Pathname
   
-  def touch
+  def touch(mtime = nil)
     FileUtils.touch(self.to_s)
+    utime(mtime, mtime) if mtime
   end
   
 end

data/spec/spec_helper.rb~

@@ -5,8 +5,9 @@ require "pathname"
 
 class Pathname
   
-  def touch
+  def touch(mtime = nil)
     FileUtils.touch(self.to_s)
+    utime(mtime, mtime) if mtime
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pith
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +10:00
+date: 2010-09-01 00:00:00 +10:00
 default_executable: pith
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,6 @@ files:
 - lib/pith/input/verbatim.rb~
 - lib/pith/input.rb
 - lib/pith/input.rb~
-- lib/pith/metadata.rb
 - lib/pith/metadata.rb~
 - lib/pith/project.rb
 - lib/pith/project.rb~
@@ -115,6 +114,8 @@ files:
 - lib/pith.rb
 - lib/pith.rb~
 - sample/_layouts/standard.haml
+- sample/_out/blah/deblah.txt
+- sample/_out/features/stuff.html
 - sample/_out/index.html
 - sample/_out/stylesheets/app.css
 - sample/index.html.haml
@@ -123,7 +124,6 @@ files:
 - Rakefile
 - spec/pith/input/abstract_spec.rb
 - spec/pith/input/abstract_spec.rb~
-- spec/pith/metadata_spec.rb
 - spec/pith/metadata_spec.rb~
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~
@@ -198,7 +198,6 @@ test_files:
 - Rakefile
 - spec/pith/input/abstract_spec.rb
 - spec/pith/input/abstract_spec.rb~
-- spec/pith/metadata_spec.rb
 - spec/pith/metadata_spec.rb~
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~

data/lib/pith/metadata.rb

@@ -1,26 +0,0 @@
-require "yaml"
-
-module Pith
-  
-  module Metadata
-    
-    extend self
-    
-    def extract_from(io)
-      line = io.gets
-      if line =~ /---$/
-        metadata_prefix = $`
-        yaml = ""
-        while line && line.start_with?(metadata_prefix)
-          yaml << line[metadata_prefix.size .. -1]
-          line = io.gets
-        end
-        YAML.load(yaml)
-      else
-        Hash.new
-      end
-    end
-  
-  end
-  
-end

data/spec/pith/metadata_spec.rb

@@ -1,46 +0,0 @@
-require 'spec_helper'
-require 'stringio'
-
-require 'pith/metadata'
-
-describe Pith::Metadata do
-
-  def metadata
-    Pith::Metadata.extract_from(StringIO.new(@input))
-  end
-  
-  describe "when input contains no YAML metadata" do
-    
-    before do
-      @input = "%p Blah blah"
-    end
-    
-    it "returns an empty Hash" do
-      metadata.should == {}
-    end
-    
-  end
-
-  describe "when input contains YAML metadata" do
-    
-    before do
-      @input = <<-HAML.gsub(/^ +/, '')
-      -# ---
-      -# x: 1
-      -# y: "2"
-      -# ...
-      -# other stuff
-      HAML
-    end
-    
-    it "extracts the metadata" do
-      metadata.should == {
-        "x" => 1,
-        "y" => "2"
-      }
-    end
-    
-  end
-
-end
-