usmu 0.4.0-java → 1.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 736e52d9dd2dbf1b4887ebfcf2b18e87c0cd3fc5
-  data.tar.gz: 95c4b21ba16f9a240449c9e17a0aeb28985390cf
+  metadata.gz: 076f6e4f586e0257b024ec579888017278a53b37
+  data.tar.gz: e7ce74410b8b2f7a4f0445dc1fc9564340344504
 SHA512:
-  metadata.gz: ecf996f522a04839ff079909e0b92240ffe7519ab242995164247712cc667f50c97f6c416266743452f700971258c7621bc24513a64f8660094d726563ff8553
-  data.tar.gz: a71ee92f2fb6c51be007df21de215819430a7a2987ccad1388460d394273e8e7808a5c6f89f883df480fa2e55338c8805665734f0d2c9f8982d6405648e97201
+  metadata.gz: 9dccb1a78e6e9fd7b02d2be250becddf37894f59853a694e22235556ebd7391809941689e175fac09cf3a48e1847ac92b6308b240a17747e6fd773b7132f8f0e
+  data.tar.gz: 7ab64019c566d4411ad8f4beac28384e5580841dde0c9a2900908aff82f2d4579ec6a6435bad155331f352121846bf289f5edccc5084e61a1687e553ee84169a

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Usmu Change Log
 
+## 1.0.0
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Minor refactor of /spec (d353c8a1f8914dc9fb554770479092cfc1e526bc)
+* Small update to the init site (d86e9a205a3a2f1cc76dec7e66f0540edc9e13c1)
+* [#29] Generalise Configuration#[] into Helpers::Indexer and add to Layout (474b5d778f841595602a4ec7913a646ff5e90106)
+* [#27] Add permalinks (ce190c0d33e84bf38b26cc134fe96bb9a3bb3f22)
+* [#19] Basic functional collection support for paging (de2fa4194fe9db955e09a302a1b87816557e8f3e)
+* [#19] Add enumeration of collections (e6923cf10426e62bc5f35c3649303a1ae65466fd)
+
 ## 0.4.0
 
 Matthew Scharley <matt.scharley@gmail.com>

data/Guardfile

@@ -3,7 +3,7 @@
 
 guard :rspec, cmd: 'rspec', spec_paths: ['spec'] do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/usmu/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^spec/support})      { 'spec' }
   watch('spec/spec_helper.rb')  { 'spec' }
 

data/Rakefile

@@ -49,6 +49,7 @@ task :ci => [:clean, :spec]
 desc 'Clean up after tests'
 task :clean do
   [
+      'doc',
       'tmp',
       'test-site/site',
       current_gems,

data/lib/usmu.rb

@@ -86,6 +86,7 @@ end
 
 %W{
   usmu/version
+  usmu/collections
   usmu/configuration
   usmu/metadata_service
   usmu/site_generator
@@ -96,4 +97,5 @@ end
   usmu/template/layout
   usmu/template/page
   usmu/template/static_file
+  usmu/helpers/indexer
 }.each { |f| require f }

data/lib/usmu/collections.rb

@@ -0,0 +1,50 @@
+
+module Usmu
+  class Collections
+    # @param [Usmu::SiteGenerator] generator
+    def initialize(generator)
+      @generator = generator
+      refresh
+    end
+
+    def [](index)
+      unless @collections[index]
+        files = @generator.renderables.select {|r| r['collection'] == index }.sort_by &:date
+        @collections[index] = Collection.new(files)
+      end
+
+      @collections[index]
+    end
+
+    def refresh
+      @collections = {}
+    end
+
+    class Collection
+      # @param [Array<Usmu::Template::Page>] pages
+      def initialize(pages)
+        @pages = pages
+      end
+
+      def pages
+        @pages.dup
+      end
+
+      def each(&block)
+        pages.each &block
+      end
+
+      def previous_from(file)
+        i = @pages.index file
+        return unless i
+        @pages[(i - 1) % @pages.length]
+      end
+
+      def next_from(file)
+        i = @pages.index file
+        return unless i
+        @pages[(i + 1) % @pages.length]
+      end
+    end
+  end
+end

data/lib/usmu/configuration.rb

@@ -1,12 +1,17 @@
 require 'yaml'
 require 'usmu/metadata_service'
+require 'usmu/helpers/indexer'
 
 module Usmu
   # This class is used to represent a configuration file. This file should be a YAML file and called `usmu.yml`
   # by default.
   class Configuration
+    include Usmu::Helpers::Indexer
+
     @log = Logging.logger[self]
 
+    indexer :@config
+
     # @!attribute [r] config_file
     # @return [String] the name of the file used to load the configuration.
     attr_reader :config_file
@@ -84,41 +89,6 @@ module Usmu
       @includes_metadata ||= MetadataService.new(includes_path)
     end
 
-    # An index accessor to directly access the configuration file. It should be noted that `['source']` and
-    # `#source_path` and other similar pairs will have different values. `['source']` is the raw value from the
-    # configuration file while the latter is a path on the system, potentially altered by the path from the current
-    # working directory to the configuration file and other factors. The accessor functions such as `#source_path`
-    # should be preferred for most usages.
-    #
-    # @param [String, Symbol] indices
-    #   A list of indices to use to find the value to return. Can also include an options hash with the
-    #   following options:
-    #
-    #   * `:default`: Sets the default value if the value can't be found.
-    #
-    # @return [Array, Hash, String, Symbol]
-    #   Returns a value from the hash loaded from YAML. The type of value will ultimately depend on the configuration
-    #   file and the indices provided.
-    def [](*indices)
-      if indices.last.instance_of? Hash
-        opts = indices.pop
-      else
-        opts = {}
-      end
-
-      value = @config
-      while indices.length > 0
-        i = indices.shift
-        if value.key? i
-          value = value[i]
-        else
-          return opts[:default]
-        end
-      end
-
-      value
-    end
-
     # Returns an array of exclusions
     #
     # @return [Array]
@@ -126,6 +96,11 @@ module Usmu
       self['exclude'] || []
     end
 
+    # @return [Usmu::SiteGenerator]
+    def generator
+      @generator ||= SiteGenerator.new(self)
+    end
+
     private
 
     attr_reader :log

data/lib/usmu/helpers/indexer.rb

@@ -0,0 +1,54 @@
+
+module Usmu
+  module Helpers
+    module Indexer
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def indexer(variable)
+          # An index accessor to directly access the configuration file. It should be noted that `['source']` and
+          # `#source_path` and other similar pairs will have different values. `['source']` is the raw value from the
+          # configuration file while the latter is a path on the system, potentially altered by the path from the current
+          # working directory to the configuration file and other factors. The accessor functions such as `#source_path`
+          # should be preferred for most usages.
+          #
+          # @param [String, Symbol] indices
+          #   A list of indices to use to find the value to return. Can also include an options hash with the
+          #   following options:
+          #
+          #   * `:default`: Sets the default value if the value can't be found.
+          #
+          # @return [Array, Hash, String, Symbol]
+          #   Returns a value from the hash loaded from YAML. The type of value will ultimately depend on the configuration
+          #   file and the indices provided.
+          define_method(:[]) do |*indices|
+            if indices.last.instance_of? Hash
+              opts = indices.pop
+            else
+              opts = {}
+            end
+
+            value = variable.to_s[0] == '@' ? instance_variable_get(variable) : send(variable)
+            while indices.length > 0
+              i = indices.shift
+              if value.key? i
+                value = value[i]
+              else
+                return opts[:default]
+              end
+            end
+
+            value
+          end
+
+          define_method(:key?) do |index|
+            value = variable.to_s[0] == '@' ? instance_variable_get(variable) : send(variable)
+            value.key? index
+          end
+        end
+      end
+    end
+  end
+end

data/lib/usmu/plugin/core.rb

@@ -41,8 +41,7 @@ module Usmu
       # @param [Array<String>] args arguments passed by the user.
       # @param [Hash] options options parsed by Commander
       def command_generate(args, options)
-        @site_generator = Usmu::SiteGenerator.new(@ui.configuration)
-        @site_generator.generate
+        @ui.configuration.generator.generate
       end
 
       # Command to initialise a new website.

data/lib/usmu/site_generator.rb

@@ -63,6 +63,14 @@ module Usmu
       nil
     end
 
+    def collections
+      @collections ||= Collections.new(self)
+    end
+
+    def refresh
+      collections.refresh
+    end
+
     private
 
     # Helper function to generate a page

data/lib/usmu/template/helpers.rb

@@ -7,8 +7,9 @@ module Usmu
     class Helpers
       # Create a new Helpers instance. These are created on demand as needed by templates, there is not a singleton
       # instance.
-      def initialize(configuration)
+      def initialize(configuration, layout)
         @configuration = configuration
+        @layout = layout
       end
 
       # Finds and renders a named include.
@@ -26,6 +27,31 @@ module Usmu
         inc.arguments = args
         inc.render
       end
+
+      def url(path)
+        path = if path.is_a? String
+                 path
+               elsif path.respond_to? :output_filename
+                 path.output_filename
+               else
+                 path.to_s
+               end
+        @configuration['base path', default: '/'] + path
+      end
+
+      def previous_page
+        collection = @layout['page', 'collection', default: @layout['collection', default: '']]
+        @configuration.generator.collections[collection].previous_from(@layout)
+      end
+
+      def next_page
+        collection = @layout['page', 'collection', default: @layout['collection', default: '']]
+        @configuration.generator.collections[collection].next_from(@layout['page', default: @layout])
+      end
+
+      def collection(name)
+        @configuration.generator.collections[name]
+      end
     end
   end
 end

data/lib/usmu/template/layout.rb

@@ -2,6 +2,7 @@ require 'tilt'
 require 'deep_merge'
 require 'usmu/template/helpers'
 require 'usmu/template/static_file'
+require 'usmu/helpers/indexer'
 
 module Usmu
   module Template
@@ -60,13 +61,6 @@ module Usmu
         end
       end
 
-      # This is a shortcut to accessing metadata.
-      #
-      # @see #metadata
-      def [](index)
-        metadata[index]
-      end
-
       # Renders the file with any templating language required and returns the result
       #
       # @param variables [Hash] Variables to be used in the template.
@@ -204,7 +198,7 @@ module Usmu
       # @!attribute [r] helpers
       # @return [Usmu::Template::Helpers] the Helpers class to use as a scope for templates
       def helpers
-        @helpers ||= Usmu::Template::Helpers.new(@configuration)
+        @helpers ||= Usmu::Template::Helpers.new(@configuration, self)
       end
 
       # Adds defaults for the given generator engine

data/lib/usmu/template/page.rb

@@ -1,10 +1,16 @@
 require 'usmu/template/layout'
+require 'time'
 
 module Usmu
   module Template
     # Represents a page in the source directory of the website.
     class Page < Layout
 
+      private
+      alias :super_output_filename :output_filename
+
+      public
+
       # @param configuration [Usmu::Configuration] The configuration for the website we're generating.
       # @param name [String] The name of the file in the source directory.
       # @param metadata [Hash] The metadata for the file.
@@ -21,6 +27,27 @@ module Usmu
         end
       end
 
+      def output_filename
+        permalink || super_output_filename
+      end
+
+      def date
+        date = self['date']
+        if date.is_a? Time
+          return date
+        end
+
+        if date
+          date = Time.parse(date) rescue nil
+        end
+
+        unless date
+          date = File.stat(input_path).mtime
+        end
+
+        date
+      end
+
       protected
 
       # @!attribute [r] content_path
@@ -34,6 +61,19 @@ module Usmu
       def content_path
         @configuration.source_path
       end
+
+      def permalink
+        link = self['permalink']
+        return nil unless link
+
+        date = self.date
+
+        extension = output_extension
+        extension = '.' + extension if extension
+
+        link_tr = link.gsub('%f', File.basename(@name[0..(@name.rindex('.') - 1)]))
+        date.strftime(link_tr) + extension
+      end
     end
   end
 end

data/lib/usmu/template/static_file.rb

@@ -5,10 +5,14 @@ module Usmu
     # Represents a static file which should be transferred to the destination unchanged. This also acts as the base
     # class for all layouts and page types. The basic interface defined here is used to process all types of files.
     class StaticFile
+      include Usmu::Helpers::Indexer
+
       # @!attribute [r] name
       # @return [String] the name of the file in the source directory
       attr_reader :name
 
+      indexer :metadata
+
       # @param configuration [Usmu::Configuration] The configuration for the website we're generating.
       # @param name [String] The name of the file in the source directory.
       # @param metadata [Hash] The metadata for the file.
@@ -40,6 +44,10 @@ module Usmu
         File.join(@configuration.source_path, @name)
       end
 
+      def metadata
+        {}
+      end
+
       # @!attribute [r] output_filename
       # @return [String] the filename to use in the output directory.
       #
@@ -47,6 +55,16 @@ module Usmu
       def output_filename
         @name
       end
+
+      def inspect
+        "\#<#{self.class}:#{'0x%08x' % __id__} #{@name} => #{output_filename}>"
+      end
+
+      def ==(other)
+        return false unless self.class == other.class
+
+        self.input_path == other.input_path && self.output_filename == other.output_filename
+      end
     end
   end
 end

data/lib/usmu/ui/console.rb

@@ -5,10 +5,6 @@ module Usmu
   module Ui
     # This is the CLI UI controller. This is initialised by the usmu binary to control the generation process.
     class Console
-      # @!attribute [r] site_generator
-      # @return [Usmu::SiteGenerator]
-      attr_reader :site_generator
-
       # @!attribute [r] configuration
       # Do not access this till your command starts running, eg. in Hooks#commands, otherwise you may not get the right
       # value for the configuration as option parsing may not have happened yet.

data/lib/usmu/ui/rack_server.rb

@@ -4,8 +4,8 @@ module Usmu
     class RackServer
       def initialize(configuration)
         @log = Logging.logger[self]
-        @generator = SiteGenerator.new(configuration)
         @configuration = configuration
+        @generator = @configuration.generator
         @index = configuration['serve', 'index', default: 'index.html']
       end
 
@@ -19,6 +19,7 @@ module Usmu
         valid = @generator.renderables.select {|r| r.output_filename == path }
 
         if valid.length > 0
+          @generator.refresh
           page = valid[0]
           type = case page.output_filename[page.output_filename.rindex('.')...page.output_filename.length]
                    when '.html', '.php'

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '0.4.0'
+  VERSION = '1.0.0'
 end

data/share/init-site/source/index.meta.yml

@@ -0,0 +1,2 @@
+---
+layout: html

data/share/init-site/usmu.yml

@@ -3,4 +3,4 @@
 title: Example site
 
 exclude:
-- '**/_*.s[ca]ss
+- '**/_*.s[ca]ss'

data/spec/{site_generator_spec.rb → usmu/site_generator_spec.rb}

@@ -6,17 +6,17 @@ RSpec.describe Usmu::SiteGenerator do
 
   it 'should have layouts' do
     expect(generator.respond_to? :layouts).to eq(true)
-    expect(generator.layouts.map {|l| l.name}.sort).to eq(%w{embedded.slim html.slim})
+    expect(generator.layouts.map {|l| l.name}.sort).to eq(%w{embedded.slim html.slim post.slim})
   end
 
   it 'should have a list of renderable items' do
     expect(generator.respond_to? :renderables).to eq(true)
-    expect(generator.renderables.map {|r| r.name}.sort).to eq(%w{.dotfiletest.txt assets/external.scss css/app.scss default.md embedded.md index.md posts/test-post.md robots.txt})
+    expect(generator.renderables.map {|r| r.name}.sort).to eq(%w{.dotfiletest.txt archive.slim assets/external.scss css/app.scss default.md embedded.md index.md posts/second-post.md posts/test-post.md robots.txt})
   end
 
   it 'should have pages' do
     expect(generator.respond_to? :pages).to eq(true)
-    expect(generator.pages.map {|p| p.name}.sort).to eq(%w{css/app.scss default.md embedded.md index.md posts/test-post.md})
+    expect(generator.pages.map {|p| p.name}.sort).to eq(%w{archive.slim css/app.scss default.md embedded.md index.md posts/second-post.md posts/test-post.md})
   end
 
   it 'should have files' do

data/test-site/content/archive.slim

@@ -0,0 +1,13 @@
+p Chronological order:
+
+ul
+  - for page in collection('posts')
+    li
+      a href="#{url page}" #{page['title']}
+
+p Reverse order:
+
+ul
+  - for page in collection('posts').pages.reverse
+    li
+      a href="#{url page}" #{page['title']}

data/test-site/content/posts/meta.yml

@@ -0,0 +1,4 @@
+---
+permalink: '%Y/%m/%f'
+collection: posts
+layout: post

data/test-site/content/posts/second-post.md

@@ -0,0 +1,3 @@
+## This is my second post!
+
+Hello again world.

data/test-site/content/posts/second-post.meta.yml

@@ -0,0 +1,3 @@
+---
+date: 2015-01-24 12:00:00 +1000
+title: Second post

data/test-site/content/posts/test-post.md

@@ -1,3 +1,3 @@
-# Hello world!
+## Hello world!
 
-This is my first post.
+This is my first post.

data/test-site/content/posts/test-post.meta.yml

@@ -0,0 +1,3 @@
+---
+date: 2015-01-23 12:00:00 +1000
+title: Test post

data/test-site/expected-site/2015/01/second-post.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Second post | Testing website</title>
+  </head>
+  <body>
+    <div id="content">
+      <article>
+        <h1>
+          Second post
+        </h1>
+        <h2>This is my second post!</h2>
+        
+        <p>Hello again world.</p>
+        
+      </article>
+      <nav class="article-nav">
+        <div class="next">
+          <a href="/2015/01/test-post.html">Test post</a>
+        </div>
+      </nav>
+      
+    </div>
+    <footer>
+      Copyright &copy; Testers Inc.
+    </footer>
+    
+  </body>
+</html>

data/test-site/expected-site/2015/01/test-post.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Test post | Testing website</title>
+  </head>
+  <body>
+    <div id="content">
+      <article>
+        <h1>
+          Test post
+        </h1>
+        <h2>Hello world!</h2>
+        
+        <p>This is my first post.</p>
+        
+      </article>
+      <nav class="article-nav">
+        <div class="next">
+          <a href="/2015/01/second-post.html">Second post</a>
+        </div>
+      </nav>
+      
+    </div>
+    <footer>
+      Copyright &copy; Testers Inc.
+    </footer>
+    
+  </body>
+</html>

data/test-site/expected-site/archive.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Default Title | Testing website</title>
+  </head>
+  <body>
+    <div id="content">
+      <p>
+        Chronological order:
+      </p>
+      <ul>
+        <li>
+          <a href="/2015/01/test-post.html">Test post</a>
+        </li>
+        <li>
+          <a href="/2015/01/second-post.html">Second post</a>
+        </li>
+      </ul>
+      <p>
+        Reverse order:
+      </p>
+      <ul>
+        <li>
+          <a href="/2015/01/second-post.html">Second post</a>
+        </li>
+        <li>
+          <a href="/2015/01/test-post.html">Test post</a>
+        </li>
+      </ul>
+      
+    </div>
+    <footer>
+      Copyright &copy; Testers Inc.
+    </footer>
+    
+  </body>
+</html>

data/test-site/layouts/post.meta.yml

@@ -0,0 +1,2 @@
+---
+layout: html

data/test-site/layouts/post.slim

@@ -0,0 +1,10 @@
+article
+  h1 #{page['title']}
+  | #{{content}}
+nav.article-nav
+  - if previous_page
+    .previous
+      a href="#{url previous_page.output_filename}" #{previous_page['title']}
+  - if next_page
+    .next
+      a href="#{url next_page.output_filename}" #{next_page['title']}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: java
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -257,10 +257,12 @@ files:
 - Rakefile
 - bin/usmu
 - lib/usmu.rb
+- lib/usmu/collections.rb
 - lib/usmu/configuration.rb
 - lib/usmu/deployment.rb
 - lib/usmu/deployment/directory_diff.rb
 - lib/usmu/deployment/remote_file_interface.rb
+- lib/usmu/helpers/indexer.rb
 - lib/usmu/metadata_service.rb
 - lib/usmu/plugin.rb
 - lib/usmu/plugin/core.rb
@@ -279,24 +281,26 @@ files:
 - share/init-site/Gemfile
 - share/init-site/layouts/html.slim
 - share/init-site/source/index.md
+- share/init-site/source/index.meta.yml
 - share/init-site/usmu.yml
 - spec/acceptance/full_site_build.feature
 - spec/acceptance/steps/full_site_build_steps.rb
-- spec/configuration_spec.rb
-- spec/deployment/directory_diff_spec.rb
-- spec/metadata_service_spec.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
-- spec/plugin/core_spec.rb
-- spec/plugin_spec.rb
-- spec/site_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_layout.rb
-- spec/template/layout_spec.rb
-- spec/template/page_spec.rb
-- spec/template/static_file_spec.rb
-- spec/ui/console_spec.rb
+- spec/usmu/configuration_spec.rb
+- spec/usmu/deployment/directory_diff_spec.rb
+- spec/usmu/metadata_service_spec.rb
+- spec/usmu/plugin/core_spec.rb
+- spec/usmu/plugin_spec.rb
+- spec/usmu/site_generator_spec.rb
+- spec/usmu/template/layout_spec.rb
+- spec/usmu/template/page_spec.rb
+- spec/usmu/template/static_file_spec.rb
+- spec/usmu/ui/console_spec.rb
 - test-site/content/.dotfiletest.txt
+- test-site/content/archive.slim
 - test-site/content/assets/external.scss
 - test-site/content/assets/meta.yml
 - test-site/content/css/_partial.scss
@@ -306,21 +310,29 @@ files:
 - test-site/content/embedded.meta.yml
 - test-site/content/index.md
 - test-site/content/index.meta.yml
+- test-site/content/posts/meta.yml
+- test-site/content/posts/second-post.md
+- test-site/content/posts/second-post.meta.yml
 - test-site/content/posts/test-post.md
+- test-site/content/posts/test-post.meta.yml
 - test-site/content/robots.txt
 - test-site/expected-site/.dotfiletest.txt
+- test-site/expected-site/2015/01/second-post.html
+- test-site/expected-site/2015/01/test-post.html
+- test-site/expected-site/archive.html
 - test-site/expected-site/assets/external.scss
 - test-site/expected-site/css/app.css
 - test-site/expected-site/default.html
 - test-site/expected-site/embedded.html
 - test-site/expected-site/index.html
-- test-site/expected-site/posts/test-post.html
 - test-site/expected-site/robots.txt
 - test-site/includes/footer.meta.yml
 - test-site/includes/footer.slim
 - test-site/layouts/embedded.meta.yml
 - test-site/layouts/embedded.slim
 - test-site/layouts/html.slim
+- test-site/layouts/post.meta.yml
+- test-site/layouts/post.slim
 - test-site/usmu.yml
 - usmu.gemspec
 homepage: https://github.com/usmu/usmu
@@ -350,21 +362,22 @@ summary: A static site generator with a web-based frontend for editing.
 test_files:
 - spec/acceptance/full_site_build.feature
 - spec/acceptance/steps/full_site_build_steps.rb
-- spec/configuration_spec.rb
-- spec/deployment/directory_diff_spec.rb
-- spec/metadata_service_spec.rb
 - spec/mock/usmu/mock_plugin.rb
 - spec/mock/usmu/mock_remote_files.rb
-- spec/plugin/core_spec.rb
-- spec/plugin_spec.rb
-- spec/site_generator_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_layout.rb
-- spec/template/layout_spec.rb
-- spec/template/page_spec.rb
-- spec/template/static_file_spec.rb
-- spec/ui/console_spec.rb
+- spec/usmu/configuration_spec.rb
+- spec/usmu/deployment/directory_diff_spec.rb
+- spec/usmu/metadata_service_spec.rb
+- spec/usmu/plugin/core_spec.rb
+- spec/usmu/plugin_spec.rb
+- spec/usmu/site_generator_spec.rb
+- spec/usmu/template/layout_spec.rb
+- spec/usmu/template/page_spec.rb
+- spec/usmu/template/static_file_spec.rb
+- spec/usmu/ui/console_spec.rb
 - test-site/content/.dotfiletest.txt
+- test-site/content/archive.slim
 - test-site/content/assets/external.scss
 - test-site/content/assets/meta.yml
 - test-site/content/css/_partial.scss
@@ -374,20 +387,28 @@ test_files:
 - test-site/content/embedded.meta.yml
 - test-site/content/index.md
 - test-site/content/index.meta.yml
+- test-site/content/posts/meta.yml
+- test-site/content/posts/second-post.md
+- test-site/content/posts/second-post.meta.yml
 - test-site/content/posts/test-post.md
+- test-site/content/posts/test-post.meta.yml
 - test-site/content/robots.txt
 - test-site/expected-site/.dotfiletest.txt
+- test-site/expected-site/2015/01/second-post.html
+- test-site/expected-site/2015/01/test-post.html
+- test-site/expected-site/archive.html
 - test-site/expected-site/assets/external.scss
 - test-site/expected-site/css/app.css
 - test-site/expected-site/default.html
 - test-site/expected-site/embedded.html
 - test-site/expected-site/index.html
-- test-site/expected-site/posts/test-post.html
 - test-site/expected-site/robots.txt
 - test-site/includes/footer.meta.yml
 - test-site/includes/footer.slim
 - test-site/layouts/embedded.meta.yml
 - test-site/layouts/embedded.slim
 - test-site/layouts/html.slim
+- test-site/layouts/post.meta.yml
+- test-site/layouts/post.slim
 - test-site/usmu.yml
 has_rdoc: 

data/test-site/expected-site/posts/test-post.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Default Title | Testing website</title>
-  </head>
-  <body>
-    <div id="content">
-      <h1>Hello world!</h1>
-      
-      <p>This is my first post.</p>
-      
-    </div>
-    <footer>
-      Copyright &copy; Testers Inc.
-    </footer>
-    
-  </body>
-</html>