pith 0.0.8 → 0.0.9

data/bin/pith

@@ -68,7 +68,7 @@ end
 
 def watch
   require "pith/watcher"
-  Pith::Watcher.new(project, :interval => $interval).call
+  Pith::Watcher.new(@project, :interval => $interval).call
 end
 
 def serve

data/features/include.feature

@@ -10,6 +10,13 @@ Scenario: include a partial
   When I build the site
   Then output file "index.html" should contain "<p>blah blah</p>"
 
+Scenario: include a static resource
+
+  Given input file "index.html.haml" contains "= include('_fragment.html')"
+  And input file "_fragment.html" contains "<p>blah blah</p>"
+  When I build the site
+  Then output file "index.html" should contain "<p>blah blah</p>"
+
 Scenario: include a partial in the same sub-directory
 
   Given input file "subdir/page.html.haml" contains "= include('_fragment.haml')"

data/features/markdown.feature

@@ -0,0 +1,24 @@
+Feature: support for Markdown
+
+  I want to build pages using Markdown
+  So that I can express content succintly
+  
+Scenario: Simple Markdown
+
+  Given input file "article.html.md" contains
+    """
+    - Yen (¥)
+    - Pound (£)
+    - Euro (€)
+    """
+
+  When I build the site
+  
+  Then output file "article.html" should contain
+    """
+    <ul>
+    <li>Yen (¥)</li>
+    <li>Pound (£)</li>
+    <li>Euro (€)</li>
+    </ul>
+    """

data/lib/pith/input/resource.rb

@@ -24,6 +24,16 @@ module Pith
         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
 

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

@@ -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/render_context.rb

@@ -67,16 +67,22 @@ module Pith
     def link(target_ref, label = nil)
       target_path = resolve_reference(target_ref)
       label ||= begin 
-        input(target_path).title
+        target_input = input(target_path)
+        record_dependency_on(target_input.file)
+        target_input.title
       rescue ReferenceError
         "???" 
       end
       url = relative_url_to(target_path)
       %{<a href="#{url}">#{label}</a>}
     end
+
+    def record_dependency_on(file)
+      @dependencies << file
+    end
     
     private
-
+    
     def resolve_reference(ref)
       if ref.respond_to?(:output_path)
         ref.output_path
@@ -88,12 +94,11 @@ module Pith
     def input(path)
       input = project.input(path)
       raise(ReferenceError, %{Can't find "#{path}"}) if input.nil?
-      @dependencies << input.file
       input
     end
     
     def with_input(input)
-      @dependencies << input.file
+      record_dependency_on(input.file)
       @input_stack.push(input)
       begin
         yield

data/lib/pith/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pith
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +10:00
+date: 2010-09-19 00:00:00 +10:00
 default_executable: pith
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,9 @@ files:
 - lib/pith/input.rb~
 - lib/pith/metadata.rb~
 - lib/pith/pathname_ext.rb
+- lib/pith/plugins/publication/input.rb
+- lib/pith/plugins/publication/project.rb
+- lib/pith/plugins/publication.rb
 - lib/pith/project.rb
 - lib/pith/project.rb~
 - lib/pith/reference_error.rb
@@ -144,6 +147,7 @@ files:
 - spec/pith/input/abstract_spec.rb~
 - spec/pith/input/template_spec.rb
 - spec/pith/metadata_spec.rb~
+- spec/pith/plugins/publication_spec.rb
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~
 - spec/spec_helper.rb
@@ -163,6 +167,7 @@ files:
 - features/layouts.feature
 - features/layouts.feature~
 - features/linking.feature~
+- features/markdown.feature
 - features/metadata.feature
 - features/metadata.feature~
 - features/relative_linking.feature
@@ -218,6 +223,7 @@ test_files:
 - spec/pith/input/abstract_spec.rb~
 - spec/pith/input/template_spec.rb
 - spec/pith/metadata_spec.rb~
+- spec/pith/plugins/publication_spec.rb
 - spec/pith/project_spec.rb
 - spec/pith/project_spec.rb~
 - spec/spec_helper.rb
@@ -237,6 +243,7 @@ test_files:
 - features/layouts.feature
 - features/layouts.feature~
 - features/linking.feature~
+- features/markdown.feature
 - features/metadata.feature
 - features/metadata.feature~
 - features/relative_linking.feature