staticpress 0.5.0 → 0.5.1

data/README.markdown

@@ -8,3 +8,17 @@ Staticpress is a blog-focused static site generator. It uses Tilt for rendering
 Staticpress is installable as a Rubygem so a simple `[sudo] gem install staticpress` is all you need. Once installed you will need to initialize your blog with `staticpress new <path-to-blog> [name-of-blog]`, where `<path-to-blog>` is a relative path to some directory and `[name-of-blog]` is an optional title. If the directory does not exist yet, it will be created, so go ahead and `cd` into it.
 
 From your blog directory, you can create a new blog post with `staticpress create <title>`. You can turn on the server with `staticpress serve` to preview work in progress. Several other commands are available; check out `staticpress help` for more information.
+
+
+* .new passes params to #initialize
+* #initialize manually calculates full path to template from params and populates @template_types
+* Base#template_types is looped over in Base#render_partial
+* Base#template_extension joins Base#template_types and prepends with . if not empty
+* #template_path uses Base#template_extension to create full path to source
+
+
+* http://jekyllbootstrap.com/
+* http://vitobotta.com/how-to-migrate-from-wordpress-to-jekyll/
+* http://vitobotta.com/sinatra-contact-form-jekyll/
+
+* http://nanoc.stoneship.org/docs/

data/docs/content/docs/content-types.markdown

@@ -0,0 +1,3 @@
+# Content Types
+
+Staticpress supports many formats for content. Staticpress uses [Tilt](https://github.com/rtomayko/tilt) under the covers. You can mix and match format as much as you like. Additionally you can create pages in any format; if Tilt does not recognize the file, it will be copied through untouched. This is useful for including images in your posts for instance.

data/docs/content/docs/diving-deeper.markdown

@@ -1,3 +1,3 @@
 # Diving Deeper
 
-
+In addition to blog posts, Staticpress can handle regular pages as well. Simply type `staticpress create_page <title> [path-in-content]` to get started.

data/docs/content/docs/setup.markdown

@@ -8,7 +8,7 @@ Once you have Ruby, open a terminal and type `gem install staticpress`. This com
 
 ## Usage
 
-When you want to create a new Staticpress blog, simply run `staticpress new <path-to-blog> [name-of-blog]`. Staticpress will create the `<path-to-blog>` for you if it does not exist. `[name-of-blog]` is optional. If you leave it out, Staticpress will make up a blog name from `<path-to-blog>`. Either way, `cd` into `<path-to-blog>`; this will be the place you need to be for all the other commands to work. By the way Staticpress uses several conventions to keep things simple. For instance many commands you are asked to type on the terminal take parameters. Required parameters will `<look-like-this>`, while optional parameters will `[look-like-this]`.
+When you want to create a new Staticpress blog, simply run `staticpress new <path-to-blog> [name-of-blog]`. Staticpress will create the `<path-to-blog>` for you if it does not exist. `[name-of-blog]` is optional. If you leave it out, Staticpress will make up a blog name from `<path-to-blog>`. Either way, `cd` into `<path-to-blog>`; this will be the place you need to be for all the other commands to work. By the way Staticpress uses several conventions to keep things simple. For instance many commands you are asked to type on the terminal take parameters. Required parameters will `<look-like-this>`, while optional parameters will `[look-like-this]`. You should not type the `<>` or `[]` symbols.
 
 ## Hello, World
 

data/docs/content/index.markdown

@@ -1 +1 @@
-hello
+[Read the documentation](/docs/setup).

data/features/happy_path.feature

@@ -58,6 +58,37 @@ Feature: The happy path
     Then a directory named "content" should exist
     And a file named "content/about.markdown" should exist
 
+  Scenario: Creating a static page with multiple formats
+    Given a blog exists
+    When I write to "content/formats.markdown.erb" with:
+      """
+      hello world
+      """
+    And I run `staticpress build`
+    Then the file "public/formats/index.html" should contain exactly:
+      """
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <title>Formats | Transient Thoughts</title>
+          <link href='/assets/basic/styles/all.css' rel='stylesheet' type='text/css' />
+          <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js'></script>
+          <script src='/assets/basic/scripts/application.js'></script>
+        </head>
+        <body>
+          <header>
+            <span class='site-title'>Transient Thoughts</span>
+            <span class='site-subtitle'>A blogging framework for hackers</span>
+          </header>
+          <section>
+            <p>hello world</p>
+          </section>
+          <section></section>
+        </body>
+      </html>
+
+      """
+
   Scenario: Copying a built-in plugin
     Given a blog exists
     When I run `staticpress fork_plugin blockquote`
@@ -98,7 +129,7 @@ Feature: The happy path
     When I run `staticpress build --verbose`
     Then the output should contain "    page public/about/index.html"
 
-  Scenario: Building a site a custom homepage
+  Scenario: Building a site with a custom homepage
     Given a blog with content exists
     And I write to "content/index.markdown" with:
       """
@@ -124,7 +155,14 @@ Feature: The happy path
           <script src='/assets/basic/scripts/application.js'></script>
         </head>
         <body>
-          <p>in custom page</p>
+          <header>
+            <span class='site-title'>Transient Thoughts</span>
+            <span class='site-subtitle'>A blogging framework for hackers</span>
+          </header>
+          <section>
+            <p>in custom page</p>
+          </section>
+          <section></section>
         </body>
       </html>
 

data/lib/staticpress/content/base.rb

@@ -14,7 +14,7 @@ module Staticpress::Content
     extend Staticpress::Helpers
     include Staticpress::Helpers
 
-    attr_reader :params
+    attr_reader :params, :template_types
 
     def initialize(params = {})
       clean_params = params.select { |key, value| value }.map do |key, value|
@@ -28,6 +28,7 @@ module Staticpress::Content
       end
 
       @params = optional_param_defaults.merge Hash[clean_params]
+      @template_types = []
     end
 
     def ==(other)
@@ -68,6 +69,10 @@ module Staticpress::Content
       end
     end
 
+    def markup_template?
+      config.markup_templates.include?(template_path.extname[1..-1])
+    end
+
     def meta
       Staticpress::Metadata.new(content.names.include?('frontmatter') ? YAML.load(content[:frontmatter]) : {})
     end
@@ -78,7 +83,13 @@ module Staticpress::Content
 
     def output_path
       base = Staticpress.blog_path + config.destination_path + url_path.sub(/^\//, '')
-      (config.index_file && config.markup_templates.include?(template_path.extname[1..-1])) ? base + config.index_file : base
+
+      # FIXME need a better check
+      if (markup_template? && config.index_file && (Pathname(config.index_file).extname != base.extname))
+        base + config.index_file
+      else
+        base
+      end
     end
 
     def raw
@@ -96,8 +107,10 @@ module Staticpress::Content
     end
 
     def render_partial(locals = {})
-      template = Tilt.new(template_path.to_s, template_engine_options) { raw }
-      template.render template_context, locals
+      template_types.inject(raw) do |result, template_type|
+        template = Tilt.new(template_type.to_s, template_engine_options(template_type)) { result }
+        template.render template_context, locals
+      end
     end
 
     def save
@@ -120,16 +133,16 @@ module Staticpress::Content
       Staticpress::ViewHelpers.new self
     end
 
-    def template_engine_options
+    def template_engine_options(template_type)
       (config.template_engine_options[template_type] || {}).to_hash
     end
 
-    def template_path_content
-      exist? ? template_path.read : ''
+    def template_extension
+      template_types.empty? ? '' : ".#{template_types.reverse.join('.')}"
     end
 
-    def template_type
-      template_path.extname.sub(/^\./, '').to_sym
+    def template_path_content
+      exist? ? template_path.read : ''
     end
 
     def theme

data/lib/staticpress/content/page.rb

@@ -13,22 +13,22 @@ module Staticpress::Content
     extend ResourceContent
     extend StaticContent
 
-    attr_reader :extension, :full_slug
+    attr_reader :full_slug
 
-    def initialize(params)
+    def initialize(params = {})
       super
 
-      index = extensionless_basename Pathname(config.index_file)
+      source_path = Staticpress.blog_path + config.source_path
 
       @full_slug = params[:slug]
-      @extension = find_supported_extension(Staticpress.blog_path + config.source_path + full_slug)
+      @template_types = find_supported_extensions(source_path + full_slug)
 
-      if @extension.nil? && !template_path.file?
+      unless template_path.file?
         @full_slug = [
           params[:slug],
-          index
+          extensionless_basename(Pathname(config.index_file))
         ].reject(&:empty?).join('/')
-        @extension = find_supported_extension(Staticpress.blog_path + config.source_path + full_slug)
+        @template_types = find_supported_extensions(source_path + full_slug)
       end
     end
 
@@ -41,8 +41,7 @@ module Staticpress::Content
     end
 
     def template_path
-      slug = extension ? "#{full_slug}.#{extension}" : full_slug
-      Staticpress.blog_path + config.source_path + slug
+      Staticpress.blog_path + config.source_path + "#{full_slug}#{template_extension}"
     end
 
     def self.all
@@ -65,15 +64,21 @@ module Staticpress::Content
       destination.open('w') { |f| f.write template }
     end
 
-    def self.find_by_path(path)
-      if path.file?
-        raw_slug = parse_slug(path, (Staticpress.blog_path + config.source_path)).first
+    def self.extract_slug(path)
+      base_path = Staticpress.blog_path + config.source_path
+      supported = find_supported_extensions(path)
+      extension = supported.empty? ? '' : "\\.#{supported.reverse.join('\.')}"
+
+      if match = /^#{base_path}\/(?<slug>.+)#{extension}$/.match(path.to_s)
         basename = extensionless_basename Pathname(config.index_file)
-        slug = raw_slug.sub(/.*(\/?#{basename})$/, '')
-        new :slug => slug
+        match[:slug].sub(/.*(\/?#{basename})$/, '')
       end
     end
 
+    def self.find_by_path(path)
+      new :slug => extract_slug(path) if path.file?
+    end
+
     def self.template
       <<-TEMPLATE
 in page

data/lib/staticpress/content/post.rb

@@ -8,11 +8,10 @@ module Staticpress::Content
     include ResourceContent
     extend ResourceContent
 
-    attr_reader :extension
-
     def initialize(params)
       super
-      @extension = find_supported_extension template_path
+      # FIXME calculate template_path
+      @template_types = find_supported_extensions template_path
     end
 
     def <=>(other)
@@ -32,7 +31,7 @@ module Staticpress::Content
         params[:year],
         params[:month],
         params[:day],
-        (extension ? "#{params[:title]}.#{extension}" : params[:title])
+        "#{params[:title]}#{template_extension}"
       ].join('-')
       Staticpress.blog_path + config.posts_source_path + name
     end

data/lib/staticpress/content/resource_content.rb

@@ -5,11 +5,14 @@ require 'staticpress/content/static_content'
 
 module Staticpress::Content
   module ResourceContent
-    # FIXME add tests
-    def find_supported_extension(extensionless_path)
-      Staticpress::Content::StaticContent.supported_extensions.detect do |extension|
-        extension.to_sym if Pathname("#{extensionless_path}.#{extension}").file?
-      end
+    def find_supported_extensions(path)
+      file = path.file? ? path : Dir["#{path}.*"].first
+      return [] if file.nil?
+
+      # TODO stop looping when no more supported extensions
+      Pathname(file).sub("#{file.to_s}.", '').to_s.split('.').map(&:to_sym).select do |extension|
+        Staticpress::Content::StaticContent.supported_extensions.include? extension
+      end.reverse
     end
 
     def gather_resources_from(paths)

data/lib/staticpress/content/static_content.rb

@@ -1,3 +1,5 @@
+require 'tilt'
+
 require 'staticpress'
 
 module Staticpress::Content

data/lib/staticpress/content/theme.rb

@@ -11,11 +11,9 @@ module Staticpress::Content
     extend ResourceContent
     extend StaticContent
 
-    attr_reader :extension
-
     def initialize(params)
       super
-      @extension = find_supported_extension template_path
+      @template_types = find_supported_extensions template_path
     end
 
     def static?
@@ -23,8 +21,7 @@ module Staticpress::Content
     end
 
     def template_path
-      slug = extension ? "#{params[:slug]}.#{extension}" : params[:slug]
-      Staticpress::Theme.new(params[:theme]).root + 'assets' + params[:asset_type] + slug
+      Staticpress::Theme.new(params[:theme]).root + 'assets' + params[:asset_type] + "#{params[:slug]}#{template_extension}"
     end
 
     def self.all

data/lib/staticpress/helpers.rb

@@ -11,13 +11,11 @@ module Staticpress
     end
 
     def extensionless_basename(pathname)
-      path = pathname.basename.to_path
-      path[0...(path.length - pathname.extname.length)]
+      extensionless_path(pathname).basename.to_s
     end
 
     def extensionless_path(pathname)
-      path = pathname.to_path
-      Pathname path[0...(path.length - pathname.extname.length)]
+      pathname.sub(pathname.extname, '')
     end
 
     def hash_from_array(array, &block)

data/lib/staticpress/version.rb

@@ -2,7 +2,7 @@ module Staticpress
   class Version
     extend Comparable
 
-    SIGNATURE = [0, 5, 0]
+    SIGNATURE = [0, 5, 1]
 
     def self.<=>(other)
       other = other.split('.').map(&:to_i) if other.respond_to? :split

data/lib/themes/basic/layouts/default.haml

@@ -6,4 +6,9 @@
     %script{ :src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js' }
     %script{ :src => '/assets/basic/scripts/application.js' }
   %body
-    = yield
+    %header
+      %span.site-title= config.title
+      %span.site-subtitle= config.subtitle
+    %section
+      = yield
+    %section

data/lib/themes/basic/layouts/post_index.haml

@@ -6,4 +6,9 @@
     %script{ :src => 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js' }
     %script{ :src => '/assets/basic/scripts/application.js' }
   %body
-    = yield
+    %header
+      %span.site-title= config.title
+      %span.site-subtitle= config.subtitle
+    %section
+      = yield
+    %section

data/staticpress.gemspec

@@ -2,6 +2,7 @@
 
 require File.expand_path('../lib/staticpress/version', __FILE__)
 
+# http://timelessrepo.com/use-the-gemspec
 Gem::Specification.new do |s|
   s.name        = 'staticpress'
   s.version     = Staticpress::Version
@@ -34,6 +35,7 @@ Staticpress is a blog-focused static site generator. It uses Tilt for rendering
   s.add_development_dependency 'sass'
 
   s.add_runtime_dependency 'bundler'
+  #s.add_runtime_dependency 'hike' # look into this for template inheritance https://github.com/sstephenson/hike
   s.add_runtime_dependency 'rack'
   s.add_runtime_dependency 'thor'
   s.add_runtime_dependency 'tilt'

data/tests/staticpress/content/base_test.rb

@@ -16,6 +16,8 @@ class ContentBaseTest < TestCase
   let(:index) { Staticpress::Content::Index.new }
   let(:index_2) { Staticpress::Content::Index.new :number => 2 }
 
+  let(:chained) { Staticpress::Content::Page.new(:slug => 'chained') }
+  let(:chain) { Staticpress::Content::Page.new(:slug => 'chain.html') }
   let(:page) { Staticpress::Content::Page.new(:slug => 'about') }
   let(:second_page) { Staticpress::Content::Page.new :slug => 'contact' }
   let(:page_root) { Staticpress::Content::Page.new :slug => '' }
@@ -61,6 +63,7 @@ class ContentBaseTest < TestCase
   end
 
   def test_content_type
+    assert_equal 'text/html', chained.content_type
     assert_equal 'text/html', page.content_type
     assert_equal 'text/css', style_2.content_type
     assert_equal 'image/png', static_bin.content_type
@@ -71,6 +74,8 @@ class ContentBaseTest < TestCase
     assert category.exist?, "#{category} does not exist"
     assert index.exist?, "#{index} does not exist"
 
+    assert chained.exist?, "#{chained} does not exist"
+    assert chain.exist?, "#{chain} does not exist"
     assert page.exist?, "#{page} does not exist"
     assert second_page.exist?, "#{second_page} does not exist"
     assert static_bin.exist?, "#{static_bin} does not exist"
@@ -91,6 +96,7 @@ class ContentBaseTest < TestCase
     assert_equal index, Staticpress::Content::Index.find_by_url_path('/')
 
     assert_equal page_root, Staticpress::Content::Page.find_by_url_path('/')
+    assert_equal chained, Staticpress::Content::Page.find_by_url_path('/chained')
     assert_equal page, Staticpress::Content::Page.find_by_url_path('/about')
     assert_equal static_bin, Staticpress::Content::Page.find_by_url_path('/ruby.png')
 
@@ -107,7 +113,17 @@ class ContentBaseTest < TestCase
     assert_equal 'Foo -> Bar -> Baz | Test Blog', page_nested.full_title
   end
 
+  def test_markup_template?
+    assert chained.markup_template?, "#{chained} is not markup"
+    assert chain.markup_template?, "#{chain} is not markup"
+    assert page.markup_template?, "#{page} is not markup"
+
+    refute style_2.markup_template?, "#{chained} is markup"
+  end
+
   def test_output_path
+    assert_equal (Staticpress.blog_path + 'public' + 'chained' + 'index.html'), chained.output_path
+    assert_equal (Staticpress.blog_path + 'public' + 'chain.html'), chain.output_path
     assert_equal (Staticpress.blog_path + 'public' + 'about' + 'index.html'), page.output_path
     assert_equal (Staticpress.blog_path + 'public' + 'index.html'), page_root.output_path
     assert_equal (Staticpress.blog_path + 'public' + 'style2.css'), style_2.output_path
@@ -124,11 +140,14 @@ class ContentBaseTest < TestCase
     assert_equal expected, Staticpress::Content::Tag.new(:name => 'charlotte', :number => nil).params
     assert_equal expected, Staticpress::Content::Tag.new(:name => 'charlotte', :number => 1).params
     assert_equal expected, Staticpress::Content::Tag.new(:name => 'charlotte', :number => '1').params
+
+    assert_equal({ :slug => 'chain.html' }, Staticpress::Content::Page.new(:slug => 'chain.html').params)
   end
 
   def test_raw
     assert_equal '= partial :list_posts, :posts => page.sub_content', category.raw
 
+    assert_equal "<%= 'Processed with ERB' %>, then Markdown.", chained.raw
     assert_equal 'in page', page.raw
     assert_equal "in page\n\nin page", second_page.raw
     assert_equal 'this file intentionally left blank', static_txt.raw
@@ -182,6 +201,7 @@ body{color:green}
   end
 
   def test_render_partial
+    assert_equal "<p>Processed with ERB, then Markdown.</p>\n", chained.render_partial
     assert_equal "<p>in page</p>\n", page.render_partial
     assert_equal "<p>in page</p>\n\n<p>in page</p>\n", second_page.render_partial
 
@@ -217,14 +237,16 @@ body{color:green}
 
   def test_template_engine_options
     expected = Compass.sass_engine_options.merge :line_comments => false, :style => :compressed
-    assert_eql expected, asset_style.template_engine_options
-    assert_equal({}, asset_script.template_engine_options)
+    assert_eql expected, asset_style.template_engine_options(:sass)
+    assert_equal({}, asset_script.template_engine_options(:js))
   end
 
-  def test_template_type
-    assert_equal :markdown, page.template_type
-    assert_equal :sass, asset_style.template_type
-    assert_equal :js, asset_script.template_type
+  def test_template_types
+    assert_equal [:erb, :markdown], chained.template_types
+    assert_equal [:erb, :markdown], chain.template_types
+    assert_equal [:markdown], page.template_types
+    assert_equal [:sass], asset_style.template_types
+    assert_equal [], asset_script.template_types
   end
 
   def test_title
@@ -258,6 +280,8 @@ body{color:green}
     assert_equal '/page/2', index_2.url_path
 
     assert_equal '/', page_root.url_path
+    assert_equal '/chained', chained.url_path
+    assert_equal '/chain.html', chain.url_path
     assert_equal '/about', page.url_path
     assert_equal '/contact', second_page.url_path
     assert_equal '/ruby.png', static_bin.url_path

data/tests/staticpress/content/page_test.rb

@@ -8,6 +8,8 @@ class ContentPageTest < TestCase
 
   let(:page_dir) { Staticpress.blog_path + config.source_path }
 
+  let(:chained) { Staticpress::Content::Page.new(:slug => 'chained') }
+  let(:chain) { Staticpress::Content::Page.new(:slug => 'chain.html') }
   let(:page) { Staticpress::Content::Page.new :slug => 'about' }
   let(:second_page) { Staticpress::Content::Page.new :slug => 'contact' }
   let(:index_page) { Staticpress::Content::Page.new :slug => '' }
@@ -19,10 +21,30 @@ class ContentPageTest < TestCase
   let(:fake) { Staticpress::Content::Page.new :slug => 'i/dont/exist' }
 
   def test_all
-    assert_equal 9, Staticpress::Content::Page.all.count
+    assert_equal 11, Staticpress::Content::Page.all.count
+  end
+
+  def test_extension
+    assert_equal '.markdown.erb', chained.template_extension
+    assert_equal '.markdown.erb', chain.template_extension
+    assert_equal '.markdown', page.template_extension
+  end
+
+  def test_full_slug
+    assert_equal 'chained', chained.full_slug
+    assert_equal 'chain.html', chain.full_slug
+    assert_equal 'about', page.full_slug
+  end
+
+  def test_extract_slug
+    assert_equal 'chained', Staticpress::Content::Page.extract_slug(page_dir + 'chained.markdown.erb')
+    assert_equal 'about', Staticpress::Content::Page.extract_slug(page_dir + 'about.markdown')
+    assert_equal 'plain.txt', Staticpress::Content::Page.extract_slug(page_dir + 'plain.txt')
   end
 
   def test_find_by_path
+    assert_equal chained, Staticpress::Content::Page.find_by_path(page_dir + 'chained.markdown.erb')
+    assert_equal chain, Staticpress::Content::Page.find_by_path(page_dir + 'chain.html.markdown.erb')
     assert_equal page, Staticpress::Content::Page.find_by_path(page_dir + 'about.markdown')
     assert_equal index_page, Staticpress::Content::Page.find_by_path(page_dir + 'index.markdown')
     assert_nil Staticpress::Content::Page.find_by_path(page_dir + 'i' + 'dont' + 'exist.markdown')

data/tests/staticpress/content/resource_content_test.rb

@@ -0,0 +1,20 @@
+require_relative '../../test_case'
+
+require 'staticpress/helpers'
+require 'staticpress/content/resource_content'
+
+class ResourceContentTest < TestCase
+  include Staticpress::Helpers
+  include Staticpress::Content::ResourceContent
+
+  let(:page_dir) { Staticpress.blog_path + config.source_path }
+
+  def test_find_supported_extensions
+    assert_equal [:erb, :markdown], find_supported_extensions(page_dir + 'chained.markdown.erb')
+    assert_equal [:erb, :markdown], find_supported_extensions(page_dir + 'chained.markdown')
+    assert_equal [:erb, :markdown], find_supported_extensions(page_dir + 'chained')
+    assert_equal [:markdown], find_supported_extensions(page_dir + 'about')
+    assert_equal [], find_supported_extensions(page_dir + 'plain.txt')
+    assert_equal [], find_supported_extensions(page_dir + 'i/dont/exist')
+  end
+end

data/tests/test_blog/content/chained.markdown.erb

@@ -0,0 +1 @@
+<%= 'Processed with ERB' %>, then Markdown.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticpress
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-12-28 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &18072460 !ruby/object:Gem::Requirement
+  requirement: &23480280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18072460
+  version_requirements: *23480280
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &18072040 !ruby/object:Gem::Requirement
+  requirement: &23479040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18072040
+  version_requirements: *23479040
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &18071440 !ruby/object:Gem::Requirement
+  requirement: &23477660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,10 +84,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18071440
+  version_requirements: *23477660
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &18070840 !ruby/object:Gem::Requirement
+  requirement: &23760940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,10 +95,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18070840
+  version_requirements: *23760940
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &18070260 !ruby/object:Gem::Requirement
+  requirement: &23760460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -106,10 +106,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18070260
+  version_requirements: *23760460
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &18069840 !ruby/object:Gem::Requirement
+  requirement: &23759140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,10 +117,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18069840
+  version_requirements: *23759140
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &18069400 !ruby/object:Gem::Requirement
+  requirement: &23757940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -128,10 +128,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18069400
+  version_requirements: *23757940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18068940 !ruby/object:Gem::Requirement
+  requirement: &23756500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -139,10 +139,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18068940
+  version_requirements: *23756500
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &18068240 !ruby/object:Gem::Requirement
+  requirement: &23755380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -150,10 +150,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18068240
+  version_requirements: *23755380
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &18067540 !ruby/object:Gem::Requirement
+  requirement: &22843360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -161,10 +161,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18067540
+  version_requirements: *22843360
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &18066880 !ruby/object:Gem::Requirement
+  requirement: &22841040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -172,7 +172,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18066880
+  version_requirements: *22841040
 description: ! 'Staticpress is a blog-focused static site generator. It uses Tilt
   for rendering nearly any template you can think of and come with a built-in Rack
   server for easy development previews.
@@ -195,8 +195,13 @@ files:
 - docs/README.markdown
 - docs/config.ru
 - docs/config.yml
+- docs/content/docs/content-types.markdown
+- docs/content/docs/deploying.markdown
 - docs/content/docs/diving-deeper.markdown
+- docs/content/docs/help.markdown
+- docs/content/docs/plugins.markdown
 - docs/content/docs/setup.markdown
+- docs/content/docs/theme.markdown
 - docs/content/index.markdown
 - features/happy_path.feature
 - features/step_definitions/staticpress_steps.rb
@@ -251,6 +256,7 @@ files:
 - tests/staticpress/content/index_test.rb
 - tests/staticpress/content/page_test.rb
 - tests/staticpress/content/post_test.rb
+- tests/staticpress/content/resource_content_test.rb
 - tests/staticpress/content/tag_test.rb
 - tests/staticpress/content/theme_test.rb
 - tests/staticpress/helpers_test.rb
@@ -277,6 +283,8 @@ files:
 - tests/test_blog/content/_posts/2011-08-06-in-charlotte.markdown
 - tests/test_blog/content/_posts/2011-08-20-forever.markdown
 - tests/test_blog/content/about.markdown
+- tests/test_blog/content/chain.html.markdown.erb
+- tests/test_blog/content/chained.markdown.erb
 - tests/test_blog/content/contact.markdown
 - tests/test_blog/content/foo/bar/baz.markdown
 - tests/test_blog/content/index.markdown
@@ -316,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: staticpress
-rubygems_version: 1.8.13
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Blog-centric static site builder