howl 0.3.0 → 0.4.0

data/.gitignore

@@ -21,4 +21,4 @@ pkg
 .sass-cache
 
 ## PROJECT::SPECIFIC
-test/fixtures/site
+test/fixtures/generated

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/howl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{howl}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clinton R. Nixon"]
@@ -36,15 +36,15 @@ Gem::Specification.new do |s|
      "lib/howl/site.rb",
      "lib/howl/template.rb",
      "lib/howl/view.rb",
-     "test/fixtures/pages/css/modules/colors.scss",
-     "test/fixtures/pages/css/screen.scss",
-     "test/fixtures/pages/has_template.html",
-     "test/fixtures/pages/index.html",
-     "test/fixtures/pages/no_yaml.html",
-     "test/fixtures/pages/simple.html",
      "test/fixtures/posts/first_post.html",
      "test/fixtures/posts/markdown_post.md",
      "test/fixtures/posts/no_date.html",
+     "test/fixtures/site/css/modules/colors.scss",
+     "test/fixtures/site/css/screen.scss",
+     "test/fixtures/site/has_template.html",
+     "test/fixtures/site/index.html",
+     "test/fixtures/site/no_yaml.html",
+     "test/fixtures/site/simple.html",
      "test/fixtures/templates/alt.html",
      "test/fixtures/templates/default.html",
      "test/fixtures/templates/post.html",

data/lib/howl/page.rb

@@ -1,7 +1,7 @@
 module Howl
   class Page < Template
     def output_path
-      site.path("site") + path.relative_path_from(site.path "pages").dirname + output_filename
+      site.output_path(path.relative_path_from(site.pages_path).dirname + output_filename)
     end
   end
 end

data/lib/howl/post.rb

@@ -11,7 +11,7 @@ module Howl
     end
 
     def output_path
-      site.path("site/posts") + date.strftime("%Y/%m/%d") + output_filename
+      site.output_path("posts") + date.strftime("%Y/%m/%d") + output_filename
     end
 
     def title
@@ -21,5 +21,15 @@ module Howl
     def dom_id
       title.slugify
     end
+
+    def link
+      "/" + output_path.relative_path_from(site.output_path).to_s
+    end
+
+    def rendered_content
+      render_view = view.dup
+      render_view.delete('template')
+      converter.convert(Mustache.render(@content, render_view))
+    end
   end
 end

data/lib/howl/site.rb

@@ -10,24 +10,39 @@ module Howl
       root + path
     end
 
+    def posts_path(path = '')
+      root + "posts" + path
+    end
+
+    def templates_path(path = '')
+      root + "templates" + path
+    end
+
+    def pages_path(path = '')
+      root + "site" + path
+    end
+
+    def output_path(path = '')
+      root + "generated" + path
+    end
+
     def pages
-      @pages ||= Dir[path "pages/**/*.*"].map { |path| Page.new(path, self) }
+      @pages ||= Dir[pages_path "**/*.*"].map { |path| Page.new(path, self) }
     end
 
     def posts
-      @posts ||= Dir[path "posts/**/*.*"].map { |path| Post.new(path, self) }.sort
+      @posts ||= Dir[posts_path "**/*.*"].map { |path| Post.new(path, self) }.sort
     end
 
     def templates
-      @templates ||= Hash[Dir[root + "templates/*"].map { |path| 
+      @templates ||= Hash[Dir[templates_path('*')].map { |path| 
         [Pathname.new(path).relative_path_from(path "templates").to_s, 
          Template.new(path, self)] 
       }]
     end
 
     def write_to_disk
-      FileUtils.rm_r(path "site") if File.exist?(path "site")
-      #raise (pages + posts).map(&:class).inspect
+      FileUtils.rm_r(output_path) if File.exist?(output_path)
       (pages + posts).each do |page|
         FileUtils.makedirs(page.output_path.dirname)
         page.output_path.open("w") do |fh|

data/test/howl_test.rb

@@ -5,7 +5,7 @@ context "Site" do
   setup { @site = Site.new(fixture_path) }
   
   should("find all pages") {
-    topic.pages == Dir[fixture_path("pages/**/*.*")].map { |path| Page.new(path, topic) }
+    topic.pages == Dir[fixture_path("site/**/*.*")].map { |path| Page.new(path, topic) }
   }
 
   should("write out all pages") {
@@ -18,7 +18,7 @@ context "Site" do
   should("write out all posts") {
     topic.write_to_disk
     topic.posts.map { |post|
-      Dir[topic.path("site/posts") + "**/*.*"].map { |path|
+      Dir[topic.path("generated/posts") + "**/*.*"].map { |path|
         File.basename(path, File.extname(path)) 
       }.include?(post.path.basename(post.extension).to_s)
     }.all?
@@ -26,7 +26,7 @@ context "Site" do
 
   context "Page" do
     context "simple.html" do
-      setup { Page.new(fixture_path("pages/simple.html"), @site) }
+      setup { Page.new(fixture_path("site/simple.html"), @site) }
 
       asserts("#content") { topic.content.strip }.equals "<h1>{{title}}</h1>"
       asserts("#view is correct") {
@@ -35,12 +35,12 @@ context "Site" do
       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")
+        topic.output_path == (topic.site.output_path "simple.html")
       }
     end
 
     context "no_yaml.html" do
-      setup { Page.new(fixture_path("pages/no_yaml.html"), @site) }
+      setup { Page.new(fixture_path("site/no_yaml.html"), @site) }
 
       asserts("#content") { topic.content.strip }.equals "This page has no YAML front-matter."
       asserts("#view is correct") {
@@ -50,7 +50,7 @@ context "Site" do
     end
 
     context "has_template.html" do
-      setup { Page.new(fixture_path("pages/has_template.html"), @site) }
+      setup { Page.new(fixture_path("site/has_template.html"), @site) }
 
       asserts("#rendered") { topic.render.clean }.equals %Q[
 <html>
@@ -64,7 +64,7 @@ context "Site" do
     end
 
     context "index.html" do
-      setup { Page.new(fixture_path("pages/index.html"), @site) }
+      setup { Page.new(fixture_path("site/index.html"), @site) }
 
       should "show all posts" do
         doc = Nokogiri.parse(topic.render)
@@ -83,9 +83,15 @@ context "Site" do
     }
 
     asserts(:output_path).equals {
-      topic.site.path("site/posts/2010/09/04") + "first_post.html"
+      topic.site.path("generated/posts/2010/09/04") + "first_post.html"
     }
 
+    should("render content") {
+      topic.rendered_content.clean == topic.converter.convert(topic.content).clean
+    }
+
+    asserts(:link).equals { "/posts/2010/09/04/first_post.html" }
+
     context "without a date" do
       setup { Post.new(fixture_path("posts/no_date.html"), @site) }
 

data/test/teststrap.rb

@@ -21,3 +21,5 @@ class Mustache
     true
   end
 end
+
+Riot.verbose

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Clinton R. Nixon
@@ -125,15 +125,15 @@ files:
 - lib/howl/site.rb
 - lib/howl/template.rb
 - lib/howl/view.rb
-- test/fixtures/pages/css/modules/colors.scss
-- test/fixtures/pages/css/screen.scss
-- test/fixtures/pages/has_template.html
-- test/fixtures/pages/index.html
-- test/fixtures/pages/no_yaml.html
-- test/fixtures/pages/simple.html
 - test/fixtures/posts/first_post.html
 - test/fixtures/posts/markdown_post.md
 - test/fixtures/posts/no_date.html
+- test/fixtures/site/css/modules/colors.scss
+- test/fixtures/site/css/screen.scss
+- test/fixtures/site/has_template.html
+- test/fixtures/site/index.html
+- test/fixtures/site/no_yaml.html
+- test/fixtures/site/simple.html
 - test/fixtures/templates/alt.html
 - test/fixtures/templates/default.html
 - test/fixtures/templates/post.html