noumenon 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.2.3
+
+## New Features
+
+* Applications are now mounted by using the `Noumenon.mount` method, so that users won't be able to
+  break mounted apps by deleting or changing their content items.
+* The application API is slightly more stable now.
+* Templates allow global variables to be registered using `Noumenon::Template.register_global "foo", "bar"`.
+* All templates now have a `theme` object available to them which gives access to metadata.
+
+## Bug Fixes
+
+* Assets from the asset repository will now be served correctly. I'm not sure how that ever worked 
+  previously.
+
 # 0.2.2
 
 ## New Features

data/features/applications/mounting_an_application.feature

@@ -0,0 +1,42 @@
+Feature: Mounting an Application
+  As a site developer
+  I want to mount an application on a specific URL
+  So that my users can have extra stuff
+
+  Scenario: ExampleApp mounted at /example
+    Given I have mounted "Noumenon::Spec::ExampleApp" at "/example"
+    When I view "/example"
+    Then the page should load
+    And the headline should be "This is a mounted application"
+  
+  Scenario: Providing options
+    Given I have mounted "Noumenon::Spec::ExampleApp" at "/example" with these options:
+      | message | Hello, world! |
+    When I view "/example"
+    Then the page should load
+    And the headline should be "Hello, world!"
+  
+  Scenario: Handling URLs below the mount point
+    Given I have mounted "Noumenon::Spec::ExampleApp" at "/example"
+    When I view "/example/sub"
+    Then the page should load
+    And the headline should be "This is a sub-page"
+    
+  Scenario: Rendering a content item below a mounted application
+    Given I have mounted "Noumenon::Spec::ExampleApp" at "/example"
+    And this content item exists at "/example/templated"
+      | template | default  |
+      | title    | Template |
+    And this template exists at "default.nou.html"
+      """
+      <h1>{{ title }}</h1>
+      """
+    When I view "/example/templated"
+    Then the page should load
+    And the headline should be "Template"
+  
+  Scenario: Mounting an application at the root
+    Given I have mounted "Noumenon::Spec::ExampleApp" at "/"
+    When I view "/"
+    Then the page should load
+    And the headline should be "This is a mounted application"

data/features/asset_serving/from_a_repository.feature

@@ -2,7 +2,7 @@ Feature: Serving assets from the asset repository
   As a user
   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
     Given I have uploaded this asset as "example.txt" to the asset repository
       """

data/features/generator/application_generator.feature

@@ -0,0 +1,13 @@
+Feature: Generating an application
+  As an application developer
+  I want to create a skeleton application
+  So that I can provide custom functionality for my client
+  
+  @wip
+  Scenario: Running the generator
+    When I run `bundle exec ../../bin/noumenon application contact_form_plus`
+    Then a directory named "contact_form_plus" should exist
+    And the directory "contact_form_plus" should contain a skeleton application
+    And the application in "contact_form_plus" should be named "ContactFormPlus"
+    And the gem in "contact_form_plus" should be named "noumenon-contact_form_plus"
+    And the application in "contact_form_plus" should be configured for Cucumber

data/features/support/env.rb

@@ -6,6 +6,7 @@ require File.join(File.dirname(__FILE__), '..', '..', 'lib/noumenon.rb')
 
 require 'aruba/cucumber'
 require 'capybara/cucumber'
+require 'noumenon/cucumber'
 require 'rspec'
 
 require 'fileutils'

data/features/template_rendering/static.feature

@@ -13,6 +13,7 @@ Feature: Rendering a static template
       | template | static |
     When I view "/static"
     Then the page should load
+    And the "Content-Type" header should be "text/html;charset=utf-8"
     And the headline should be "Static Template"
     And the body text should be "This is a static template which does not have any fields."
   
@@ -22,6 +23,7 @@ Feature: Rendering a static template
       | template | static |
     When I view "/static"
     Then the page should return a 500 error
+    And the "Content-Type" header should be "text/html;charset=utf-8"
     And the headline should be "Missing Template"
     And the body text should be "The template 'static' does not exist within the current theme."
   
@@ -34,10 +36,18 @@ Feature: Rendering a static template
       | key | value |
     When I view "/default"
     Then the page should load
+    And the "Content-Type" header should be "text/html;charset=utf-8"
     And the headline should be "Default Template"
   
   Scenario: Content item does not exist
     Given no content item exists at "/static"
     When I view "/static"
     Then the page should return a 404 error
+    And the "Content-Type" header should be "text/html;charset=utf-8"
+    And the headline should be "Page Not Found"
+  
+  Scenario: No content repository was configured
+    Given no content repository has been configured
+    When I view "/static"
+    Then the page should return a 404 error
     And the headline should be "Page Not Found"

data/features/template_tags/template_attribute.feature

@@ -0,0 +1,3 @@
+Feature: The theme_attribute tag
+  As a designer
+  I want to include attributes from my theme in template

data/features/template_tags/textilize.feature

@@ -3,7 +3,6 @@ Feature: Using Textile to format text
   I want to allow my users to use Textile
   So that they can't mess up the design too badly
   
-  @wip
   Scenario: A textile block
     Given this template exists at "textile.nou.html"
       """

data/features/template_tags/theme_attribute.feature

@@ -0,0 +1,28 @@
+Feature: The theme object
+  As a designer
+  I want to include attributes from my theme in template
+  So that it still contains copyright details when distributed
+  
+  Background:
+    Given I am using this theme
+      | name      | Theme Test     |
+      | copyright | Jon Wood, 2011 |
+      | author    | Jon Wood       |
+    And this content item exists at "/theme_attribute"
+      | template | theme_example |
+
+  Scenario: A defined theme attribute
+    Given this template exists at "theme_example.nou.html"
+      """
+      <h1>{{ theme.name }}</h1>
+      """
+    When I view "/theme_attribute"
+    Then the headline should be "Theme Test"
+
+  Scenario: An undefined theme attribute
+    Given this template exists at "theme_example.nou.html"
+      """
+      <h1>{{ theme.bob }}</h1>
+      """
+    When I view "/theme_attribute"
+    Then the headline should be ""

data/generators/application/Rakefile

@@ -0,0 +1,16 @@
+require 'cucumber/rake/task'
+require 'bundler/gem_helper'
+
+task :default => :cucumber
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w(--format progress)
+end
+
+Cucumber::Rake::Task.new("cucumber:wip") do |t|
+  t.cucumber_opts = %w(--tags @wip:4 --wip)
+end
+
+namespace :gem do
+  Bundler::GemHelper.install_tasks
+end

data/generators/application/application.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "noumenon/<%= @name %>/version"
+
+Gem::Specification.new do |s|
+  s.name        = "noumenon-<%= @name %>"
+  s.version     = Noumenon::<%= @name.split("_").collect(&:capitalize).join("") %>::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = [ "Jon Wood" ]
+  s.email       = [ "jon@blankpad.net" ]
+  s.homepage    = "https://github.com/Noumenon/<%= @name %>"
+  s.summary     = %q{A <%= @name.gsub("_", " ") %> application for Noumenon.}
+  s.description = <<EOF
+This is a description of your application. You should update it.
+EOF
+
+  s.rubyforge_project = "noumenon-<%= @name %>"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+  
+  s.add_dependency "noumenon"
+
+  s.add_development_dependency "cucumber", "~> 1.0.0"
+  s.add_development_dependency "capybara", "~> 1.0.0.rc1"
+  s.add_development_dependency "rspec",    "~> 2.5"
+end

data/generators/application/application.rb

@@ -0,0 +1,15 @@
+require 'noumenon'
+
+module Noumenon
+  module <%= @name.split("_").collect(&:capitalize).join("") %>
+    class Application < Noumenon::Core
+      def default_options
+        {}
+      end
+
+      get "/" do
+        "<h1>Welcome to <%= @name.gsub("_", " ").capitalize %></h1>"
+      end
+    end
+  end
+end

data/generators/application/features/example.feature

@@ -0,0 +1,9 @@
+Feature: Loading the root
+  As a developer
+  I want to know that my features work
+  So that I can carry on work
+
+  Scenario: Loading the home page
+    When I view "/"
+    Then the page should load
+    And the headline should be "Welcome to <%= @name.gsub("_", " ").capitalize %>"

data/generators/application/features/support/content/pages/index.yml

@@ -0,0 +1,3 @@
+template: "default"
+title: "Welcome to Noumenon"
+body: "You've just created a Noumenon site, well done!"

data/generators/application/features/support/env.rb

@@ -0,0 +1,19 @@
+require 'noumenon'
+require File.expand_path('../../../lib/noumenon/<%= @name %>', __FILE__)
+
+require 'rspec'
+require 'capybara/cucumber'
+require 'noumenon/cucumber'
+
+World do
+  include RSpec::Expectations
+  include RSpec::Matchers
+  
+  Noumenon.mount '/', Noumenon::<%= @name.split("_").collect(&:capitalize).join("") %>::Application
+  
+  Noumenon.theme = Noumenon::Theme.load(File.expand_path("../theme", __FILE__))
+  Noumenon.content_repository = Noumenon::ContentRepository::FileSystem.new(path: File.expand_path("../content/pages"))
+  Noumenon.asset_repository = Noumenon::AssetRepository::FileSystem.new(path: File.expand_path("../content/assets"))
+  
+  Capybara.app = Noumenon.server
+end

data/generators/application/features/support/theme/assets/style.css

@@ -0,0 +1 @@
+/* Your themes styles should go here. */

data/generators/application/features/support/theme/layouts/default.nou.html

@@ -0,0 +1,23 @@
+title:
+  type: string
+  description: The title to put in the browser's title bar.
+  required: false
+
+content:
+  type: string
+  description: The content from the page template.
+  required: true
+---
+<!doctype html>
+<html>
+  <head>
+    <title>{{ title }}</title>
+    <link rel="stylesheet" href="{% theme_asset style.css %}" />
+  </head>
+
+  <body>
+    <section id="content">
+      {{ content }}
+    </section>
+  </body>
+</html>

data/generators/application/features/support/theme/templates/default.nou.html

@@ -0,0 +1,12 @@
+title:
+  description: The title of the content block
+  required: true
+  type: string
+
+body:
+  description: The main content
+  required: true
+  type: text
+---
+<h1>{{ title }}</h1>
+<p>{{ body }}</p>

data/generators/application/features/support/theme/theme.yml

@@ -0,0 +1,5 @@
+name: "Generated Theme"
+author: "Your Name"
+email: "you@example.org"
+copyright: "2011, Your Name"
+license: "MIT"

data/generators/application/load.rb

@@ -0,0 +1,7 @@
+require 'noumenon/<%= @name %>/version'
+
+module Noumenon
+  module <%= @name.split("_").collect(&:capitalize).join("") %>
+    autoload :Application, 'noumenon/<%= @name %>/application'
+  end
+end

data/generators/application/version.rb

@@ -0,0 +1,5 @@
+module Noumenon
+  module <%= @name.split("_").collect(&:capitalize).join("") %>
+    VERSION = "0.0.1"
+  end
+end

data/lib/noumenon.rb

@@ -29,7 +29,10 @@ module Noumenon
   def self.server
     Rack::Builder.new do
       use Noumenon::Theme::AssetsMiddleware
-      run Noumenon::Core
+      
+      Noumenon.mounted_applications.each do |path, app|
+        map(path) { run app[:application].new(app[:options].merge(mount_point: path)) }
+      end
     end
   end
   
@@ -92,4 +95,17 @@ module Noumenon
     
     @theme
   end
+
+  def self.mounted_applications
+    @mounted_applications ||= {
+      "/" => { application: Noumenon::Core, options: {} }
+    }
+  end
+
+  def self.mount(path, application, options = {})
+    mounted_applications[path] = {
+      application: application,
+      options: options
+    }
+  end
 end

data/lib/noumenon/cli.rb

@@ -7,21 +7,67 @@ class Noumenon::Cli < Thor
 
   desc "site PATH", "Generate a new site at PATH"
   def site(path)
-    say_status :site, path
-    directory "site", path
+    generate :site, path
     invoke :theme, [ File.join(path, "theme") ]
     invoke :repository, [ File.join(path, "content") ]
   end
 
   desc "theme PATH", "Generate a new theme at PATH"
   def theme(path)
-    say_status :theme, path
-    directory "theme", path
+    generate :theme, path
   end
 
   desc "repository PATH", "Generate a new content repository at PATH"
   def repository(path)
-    say_status :repository, path
-    directory "repository", path
+    generate :repository, path
+  end
+
+  desc "application NAME", "Generate a new application at NAME"
+  def application(name)
+    @name = name
+    
+    say_status :application, name
+    
+    empty_directory name
+
+    inside name do
+      [ "lib", "lib/noumenon", "lib/noumenon", "lib/noumenon/#{name}", "templates", "assets", "features", "features/support", "features/step_definitions" ].each do |dir|
+        empty_directory dir
+      end
+
+      create_file("Gemfile") { "gemspec" }
+    end
+     
+    template "application/application.gemspec", "#{name}/noumenon-#{name}.gemspec"
+    template "application/application.rb", "#{name}/lib/noumenon/#{name}/application.rb"
+    template "application/version.rb", "#{name}/lib/noumenon/#{name}/version.rb"
+    template "application/load.rb", "#{name}/lib/noumenon/#{name}.rb"
+
+    invoke :application_features, name
+  end
+
+  desc "application_features NAME", "Generate Cucumber configuration for the application at NAME"
+  def application_features(name)
+    @name = name
+    
+    inside name do
+      [ "features", "features/support", "features/step_definitions" ].each do |dir|
+        empty_directory dir
+      end
+    end
+    
+    template "application/Rakefile", "#{name}/Rakefile"
+    template "application/features/example.feature", "#{name}/features/example.feature"
+    template "application/features/support/env.rb", "#{name}/features/support/env.rb"
+    
+    path = "#{name}/features/support"
+    invoke :theme, [ File.join(path, "theme") ]
+    invoke :repository, [ File.join(path, "content") ]
+  end
+
+  protected
+  def generate(thing, path)
+    say_status thing.to_sym, path
+    directory thing.to_s, path
   end
 end

data/lib/noumenon/core.rb

@@ -8,6 +8,17 @@ require 'rack/mime'
 #
 # @api public
 class Noumenon::Core < Sinatra::Base
+  def default_options
+    {}
+  end
+  
+  def initialize(options = {})
+    @options = default_options.merge(options.symbolize_keys)
+    @options[:mount_point] ||= "/"
+    
+    super nil
+  end
+  
   # Renders a content item within it's template and layout.
   #
   # If the template or layout is not specified then it will be set to "default".
@@ -46,44 +57,23 @@ class Noumenon::Core < Sinatra::Base
   # 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
+  # TODO: Abstract /assets/ out to an application 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(path)
+    asset = Noumenon.asset_repository.get_asset_path(path)
     halt 404, "Asset not found" unless asset
     
     send_file asset
   end
 
-  get "*" do |path|
-    page = content.get(path)
-    
-    unless page
-      # Search up the tree until we either hit the top, and 404, or find a mounted application.
-      path = path.split("/")
-      while path.size > 0
-        path.pop
-        page = content.get(path.join("/"))
-        break if page && page[:type] == "application"
-      end
-      
-      halt 404, "<h1>Page Not Found</h1>" unless page
-      path = path.join("/")
-    end
-    
-    case page[:type]
-    when "application"
-      app = page[:application].constantize
-      
-      # Rewrite PATH_INFO so that the child application can listen to URLs assuming it's at the root.
-      env["PATH_INFO"].gsub!("#{path}", "")
-      env["PATH_INFO"] = "/" if env["PATH_INFO"] == ""
-      app.new(page).call(env)
-    else
+  def route_missing
+    if content && page = content.get(File.join(@options[:mount_point], @request.path_info))
       render_page(page)
-    end
+    else
+      halt 404, "<h1>Page Not Found</h1>"
+    end 
   end
-  
+
   private
     def wrap_with_layout(content, page)
       begin

data/lib/noumenon/cucumber.rb

@@ -0,0 +1 @@
+Dir.glob(File.expand_path("../cucumber/**/*.rb", __FILE__)).each { |f| require f }

data/lib/noumenon/cucumber/application_steps.rb

@@ -0,0 +1,9 @@
+Given /^I have mounted "([^"]*)" at "([^"]*)" with these options:$/ do |application, path, options|
+  Noumenon.mount(path, application.constantize, options.rows_hash.symbolize_keys)
+  Capybara.app = Noumenon.server
+end
+
+Given /^I have mounted "([^"]*)" at "([^"]*)"$/ do |application, path|
+  Noumenon.mount(path, application.constantize)
+  Capybara.app = Noumenon.server
+end

data/{features/step_definitions → lib/noumenon/cucumber}/asset_steps.rb

@@ -6,11 +6,6 @@ Given /^the asset "([^"]*)" exists within the theme with this content:$/ do |ass
   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::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.put(path, string)
 end

data/{features/step_definitions → lib/noumenon/cucumber}/content_steps.rb

@@ -1,3 +1,8 @@
+Given /^no content repository has been configured$/ do
+  Noumenon.content_repository = nil
+  Capybara.app = Noumenon.server
+end
+
 Given /^this content item exists at "([^"]*)"$/ do |path, fields|
   Noumenon.content_repository.put(path, fields.rows_hash)
 end

data/lib/noumenon/cucumber/generator_steps.rb

@@ -0,0 +1,64 @@
+def generator_file(generator, file)
+  File.read File.expand_path("../../../../generators/#{generator}/#{file}", __FILE__)
+end
+
+Then /^the directory "([^"]*)" should contain a Noumenon site$/ do |path|
+  steps %Q{
+    Then a file named "#{path}/Gemfile" should exist
+    Then a file named "#{path}/config.ru" should exist
+  }
+  check_exact_file_content "#{path}/config.ru", generator_file("site", "config.ru")
+end
+
+Then /^the directory "([^"]*)" should contain a theme$/ do |path|
+  check_exact_file_content "#{path}/theme.yml", generator_file("theme", "theme.yml")
+  check_exact_file_content "#{path}/layouts/default.nou.html", generator_file("theme", "layouts/default.nou.html")
+  check_exact_file_content "#{path}/templates/default.nou.html", generator_file("theme", "templates/default.nou.html")
+  check_exact_file_content "#{path}/assets/style.css", generator_file("theme", "assets/style.css")
+end
+
+Then /^the directory "([^"]*)" should contain a repository$/ do |path|
+  steps %Q{
+    Then a directory named "#{path}/pages" should exist
+     And a directory named "#{path}/assets" should exist
+  }
+
+  check_exact_file_content "#{path}/pages/index.yml", generator_file("repository/pages", "index.yml")
+end
+
+Then /^the directory "([^"]*)" should contain a skeleton application$/ do |path|
+  steps %Q{
+    Then a file named "#{path}/Gemfile" should exist
+     And a file named "#{path}/noumenon-#{path}.gemspec" should exist
+     And a file named "#{path}/lib/noumenon/#{path}.rb" should exist
+     And a directory named "#{path}/lib/noumenon/#{path}/" should exist
+     And a file named "#{path}/lib/noumenon/#{path}/version.rb" should exist
+     And a file named "#{path}/lib/noumenon/#{path}/application.rb" should exist
+     And a directory named "#{path}/templates/" should exist
+     And a directory named "#{path}/assets/" should exist
+  }
+end
+
+Then /^the application in "([^"]*)" should be configured for Cucumber$/ do |path|
+  steps %Q{
+    Then a file named "#{path}/Rakefile" should exist
+     And a directory named "#{path}/features" should exist
+     And a directory named "#{path}/features/support" should exist
+     And a file named "#{path}/features/support/env.rb" should exist
+     And the directory "#{path}/features/support/content" should contain a repository
+     And the directory "#{path}/features/support/theme" should contain a theme
+     And a directory named "#{path}/features/step_definitions" should exist
+  }
+end
+
+Then /^the application in "([^"]*)" should be named "([^"]*)"$/ do |path, name|
+  in_current_dir do
+    File.read("#{path}/lib/noumenon/#{path}.rb").should =~ /module #{name}/
+  end
+end
+
+Then /^the gem in "([^"]*)" should be named "([^"]*)"$/ do |path, name|
+  in_current_dir do
+    File.read("#{path}/#{name}.gemspec").should =~ /s\.name\s+= "#{name}"/
+  end
+end

data/{features/step_definitions → lib/noumenon/cucumber}/request_steps.rb

@@ -10,6 +10,10 @@ Then /^the page should return a (\d+) error$/ do |status|
   page.status_code.should == status.to_i
 end
 
+Then /^the "([^"]*)" header should be "([^"]*)"$/ do |header, value|
+  page.response_headers[header].should == value
+end
+
 Then /^the page content should be:$/ do |content|
   page.source.should == content
 end

data/{features/step_definitions → lib/noumenon/cucumber}/theme_steps.rb

@@ -1,3 +1,9 @@
+Given /^I am using this theme$/ do |attributes|
+  create_theme attributes.rows_hash
+  Noumenon.theme = Noumenon::Theme.load(theme_path)
+  Capybara.app = Noumenon.server 
+end
+
 Given /^this template exists at "([^"]*)"$/ do |path, template|
   File.open(File.join(Noumenon.theme.path, "templates", path), "w") do |f|
     f.write(template)

data/lib/noumenon/spec/example_app.rb

@@ -1,22 +1,15 @@
 require 'noumenon'
 
-class Noumenon::Spec::ExampleApp
-  def initialize(options = {})
-    @options = { message: "This is a mounted application" }.merge(options.symbolize_keys)
+class Noumenon::Spec::ExampleApp < Noumenon::Core
+  def default_options
+    { message: "This is a mounted application" }
   end
   
-  def call(env)
-    case env["PATH_INFO"]
-      when "/"
-        respond 200, "<h1>#{@options[:message]}</h1>"
-      when "/sub"
-        respond 200, "<h1>This is a sub-page</h1>"
-      else
-        respond 404, "Page Not Found"
-    end
+  get "/" do
+    "<h1>#{@options[:message]}</h1>"
   end
-
-  def respond(status, content)
-    [ status, { "Content-Type" => "text/html" }, StringIO.new(content) ]
+  
+  get "/sub" do
+    "<h1>This is a sub-page</h1>"
   end
 end

data/lib/noumenon/template.rb

@@ -86,12 +86,12 @@ class Noumenon::Template
     self.new(path, content, fields)
   end
   
-  def self.drops
-    @drops ||= {}
+  def self.globals
+    @globals ||= {}
   end
   
-  def self.register_drop(name, klass)
-    drops[name] = klass
+  def self.register_global(name, klass)
+    globals[name] = klass
   end
 
   # Creates a new Template instance.
@@ -132,7 +132,7 @@ class Noumenon::Template
 
     raise MissingContentError.new("The following fields were missing from your content: #{missing_fields.sort.join(", ")}") unless missing_fields.empty?
     
-    Liquid::Template.parse(content).render(fields_from_page.merge(self.class.drops))
+    Liquid::Template.parse(content).render(fields_from_page.merge(self.class.globals))
   end
 end
 

data/lib/noumenon/theme.rb

@@ -1,5 +1,6 @@
 require 'noumenon'
 require 'yaml'
+require 'liquid/drop'
 
 # Provides access to a theme and it's contents.
 #
@@ -64,7 +65,7 @@ class Noumenon::Theme
   # @api public
   attr_accessor :license
   
-  # Create a new them instance.
+  # Create a new theme instance.
   #
   # @param [ String, #to_s ] path The path the theme was loaded from.
   # @param [ Hash ] description Any metadata to attach to theme.
@@ -103,4 +104,17 @@ class Noumenon::Theme
   def layout(name)
     Noumenon::Template.from_file File.join(path, "layouts", name)
   end
+
+  class Drop < ::Liquid::Drop
+    def before_method(method)
+      @theme ||= Noumenon.theme
+      @theme.to_liquid[method.to_sym]
+    end
+  end
+
+  def to_liquid
+    { name: name, author: author, email: email, copyright: copyright, license: license }
+  end
+  
+  Noumenon::Template.register_global 'theme', Drop.new
 end

data/lib/noumenon/version.rb

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

data/noumenon.gemspec

@@ -39,7 +39,7 @@ EOF
   
   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 "cucumber",  "~> 1.0"
   s.add_development_dependency "rake",      "~> 0.9"
   s.add_development_dependency "rdiscount", "~> 1.6"
   s.add_development_dependency "rspec",     "~> 2.5"

data/spec/noumenon/template_spec.rb

@@ -71,7 +71,7 @@ describe Noumenon::Template do
       end
     end
   end
-
+  
   describe "rendering a template" do
     let(:template) { Noumenon::Template.from_file template_path("template_with_fields.html") }
     
@@ -94,7 +94,6 @@ describe Noumenon::Template do
     context "when all required fields were provided" do
       it "renders the template, replacing any fields" do
         content = template.render("title" => "Example Page", "body" => "This is an example, isn't it lovely.", "author" => "Jon Wood")
-
         content.should =~ %r{<h1>Example Page</h1>}
         content.should =~ %r{<div id="content">This is an example, isn't it lovely.</div>}
         content.should =~ %r{<p class="byline">Written by Jon Wood.</p>}
@@ -117,4 +116,22 @@ describe Noumenon::Template do
       end
     end
   end
+
+  describe "registering global variables" do
+    subject { Noumenon::Template }
+
+    it { should respond_to :globals }
+    it { should respond_to :register_global }
+    
+    it "adds the global to the list" do
+      Noumenon::Template.register_global "foo", "bar"
+      Noumenon::Template.globals["foo"].should == "bar"
+    end
+
+    it "includes the variable when rendering a template" do
+      Noumenon::Template.register_global "foo", "bar"
+      
+      Noumenon::Template.new("#{__FILE__}: #{__LINE__}", "{{ foo }}").render.should == "bar"
+    end
+  end
 end

data/spec/noumenon/theme_spec.rb

@@ -125,5 +125,20 @@ describe Noumenon::Theme do
         end
       end
     end
+
+    describe "making themes available to a Liquid template" do
+      before(:each) { Noumenon.theme = theme }
+      subject { theme.to_liquid }
+
+      it { should be_instance_of Hash }
+
+      %w(name author email copyright license).each do |attribute|
+        specify { subject[attribute.to_sym].should == theme.send(attribute) }
+      end
+
+      it "registers the current theme as a global variable for templates" do
+        Noumenon::Template.globals["theme"].should be_instance_of Noumenon::Theme::Drop
+      end
+    end
   end
 end

data/spec/noumenon_spec.rb

@@ -66,4 +66,41 @@ describe Noumenon do
       end
     end
   end
+
+  describe "mounting an application", capybara: true do
+    before do
+      Noumenon.mount "/app", Noumenon::Spec::ExampleApp
+      reload_server!
+    end
+
+    it "adds the application to the list of mounted apps" do
+      Noumenon.mounted_applications["/app"].should == {
+        application: Noumenon::Spec::ExampleApp, 
+        options: {}
+      }
+    end
+
+    it "responds to requests on the path with the mounted application" do
+      visit '/app'
+      
+      page.status_code.should == 200
+      page.should have_css "h1", text: "This is a mounted application"
+    end
+
+    it "passes any options through to the application" do
+      Noumenon.mount "/app", Noumenon::Spec::ExampleApp, message: "Hello, world!"
+      reload_server!
+      
+      visit '/app'
+      
+      page.status_code.should == 200
+      page.should have_css "h1", text: "Hello, world!"
+    end
+
+    it "allows sub-URLs to be handled by the application also" do
+      visit '/app/sub'
+
+      page.should have_css "h1", text: "This is a sub-page"
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,22 @@
+ENV["RACK_ENV"] ||= "test"
+
 # Load anything in spec/support
 Dir.glob(File.join(File.expand_path("..", __FILE__), "support", "**", "*.rb")).each { |f| require f }
 
 require 'noumenon'
+require 'capybara/dsl'
 
 RSpec.configure do |spec|
   include Noumenon::Spec::ThemeHelpers
+ 
+  # Capybara stuff only gets enabled when requested, otherwise Liquid breaks in obscure ways.
+  def reload_server!
+    Capybara.app = Noumenon.server
+  end
   
-  spec.before(:each) do
-    # Configure Noumenon
+  spec.include Capybara::DSL, capybara: true
+
+  spec.before(:each, capybara: true) do
+    reload_server!
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: noumenon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jon Wood
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 +01:00
+date: 2011-06-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.10"
+        version: "1.0"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -176,17 +176,11 @@ files:
 - README.md
 - Rakefile
 - bin/noumenon
+- features/applications/mounting_an_application.feature
 - features/asset_serving/from_a_repository.feature
 - features/asset_serving/from_themes.feature
+- features/generator/application_generator.feature
 - features/generator/site_generator.feature
-- features/mounted_applications.feature
-- features/step_definitions/asset_steps.rb
-- features/step_definitions/content_steps.rb
-- features/step_definitions/generator_steps.rb
-- features/step_definitions/liquid_steps.rb
-- features/step_definitions/navigation_steps.rb
-- features/step_definitions/request_steps.rb
-- features/step_definitions/theme_steps.rb
 - features/support/env.rb
 - features/support/theme/theme.yml
 - features/template_extensions.feature
@@ -196,7 +190,22 @@ files:
 - features/template_tags/assign_to.feature
 - features/template_tags/content_from.feature
 - features/template_tags/nav_menu.feature
+- features/template_tags/template_attribute.feature
 - features/template_tags/textilize.feature
+- features/template_tags/theme_attribute.feature
+- generators/application/Rakefile
+- generators/application/application.gemspec
+- generators/application/application.rb
+- generators/application/features/example.feature
+- generators/application/features/support/content/assets/.gitkeep
+- generators/application/features/support/content/pages/index.yml
+- generators/application/features/support/env.rb
+- generators/application/features/support/theme/assets/style.css
+- generators/application/features/support/theme/layouts/default.nou.html
+- generators/application/features/support/theme/templates/default.nou.html
+- generators/application/features/support/theme/theme.yml
+- generators/application/load.rb
+- generators/application/version.rb
 - generators/repository/assets/.gitkeep
 - generators/repository/pages/index.yml
 - generators/site/Gemfile
@@ -212,6 +221,15 @@ files:
 - lib/noumenon/content_repository.rb
 - lib/noumenon/content_repository/file_system.rb
 - lib/noumenon/core.rb
+- lib/noumenon/cucumber.rb
+- lib/noumenon/cucumber/application_steps.rb
+- lib/noumenon/cucumber/asset_steps.rb
+- lib/noumenon/cucumber/content_steps.rb
+- lib/noumenon/cucumber/generator_steps.rb
+- lib/noumenon/cucumber/liquid_steps.rb
+- lib/noumenon/cucumber/navigation_steps.rb
+- lib/noumenon/cucumber/request_steps.rb
+- lib/noumenon/cucumber/theme_steps.rb
 - lib/noumenon/spec.rb
 - lib/noumenon/spec/example_app.rb
 - lib/noumenon/spec/example_tags.rb
@@ -264,17 +282,11 @@ signing_key:
 specification_version: 3
 summary: A flexible content management system.
 test_files: 
+- features/applications/mounting_an_application.feature
 - features/asset_serving/from_a_repository.feature
 - features/asset_serving/from_themes.feature
+- features/generator/application_generator.feature
 - features/generator/site_generator.feature
-- features/mounted_applications.feature
-- features/step_definitions/asset_steps.rb
-- features/step_definitions/content_steps.rb
-- features/step_definitions/generator_steps.rb
-- features/step_definitions/liquid_steps.rb
-- features/step_definitions/navigation_steps.rb
-- features/step_definitions/request_steps.rb
-- features/step_definitions/theme_steps.rb
 - features/support/env.rb
 - features/support/theme/theme.yml
 - features/template_extensions.feature
@@ -284,7 +296,9 @@ test_files:
 - features/template_tags/assign_to.feature
 - features/template_tags/content_from.feature
 - features/template_tags/nav_menu.feature
+- features/template_tags/template_attribute.feature
 - features/template_tags/textilize.feature
+- features/template_tags/theme_attribute.feature
 - spec/noumenon/asset_repository/file_system_spec.rb
 - spec/noumenon/asset_repository_spec.rb
 - spec/noumenon/content_repository/file_system_spec.rb

data/features/mounted_applications.feature

@@ -1,30 +0,0 @@
-Feature: Mounted Applications
-  As a developer
-  I want to mount an application at /app
-  So that I can provide extra functionality
-  In order to deliver the site my client wants
-
-  Scenario: An application has been mounted
-    Given this content item exists at "/app"
-      | type        | application                |
-      | application | Noumenon::Spec::ExampleApp |
-    When I view "/app"
-    Then the page should load
-    And the headline should be "This is a mounted application"
-  
-  Scenario: Loading paths below the mounted application
-    Given this content item exists at "/app"
-      | type        | application                |
-      | application | Noumenon::Spec::ExampleApp |
-    When I view "/app/sub"
-    Then the page should load
-    And the headline should be "This is a sub-page"
-
-  Scenario: Passing configuration to an application
-    Given this content item exists at "/app"
-      | type        | application                |
-      | application | Noumenon::Spec::ExampleApp |
-      | message     | Hello, world!              |
-    When I view "/app"
-    Then the page should load
-    And the headline should be "Hello, world!"

data/features/step_definitions/generator_steps.rb

@@ -1,24 +0,0 @@
-def generator_file(generator, file)
-  File.read File.expand_path("../../../generators/#{generator}/#{file}", __FILE__)
-end
-
-Then /^the directory "([^"]*)" should contain a Noumenon site$/ do |path|
-  Then %Q{a file named "#{path}/Gemfile" should exist}
-   And %Q{a file named "#{path}/config.ru" should exist}
-  
-  check_exact_file_content "#{path}/Gemfile", generator_file("site", "Gemfile")
-  check_exact_file_content "#{path}/config.ru", generator_file("site", "config.ru")
-end
-
-Then /^the directory "([^"]*)" should contain a theme$/ do |path|
-  check_exact_file_content "#{path}/theme.yml", generator_file("theme", "theme.yml")
-  check_exact_file_content "#{path}/layouts/default.nou.html", generator_file("theme", "layouts/default.nou.html")
-  check_exact_file_content "#{path}/templates/default.nou.html", generator_file("theme", "templates/default.nou.html")
-  check_exact_file_content "#{path}/assets/style.css", generator_file("theme", "assets/style.css")
-end
-
-Then /^the directory "([^"]*)" should contain a repository$/ do |path|
-  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