wormwood 0.0.5 → 0.0.6

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.DS_Store
 Gemfile.lock
 InstalledFiles
 _yardoc

data/README.md

@@ -2,14 +2,18 @@
 
 Wormwood is an event-driven file rendering utility inspired by [Jekyll](https://github.com/mojombo/jekyll).
 
-Wormwood watches for changes to a template directory ( _./_ by default), renders the changed files (via [Tilt](https://github.com/rtomayko/tilt)), and writes the rendered output to an output directory ( _public_ by default).
-
+Wormwood:
+1. watches for changes to a template directory ( _./_ by default)
+2. renders the changed files (via [Tilt](https://github.com/rtomayko/tilt))
+3. writes the rendered output to an output directory ( _./_ by default).
 
 ## Usage
 
-1. Create a file [Tilt](https://github.com/rtomayko/tilt)) knows how to render, e.g., _foo.erb_
-2. Run `wormwood`
-3. Edit _foo.erb_ and observe changes applied to _foo.html_
+1. Create a file [Tilt](https://github.com/rtomayko/tilt) knows how to render, e.g., _foo.erb_
+2. Create a file named "layout" in the same directory, with a Tilt-supported extension, e.g., _layout.erb_
+3. Reference _content_ in the layout, e.g., `<%= content %>`
+4. Run `wormwood`
+5. Edit _foo.erb_ and observe changes applied to _foo.html_
 
 
 ## Configuration
@@ -18,6 +22,12 @@ You can specify _source_ and _destination_ directories as options. For example:
 
     wormwood -s templates -d public
 
+Other options:
+
+`--layout` specifies the layout file name (without the extension), e.g., `wormwood --layout default`. Defaults to "layout".
+
+`--variable` specifies the variable name used to insert the rendered content into the layout, e.g., `wormwood --variable yield`. Defaults to "content".
+
 
 ## Installation
 

data/bin/wormwood

@@ -9,8 +9,10 @@ program :description, 'Event-driven template rendering inspired by Jekyll.'
 
 default_command :watch
 
-global_option '-s', '--source [DIR]', 'Watches specified directory path (defaults to ./)'
-global_option '-d', '--destination [DIR]', 'Writes to specified directory path (defaults to ./)'
+global_option '--source [DIR]', 'Watches specified directory path (defaults to "./")'
+global_option '--destination [DIR]', 'Writes to specified directory path (defaults to "./")'
+global_option '--layout [NAME]', 'The layout file name (defaults to "layout")'
+global_option '--variable [NAME]', 'The layout variable name (defaults to "content")'
 
 command :watch do |c|
   c.syntax = 'wormwood watch [options]'
@@ -18,7 +20,9 @@ command :watch do |c|
   c.action do |args, options|
     options.default \
       :source => './',
-      :destination  => './'
+      :destination  => './',
+      :layout => 'layout',
+      :variable => 'content'
     Wormwood.watch(options)
   end
 end
@@ -29,7 +33,9 @@ command :build do |c|
   c.action do |args, options|
     options.default \
       :source => './',
-      :destination  => './'
+      :destination  => './',
+      :layout => 'layout',
+      :variable => 'content'
     Wormwood.build(Dir[Wormwood::GLOB], options)
   end
 end

data/lib/wormwood/version.rb

@@ -1,3 +1,3 @@
 module Wormwood
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/wormwood.rb

@@ -21,12 +21,14 @@ module Wormwood
   end
 
   def self.build paths, options
+    layout_path = Dir.glob(File.join(options.source, "#{options.layout}*")).first
     paths.each do |source_path|
-      dest_path = File.dirname(source_path).sub(options.source, options.destination)
-      FileUtils.mkdir_p(dest_path) unless File.exists? dest_path
+      dest_path = File.join \
+        options.destination,
+        "#{File.basename(source_path, ".*")}.html"
       File.write \
-        "#{dest_path}/#{File.basename(source_path, ".*")}.html",
-        Tilt.new(source_path).render
+        dest_path,
+        Tilt.new(layout_path).render(nil, {options.variable => Tilt.new(source_path).render})
     end
   end
 

data/test/lib/wormwood/build_test.rb

@@ -8,7 +8,13 @@ describe Wormwood do
   it "writes to the correct destination" do
     Wormwood.build \
       [source_dir("foo.erb")],
-      OpenStruct.new({'source' => source_dir, 'destination' => dest_dir})
+      OpenStruct.new({
+        'source' => source_dir,
+        'destination' => dest_dir,
+        'layout' => 'layout',
+        'variable' => 'content'
+      })
     assert File.exist?(dest_dir('foo.html'))
+    assert "asd" == File.read(dest_dir('foo.html'))
   end
 end

data/test/test_helper.rb

@@ -7,7 +7,8 @@ require_relative '../lib/wormwood.rb'
 def create_source
   unless File.exists? source_dir
     FileUtils.mkdir_p(source_dir)
-    File.write(source_dir('foo.erb'), "content")
+    File.write(source_dir('layout.erb'), "<%= content %>")
+    File.write(source_dir('foo.erb'), "asd")
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wormwood
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander