howl 0.1.0 → 0.2.0

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.add_development_dependency "riot", ">= 0.11"
     gem.add_runtime_dependency 'rdiscount'
     gem.add_runtime_dependency 'mustache'
+    gem.add_runtime_dependency 'hashie'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/howl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{howl}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clinton R. Nixon"]
-  s.date = %q{2010-10-15}
+  s.date = %q{2010-10-16}
   s.description = %q{Howl is a tiny static website/blog generator.}
   s.email = %q{crnixon@gmail.com}
   s.extra_rdoc_files = [
@@ -28,11 +28,16 @@ Gem::Specification.new do |s|
      "test/fixtures/pages/has_template.html",
      "test/fixtures/pages/no_yaml.html",
      "test/fixtures/pages/simple.html",
+     "test/fixtures/posts/first_post.html",
+     "test/fixtures/posts/no_date.html",
      "test/fixtures/site/has_template.html",
      "test/fixtures/site/no_yaml.html",
+     "test/fixtures/site/posts/2010/09/04/first_post.html",
+     "test/fixtures/site/posts/2010/10/16/no_date.html",
      "test/fixtures/site/simple.html",
      "test/fixtures/templates/alt.html",
      "test/fixtures/templates/default.html",
+     "test/fixtures/templates/post.html",
      "test/fixtures/templates/site.html",
      "test/howl_test.rb",
      "test/teststrap.rb"
@@ -55,15 +60,18 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<riot>, [">= 0.11"])
       s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
       s.add_runtime_dependency(%q<mustache>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
     else
       s.add_dependency(%q<riot>, [">= 0.11"])
       s.add_dependency(%q<rdiscount>, [">= 0"])
       s.add_dependency(%q<mustache>, [">= 0"])
+      s.add_dependency(%q<hashie>, [">= 0"])
     end
   else
     s.add_dependency(%q<riot>, [">= 0.11"])
     s.add_dependency(%q<rdiscount>, [">= 0"])
     s.add_dependency(%q<mustache>, [">= 0"])
+    s.add_dependency(%q<hashie>, [">= 0"])
   end
 end
 

data/lib/howl.rb

@@ -1,8 +1,10 @@
 require 'yaml'
 require 'rdiscount'
 require 'mustache'
+require 'hashie'
 require 'pathname'
 require 'fileutils'
+require 'time'
 
 $:.unshift File.dirname(__FILE__)
 
@@ -22,6 +24,10 @@ module Howl
       @pages ||= Dir[path "pages/*"].map { |path| Page.new(path, self) }
     end
 
+    def posts
+      @posts ||= Dir[path "posts/*"].map { |path| Post.new(path, self) }.sort
+    end
+
     def templates
       @templates ||= Hash[Dir[root + "templates/*"].map { |path| 
         [Pathname.new(path).relative_path_from(path "templates").to_s, 
@@ -31,8 +37,9 @@ module Howl
 
     def write_to_disk
       FileUtils.rm_r(path "site") if File.exist?(path "site")
-      FileUtils.makedirs(path "site")
-      pages.each do |page|
+      #raise (pages + posts).map(&:class).inspect
+      (pages + posts).each do |page|
+        FileUtils.makedirs(page.output_path.dirname)
         page.output_path.open("w") do |fh|
           fh.write page.render
         end
@@ -40,8 +47,11 @@ module Howl
     end
   end
 
+  class View < Hashie::Mash
+  end
+
   class Template
-    attr_accessor :data, :content, :site
+    attr_accessor :view, :content, :site, :path
 
     def initialize(path, site)
       @site = site
@@ -54,35 +64,43 @@ module Howl
       self.path == other.path && self.class == other.class
     end
 
-    def render(render_data = {})
-      render_data.merge!(@data)
-      rendered = Mustache.render(@content, render_data)
-      template = render_data.delete("template")
+    def render(render_view = {})
+      render_view.merge!(@view)
+      rendered = Mustache.render(@content, render_view)
+      template = render_view.delete("template")
       if template
-        rendered = @site.templates[template + @extension].render(render_data.merge("content" => rendered))
+        begin
+          rendered = @site.templates[template + @extension].render(render_view.merge("content" => rendered))
+        rescue NoMethodError => ex
+          puts "Warning: Template #{template + @extension} does not exist in file #{path}"
+          rendered
+        end
       end
 
       rendered
     end
+
     private
 
     def load_file
       content = @path.read
-      data, content = content.split("\n\n", 2)
+      view, content = content.split("\n\n", 2)
 
-      if test_for_yaml(data)
-        @data = YAML.load(data)
+      if test_for_yaml(view)
         @content = content
+        view = YAML.load(view)
       else
-        @data = {}
-        @content = "#{data}\n\n#{content}".strip
+        @content = "#{view}\n\n#{content}".strip
+        view = {}
       end
+
+      @view = View.new(view.merge(:site => site))
     end
 
-    def test_for_yaml(data)
+    def test_for_yaml(view)
       begin
-        data = YAML.load(data)
-        data.is_a?(Hash)
+        view = YAML.load(view)
+        view.is_a?(Hash)
       rescue ArgumentError
         false
       end
@@ -90,13 +108,24 @@ module Howl
   end
 
   class Page < Template
-    attr_accessor :path
-
     def output_path
       site.path("site") + path.relative_path_from(site.path "pages")
     end
   end
 
   class Post < Template
+    include Comparable
+
+    def date
+      view.date? ? Time.parse(view.date) : File.mtime(path)
+    end
+
+    def output_path
+      site.path("site/posts") + date.strftime("%Y/%m/%d") + path.basename
+    end
+
+    def <=>(other)
+      self.date <=> other.date
+    end
   end
 end

data/test/fixtures/posts/first_post.html

@@ -0,0 +1,5 @@
+date: 4 Sep 2010
+title: First Post!
+template: post
+
+DANG

data/test/fixtures/posts/no_date.html

@@ -0,0 +1,3 @@
+topic: I Have No Date
+
+This post has no date in its YAML front-matter.

data/test/fixtures/site/posts/2010/09/04/first_post.html

@@ -0,0 +1,11 @@
+<html>
+<head><title>First Post!</title></head>
+<div class="post">
+  <h2>First Post!</h2>
+  <div class="post-content">
+    DANG
+
+  </div.
+</div>
+
+</html>

data/test/fixtures/site/posts/2010/10/16/no_date.html

@@ -0,0 +1 @@
+This post has no date in its YAML front-matter.

data/test/fixtures/templates/post.html

@@ -0,0 +1,8 @@
+template: site
+
+<div class="post">
+  <h2>{{title}}</h2>
+  <div class="post-content">
+    {{content}}
+  </div>
+</div>

data/test/howl_test.rb

@@ -2,7 +2,7 @@ require 'teststrap'
 include Howl
 
 context "Site" do
-  setup { Site.new(fixture_path) }
+  setup { @site = Site.new(fixture_path) }
   
   should("find all pages") {
     topic.pages == Dir[fixture_path("pages/*")].map { |path| Page.new(path, topic) }
@@ -14,35 +14,43 @@ context "Site" do
       File.exist?(page.output_path)
     }.all?
   }
-end
 
-context "Page" do
-  setup { @site = Site.new(fixture_path) }
+  should("write out all posts") {
+    topic.write_to_disk
+    topic.posts.map { |post|
+      Dir[topic.path("site/posts") + "**/*"].map { |path| File.basename(path) }.include?(post.path.basename.to_s)
+    }.all?
+  }
 
-  context "simple.html" do
-    setup { Page.new(fixture_path("pages/simple.html"), @site) }
+  context "Page" do
+    context "simple.html" do
+      setup { Page.new(fixture_path("pages/simple.html"), @site) }
 
-    asserts(:data).equals({"title" => "This is a simple page"})
-    asserts("#content") { topic.content.strip }.equals "<h1>{{title}}</h1>"
-    asserts("#rendered") { topic.render.strip }.equals "<h1>This is a simple page</h1>"
+      asserts("#content") { topic.content.strip }.equals "<h1>{{title}}</h1>"
+      asserts("#view is correct") {
+        topic.view == View.new(:site => topic.site, :title => "This is a simple page")
+      }
+      asserts("#rendered") { topic.render.strip }.equals "<h1>This is a simple page</h1>"
 
-    should("be able to find its output path") {
-      topic.output_path == (topic.site.path "site/simple.html")
-    }
-  end
+      should("be able to find its output path") {
+        topic.output_path == (topic.site.path "site/simple.html")
+      }
+    end
 
-  context "no_yaml.html" do
-    setup { Page.new(fixture_path("pages/no_yaml.html"), @site) }
+    context "no_yaml.html" do
+      setup { Page.new(fixture_path("pages/no_yaml.html"), @site) }
 
-    asserts(:data).equals({})
-    asserts("#content") { topic.content.strip }.equals "This page has no YAML front-matter."
-    asserts("#rendered") { topic.render.strip }.equals "This page has no YAML front-matter."
-  end
+      asserts("#content") { topic.content.strip }.equals "This page has no YAML front-matter."
+      asserts("#view is correct") {
+        topic.view == View.new(:site => topic.site)
+      }
+      asserts("#rendered") { topic.render.strip }.equals "This page has no YAML front-matter."
+    end
 
-  context "has_template.html" do
-    setup { Page.new(fixture_path("pages/has_template.html"), @site) }
+    context "has_template.html" do
+      setup { Page.new(fixture_path("pages/has_template.html"), @site) }
 
-    asserts("#rendered") { topic.render.clean }.equals %Q[
+      asserts("#rendered") { topic.render.clean }.equals %Q[
 <html>
 <head><title>This page has a template</title></head>
 <h1>This page has a template</h1>
@@ -50,6 +58,26 @@ context "Page" do
   Hello world!
 </div>
 </html>
-    ].clean
+      ].clean
+    end
+  end
+
+  context "Post" do
+    setup { Post.new(fixture_path("posts/first_post.html"), @site) }
+
+    asserts("date is equal to date from front matter") { 
+      topic.date == Time.parse("2010/09/04") 
+    }
+
+    asserts(:output_path).equals {
+      topic.site.path("site/posts/2010/09/04") + "first_post.html"
+    }
+
+    context "without a date" do
+      setup { Post.new(fixture_path("posts/no_date.html"), @site) }
+
+      asserts("date is equal to file's mtime") { topic.date == File.mtime(topic.path) }
+    end
   end
 end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Clinton R. Nixon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 -04:00
+date: 2010-10-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hashie
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Howl is a tiny static website/blog generator.
 email: crnixon@gmail.com
 executables: []
@@ -78,11 +91,16 @@ files:
 - test/fixtures/pages/has_template.html
 - test/fixtures/pages/no_yaml.html
 - test/fixtures/pages/simple.html
+- test/fixtures/posts/first_post.html
+- test/fixtures/posts/no_date.html
 - test/fixtures/site/has_template.html
 - test/fixtures/site/no_yaml.html
+- test/fixtures/site/posts/2010/09/04/first_post.html
+- test/fixtures/site/posts/2010/10/16/no_date.html
 - test/fixtures/site/simple.html
 - test/fixtures/templates/alt.html
 - test/fixtures/templates/default.html
+- test/fixtures/templates/post.html
 - test/fixtures/templates/site.html
 - test/howl_test.rb
 - test/teststrap.rb