howl 0.4.1 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/howl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{howl}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clinton R. Nixon"]
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
      "sample_site/site/index.html",
      "sample_site/templates/default.html",
      "sample_site/templates/site.html",
+     "test/fixtures/config.yml",
      "test/fixtures/posts/first_post.html",
      "test/fixtures/posts/markdown_post.md",
      "test/fixtures/posts/no_date.html",
@@ -55,6 +56,18 @@ Gem::Specification.new do |s|
      "test/fixtures/templates/post.html",
      "test/fixtures/templates/site.html",
      "test/howl_test.rb",
+     "test/integration_site/config.yml",
+     "test/integration_site/generated/images/logo.png",
+     "test/integration_site/generated/index.html",
+     "test/integration_site/generated/posts/2010/10/17/post.html",
+     "test/integration_site/generated/stylesheets/screen.css",
+     "test/integration_site/posts/post.md",
+     "test/integration_site/site/images/logo.png",
+     "test/integration_site/site/index.html",
+     "test/integration_site/site/stylesheets/screen.css",
+     "test/integration_site/templates/post.html",
+     "test/integration_site/templates/site.html",
+     "test/integration_test.rb",
      "test/teststrap.rb"
   ]
   s.homepage = %q{http://github.com/crnixon/howl}
@@ -64,6 +77,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A tiny static website/blog generator.}
   s.test_files = [
     "test/howl_test.rb",
+     "test/integration_test.rb",
      "test/teststrap.rb"
   ]
 

data/lib/howl/core_ext.rb

@@ -11,3 +11,17 @@ class String
   end
 end
 
+def File.binary? name
+  open name do |f|
+    while (b=f.read(256)) do
+      return true if b[ "\0"]
+    end
+  end
+  false
+end
+
+class Pathname
+  def binary?
+    File.binary?(@path)
+  end
+end

data/lib/howl/post.rb

@@ -3,7 +3,7 @@ module Howl
     include Comparable
 
     def date
-      view.date? ? Time.parse(view.date) : File.mtime(path)
+      view.date? ? Time.parse(view.date.to_s) : File.mtime(path)
     end
 
     def <=>(other)
@@ -31,5 +31,11 @@ module Howl
       render_view.delete('template')
       converter.convert(Mustache.render(@content, render_view))
     end
+
+    def view_data
+      { :site => site,
+        :date => date,
+        :link => link }
+    end
   end
 end

data/lib/howl/site.rb

@@ -1,9 +1,10 @@
 module Howl
   class Site
-    attr_accessor :root
+    attr_accessor :root, :view
 
     def initialize(root)
       @root = Pathname.new(root)
+      load_config
     end
 
     def path(path)
@@ -45,10 +46,23 @@ module Howl
       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|
-          fh.write page.render
+
+        if page.path.binary?
+          FileUtils.copy(page.path, page.output_path)
+        else
+          page.output_path.open("w") do |fh|
+            fh.write page.render
+          end
         end
       end
     end
+
+    private
+
+    def load_config
+      view = YAML.load(File.read(path "config.yml")) if path("config.yml").exist?
+      view = {} unless view.is_a?(Hash)
+      @view = View.new(view)
+    end
   end
 end

data/lib/howl/template.rb

@@ -1,12 +1,20 @@
 module Howl
   class Template
+    def self.viewables
+      @viewables ||= []
+    end
+
+    def self.can_view(*viewables)
+      viewables.push(*viewables)
+    end
+
     attr_accessor :view, :content, :site, :path, :extension
 
     def initialize(path, site)
       @site = site
       @path = Pathname.new(path)
       @extension = @path.extname
-      load_file
+      load_file unless @path.binary?
     end
 
     def ==(other)
@@ -30,14 +38,16 @@ module Howl
       @converter
     end
 
-    def render(render_view = View.new)
+    def render(render_view = nil)
+      render_view ||= site.view
+      render_view = render_view.dup
       render_view.merge!(@view)
       rendered = converter.convert(Mustache.render(@content, render_view))
       template_name = render_view.delete("template")
 
       if template_name
         template = find_template(template_name)
-        if template
+        if template && template != self
           rendered = template.render(
               render_view.merge("content" => rendered))
         else
@@ -57,6 +67,10 @@ module Howl
       @site.templates[template_name + converter.extension]
     end
 
+    def view_data
+      { :site => site }
+    end
+
     def load_file
       content = @path.read
       view, content = content.split("\n\n", 2)
@@ -69,7 +83,8 @@ module Howl
         view = {}
       end
 
-      @view = View.new(view.merge(:site => site))
+      @view = View.new(view)
+      @view.merge!(view_data)
     end
 
     def test_for_yaml(view)

data/lib/howl/view.rb

@@ -15,5 +15,15 @@ module Howl
         site.posts
       end
     end
+
+    # filters
+
+    def format_date
+      lambda do |text|
+        time = Time.parse(text.to_s)
+        time_format = self.date_format || "%b %-d, %Y at %-I:%M %P"
+        time.strftime(time_format)
+      end
+    end
   end
 end

data/test/fixtures/config.yml

@@ -0,0 +1,2 @@
+title: Test Site
+site_key: true

data/test/howl_test.rb

@@ -8,6 +8,10 @@ context "Site" do
     topic.pages == Dir[fixture_path("site/**/*.*")].map { |path| Page.new(path, topic) }
   }
 
+  should("read its config") {
+    topic.view.has_key?(:title)
+  }
+
   should("write out all pages") {
     topic.write_to_disk
     topic.pages.map { |page|

data/test/integration_site/config.yml

@@ -0,0 +1,2 @@
+site_name: dce.gitwrite.com
+site_url: "http://dce.gitwrite.com"

data/test/integration_site/generated/index.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8" />
+  <title>dce.gitwrite.com</title>
+  <link rel="stylesheet" href="/stylesheets/screen.css" type="text/css" />
+	<!--[if IE]>
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+	<![endif]-->
+</head>
+
+<body>
+  <div id="container">
+    <div id="header">
+      <h1><a href="http://dce.gitwrite.com">dce.gitwrite.com</a></h1>
+    </div>
+
+    <div id="content">
+      <div class="post">
+  <h2>
+    <a href="/posts/2010/10/17/post.html">Welcome to GitWrite</a>
+  </h2>
+  <span class="meta sidebar">
+    Oct 17, 2010 at 1:24 pm<br />
+  </span>
+  <p>Thank you for trying out GitWrite. Your blog lives in a repository at</p>
+
+<blockquote><p><code>git://gitwrite.com/blogs/dce.git</code></p></blockquote>
+
+<p>Pull it down (with <code>git checkout</code>), make some updates, and push it back.
+In a few moments, your blog will be regenerated to include your new content. Of
+course, you can always make edits through our <a href="http://gitwrite.com/site">web interface</a>, as well.</p>
+
+  <p class="meta"><a href="/posts/2010/10/17/post.html">Permalink</a></p>
+</div>
+
+    </div>
+
+    <div id="footer" class="meta">
+      Powered by <a href="http://gitwrite.com" class="image-link"><img src="/images/logo.png" width="100"/></a> &#182; Theme inspired by <a href="http://www.tumblr.com/theme/325">langer</a>
+    </div>
+  </div>
+</body>
+</html>

data/test/integration_site/generated/posts/2010/10/17/post.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8" />
+  <title>dce.gitwrite.com</title>
+  <link rel="stylesheet" href="/stylesheets/screen.css" type="text/css" />
+	<!--[if IE]>
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+	<![endif]-->
+</head>
+
+<body>
+  <div id="container">
+    <div id="header">
+      <h1><a href="http://dce.gitwrite.com">dce.gitwrite.com</a></h1>
+    </div>
+
+    <div id="content">
+      <div class="post">
+  <h2>Welcome to GitWrite</h2>
+  <span class="meta sidebar">
+    Oct 17, 2010 at 1:24 pm<br />
+  </span>
+
+  <p>Thank you for trying out GitWrite. Your blog lives in a repository at</p>
+
+<blockquote><p><code>git://gitwrite.com/blogs/dce.git</code></p></blockquote>
+
+<p>Pull it down (with <code>git checkout</code>), make some updates, and push it back.
+In a few moments, your blog will be regenerated to include your new content. Of
+course, you can always make edits through our <a href="http://gitwrite.com/site">web interface</a>, as well.</p>
+
+
+  <p class="meta"><a href="/posts/2010/10/17/post.html">Permalink</a></p>
+</div>
+
+    </div>
+
+    <div id="footer" class="meta">
+      Powered by <a href="http://gitwrite.com" class="image-link"><img src="/images/logo.png" width="100"/></a> &#182; Theme inspired by <a href="http://www.tumblr.com/theme/325">langer</a>
+    </div>
+  </div>
+</body>
+</html>

data/test/integration_site/generated/stylesheets/screen.css

@@ -0,0 +1,60 @@
+h1, h2, h3 {
+  font-weight: normal;
+}
+
+a {
+  text-decoration: none;
+  background-color: #FF9;
+  color: black;
+  padding: 3px;
+}
+
+a:hover {
+  border-bottom: 1px solid black;
+}
+
+#container {
+  width: 500px;
+  margin: 0 auto;
+  font: 14px/1.5 Georgia, sans-serif;
+}
+
+#footer {
+  margin-top: 60px;
+  padding-top: 30px;
+  border-top: 1px dotted #999;
+  text-align: center;
+}
+
+div.post {
+  position: relative;
+  margin-top: 60px;
+}
+
+.meta {
+  font-size: .8em;
+  color: #999;
+  font-style: italic;
+}
+
+div.post span.sidebar {
+  position: absolute;
+  top: 5px;
+  left: -225px;
+  width: 200px;
+  text-align: right;
+  border-right: 1px dotted #999;
+  padding-right: 10px;
+  display: block;
+}
+
+a.image-link {
+  background: none;
+  padding: none;
+  border: none;
+}
+
+a.image-link img {
+  border: 1px solid #999;
+  vertical-align: middle;
+}

data/test/integration_site/posts/post.md

@@ -0,0 +1,12 @@
+title: Welcome to GitWrite
+template: post
+
+Thank you for trying out GitWrite. Your blog lives in a repository at
+
+> `git://gitwrite.com/blogs/dce.git`
+
+Pull it down (with `git checkout`), make some updates, and push it back.
+In a few moments, your blog will be regenerated to include your new content. Of
+course, you can always make edits through our [web interface][dash], as well.
+
+  [dash]: http://gitwrite.com/site

data/test/integration_site/site/index.html

@@ -0,0 +1,14 @@
+template: site
+
+{{#posts}}
+<div class="post">
+  <h2>
+    <a href="{{link}}">{{title}}</a>
+  </h2>
+  <span class="meta sidebar">
+    {{#format_date}}{{date}}{{/format_date}}<br />
+  </span>
+  {{&rendered_content}}
+  <p class="meta"><a href="{{link}}">Permalink</a></p>
+</div>
+{{/posts}}

data/test/integration_site/site/stylesheets/screen.css

@@ -0,0 +1,60 @@
+h1, h2, h3 {
+  font-weight: normal;
+}
+
+a {
+  text-decoration: none;
+  background-color: #FF9;
+  color: black;
+  padding: 3px;
+}
+
+a:hover {
+  border-bottom: 1px solid black;
+}
+
+#container {
+  width: 500px;
+  margin: 0 auto;
+  font: 14px/1.5 Georgia, sans-serif;
+}
+
+#footer {
+  margin-top: 60px;
+  padding-top: 30px;
+  border-top: 1px dotted #999;
+  text-align: center;
+}
+
+div.post {
+  position: relative;
+  margin-top: 60px;
+}
+
+.meta {
+  font-size: .8em;
+  color: #999;
+  font-style: italic;
+}
+
+div.post span.sidebar {
+  position: absolute;
+  top: 5px;
+  left: -225px;
+  width: 200px;
+  text-align: right;
+  border-right: 1px dotted #999;
+  padding-right: 10px;
+  display: block;
+}
+
+a.image-link {
+  background: none;
+  padding: none;
+  border: none;
+}
+
+a.image-link img {
+  border: 1px solid #999;
+  vertical-align: middle;
+}

data/test/integration_site/templates/post.html

@@ -0,0 +1,12 @@
+template: site
+
+<div class="post">
+  <h2>{{title}}</h2>
+  <span class="meta sidebar">
+    {{#format_date}}{{date}}{{/format_date}}<br />
+  </span>
+
+  {{& content}}
+
+  <p class="meta"><a href="{{link}}">Permalink</a></p>
+</div>

data/test/integration_site/templates/site.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8" />
+  <title>{{site_name}}</title>
+  <link rel="stylesheet" href="/stylesheets/screen.css" type="text/css" />
+	<!--[if IE]>
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+	<![endif]-->
+</head>
+
+<body>
+  <div id="container">
+    <div id="header">
+      <h1><a href="{{site_url}}">{{site_name}}</a></h1>
+    </div>
+
+    <div id="content">
+      {{& content}}
+    </div>
+
+    <div id="footer" class="meta">
+      Powered by <a href="http://gitwrite.com" class="image-link"><img src="/images/logo.png" width="100"/></a> &#182; Theme inspired by <a href="http://www.tumblr.com/theme/325">langer</a>
+    </div>
+  </div>
+</body>
+</html>

data/test/integration_test.rb

@@ -0,0 +1,10 @@
+require 'teststrap'
+include Howl
+
+context "Integration Site" do
+  setup { Site.new(File.join(File.dirname(__FILE__), "integration_site")) }
+
+  should "generate successfully" do
+    topic.write_to_disk
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Clinton R. Nixon
@@ -130,6 +130,7 @@ files:
 - sample_site/site/index.html
 - sample_site/templates/default.html
 - sample_site/templates/site.html
+- test/fixtures/config.yml
 - test/fixtures/posts/first_post.html
 - test/fixtures/posts/markdown_post.md
 - test/fixtures/posts/no_date.html
@@ -144,6 +145,18 @@ files:
 - test/fixtures/templates/post.html
 - test/fixtures/templates/site.html
 - test/howl_test.rb
+- test/integration_site/config.yml
+- test/integration_site/generated/images/logo.png
+- test/integration_site/generated/index.html
+- test/integration_site/generated/posts/2010/10/17/post.html
+- test/integration_site/generated/stylesheets/screen.css
+- test/integration_site/posts/post.md
+- test/integration_site/site/images/logo.png
+- test/integration_site/site/index.html
+- test/integration_site/site/stylesheets/screen.css
+- test/integration_site/templates/post.html
+- test/integration_site/templates/site.html
+- test/integration_test.rb
 - test/teststrap.rb
 has_rdoc: true
 homepage: http://github.com/crnixon/howl
@@ -179,4 +192,5 @@ specification_version: 3
 summary: A tiny static website/blog generator.
 test_files: 
 - test/howl_test.rb
+- test/integration_test.rb
 - test/teststrap.rb