noumenon 0.1.7 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# 0.2.0
+
+## Backwards Compatiability Broken
+
+This version is incompatiable with the 0.1 series due to content and asset repositories being split.
+
+## New Features
+
+* Content and asset repositories are now two different things, largely to avoid special casing the assets
+  directory for file system repositories, but it should also allow more flexibility going forward.
+
+## Bug Fixes
+
+* Use send_file to serve assets from the content repository so that the correct metadata is provided
+  to allow it to be loaded in a browser.
+
+* Use the {% theme_asset %} tag in generated themes to load the stylesheet so that changing the theme name
+  doesn't break the link.
+
 # 0.1.7
 
 ## New Features

data/README.md

@@ -42,8 +42,6 @@ Assets such as images, stylesheets, and javascripts are placed in the "assets" d
 application at http://example.org/themes/Theme Name/asset.png. The URL structure directly matches the directory structure
 of your assets directory.
 
-In the future some asset types will be served from the content repository instead, such as images embedded within a page.
-
 #### Templates
 
 The core of a theme is the templates it provides. Each template can list the fields that it supports, and mark some or all
@@ -130,8 +128,13 @@ 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.
+### An Asset Repository
+
+The asset repository is used to store arbitrary files, such as images to embed within pages.
+
+Any uploaded assets can usually be accessed from /assets/path/to/image.jpg, although in some cases it may be quicker to access them
+directly. To get the correct URL for an asset use the `{% asset /path/to/image.jpg %}` template tag, which will return the correct
+URL.
 
 ### Applications
 

data/features/asset_serving/{from_content_repositories.feature → from_a_repository.feature}

@@ -1,6 +1,6 @@
-Feature: Serving assets from the content repository
+Feature: Serving assets from the asset repository
   As a user
-  I want to have assets in my content repository
+  I want to be able to upload assets to my site
   So that I can attach my own images to pages
 
   Scenario: The asset has been added
@@ -18,15 +18,3 @@ Feature: Serving assets from the content repository
     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/step_definitions/asset_steps.rb

@@ -8,11 +8,11 @@ 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"))
+  Noumenon.asset_repository = Noumenon::ContentRepository::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)
+  Noumenon.asset_repository.put(path, string)
 end
 
 Given /^there is no asset called "([^"]*)" in the asset repository$/ do |path|

data/features/step_definitions/generator_steps.rb

@@ -18,5 +18,7 @@ Then /^the directory "([^"]*)" should contain a theme$/ do |path|
 end
 
 Then /^the directory "([^"]*)" should contain a repository$/ do |path|
-  check_exact_file_content "#{path}/index.yml", generator_file("repository", "index.yml")
+  Then %Q{a directory named "#{path}/pages" should exist}
+  check_exact_file_content "#{path}/pages/index.yml", generator_file("repository/pages", "index.yml")
+   And %Q{a directory named "#{path}/assets" should exist}
 end

data/features/support/env.rb

@@ -19,13 +19,17 @@ World do
   include RSpec::Matchers
   
   def tmp_path
-    File.expand_path('../tmp', __FILE__)
+    File.expand_path('../../../tmp', __FILE__)
   end
 
   def content_path
     File.join(tmp_path, "content")
   end
-
+  
+  def asset_path
+    File.join(tmp_path, "assets")
+  end
+  
   true
 end
 
@@ -33,7 +37,8 @@ Before do
   Noumenon.theme = create_theme(name: "Example Theme")
   
   FileUtils.mkdir_p content_path
-  Noumenon.content_repository = Noumenon::Repository::FileSystem.new(path: content_path)
+  Noumenon.content_repository = Noumenon::ContentRepository::FileSystem.new(path: content_path)
+  Noumenon.asset_repository = Noumenon::AssetRepository::FileSystem.new(path: asset_path)
 end
 
 After do

data/generators/site/config.ru

@@ -1,7 +1,7 @@
-require 'bundler/setup'
 require 'noumenon'
 
 Noumenon.theme = Noumenon::Theme.load("./theme")
-Noumenon.content_repository = Noumenon::Repository::FileSystem.new(path: "./content")
+Noumenon.content_repository = Noumenon::ContentRepository::FileSystem.new(path: "./content/pages")
+Noumenon.content_repository = Noumenon::AssetRepository::FileSystem.new(path: "./content/assets")
 
 run Noumenon.server

data/generators/theme/layouts/default.nou.html

@@ -12,7 +12,7 @@ content:
 <html>
   <head>
     <title>{{ title }}</title>
-    <link rel="stylesheet" href="/themes/Your%20Theme/styles.css" />
+    <link rel="stylesheet" href="{% theme_asset style.css %}" />
   </head>
 
   <body>

data/lib/noumenon.rb

@@ -5,8 +5,9 @@ require 'rack/builder'
 
 # @api public
 module Noumenon
+  autoload :AssetRepository, 'noumenon/asset_repository'
   autoload :Core, 'noumenon/core'
-  autoload :Repository, 'noumenon/repository'
+  autoload :ContentRepository, 'noumenon/content_repository'
   autoload :Template, 'noumenon/template'
   autoload :Theme, 'noumenon/theme'
   autoload :Spec, 'noumenon/spec'

data/lib/noumenon/asset_repository.rb

@@ -0,0 +1,49 @@
+class Noumenon::AssetRepository
+  autoload :FileSystem, 'noumenon/asset_repository/file_system'
+  
+  # Provides access to options set on initialization.
+  # @api public
+  attr_reader :options
+  
+  # Create a new Repository instance.
+  #
+  # @param [ Hash, #each ] options A hash of options to use when configuring the repository.
+  # @api public
+  def initialize(options = {})
+    @options = options
+  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 put(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(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 url_for(path)
+    File.join("/assets", path)
+  end
+
+  protected
+  def not_supported(action)
+    raise NotImplementedError.new("This repository type does not support #{action}.")
+  end
+end

data/lib/noumenon/asset_repository/file_system.rb

@@ -0,0 +1,64 @@
+require 'noumenon/asset_repository'
+require 'fileutils'
+
+# A content repository which uses YAML files within the filesystem for storage.
+# 
+# @example The structure of a filesystem repository
+#   index.yml
+#   |- about
+#      |- index.yml
+#      |- team.yml
+#      |- company.yml
+#   contact.yml
+#
+# @example A piece of content
+#   template: team_member
+#   name: Jon Wood
+#   position: Head Honcho of Awesomeness
+#   bio: Jon's just awesome, we'll leave it at that.
+#
+# @api public
+class Noumenon::AssetRepository::FileSystem < Noumenon::AssetRepository
+  # @param [ Hash ] options A hash of options.
+  # @option options [ String ] :path The path to access the repository at.
+  # @api public
+  def initialize(options = {})
+    unless options.key? :path
+      raise ArgumentError.new("You must provide a path to the asset repository: Noumenon::AssetRepository::FileSystem.new(path: '/tmp')")
+    end
+
+    super options
+  end
+  
+  # Save a static asset to the repository.
+  #
+  # @see Noumenon::Repository#save_asset
+  # @api public
+  def put(path, content)
+    raise ArgumentError.new("Assets must have a file extension.") unless File.extname(path).size > 0
+
+    full_path = filesystem_path_for(path)
+    directory = File.dirname(full_path)
+    FileUtils.mkdir_p(directory) unless File.exist?(directory)
+    File.open(full_path, "w") { |f| f.write content }
+  end
+
+  # Retreive a static asset to the repository.
+  #
+  # @see Noumenon::Repository#get_asset
+  # @api public
+  def get(path)
+    return nil unless File.exist?(filesystem_path_for(path))
+    return nil unless File.extname(path).size > 0
+    File.read filesystem_path_for(path)
+  end
+  
+  def get_asset_path(path)
+    return nil unless File.extname(path).size > 0
+    filesystem_path_for path
+  end
+
+  def filesystem_path_for(path)
+    File.join options[:path], path
+  end
+end

data/lib/noumenon/{repository.rb → content_repository.rb}

@@ -4,8 +4,8 @@ require 'noumenon'
 # expected API for a repository.
 #
 # @api public
-class Noumenon::Repository
-  autoload :FileSystem, 'noumenon/repository/file_system'
+class Noumenon::ContentRepository
+  autoload :FileSystem, 'noumenon/content_repository/file_system'
   
   # Provides access to options set on initialization.
   # @api public

data/lib/noumenon/{repository → content_repository}/file_system.rb

@@ -1,4 +1,4 @@
-require 'noumenon/repository'
+require 'noumenon/content_repository'
 require 'yaml'
 require 'fileutils'
 
@@ -19,13 +19,13 @@ require 'fileutils'
 #   bio: Jon's just awesome, we'll leave it at that.
 #
 # @api public
-class Noumenon::Repository::FileSystem < Noumenon::Repository
+class Noumenon::ContentRepository::FileSystem < Noumenon::ContentRepository
   # @param [ Hash ] options A hash of options.
   # @option options [ String ] :path The path to access the repository at.
   # @api public
   def initialize(options = {})
     unless options.key? :path
-      raise ArgumentError.new("You must provide a path to the content repository: Noumenon::Repository::FileSystem.new(path: '/tmp')")
+      raise ArgumentError.new("You must provide a path to the content repository: Noumenon::ContentRepository::FileSystem.new(path: '/tmp')")
     end
 
     super options
@@ -75,7 +75,7 @@ class Noumenon::Repository::FileSystem < Noumenon::Repository
     items.reject { |i| i.gsub(root, "").split("/").size > depth + 1 }.collect do |item|
       path = item == "" ? "/" : item
       
-      # Loading everyitem probably isn't scalable, but it'll do for now. We can add caching
+      # Loading every item probably isn't scalable, but it'll do for now. We can add caching
       # at a later date if needed.
       page = get(path).merge({ path: path })
       page[:children] = children(page[:path], depth - 1) if depth - 1 > 0
@@ -100,6 +100,11 @@ class Noumenon::Repository::FileSystem < Noumenon::Repository
     return nil unless File.extname(path).size > 0
     read_file File.join("assets", path)
   end
+  
+  def get_asset_path(path)
+    return nil unless File.extname(path).size > 0
+    repository_path "assets/#{path}"
+  end
 
   private
   # Return the on-disk path to a repository item.

data/lib/noumenon/core.rb

@@ -1,5 +1,6 @@
 require 'noumenon'
 require 'sinatra'
+require 'rack/mime'
 
 # The core Noumenon web application, responsible for loading content from the repository,
 # and then either rendering it with the appropriate template, or passing it to the specified
@@ -41,11 +42,21 @@ class Noumenon::Core < Sinatra::Base
     Noumenon.content_repository
   end
   
+  # The default assets handler is incredibly naive, loading the entire asset into memory, and then
+  # sending it back out again. In the future asset repositories will be able to implement more sensible
+  # methods of sending content, such as redirecting to an S3 URL.
+  #
+  # TODO: Abstract /assets/ out to a middleware which can be implemented by repositories which
+  #       can't just provide a URL straight up (such as MongoDB).
   get "/assets/*" do |path|
-    asset = Noumenon.asset_repository.get_asset("/#{path}")
+    asset = Noumenon.asset_repository.get(path)
     halt 404, "Asset not found" unless asset
     
-    asset
+    status 200
+    headers \
+      "Content-Type" => Rack::Mime.mime_type(File.extname(path)),
+      "Length" => asset.bytesize.to_s
+    body asset
   end
 
   get "*" do |path|

data/lib/noumenon/spec/theme_helpers.rb

@@ -11,7 +11,7 @@ module Noumenon
       # @return [ String ]
       # @api public
       def theme_path
-        File.join(File.dirname(__FILE__), "..", "tmp", "example_theme")
+        File.expand_path("../../../../tmp/example_theme", __FILE__)
       end
       
       # Create a new theme directory at #theme_path.

data/lib/noumenon/template/core_tags.rb

@@ -120,7 +120,7 @@ module Noumenon::Template::CoreTags
     end
 
     def render(context)
-      Noumenon.asset_repository.asset_url(@asset)
+      Noumenon.asset_repository.url_for(@asset)
     end
   end
   Liquid::Template.register_tag('asset', ContentAssetTag)

data/lib/noumenon/version.rb

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

data/spec/noumenon/asset_repository/file_system_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Noumenon::AssetRepository::FileSystem do
+  let(:assets_path) { File.join(File.dirname(__FILE__), "..", "..", "..", "..", "tmp", "assets") }
+
+  around do |example|
+    FileUtils.mkdir_p assets_path
+    example.run
+    FileUtils.rm_r assets_path 
+  end
+  
+  subject do
+    Noumenon::AssetRepository::FileSystem.new path: assets_path
+  end
+
+  describe "initialization" do
+    context "when no path option is provided" do
+      it "should raise an ArgumentError" do
+        lambda { Noumenon::AssetRepository::FileSystem.new }.should raise_error ArgumentError
+      end
+
+      it "should provide details of the error of how to resolve the error" do
+        begin
+          Noumenon::AssetRepository::FileSystem.new
+        rescue ArgumentError => e
+          e.to_s.should == "You must provide a path to the asset repository: Noumenon::AssetRepository::FileSystem.new(path: '/tmp')"
+        end
+      end
+    end
+  end
+
+  it { should implement(:put, "/foo.txt", "foo") }
+  describe "saving assets" do
+    it "raises an ArgumentError when the path has no extension" do
+      lambda { subject.put("/foo", "Content") }.should raise_error(ArgumentError, "Assets must have a file extension.")
+    end
+    
+    it "saves the asset to the filesystem" do
+      lambda { subject.put("/foo.txt", "Content") }.should create_file(File.join(assets_path, "foo.txt")).with_content("Content")
+    end
+    
+    it "creates any neccesary parent directories" do
+      lambda { subject.put("/bar/foo.txt", "Content") }.should create_file(File.join(assets_path, "bar", "foo.txt"))
+    end
+  end
+
+  it { should implement(:get, "/foo.txt") }
+  describe "retrieving assets" do
+    it "returns nil if the path provided is not a file with an extension" do
+      subject.get("/foo").should be_nil
+      subject.get("/foo/").should be_nil
+    end
+    
+    it "returns nil if the asset did not exist" do
+      subject.get("/foo.txt").should be_nil
+    end
+
+    it "returns the file's contents if ithe asset does exist" do
+      subject.put("/foo.txt", "Content")
+      subject.get("/foo.txt").should == "Content"
+    end
+  end
+end

data/spec/noumenon/asset_repository_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Noumenon::AssetRepository do
+  it "saves any provided on initialization" do
+    repo = Noumenon::AssetRepository.new(option: "set")
+    repo.options[:option].should == "set"
+  end
+
+  it { should_not implement(:put, "/example.txt", "Content").with_message("This repository type does not support saving assets.") }
+  it { should_not implement(:get, "/example.txt").with_message("This repository type does not support loading assets.") }
+
+  it { should implement(:url_for, "/example.txt") }
+  it "returns the default URL below /assets/ when requested" do
+    subject.url_for("/example.txt").should == "/assets/example.txt"
+  end
+end

data/spec/noumenon/{repository → content_repository}/file_system_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Noumenon::Repository::FileSystem do
+describe Noumenon::ContentRepository::FileSystem do
   let(:content_path) { File.join(File.dirname(__FILE__), "..", "..", "..", "..", "tmp", "content") }
 
   around do |example|
@@ -10,20 +10,20 @@ describe Noumenon::Repository::FileSystem do
   end
   
   subject do
-    Noumenon::Repository::FileSystem.new path: content_path
+    Noumenon::ContentRepository::FileSystem.new path: content_path
   end
 
   describe "initialization" do
     context "when no path option is provided" do
       it "should raise an ArgumentError" do
-        lambda { Noumenon::Repository::FileSystem.new }.should raise_error ArgumentError
+        lambda { Noumenon::ContentRepository::FileSystem.new }.should raise_error ArgumentError
       end
 
       it "should provide details of the error of how to resolve the error" do
         begin
-          Noumenon::Repository::FileSystem.new
+          Noumenon::ContentRepository::FileSystem.new
         rescue ArgumentError => e
-          e.to_s.should == "You must provide a path to the content repository: Noumenon::Repository::FileSystem.new(path: '/tmp')"
+          e.to_s.should == "You must provide a path to the content repository: Noumenon::ContentRepository::FileSystem.new(path: '/tmp')"
         end
       end
     end
@@ -173,36 +173,4 @@ 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 → content_repository_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Noumenon::Repository do
+describe Noumenon::ContentRepository do
   describe "initialization" do
     it "allows access to any provided options in #options" do
-      repo = Noumenon::Repository.new(foo: "bar")
+      repo = Noumenon::ContentRepository.new(foo: "bar")
       repo.options[:foo].should == "bar"
     end
   end
@@ -11,11 +11,4 @@ describe Noumenon::Repository do
   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 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

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Noumenon do
   describe "accessing the content repository" do
     it "can be set" do
-      Noumenon.content_repository = Noumenon::Repository.new
+      Noumenon.content_repository = Noumenon::ContentRepository.new
     end
 
     it "can be retrieved" do
-      repo = Noumenon::Repository.new
+      repo = Noumenon::ContentRepository.new
       Noumenon.content_repository = repo
       Noumenon.content_repository.should == repo
     end
@@ -15,13 +15,13 @@ describe Noumenon do
   
   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.content_repository = Noumenon::ContentRepository.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
+      content = Noumenon::ContentRepository.new
+      assets = Noumenon::ContentRepository.new
 
       Noumenon.content_repository = content
       Noumenon.asset_repository = assets

metadata

@@ -2,7 +2,7 @@
 name: noumenon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jon Wood
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +01:00
+date: 2011-06-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -176,7 +176,7 @@ files:
 - README.md
 - Rakefile
 - bin/noumenon
-- features/asset_serving/from_content_repositories.feature
+- features/asset_serving/from_a_repository.feature
 - features/asset_serving/from_themes.feature
 - features/generator/site_generator.feature
 - features/mounted_applications.feature
@@ -197,7 +197,8 @@ files:
 - features/template_tags/content_from.feature
 - features/template_tags/nav_menu.feature
 - features/template_tags/textilize.feature
-- generators/repository/index.yml
+- generators/repository/assets/.gitkeep
+- generators/repository/pages/index.yml
 - generators/site/Gemfile
 - generators/site/config.ru
 - generators/theme/assets/style.css
@@ -205,10 +206,12 @@ files:
 - generators/theme/templates/default.nou.html
 - generators/theme/theme.yml
 - lib/noumenon.rb
+- lib/noumenon/asset_repository.rb
+- lib/noumenon/asset_repository/file_system.rb
 - lib/noumenon/cli.rb
+- lib/noumenon/content_repository.rb
+- lib/noumenon/content_repository/file_system.rb
 - lib/noumenon/core.rb
-- lib/noumenon/repository.rb
-- lib/noumenon/repository/file_system.rb
 - lib/noumenon/spec.rb
 - lib/noumenon/spec/example_app.rb
 - lib/noumenon/spec/example_tags.rb
@@ -220,8 +223,10 @@ files:
 - lib/noumenon/theme/assets_middleware.rb
 - lib/noumenon/version.rb
 - noumenon.gemspec
-- spec/noumenon/repository/file_system_spec.rb
-- spec/noumenon/repository_spec.rb
+- spec/noumenon/asset_repository/file_system_spec.rb
+- spec/noumenon/asset_repository_spec.rb
+- spec/noumenon/content_repository/file_system_spec.rb
+- spec/noumenon/content_repository_spec.rb
 - spec/noumenon/template_spec.rb
 - spec/noumenon/theme_spec.rb
 - spec/noumenon_spec.rb
@@ -259,7 +264,7 @@ signing_key:
 specification_version: 3
 summary: A flexible content management system.
 test_files: 
-- features/asset_serving/from_content_repositories.feature
+- features/asset_serving/from_a_repository.feature
 - features/asset_serving/from_themes.feature
 - features/generator/site_generator.feature
 - features/mounted_applications.feature
@@ -280,8 +285,10 @@ test_files:
 - features/template_tags/content_from.feature
 - features/template_tags/nav_menu.feature
 - features/template_tags/textilize.feature
-- spec/noumenon/repository/file_system_spec.rb
-- spec/noumenon/repository_spec.rb
+- spec/noumenon/asset_repository/file_system_spec.rb
+- spec/noumenon/asset_repository_spec.rb
+- spec/noumenon/content_repository/file_system_spec.rb
+- spec/noumenon/content_repository_spec.rb
 - spec/noumenon/template_spec.rb
 - spec/noumenon/theme_spec.rb
 - spec/noumenon_spec.rb