noumenon 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.1.4
+
+## New Features
+
+* Support for saving assets to the content repository, and selecting an alternative repository 
+  such as S3 for static assets.
+* Added the `asset` and `theme_asset` template tags to generate URLs.
+* Allow use of a `nav_title` attribute to put a different title in the navigation menu to the page itself.
+
+## Bug Fixes
+
+* Fix the template tags link from the documentation to the wiki.
+* Make sure future releases of gems can't break Noumenon by restricting future versions
+  in the gemspec.
+
 # 0.1.3
 
 ## New Features
@@ -6,8 +21,6 @@
 * Make RSpec output color when running Rake
 * Tidied up the Cucumber features
 
-## Bug Fixes
-
 # 0.1.2
 
 ## New Features

data/README.md

@@ -14,10 +14,18 @@ editors thats more likely to be a web interface.
 
 ## Getting Started
 
-If you want to skip the theory, and just play around with things in practice then your best bet is to run `noumenon site example_site`
-from a terminal, which will generate you a Gemfile, config.ru, content repository, and theme. If you want to run it
-any Rack based application server should work. I've tested under Thin and Unicorn, and Heroku will work if you want
-to publish a static site.
+If you want to skip the theory, and get on with the fun bit, follow these steps:
+
+```shell
+$ gem install noumenon thin bundler
+$ noumenon my_site
+$ cd my_site
+$ bundle install
+$ thin start
+```
+
+You're basic Noumenon site will be running at http://localhost:3000/ now. If you want to put it on the internet it should
+work straight out of the box on Heroku.
 
 ## How it Works
 
@@ -122,6 +130,9 @@ Currently the only available content repository uses YAML files to store your co
 and the API for content repositories is simple enough that just about any datastore could be used if you want to implement an
 adapater for it.
 
+Content repositories can also store static assets such as images for use within your pages. For the default file system repository
+just put them below the `assets` directory, which is made available at the URL `/assets/` by Noumenon.
+
 ### Applications
 
 If part of your site requires something other then rendering a piece of content within a static template then you can use a 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/gem_helper'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 require 'yard'
@@ -20,3 +21,7 @@ end
 YARD::Rake::YardocTask.new do |t|
   t.name = :doc
 end
+
+namespace :gem do
+  Bundler::GemHelper.install_tasks
+end

data/features/asset_serving/from_content_repositories.feature

@@ -0,0 +1,32 @@
+Feature: Serving assets from the content repository
+  As a user
+  I want to have assets in my content repository
+  So that I can attach my own images to pages
+
+  Scenario: The asset has been added
+    Given I have uploaded this asset as "example.txt" to the asset repository
+      """
+      Hello, world!
+      """
+    When I view "/assets/example.txt"
+    Then the page content should be:
+      """
+      Hello, world!
+      """
+
+  Scenario: The asset does not exist
+    Given there is no asset called "example.txt" in the asset repository
+    When I view "/assets/example.txt"
+    Then the page should return a 404 error
+
+  Scenario: Using an alternative asset repository
+    Given I have chosen to use a seperate asset repository
+    And I have uploaded this asset as "example.txt" to the asset repository
+      """
+      Alternative repos FTW
+      """
+    When I view "/assets/example.txt"
+    Then the page content should be:
+      """
+      Alternative repos FTW
+      """

data/features/{theme_assets.feature → asset_serving/from_themes.feature}

@@ -1,4 +1,4 @@
-Feature: Theme Assets
+Feature: Serving assets from a theme
   As a designer
   I want to serve files from my theme
   So that I can bundle any required images with it

data/features/step_definitions/asset_steps.rb

@@ -5,3 +5,16 @@ end
 Given /^the asset "([^"]*)" exists within the theme with this content:$/ do |asset_name, content|
   File.open(File.join(Noumenon.theme.path, "assets", asset_name), "w") { |f| f.print content }
 end
+
+Given /^I have chosen to use a seperate asset repository$/ do
+  FileUtils.mkdir_p File.join(tmp_path, "assets")
+  Noumenon.asset_repository = Noumenon::Repository::FileSystem.new(path: File.join(tmp_path, "assets"))
+end
+
+Given /^I have uploaded this asset as "([^"]*)" to the asset repository$/ do |path, string|
+  Noumenon.asset_repository.save_asset(path, string)
+end
+
+Given /^there is no asset called "([^"]*)" in the asset repository$/ do |path|
+  # noop
+end

data/features/support/env.rb

@@ -17,9 +17,13 @@ Capybara.app = Noumenon.server
 World do
   include RSpec::Expectations
   include RSpec::Matchers
+  
+  def tmp_path
+    File.expand_path('../tmp', __FILE__)
+  end
 
   def content_path
-    File.expand_path('../tmp/content', __FILE__)
+    File.join(tmp_path, "content")
   end
 
   true
@@ -33,6 +37,5 @@ Before do
 end
 
 After do
-  FileUtils.rm_r content_path
-  FileUtils.rm_r theme_path
+  FileUtils.rm_r tmp_path
 end

data/features/template_tags/asset_paths.feature

@@ -0,0 +1,30 @@
+Feature: Generating asset paths from templates
+  As a designer
+  I want to use a tag to reference asset paths in templates
+  So that they keep working once deployed
+
+  Scenario: Generating a path for a theme asset
+    Given this template exists at "theme_assets.nou.html"
+      """
+      <img src="{% theme_asset logo.png %}" />
+      """
+    And this content item exists at "/theme_assets"
+      | template | theme_assets |
+    When I view "/theme_assets"
+    Then the page content should be:
+      """
+      <img src="/themes/Example%20Theme/logo.png" />
+      """
+
+  Scenario: Generating a URL for a content asset
+    Given this template exists at "content_assets.nou.html"
+      """
+      <img src="{% asset attachment.png %}" />
+      """
+    And this content item exists at "/content_assets"
+      | template | content_assets |
+    When I view "/content_assets"
+    Then the page content should be:
+      """
+      <img src="/assets/attachment.png" />
+      """

data/features/template_tags/nav_menu.feature

@@ -23,6 +23,25 @@ Feature: Navigation menus
       | About   | /about      |
       | Contact | /contact    |
       | Team    | /team       |
+  
+  Scenario: Custom page titles
+    Given this template exists at "basic_menu.nou.html"
+      """
+      <nav>
+        {% nav_menu %}
+      </nav>
+      """
+    And this content item exists at "/about"
+      | title    | About      |
+      | template | basic_menu |
+    And this content item exists at "/contact"
+      | title     | Get In Touch With Us |
+      | nav_title | Contact              |
+    When I view "/about"
+    Then a menu with the following items should be visible:
+      | Label   | Link Target |
+      | About   | /about      |
+      | Contact | /contact    |
 
   Scenario: Multi-level menu
     Given this template exists at "deep_menu.nou.html"

data/lib/noumenon/core.rb

@@ -40,7 +40,14 @@ class Noumenon::Core < Sinatra::Base
   def content
     Noumenon.content_repository
   end
-   
+  
+  get "/assets/*" do |path|
+    asset = Noumenon.asset_repository.get_asset("/#{path}")
+    halt 404, "Asset not found" unless asset
+    
+    asset
+  end
+
   get "*" do |path|
     page = content.get(path)
     

data/lib/noumenon/repository/file_system.rb

@@ -38,10 +38,8 @@ class Noumenon::Repository::FileSystem < Noumenon::Repository
   # @return [ Hash, #each, nil ] The piece of content, or nil if it could not be found.
   # @api public
   def get(path, check_for_index = true)
-    file = repository_path("#{path}.yml")
-  
-    if File.exist?(file)
-      YAML.load(File.read(file)).symbolize_keys
+    if content = read_file("#{path}.yml")
+      YAML.load(content).symbolize_keys
     elsif check_for_index
       return get("#{path}/index", false)
     end
@@ -50,13 +48,18 @@ class Noumenon::Repository::FileSystem < Noumenon::Repository
   # Saves a piece of content to the repsitory.
   #
   # @see Noumenon::Repository#put
+  # @api public
   def put(path, content = {})
     create_tree(path)
-    
+     
     path = File.join(path, "index") if File.exist?(repository_path(path))
-    File.open(repository_path("#{path}.yml"), "w") { |f| f.print content.symbolize_keys.to_yaml }
+    write_file "#{path}.yml", content.symbolize_keys.to_yaml
   end
   
+  # Return any content items below the path specified.
+  #
+  # @see Noumenon::Repository#children
+  # @api public
   def children(root = "/", depth = 1)
     root.gsub! /\/$/, ''
     
@@ -79,6 +82,24 @@ class Noumenon::Repository::FileSystem < Noumenon::Repository
       page
     end
   end
+  
+  # Save a static asset to the repository.
+  #
+  # @see Noumenon::Repository#save_asset
+  # @api public
+  def save_asset(path, content)
+    raise ArgumentError.new("Assets must have a file extension.") unless File.extname(path).size > 0
+    write_file File.join("assets", path), content
+  end
+
+  # Retreive a static asset to the repository.
+  #
+  # @see Noumenon::Repository#get_asset
+  # @api public
+  def get_asset(path)
+    return nil unless File.extname(path).size > 0
+    read_file File.join("assets", path)
+  end
 
   private
   # Return the on-disk path to a repository item.
@@ -97,6 +118,22 @@ class Noumenon::Repository::FileSystem < Noumenon::Repository
     end
   end
   
+  def write_file(path, content)
+    path_on_disk = repository_path(path)
+    directory = File.dirname(path_on_disk)
+    FileUtils.mkdir_p(directory) unless File.exist?(directory)
+
+    File.open(path_on_disk, "w") { |f| f.print content }
+  end
+
+  def read_file(path)
+    begin
+      File.read(repository_path(path))
+    rescue Errno::ENOENT => e
+      nil
+    end
+  end
+
   # Moves conflicting YAML files into directory/index.yml
   #
   # For example given

data/lib/noumenon/repository.rb

@@ -25,7 +25,7 @@ class Noumenon::Repository
   # @param [ Hash, #each ] content A hash of key/value pairs to use as the content.
   # @api public
   def put(path, content)
-    raise NotImplementedError.new("This repository type does not support updating it's contents.")
+    not_supported "updating it's contents"
   end
   
   # Load an item from the repository. If the item does not exist then `nil` should be returned.
@@ -34,10 +34,64 @@ class Noumenon::Repository
   # @return [ Hash, #each, nil ] Either the hash stored at the specified path, or nil if no content was found.
   # @api public
   def get(path)
-    raise NotImplementedError.new("This repository type does not support reading it's contents.")
+    not_supported "reading it's contents"
+  end
+  
+  # Returns an array of content items below the root specified. If depth is greater then 1 that
+  # many sub-directories will also be checked, with any items in those being placed in a `:children` attribute
+  # on the parent.
+  #
+  # @param [ #to_s ] root The path to start searching from.
+  # @param [ Integer ] depth The number of sub-directories to check.
+  # @return [ Array, #each ] An array of child items.
+  # @api public
+  #
+  # @example
+  #   Noumenon.content_repository.children("/", 2)
+  #   # => [ 
+  #   #      { 
+  #   #        path: "/about", title: "About, children: [
+  #   #          { path: "/about/team", title: "The Team" },
+  #   #          { path: "/about/area", title: "The Area" }
+  #   #        ]
+  #   #      }
+  #   #    ]
+  #
+  def children(root = "/", depth = 1)
+    not_supported "listing children from a path"
+  end
+  
+  # Saves a static asset to the repository. To be saved the asset must have a file extension, to prevent
+  # problems with an entire directory being overridden by a single asset.
+  #
+  # @param [ String ] path The path to save the asset at.
+  # @param [ String ] content The contents of the asset.
+  # @raises [ ArgumentError ] The path did not have a file extension.
+  def save_asset(path, content)
+    not_supported "saving assets"
+  end
+  
+  # Retrieves a static asset from the repository. If the asset does not exist nil is returned.
+  #
+  # @param [ String ] path The path to load from.
+  # @return [ String, nil ] The asset's content, or nil if it does not exist.
+  def get_asset(path)
+    not_supported "loading assets"
+  end
+  
+  # Returns a URL for the specified asset, without checking for it's existence.
+  #
+  # This is most useful for repositories that save their assets to a CDN such as S3, and allows them to be
+  # directly accessed from there, instead of downloaded and then retransmitted.
+  #
+  # @param [ String ] path The asset path within the repository.
+  # @return [ String ] The URL to use when requesting the asset.
+  def asset_url(path)
+    File.join("/assets", path)
   end
 
-  def children(root = "/")
-    raise NotImplementedError.new("This repository type does not support listing children from a path.")
+  protected
+  def not_supported(action)
+    raise NotImplementedError.new("This repository type does not support #{action}.")
   end
 end

data/lib/noumenon/template/core_tags.rb

@@ -1,8 +1,9 @@
 require 'noumenon/template'
+require 'uri'
 
 # Liquid extensions provided by Noumenon.
 #
-# @see http://github.com/Noumenon/noumenon/wiki/Template%20Tags
+# @see http://github.com/Noumenon/noumenon/wiki/Template-Tags
 module Noumenon::Template::CoreTags
   # The core set of filters provided by Noumenon for use in templates.
   #
@@ -74,7 +75,7 @@ module Noumenon::Template::CoreTags
     def render_list(items)
       list = items.collect do |item|
         str  = "<li>"
-        str << %Q{<a href="#{item[:path]}">#{item[:title]}</a>}
+        str << %Q{<a href="#{item[:path]}">#{item[:nav_title] || item[:title]}</a>}
         str << render_list(item[:children]) if item[:children]
         str << "</li>"
         
@@ -89,4 +90,26 @@ module Noumenon::Template::CoreTags
     end
   end
   Liquid::Template.register_tag('nav_menu', NavigationTag)
+
+  class ThemeAssetTag < Liquid::Tag
+    def initialize(tag_name, asset, tokens)
+      @asset = asset.strip
+    end
+
+    def render(context)
+      File.join("/themes", URI.escape(Noumenon.theme.name), @asset)
+    end
+  end
+  Liquid::Template.register_tag('theme_asset', ThemeAssetTag)
+
+  class ContentAssetTag < Liquid::Tag
+    def initialize(tag_name, asset, tokens)
+      @asset = asset.strip
+    end
+
+    def render(context)
+      Noumenon.asset_repository.asset_url(@asset)
+    end
+  end
+  Liquid::Template.register_tag('asset', ContentAssetTag)
 end

data/lib/noumenon/version.rb

@@ -1,5 +1,5 @@
 module Noumenon
   # The current version of Noumenon.
   # @api public
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/noumenon.rb

@@ -47,7 +47,23 @@ module Noumenon
   def self.content_repository=(repository)
     @content_repository = repository
   end
-  
+
+  # Returns the current asset repository. If one hasn't been set then the content repository will be returned.
+  #
+  # @api public
+  # @return [ Noumenon::Repository, #get_asset, #save_asset ]
+  def self.asset_repository
+    @asset_repository || content_repository
+  end
+
+  # Sets the current asset repository. If you want to return to using the default content repository set to nil.
+  #
+  # @api public
+  # @param [ Noumenon::Repository, #get_asset, #save_asset ] repository The repository to use for assets.
+  def self.asset_repository=(repository)
+    @asset_repository = repository
+  end
+
   # Returns the current theme
   #
   # @api public

data/noumenon.gemspec

@@ -31,16 +31,16 @@ EOF
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "facets", ">= 2.9.1"
-  s.add_dependency "liquid", ">= 2.2"
-  s.add_dependency "sinatra", ">= 1.2.3"
+  s.add_dependency "facets", "~> 2.9"
+  s.add_dependency "liquid", "~> 2.2"
+  s.add_dependency "sinatra", "~> 1.2"
   
-  s.add_development_dependency "aruba",     ">= 0.3.6"
-  s.add_development_dependency "capybara",  ">= 1.0.0.beta1"
-  s.add_development_dependency "cucumber",  ">= 0.10.2"
-  s.add_development_dependency "rake",      ">= 0.9.0"
-  s.add_development_dependency "rdiscount", ">= 1.6.8"
-  s.add_development_dependency "rspec",     ">= 2.5.0"
-  s.add_development_dependency "thor",      ">= 0.14.6"
-  s.add_development_dependency "yard",      ">= 0.7.1"
+  s.add_development_dependency "aruba",     "~> 0.3"
+  s.add_development_dependency "capybara",  "~> 1.0.0.beta1"
+  s.add_development_dependency "cucumber",  "~> 0.10"
+  s.add_development_dependency "rake",      "~> 0.9"
+  s.add_development_dependency "rdiscount", "~> 1.6"
+  s.add_development_dependency "rspec",     "~> 2.5"
+  s.add_development_dependency "thor",      "~> 0.14"
+  s.add_development_dependency "yard",      "~> 0.7"
 end

data/spec/noumenon/repository/file_system_spec.rb

@@ -29,7 +29,7 @@ describe Noumenon::Repository::FileSystem do
     end
   end
   
-  it { should respond_to(:put) }
+  it { should implement(:put, "/", foo: "bar") }
 
   describe "putting content in the repository" do
     context "when writing to a top level file" do
@@ -80,7 +80,8 @@ describe Noumenon::Repository::FileSystem do
       end
     end
   end
-
+  
+  it { should implement(:get, "/") }
   describe "retrieving content from the repository" do
     context "when the item does not exist" do
       it "returns nil" do
@@ -113,6 +114,8 @@ describe Noumenon::Repository::FileSystem do
     end
   end
 
+  it { should implement(:children) }
+
   describe "listing child items" do
     before do
       subject.put("/", title: "Home")
@@ -170,4 +173,36 @@ describe Noumenon::Repository::FileSystem do
       end
     end
   end
+
+  it { should implement(:save_asset, "/foo.txt", "foo") }
+  describe "saving assets" do
+    it "raises an ArgumentError when the path has no extension" do
+      lambda { subject.save_asset("/foo", "Content") }.should raise_error(ArgumentError, "Assets must have a file extension.")
+    end
+    
+    it "saves the asset to the filesystem" do
+      lambda { subject.save_asset("/foo.txt", "Content") }.should create_file(File.join(content_path, "assets", "foo.txt")).with_content("Content")
+    end
+    
+    it "creates any neccesary parent directories" do
+      lambda { subject.save_asset("/bar/foo.txt", "Content") }.should create_file(File.join(content_path, "assets", "bar", "foo.txt"))
+    end
+  end
+
+  it { should implement(:get_asset, "/foo.txt") }
+  describe "retrieving assets" do
+    it "returns nil if the path provided is not a file with an extension" do
+      subject.get_asset("/foo").should be_nil
+      subject.get_asset("/foo/").should be_nil
+    end
+    
+    it "returns nil if the asset did not exist" do
+      subject.get_asset("/foo.txt").should be_nil
+    end
+
+    it "returns the file's contents if ithe asset does exist" do
+      subject.save_asset("/foo.txt", "Content")
+      subject.get_asset("/foo.txt").should == "Content"
+    end
+  end
 end

data/spec/noumenon/repository_spec.rb

@@ -7,49 +7,15 @@ describe Noumenon::Repository do
       repo.options[:foo].should == "bar"
     end
   end
+  
+  it { should_not implement(:put, "/", foo: "bar").with_message("This repository type does not support updating it's contents.") }
+  it { should_not implement(:get, "/").with_message("This repository type does not support reading it's contents.") }
+  it { should_not implement(:children).with_message("This repository type does not support listing children from a path.") }
+  it { should_not implement(:save_asset, "/example.txt", "Content").with_message("This repository type does not support saving assets.") }
+  it { should_not implement(:get_asset, "/example.txt").with_message("This repository type does not support loading assets.") }
 
-  it { should respond_to(:put) }
-  describe "calling #put" do
-    it "raises a NotImplementedError" do
-      lambda { subject.put("foo/bar", "Content") }.should raise_error NotImplementedError
-    end
-
-    it "provides some details in the error message" do
-      begin
-        subject.put("foo/bar", "Content")
-      rescue NotImplementedError => e
-        e.to_s.should == "This repository type does not support updating it's contents."
-      end
-    end
-  end
-
-  it { should respond_to(:get) }
-  describe "calling #get" do
-    it "raises a NotImplementedError" do
-      lambda { subject.get("foo/bar") }.should raise_error NotImplementedError
-    end
-
-    it "provides some details in the error message" do
-      begin
-        subject.get("foo/bar")
-      rescue NotImplementedError => e
-        e.to_s.should == "This repository type does not support reading it's contents."
-      end
-    end
-  end
-
-  it { should respond_to(:children) }
-  describe "calling #children" do
-    it "raises a NotImplementedError" do
-      lambda { subject.children("/") }.should raise_error NotImplementedError
-    end
-
-    it "provides some details in the error message" do
-      begin
-        subject.children("/")
-      rescue NotImplementedError => e
-        e.to_s.should == "This repository type does not support listing children from a path."
-      end
-    end
+  it { should implement(:asset_url, "/example.txt") }
+  it "returns the default URL below /assets/ when requested" do
+    subject.asset_url("/example.txt").should == "/assets/example.txt"
   end
 end

data/spec/noumenon_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Noumenon do
-  describe "managing the content repository" do
+  describe "accessing the content repository" do
     it "can be set" do
       Noumenon.content_repository = Noumenon::Repository.new
     end
@@ -12,6 +12,22 @@ describe Noumenon do
       Noumenon.content_repository.should == repo
     end
   end
+  
+  describe "accessing the asset repository" do
+    it "returns the content repository if it has not been set" do
+      Noumenon.content_repository = Noumenon::Repository.new
+      Noumenon.asset_repository.should === Noumenon.content_repository
+    end
+
+    it "returns the set asset repository if one has been set" do
+      content = Noumenon::Repository.new
+      assets = Noumenon::Repository.new
+
+      Noumenon.content_repository = content
+      Noumenon.asset_repository = assets
+      Noumenon.asset_repository.should === assets
+    end
+  end
 
   describe "setting the theme" do
     context "when assigning with a Theme object" do

data/spec/support/file_matchers.rb

@@ -1,18 +1,40 @@
-RSpec::Matchers.define :create_file do |path|
-  match do |block|
+class CreateFileExpectation
+  def initialize(path)
+    @path = path
+  end
+  
+  def with_content(content)
+    @content = content
+    self
+  end
+
+  def matches?(block)
     block.call
-    File.exist?(path)
+    
+    exists = File.exist?(@path)
+    if @content
+      exists && (File.read(@path) == @content)
+    else
+      exists
+    end
   end
   
-  failure_message do
-    "expected a file to be created at #{File.expand_path(path)}"
+  def failure_message
+    msg = "expected a file to be created at #{File.expand_path(@path)}"
+    msg << " with content #{@content}" if @content
+    
+    msg
   end
 
-  description do
-    "create a file at #{File.expand_path(path)}"
+  def description
+    "create a file at #{File.expand_path(@path)}"
   end
 end
 
+def create_file(block)
+  CreateFileExpectation.new(block)
+end
+
 RSpec::Matchers.define :create_directory do |path|
   match do |block|
     block.call

data/spec/support/implementation_matcher.rb

@@ -0,0 +1,55 @@
+class ImplementedExpectation
+  def initialize(method, *args)
+    @method = method
+    @args = args
+    @message = "NotImplementedError"
+  end
+  
+  def with_message(message)
+    @message = message
+    self
+  end
+
+  def matches?(obj)
+    implemented = true
+    
+    begin
+      obj.send(@method, *@args)
+    rescue NotImplementedError => e
+      implemented = false
+      actual_message = e.to_s
+    end
+    
+    unless negative_expectation?
+      implemented
+    else
+      implemented || actual_message != @message
+    end
+  end
+
+  def failure_message_for_should
+    "expected to implement #{@method}"
+  end
+
+  def failure_message_for_should_not
+    message = "expected not to implement #{@method}"
+    if @message
+      message << " with the message '#{@message}'"
+    end
+
+    message
+  end
+
+  def description
+    "implement #{@method}"
+  end
+
+  private
+  def negative_expectation?
+    caller.first(3).find { |s| s =~ /should_not/ }
+  end
+end
+
+def implement(method, *args)
+  ImplementedExpectation.new(method, *args)
+end

metadata

@@ -2,7 +2,7 @@
 name: noumenon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jon Wood
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 +01:00
+date: 2011-05-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.9.1
+        version: "2.9"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: "2.2"
   type: :runtime
@@ -41,9 +41,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: "1.2"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,9 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.6
+        version: "0.3"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.0.beta1
   type: :development
@@ -74,9 +74,9 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
+        version: "0.10"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -85,9 +85,9 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: "0.9"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -96,9 +96,9 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.8
+        version: "1.6"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -107,9 +107,9 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: "2.5"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -118,9 +118,9 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.14.6
+        version: "0.14"
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -129,9 +129,9 @@ dependencies:
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: "0.7"
   type: :development
   version_requirements: *id011
 description: |
@@ -165,6 +165,8 @@ files:
 - README.md
 - Rakefile
 - bin/noumenon
+- features/asset_serving/from_content_repositories.feature
+- features/asset_serving/from_themes.feature
 - features/generator/site_generator.feature
 - features/mounted_applications.feature
 - features/step_definitions/asset_steps.rb
@@ -179,10 +181,10 @@ files:
 - features/template_extensions.feature
 - features/template_rendering/dynamic.feature
 - features/template_rendering/static.feature
+- features/template_tags/asset_paths.feature
 - features/template_tags/assign_to.feature
 - features/template_tags/content_from.feature
 - features/template_tags/nav_menu.feature
-- features/theme_assets.feature
 - generators/repository/index.yml
 - generators/site/Gemfile
 - generators/site/config.ru
@@ -213,6 +215,7 @@ files:
 - spec/noumenon_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_matchers.rb
+- spec/support/implementation_matcher.rb
 - spec/support/templates/basic_template.html
 - spec/support/templates/template_with_fields.html
 has_rdoc: true
@@ -244,6 +247,8 @@ signing_key:
 specification_version: 3
 summary: A flexible content management system.
 test_files: 
+- features/asset_serving/from_content_repositories.feature
+- features/asset_serving/from_themes.feature
 - features/generator/site_generator.feature
 - features/mounted_applications.feature
 - features/step_definitions/asset_steps.rb
@@ -258,10 +263,10 @@ test_files:
 - features/template_extensions.feature
 - features/template_rendering/dynamic.feature
 - features/template_rendering/static.feature
+- features/template_tags/asset_paths.feature
 - features/template_tags/assign_to.feature
 - features/template_tags/content_from.feature
 - features/template_tags/nav_menu.feature
-- features/theme_assets.feature
 - spec/noumenon/repository/file_system_spec.rb
 - spec/noumenon/repository_spec.rb
 - spec/noumenon/template_spec.rb
@@ -269,5 +274,6 @@ test_files:
 - spec/noumenon_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_matchers.rb
+- spec/support/implementation_matcher.rb
 - spec/support/templates/basic_template.html
 - spec/support/templates/template_with_fields.html