pith 0.0.7 → 0.0.8

data/README.markdown

@@ -59,13 +59,13 @@ A YAML header can be provided at the top of any template, defining page metadata
     title: "All about fish"
     ...
 
-Metadata provided in the header can be referenced by template content, via the "`page`" object:
+Metadata provided in the header can be referenced by template content, via the "`page.meta`" Hash:
 
     %html
       %head
-        %title= page.title
+        %title= page.meta["title"]
       %body
-        %h1= page.title
+        %h1= page.meta["title"]
 
 This is especially useful in "layout" templates (see below).
     

data/bin/pith

@@ -56,8 +56,8 @@ end
 
 puts %{Generating to "#{$output_dir}"}
 
-require "pith/project"
 require "pith/console_logger"
+require "pith/project"
 
 @project = Pith::Project.new(:input_dir => $input_dir, :output_dir => $output_dir)
 @project.logger = Pith::ConsoleLogger.new
@@ -67,15 +67,8 @@ def 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
+  require "pith/watcher"
+  Pith::Watcher.new(project, :interval => $interval).call
 end
 
 def serve

data/features/relative_linking.feature

@@ -174,3 +174,18 @@ Scenario: link to an index page
     """
     <a href="stuff/">Stuff</a>
     """
+
+Scenario: link to an index page in the same directory
+
+  Given the "assume_directory_index" flag is enabled
+
+  And input file "page.html.haml" contains 
+    """
+    = link("index.html", "Index")
+    """
+   
+  When I build the site
+  Then output file "page.html" should contain
+    """
+    <a href="./">Index</a>
+    """

data/features/resources.feature

@@ -44,3 +44,9 @@ Scenario: dot-file
     """
     DirectoryIndex index.html
     """
+
+Scenario: extension-less filename
+
+  Given input file "foo" contains "bar"
+  When I build the site
+  Then output file "foo" should contain "bar"

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
 

data/lib/pith/input.rb

@@ -7,9 +7,11 @@ module Pith
     class << self
 
       def new(project, path)
-        Template.new(project, path)
-      rescue Template::UnrecognisedType
-        Resource.new(project, path)
+        if Template.can_handle?(path)
+          Template.new(project, path)
+        else
+          Resource.new(project, path)
+        end
       end
 
     end

data/lib/pith/project.rb

@@ -15,18 +15,19 @@ module Pith
     end
     
     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
 
+    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
     #

data/lib/pith/render_context.rb

@@ -53,10 +53,11 @@ module Pith
     end
     
     def relative_url_to(target_path)
-      url = target_path.relative_path_from(page.path.parent)
+      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
+      url = "./" if url.empty?
+      Pathname(url)
     end
     
     def href(target_ref)

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.0.7".freeze
+  VERSION = "0.0.8".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

@@ -18,6 +18,28 @@ describe Pith::Input::Template do
     @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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pith
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +10:00
+date: 2010-09-10 00:00:00 +10:00
 default_executable: pith
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,11 +80,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,7 +96,7 @@ dependencies:
         - 3
         version: 0.8.3
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: |
   Pith builds static websites, using markup/template languages including Haml, Sass, ERb, Liquid, Markdown and Textile.
 
@@ -113,6 +129,7 @@ files:
 - lib/pith/server.rb~
 - lib/pith/version.rb
 - lib/pith/version.rb~
+- lib/pith/watcher.rb
 - lib/pith.rb
 - lib/pith.rb~
 - sample/_layouts/standard.haml