noumenon 0.0.3 → 0.1.0

metadata

@@ -2,7 +2,7 @@
 name: noumenon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jon Wood
@@ -10,18 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +01:00
+date: 2011-05-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: facets
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 2.9.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -36,30 +36,107 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-  type: :development
+        version: 1.2.3
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: aruba
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        version: 0.3.6
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0.beta1
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.2
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.0
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.6.8
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.14.6
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.1
+  type: :development
+  version_requirements: *id011
 description: |
-  Noumenon is a content management system designed to be backed by a file system, with
-  theme support.
+  Noumenon is a content management system designed to support being extended with Sinatra
+  applications.
   
   It's currently in an early stage of development, but right now you can create a basic
   static site using templates from a theme which specify the structure and presentation
@@ -69,14 +146,11 @@ description: |
   Future development will include an end-user friendly web interface for editing and
   creating content, while retaining the ability for developers and designers to manage
   the site's presentation using the tools they're most comfortable with.
-  
-  See http://github.com/Noumenon/example-app/ for a really bare bones example of how
-  Noumenon works.
 
 email: 
 - jon@blankpad.net
-executables: []
-
+executables: 
+- noumenon
 extensions: []
 
 extra_rdoc_files: []
@@ -84,44 +158,54 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .travis.yml
+- .yardopts
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
+- bin/noumenon
+- features/dynamic_template_rendering.feature
+- features/generator/site_generator.feature
+- features/mounted_applications.feature
+- features/static_template_rendering.feature
+- features/step_definitions/asset_steps.rb
+- features/step_definitions/content_steps.rb
+- features/step_definitions/generator_steps.rb
+- features/step_definitions/request_steps.rb
+- features/step_definitions/theme_steps.rb
+- features/support/env.rb
+- features/support/theme/theme.yml
+- features/theme_assets.feature
+- generators/repository/index.yml
+- generators/site/Gemfile
+- generators/site/config.ru
+- generators/theme/assets/style.css
+- generators/theme/layouts/default.nou.html
+- generators/theme/templates/default.nou.html
+- generators/theme/theme.yml
 - lib/noumenon.rb
-- lib/noumenon/configuration.rb
+- lib/noumenon/cli.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/fixtures.rb
+- lib/noumenon/spec/theme_helpers.rb
+- lib/noumenon/string_extensions.rb
 - lib/noumenon/template.rb
+- lib/noumenon/theme.rb
+- lib/noumenon/theme/assets_middleware.rb
 - lib/noumenon/version.rb
 - noumenon.gemspec
-- spec/fixtures/fixture_specs/test
-- spec/fixtures/missing_application/mounted_app/config.yml
-- spec/fixtures/static_example/directory_with_index/index.yml
-- spec/fixtures/static_example/found.html
-- spec/fixtures/static_example/liquid_example.html
-- spec/fixtures/static_example/mounted_app/config.yml
-- spec/fixtures/static_example/template_with_substitutions.html
-- spec/fixtures/static_example/templates/basic_example.yml
-- spec/fixtures/static_example/templates/with_fields.yml
-- spec/fixtures/themes/example/assets/example.txt
-- spec/fixtures/themes/example/templates/layout.html
-- spec/fixtures/themes/example_without_layout/templates/basic_template.html
-- spec/fixtures/themes/example_without_layout/templates/fields.html
-- spec/fixtures/themes/example_without_layout/templates/template_with_fields.html
-- spec/fixtures/themes/external_theme/assets/example.txt
-- spec/fixtures/themes/unregistered/lib/unregistered.rb
-- spec/noumenon/config_spec.rb
-- spec/noumenon/core_spec.rb
-- spec/noumenon/spec/example_app_spec.rb
-- spec/noumenon/spec/fixtures_spec.rb
-- spec/noumenon/spec_spec.rb
+- spec/noumenon/repository/file_system_spec.rb
+- spec/noumenon/repository_spec.rb
 - spec/noumenon/template_spec.rb
+- spec/noumenon/theme_spec.rb
 - spec/noumenon_spec.rb
 - spec/spec_helper.rb
-- watchr.rb
+- spec/support/file_matchers.rb
+- spec/support/templates/basic_template.html
+- spec/support/templates/template_with_fields.html
 has_rdoc: true
 homepage: https://github.com/Noumenon
 licenses: []
@@ -149,29 +233,26 @@ rubyforge_project: noumenon
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: An content management system backed by Git
+summary: A flexible content management system.
 test_files: 
-- spec/fixtures/fixture_specs/test
-- spec/fixtures/missing_application/mounted_app/config.yml
-- spec/fixtures/static_example/directory_with_index/index.yml
-- spec/fixtures/static_example/found.html
-- spec/fixtures/static_example/liquid_example.html
-- spec/fixtures/static_example/mounted_app/config.yml
-- spec/fixtures/static_example/template_with_substitutions.html
-- spec/fixtures/static_example/templates/basic_example.yml
-- spec/fixtures/static_example/templates/with_fields.yml
-- spec/fixtures/themes/example/assets/example.txt
-- spec/fixtures/themes/example/templates/layout.html
-- spec/fixtures/themes/example_without_layout/templates/basic_template.html
-- spec/fixtures/themes/example_without_layout/templates/fields.html
-- spec/fixtures/themes/example_without_layout/templates/template_with_fields.html
-- spec/fixtures/themes/external_theme/assets/example.txt
-- spec/fixtures/themes/unregistered/lib/unregistered.rb
-- spec/noumenon/config_spec.rb
-- spec/noumenon/core_spec.rb
-- spec/noumenon/spec/example_app_spec.rb
-- spec/noumenon/spec/fixtures_spec.rb
-- spec/noumenon/spec_spec.rb
+- features/dynamic_template_rendering.feature
+- features/generator/site_generator.feature
+- features/mounted_applications.feature
+- features/static_template_rendering.feature
+- features/step_definitions/asset_steps.rb
+- features/step_definitions/content_steps.rb
+- features/step_definitions/generator_steps.rb
+- features/step_definitions/request_steps.rb
+- features/step_definitions/theme_steps.rb
+- features/support/env.rb
+- features/support/theme/theme.yml
+- features/theme_assets.feature
+- spec/noumenon/repository/file_system_spec.rb
+- spec/noumenon/repository_spec.rb
 - spec/noumenon/template_spec.rb
+- spec/noumenon/theme_spec.rb
 - spec/noumenon_spec.rb
 - spec/spec_helper.rb
+- spec/support/file_matchers.rb
+- spec/support/templates/basic_template.html
+- spec/support/templates/template_with_fields.html

data/lib/noumenon/configuration.rb

@@ -1,28 +0,0 @@
-module Noumenon
-  # Handles configuration for a Noumenon application.
-  class Configuration
-    class ThemeNotFoundError < StandardError; end
-    
-    # The path to load content from.
-    attr_accessor :content_repository_path
-
-    # The theme to use.
-    attr_accessor :theme
-    
-    # Sets the current theme.
-    #
-    # If the theme could not be found under dependencies_path then a ThemeNotFoundError will be raised.
-    def theme=(value)
-      begin
-        require value.gsub("-", "/")
-      rescue LoadError => e
-      end
-      
-      unless Noumenon.themes.key?(value)
-        raise ThemeNotFoundError.new("The theme #{value} has not been registered.")
-      end
-      
-      @theme = value
-    end
-  end
-end

data/lib/noumenon/spec/fixtures.rb

@@ -1,34 +0,0 @@
-require 'pathname'
-
-module Noumenon
-  module Spec
-    # Provides a simple way of mocking a content repository for specs.
-    module Fixtures
-      # The current path that fixtures are looked up from.
-      def fixture_path(path = nil)
-        @fixture_path ||= 'spec/fixtures'
-        path.nil? ? @fixture_path : File.join(@fixture_path, path)
-      end
-
-      # Set the path that fixtures will be looked up from.
-      #
-      # Unless set to an absolute path the provided path will be assumed to be a sub-directory
-      # of "spec/fixtures".
-      def fixture_path=(value)
-        value = File.join("spec/fixtures", value) unless Pathname.new(value).absolute?
-        @fixture_path = value
-      end
-
-      # Loads a fixture from the specified path.
-      #
-      # Example:
-      #     
-      #     File.write(File.join(fixture_path, "index.html"), "<h1>Hello, world!</h1>")
-      #     fixture("index.html")
-      #     # => "<h1>Hello, world!</h1>"
-      def fixture(path)
-        File.read File.join(fixture_path, path)
-      end
-    end
-  end
-end

data/spec/fixtures/fixture_specs/test

@@ -1 +0,0 @@
-Hello, fixtures.

data/spec/fixtures/missing_application/mounted_app/config.yml

@@ -1 +0,0 @@
-application: "NonExistantApplication"

data/spec/fixtures/static_example/directory_with_index/index.yml

@@ -1 +0,0 @@
-template: "basic_template"

data/spec/fixtures/static_example/found.html

@@ -1 +0,0 @@
-<h1>Hello</h1>

data/spec/fixtures/static_example/liquid_example.html

@@ -1 +0,0 @@
-Hello liquid.

data/spec/fixtures/static_example/mounted_app/config.yml

@@ -1 +0,0 @@
-application: "Noumenon::Spec::ExampleApp"

data/spec/fixtures/static_example/template_with_substitutions.html

@@ -1 +0,0 @@
-Hello, {{ name }}

data/spec/fixtures/static_example/templates/basic_example.yml

@@ -1 +0,0 @@
-template: "basic_template"

data/spec/fixtures/static_example/templates/with_fields.yml

@@ -1,2 +0,0 @@
-template: "fields"
-example_field: "value"

data/spec/fixtures/themes/example/assets/example.txt

@@ -1 +0,0 @@
-Hello, world.

data/spec/fixtures/themes/example/templates/layout.html

@@ -1,3 +0,0 @@
-<div id="layout">
-{{ body }}
-</div>

data/spec/fixtures/themes/example_without_layout/templates/basic_template.html

@@ -1 +0,0 @@
-<h1>This is a Basic Template</h1>

data/spec/fixtures/themes/example_without_layout/templates/fields.html

@@ -1 +0,0 @@
-Field: {{ example_field }}

data/spec/fixtures/themes/external_theme/assets/example.txt

@@ -1 +0,0 @@
-This is example.txt in the external_theme theme.

data/spec/fixtures/themes/unregistered/lib/unregistered.rb

@@ -1 +0,0 @@
-Noumenon.register_theme "unregistered", File.expand_path("../..", __FILE__)

data/spec/noumenon/config_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-describe Noumenon::Configuration do
-  it { should_not be_nil }
-
-  it { should respond_to(:content_repository_path) }
-  it { should respond_to(:content_repository_path=) }
-  
-  it { should respond_to(:theme) }
-  it { should respond_to(:theme=) }
-  
-  describe "setting the theme" do
-    it "succeeds if the theme exists" do
-      subject.theme = "example"
-      subject.theme.should == "example"
-    end
-    
-    it "raises an exception if the theme has not been registered" do
-      lambda { subject.theme = "none_existant" }.should raise_error Noumenon::Configuration::ThemeNotFoundError
-    end
-
-    it "automatically requires a theme if it can be found" do
-      $: << fixture_path("themes/unregistered/lib")
-      
-      subject.theme = "unregistered"
-      subject.theme.should == "unregistered"
-    end
-  end
-end

data/spec/noumenon/core_spec.rb

@@ -1,105 +0,0 @@
-require 'spec_helper'
-
-describe Noumenon::Core do
-  def app
-    Noumenon::Core.new
-  end
-  
-  describe "accessing configuration" do
-    it { should respond_to(:config) }
-    it "returns the global configuration when calling config" do
-      app.config.should == Noumenon.config
-    end
-  end
-  
-  describe "retrieving paths" do
-    it { should respond_to(:content_path) }
-
-    it "locate a path in the content repository" do
-      app.content_path("example").should == "#{app.config.content_repository_path}/example"
-    end
-    
-    it { should respond_to(:theme_path) }
-
-    it "can locate a path in the theme directory" do
-      app.theme_path("file").should == fixture_path("themes/example/file")
-    end
-  end
-
-  describe "rendering a template" do
-    it { should respond_to(:render_template) }
-    
-    context "when the theme has no layout" do
-      before(:each) { app.config.theme = "example_without_layout" }
-
-      it "renders the requested template if it does exist" do
-        app.render_template( app.content_path("found.html") ).should == fixture("static_example/found.html")
-      end
-
-      it "uses Liquid to replace any tags in the template" do
-        app.render_template( app.content_path("template_with_substitutions.html"), 'name' => 'Jon' ).should == "Hello, Jon\n"
-      end
-    end
-
-    context "when the theme has a layout" do
-      before(:each) { app.config.theme = "example" }
-
-      it "renders the template within the theme's layout by default" do
-        app.render_template( app.content_path("found.html") ).should == %Q{<div id="layout">\n#{fixture("static_example/found.html")}\n</div>\n}
-      end
-
-      it "ignores the layout if the option :layout => false is passed" do
-        app.render_template( app.content_path("found.html"), {}, :layout => false ).should == fixture("static_example/found.html")
-      end
-    end
-  end
-
-  describe "serving content from the content repository" do
-    before(:each) { app.config.theme = "example_without_layout" }
-    
-    context "when the requested item does not exist" do
-      context "and an index file exists in a directory of the same name" do
-        it "renders the index file instead" do
-          get "/directory_with_index"
-
-          last_response.should be_ok
-          last_response.body.should == File.read(app.theme_path("templates/basic_template.html"))
-        end
-      end
-      
-      context "and no index file exists in a directory of the same name" do
-        it "responds with a status of 404" do
-          get "/empty_directory"
-
-          last_response.should_not be_ok
-          last_response.status.should == 404
-        end
-      end
-
-      context "and no directory of the same name exists" do
-        it "responds with a status of 404" do
-          get "/not_found"
-
-          last_response.should_not be_ok
-          last_response.status.should == 404
-        end
-      end
-    end
-
-    context "when the requested item exists" do
-      it "renders the specified template from the theme" do
-        get "/templates/basic_example"
-
-        last_response.should be_ok
-        last_response.body.should == File.read(app.theme_path("templates/basic_template.html"))
-      end
-      
-      it "makes substitutions as specified in the template" do
-        get "/templates/with_fields"
-
-        last_response.should be_ok
-        last_response.body.should =~ /Field: value/
-      end
-    end
-  end
-end

data/spec/noumenon/spec/example_app_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe Noumenon::Spec::ExampleApp do
-  it { should_not be_nil }
-
-  def app
-    Noumenon::Spec::ExampleApp.new
-  end
-
-  it "returns a simple message on a GET to /" do
-    get "/"
-    last_response.body.should == "This was served by Noumenon::Spec::ExampleApp"
-  end
-end

data/spec/noumenon/spec/fixtures_spec.rb

@@ -1,41 +0,0 @@
-require 'noumenon/spec/fixtures'
-
-class FixturedSpec
-  include Noumenon::Spec::Fixtures
-end
-
-describe "a class with Noumenon::Spec::Fixtures mixed in" do
-  subject { FixturedSpec.new }
-  
-  describe "the fixture path" do
-    it { should respond_to(:fixture_path) }
-    it { should respond_to(:fixture_path=) }
-  
-    it "defaults the fixture path to 'spec/fixtures'" do
-      subject.fixture_path.should == 'spec/fixtures'
-    end
-
-    it "appends the provided path to spec/fixtures if relative" do
-      subject.fixture_path = "test"
-      subject.fixture_path.should == "spec/fixtures/test"
-    end
-
-    it "sets the path provided if absolute" do
-      subject.fixture_path = "/tmp"
-      subject.fixture_path.should == "/tmp"
-    end
-
-    it "returns the full path to the fixture if fixture_path is passed an argument" do
-      subject.fixture_path = "/tmp"
-      subject.fixture_path("example").should == "/tmp/example"
-    end
-  end
-  
-  describe "loading a fixture" do
-    it { should respond_to(:fixture) }
-
-    it "returns the contents of the specified file" do
-      subject.fixture("fixture_specs/test").should eq "Hello, fixtures.\n"
-    end
-  end
-end

data/spec/noumenon/spec_spec.rb

@@ -1,7 +0,0 @@
-require 'noumenon/spec'
-
-describe Noumenon::Spec do
-  it { should_not be_nil }
-
-  it { should include Noumenon::Spec::Fixtures }
-end

data/watchr.rb

@@ -1,2 +0,0 @@
-watch( 'spec/.*\.rb' ) { |md| system("rake specs") }
-watch( 'lib/.*\.rb') { |md| system("rake specs") }