vanilla 1.16.2 → 1.17

data/Rakefile

@@ -36,10 +36,9 @@ if Object.const_defined?(:Gem)
     s.rdoc_options      = %w(--main README)
 
     # Add any extra files to include in the gem
-    s.files             = %w(Rakefile README .gemtest) + Dir.glob("{lib,bin,pristine_app}/**/*")
+    s.files             = %w(Rakefile README .gemtest) + Dir.glob("{test,lib,bin,pristine_app}/**/*")
     s.executables       = ['vanilla']
     s.require_paths     = ["lib"]
-    s.test_files        = Dir.glob("test/**/*")
 
     # All the other gems we need.
     s.add_dependency("rack", ">= 0.9.1")
@@ -47,8 +46,9 @@ if Object.const_defined?(:Gem)
     s.add_dependency("ratom", ">= 0.3.5")
     s.add_dependency("RedCloth", ">= 4.1.1")
     s.add_dependency("BlueCloth", ">= 1.0.0")
-    s.add_dependency("haml")
+    s.add_dependency("haml", ">=3.1")
     s.add_dependency("parslet", ">= 1.2.0")
+    s.add_dependency("rack-test", ">=0.5.7")
 
     s.add_development_dependency("kintama", ">= 0.1.6") # add any other gems for testing/development
     s.add_development_dependency("mocha")

data/bin/vanilla

@@ -14,13 +14,19 @@ end
 
 def upgrade
   require 'fileutils'
-  confirm("Upgrade system snips?") do
-    pristine_system = File.expand_path("../../pristine_app/soups/system", __FILE__)
-    copy(pristine_system, File.join(Dir.pwd, "soups"))
-  end
-  confirm("Upgrade tutorial snips?") do
-    pristine_system = File.expand_path("../../pristine_app/soups/tutorial", __FILE__)
-    copy(pristine_system, File.join(Dir.pwd, "soups"))
+  soups_directory = File.join(Dir.pwd, "soups")
+  if File.directory(soups_directory)
+    confirm("Upgrade system snips?") do
+      pristine_system = File.expand_path("../../pristine_app/soups/system", __FILE__)
+      copy(pristine_system, system_directory)
+    end
+    confirm("Upgrade tutorial snips?") do
+      pristine_system = File.expand_path("../../pristine_app/soups/tutorial", __FILE__)
+      copy(pristine_system, File.join(Dir.pwd, "soups"))
+    end
+  else
+    puts "Your soups must be in a directory called 'soups' to use this upgrade tool."
+    exit -1
   end
 end
 

data/lib/vanilla.rb

@@ -1,5 +1,5 @@
 module Vanilla
-  VERSION = "1.16.2"
+  VERSION = "1.17"
 
   autoload :Renderers, "vanilla/renderers"
   autoload :App, "vanilla/app"
@@ -8,6 +8,7 @@ module Vanilla
   autoload :Routes, "vanilla/routes"
   autoload :Static, "vanilla/static"
   autoload :SnipReferenceParser, "vanilla/snip_reference_parser"
+  autoload :TestHelper, "vanilla/test_helper"
 end
 
 # Load all the base dynasnip classes

data/lib/vanilla/app.rb

@@ -1,16 +1,45 @@
 require 'soup'
+require 'ostruct'
 
 module Vanilla
   class App
     include Vanilla::Routes
 
+    class << self
+      attr_reader :config
+      def configure(&block)
+        reset! unless @config
+        yield @config
+        self
+      end
+      def reset!
+        @config = OpenStruct.new
+      end
+    end
+
     attr_reader :request, :response, :config, :soup
 
+    def class_config
+      if self.class.config
+        {:soup => self.class.config.soup,
+         :soups => self.class.config.soups,
+         :root => self.class.config.root,
+         :root_snip => self.class.config.root_snip,
+         :renderers => self.class.config.renderers,
+         :default_layout_snip => self.class.config.default_layout_snip,
+         :default_renderer => self.class.config.default_renderer}
+      else
+        {}
+      end
+    end
+
     # Create a new Vanilla application
     # Configuration options:
     #
     #  :soup - provide the path to the soup data
     #  :soups - provide an array of paths to soup data
+    #  :root - the directory that the soup paths are relative to;
+    #          defaults to Dir.pwd
     #  :renderers - a hash of names to classes
     #  :default_renderer - the class to use when no renderer is provided;
     #                      defaults to 'Vanilla::Renderers::Base'
@@ -18,10 +47,11 @@ module Vanilla
     #                         defaults to 'layout'
     #  :root_snip - the snip to load for the root ('/') url;
     #               defaults to 'start'
-    def initialize(config={})
-      @config = config
+    def initialize(additional_configuration={})
+      @config = class_config.merge(additional_configuration)
+      @root_directory = @config[:root] || Dir.pwd
       if @config[:soup].nil? && @config[:soups].nil?
-        @config.merge!(:soup => File.expand_path("soup"))
+        @config[:soup] = File.expand_path("soup", @root_directory)
       end
       @soup = prepare_soup(config)
       prepare_renderers(config[:renderers])
@@ -110,7 +140,7 @@ module Vanilla
     private
 
     def prepare_renderers(additional_renderers={})
-      @renderers = Hash.new(config[:default_renderer] || Vanilla::Renderers::Base)
+      @renderers = Hash.new { config[:default_renderer] || Vanilla::Renderers::Base }
       @renderers.merge!({
         "base" => Vanilla::Renderers::Base,
         "markdown" => Vanilla::Renderers::Markdown,
@@ -145,10 +175,12 @@ module Vanilla
 
     def prepare_soup(config)
       if config[:soups]
-        backends = [config[:soups]].flatten.map { |path| ::Soup::Backends::FileBackend.new(path) }
+        backends = [config[:soups]].flatten.map do |path| 
+          ::Soup::Backends::FileBackend.new(File.expand_path(path, @root_directory))
+        end
         ::Soup.new(::Soup::Backends::MultiSoup.new(*backends))
       else
-        ::Soup.new(::Soup::Backends::FileBackend.new(config[:soup]))
+        ::Soup.new(::Soup::Backends::FileBackend.new(File.expand_path(config[:soup], @root_directory)))
       end
     end
   end

data/lib/vanilla/console.rb

@@ -1,23 +1,12 @@
-require 'vanilla'
-
-module Vanilla
-  class RackShim
-    def run(app)
-      app # return it
-    end
-    def use(*args)
-      # ignore
-    end
-    def get_binding
-      binding
-    end
-  end
+unless File.exist?("application.rb")
+  puts "Your application must reside in application.rb to use this console"
+  exit -1
 end
 
 def app(reload=false)
   if !@__vanilla_console_app || reload
-    shim_binding = Vanilla::RackShim.new.get_binding
-    @__vanilla_console_app = eval File.read("config.ru"), shim_binding
+    load "application.rb"
+    @__vanilla_console_app = Application.new
   end
   @__vanilla_console_app
 end

data/lib/vanilla/test_helper.rb

@@ -0,0 +1,55 @@
+require "vanilla"
+require "rack/test"
+require "tmpdir"
+require "fileutils"
+
+module Vanilla
+  module TestHelper
+    include Rack::Test::Methods
+
+    def app
+      unless @__app
+        Application.configure do |config|
+          # inject a sandbox soup path first.
+          config.soups ||= []
+          config.soups.unshift test_soup_path
+          # Ensure that the root path is set; this helps with
+          # running tests from different directories
+          config.root_path = File.expand_path("../.", __FILE__)
+        end
+        @__app = Application.new
+      end
+      @__app
+    end
+
+    def vanilla_setup
+      FileUtils.mkdir_p(test_soup_path)
+    end
+
+    def assert_response_status(expected, uri)
+      get uri
+      assert_equal expected, last_response.status
+    end
+
+    def assert_response_body(expected, uri)
+      get uri
+      assert_equal expected.strip, last_response.body.strip
+    end
+
+    def set_main_template(template_content)
+      app.soup << {:name => "layout", :content => template_content}
+    end
+
+    def create_snip(params)
+      app.soup << params
+    end
+
+    def test_soup_path
+      File.expand_path(File.join(Dir.tmpdir, "soup"))
+    end
+
+    def vanilla_teardown
+      FileUtils.rm_rf(test_soup_path)
+    end
+  end
+end

data/pristine_app/application.rb

@@ -0,0 +1,43 @@
+$:.unshift File.expand_path("../lib", __FILE__)
+require 'rubygems'
+require 'bundler/setup'
+require 'vanilla'
+
+# This is your application subclass.
+class Application < Vanilla::App
+end
+
+Application.configure do |config|
+  # The root directory of the application; normally the directory this 
+  # file is in.
+  config.root_path = File.expand_path(__FILE__)
+
+  # You can partition your snips into subdirectories to keep things tidy.
+  # This doesn't affect their URL structure on the site (everything is 
+  # flat).
+  #
+  # You should ensure that the system soup is at the bottom of this list
+  # unless you really know what you are doing.
+  config.soups = [
+    "soups/base",
+    "soups/system"
+  ]
+
+  # If you don't want the tutorial on your site, remove this and delete the directory
+  config.soups << "soups/tutorial"
+
+  # This is a dumping ground of ideas at the moment
+  #
+  # config.soups << "soups/extras"
+
+  # The snip to render on requests to "/". This defaults to "start"
+  #
+  # config.root_snip = "some-other-snip"
+
+  # You can register additional renderer classes, to be used with snips
+  # with the given extensions or 'render_as' attributes
+  #
+  # config.renderers = {
+  #   :awesome => "My::Custom::RendererClass"
+  # }
+end

data/pristine_app/config.ru

@@ -1,26 +1,6 @@
-require 'rubygems'
-require 'bundler/setup'
-$:.unshift File.join(File.dirname(__FILE__), *%w[lib])
-
-require 'vanilla'
-
-# You can partition your snips into subdirectories to keep things tidy. This
-# doesn't affect their URL structure on the site (everything is flat).
-soups = [
-  "soups/base",
-  "soups/system"
-]
-
-# If you don't want the tutorial on your site, remove this and delete the directory
-soups << "soups/tutorial"
-
-# This is a dumping ground of ideas at the moment
-# soups << "soups/extras"
-
-app = Vanilla::App.new(:soups => soups)
-
-# If you running your site under a proper webserver, you probably don't need this.
+# If you're running your site under a proper webserver, you probably don't need this.
 require 'vanilla/static'
 use Vanilla::Static, File.join(File.dirname(__FILE__), 'public')
 
-run app
+require "application"
+run Application.new

data/test/dynasnip_test.rb

@@ -9,21 +9,21 @@ describe Dynasnip do
     end
 
     should "make the attribute available as an instance method" do
-      assert_equal "test attribute content", TestDyna.new(@app).test_attribute
+      assert_equal "test attribute content", TestDyna.new(app).test_attribute
     end
 
     should "store the attribute in the soup" do
-      @app.soup << TestDyna.snip_attributes
-      assert_equal "test attribute content", @app.soup['test_dyna'].test_attribute
+      app.soup << TestDyna.snip_attributes
+      assert_equal "test attribute content", app.soup['test_dyna'].test_attribute
     end
 
     should "allow the attribute to be overriden by the soup contents" do
-      @app.soup << TestDyna.snip_attributes
-      snip = @app.soup['test_dyna']
+      app.soup << TestDyna.snip_attributes
+      snip = app.soup['test_dyna']
       snip.test_attribute = "altered content"
       snip.save
 
-      assert_equal "altered content", TestDyna.new(@app).test_attribute
+      assert_equal "altered content", TestDyna.new(app).test_attribute
     end
   end
 
@@ -36,7 +36,7 @@ describe Dynasnip do
     end
 
     should "show the usage defined in the snip" do
-      assert_equal "This is the usage", ShowUsage.new(@app).handle
+      assert_equal "This is the usage", ShowUsage.new(app).handle
     end
   end
 end

data/test/dynasnips/link_to_current_snip_test.rb

@@ -4,7 +4,7 @@ require "link_to_current_snip"
 
 context "The link_to_current_snip dynasnip" do
   setup do
-    @app.soup << LinkToCurrentSnip.snip_attributes
+    app.soup << LinkToCurrentSnip.snip_attributes
     create_snip :name => "test", :content => "test {link_to_current_snip}"
   end
 

data/test/dynasnips/link_to_test.rb

@@ -22,6 +22,6 @@ context "The link_to dynasnip" do
   private
 
   def render_dynasnip(klass, *args)
-    klass.new(@app).handle(*args)
+    klass.new(app).handle(*args)
   end
 end

data/test/dynasnips/page_title_test.rb

@@ -4,7 +4,7 @@ require "page_title"
 
 context "The page_title dynasnip" do
   setup do
-    @app.soup << PageTitle.snip_attributes
+    app.soup << PageTitle.snip_attributes
   end
 
   should "render as the requested snip name if that snip has no title" do

data/test/renderers/base_renderer_test.rb

@@ -31,7 +31,7 @@ describe Vanilla::Renderers::Base do
   should "include other snips using their renderers" do
     create_snip(:name => "including_snip", :content => "lets include {another_snip}")
     create_snip(:name => "another_snip", :content => "blah", :render_as => "Bold")
-    assert_equal "lets include <b>blah</b>", response_body_for("/including_snip").gsub(/\s+/, ' ')
+    assert_response_body "lets include <b>blah</b>", "/including_snip"
   end
   
   context "when trying to include a missing snip" do

data/test/renderers/erb_renderer_test.rb

@@ -18,7 +18,7 @@ describe Vanilla::Renderers::Erb do
     end
 
     should "expose the app as an instance variable" do
-      erb_snip(:name => "test", :content => "<%= @app.class.name %>")
+      erb_snip(:name => "test", :content => "<%= @app.class.superclass.name %>")
       assert_response_body "Vanilla::App", "/test"
     end
   end

data/test/renderers/haml_renderer_test.rb

@@ -24,7 +24,7 @@ describe Vanilla::Renderers::Haml do
     end
 
     should "expose the app as an instance variable" do
-      haml_snip(:name => "test", :content => "= @app.class.name")
+      haml_snip(:name => "test", :content => "= @app.class.superclass.name")
       assert_response_body "Vanilla::App", "/test"
     end
   end

data/test/renderers/markdown_renderer_test.rb

@@ -21,7 +21,7 @@ and so lets include {another_snip}
 Markdown
       )
       create_snip(:name => "another_snip", :content => "blah", :render_as => "Bold")
-      assert_equal "<h1>markdown</h1> <p>and so lets include <b>blah</b></p>", response_body_for("/test").gsub(/\s+/, ' ')
+      assert_response_body "<h1>markdown</h1>\n\n<p>and so lets include <b>blah</b></p>", "/test"
     end
   end
 

data/test/renderers/ruby_renderer_test.rb

@@ -1,4 +1,5 @@
 require "test_helper"
+require "vanilla/dynasnip"
 
 describe Vanilla::Renderers::Ruby do
   context "when rendering normally" do
@@ -9,7 +10,7 @@ describe Vanilla::Renderers::Ruby do
     end
 
     setup do
-      @app.soup << TestDyna.snip_attributes
+      app.soup << TestDyna.snip_attributes
     end
 
     should "render the result of the handle method" do
@@ -28,7 +29,7 @@ describe Vanilla::Renderers::Ruby do
     end
 
     setup do
-      @app.soup << RestishDyna.snip_attributes
+      app.soup << RestishDyna.snip_attributes
     end
 
     should "render the result of the get method on GET requests" do
@@ -48,7 +49,7 @@ describe Vanilla::Renderers::Ruby do
     end
 
     setup do
-      @app.soup << Encloser.snip_attributes
+      app.soup << Encloser.snip_attributes
       create_snip(:name => "test", :content => "{encloser}")
     end
 

data/test/snip_inclusion_test.rb

@@ -61,6 +61,6 @@ context "When including snips in other snips" do
 
   def render(content)
     snip = create_snip :name => "test-content", :content => content
-    Vanilla::Renderers::Base.new(@app).render(snip)
+    Vanilla::Renderers::Base.new(app).render(snip)
   end
 end

data/test/test_helper.rb

@@ -1,71 +1,28 @@
+$LOAD_PATH.unshift(File.expand_path("../../lib"), __FILE__)
 require "kintama"
 require "kintama/mocha"
-require "fileutils"
-require "rack/mock"
-require "vanilla"
+require "vanilla/test_helper"
 
-module Vanilla
-  module Test
-    def setup_clean_environment
-      clean_environment
-      @app = Vanilla::App.new(:soup => soup_path)
-
-      require File.expand_path("../../pristine_app/soups/system/current_snip", __FILE__)
-      @app.soup << CurrentSnip.snip_attributes
-      create_snip :name => "layout", :content => "{current_snip}"
-    end
-
-    def response_for(url)
-      @app.call(mock_env_for_url(url))
-    end
-
-    def response_body_for(url)
-      response_for(url)[2].body[0]
-    end
-
-    def response_code_for(url)
-      response_for(url)[0]
-    end
-
-    def assert_response_body(expected, uri)
-      assert_equal expected.strip, response_body_for(uri).strip
-    end
-
-    def set_main_template(template_content)
-      @app.soup << {:name => "layout", :content => template_content}
-    end
-
-    def create_snip(params)
-      @app.soup << params
-    end
-
-    def mock_env_for_url(url)
-      Rack::MockRequest.env_for(url)
-    end
-
-    def mock_request(url)
-      Rack::Request.new(mock_env_for_url(url))
-    end
-
-    def test_app_directory
-      File.join(File.dirname(__FILE__), "tmp")
-    end
-
-    def soup_path
-      File.expand_path(File.join(test_app_directory, "soup"))
-    end
+class Application < Vanilla::App
+end
 
-    def clean_environment
-      FileUtils.rm_rf(test_app_directory)
-    end
+module TestHelper
+  include Vanilla::TestHelper
+  
+  def create_simple_layout
+    require File.expand_path("../../pristine_app/soups/system/current_snip", __FILE__)
+    app.soup << CurrentSnip.snip_attributes
+    create_snip :name => "layout", :content => "{current_snip}"
   end
 end
 
-Kintama.include Vanilla::Test
+Kintama.include TestHelper
+
 Kintama.setup do
-  setup_clean_environment
+  vanilla_setup
+  create_simple_layout
 end
 
 Kintama.teardown do
-  clean_environment
+  vanilla_teardown
 end

data/test/vanilla_app_test.rb

@@ -1,14 +1,14 @@
 require "test_helper"
+require "tmpdir"
 
 describe Vanilla::App do
   context "when behaving as a Rack application" do
-    should "return an array of status code, headers and response" do
+    should "return a valid rack response" do
       create_snip(:name => "test", :content => "content")
-      result = @app.call(mock_env_for_url("/test.text"))
-      assert_kind_of Array, result
-      assert_equal 200, result[0]
-      assert_kind_of Hash, result[1]
-      result[2].each{ |output| assert_equal "content", output }
+      get "/test.text"
+      assert_equal 200, last_response.status
+      assert_kind_of Hash, last_response.headers
+      assert_equal "content", last_response.body
     end
   end
 
@@ -21,19 +21,43 @@ describe Vanilla::App do
     should "allow a customised root snip" do
       create_snip :name => "start", :content => "default"
       create_snip :name => "custom", :content => "custom"
-      @app = Vanilla::App.new(:soup => soup_path, :root_snip => "custom")
+      app.config[:root_snip] = "custom"
       assert_response_body "custom", "/"
     end
-  end
 
-  context "when detecting the snip renderer" do
-    setup do
-      @app = Vanilla::App.new(:soup => soup_path)
+    should "allow specification of the root directory to aide loading external soups" do
+      soup_dir = File.join(Dir.tmpdir, "my_soup")
+      FileUtils.mkdir_p(soup_dir)
+      File.open(File.join(soup_dir, "blah.snip"), "w") { |f| f.write "Hello superfriends" }
+
+      class TestApp < Vanilla::App
+        configure do |c| 
+          c.root = Dir.tmpdir
+          c.soups = ["my_soup"]
+        end
+      end
+
+      app = 
+      assert_equal "Hello superfriends", TestApp.new.soup['blah'].content
+    end
+
+    should "allow configuration against the class" do
+      class TestApp < Vanilla::App
+      end
+
+      TestApp.configure do |config|
+        config.soups = ["blah", "monkey"]
+        config.root = Dir.tmpdir
+      end
+
+      assert_equal ["blah", "monkey"], TestApp.new.config[:soups]
     end
+  end
 
+  context "when detecting the snip renderer" do
     should "return the constant refered to in the render_as property of the snip" do
       snip = create_snip(:name => "blah", :render_as => "Raw")
-      assert_equal Vanilla::Renderers::Raw, @app.renderer_for(snip)
+      assert_equal Vanilla::Renderers::Raw, app.renderer_for(snip)
     end
 
     context "using the snip extension" do
@@ -46,25 +70,27 @@ describe Vanilla::App do
       }.each do |extension, renderer|
         should "return the renderer #{renderer} when the snip has extension #{extension}" do
           snip = create_snip(:name => "blah", :extension => extension)
-          assert_equal renderer, @app.renderer_for(snip)
+          assert_equal renderer, app.renderer_for(snip)
         end
       end
     end
 
     should "respect snip renderers passed in the config" do
-      app = Vanilla::App.new(:soup => soup_path, :renderers => {"markdown" => "Vanilla::Renderers::Bold"})
+      TestApp.configure do |c|
+        c.renderers = {"markdown" => "Vanilla::Renderers::Bold"}
+      end
       snip = create_snip(:name => "blah", :extension => "markdown")
-      assert_equal Vanilla::Renderers::Bold, app.renderer_for(snip)
+      assert_equal Vanilla::Renderers::Bold, TestApp.new.renderer_for(snip)
     end
 
     should "return Vanilla::Renderers::Base if no render_as property exists" do
       snip = create_snip(:name => "blah")
-      assert_equal Vanilla::Renderers::Base, @app.renderer_for(snip)
+      assert_equal Vanilla::Renderers::Base, app.renderer_for(snip)
     end
 
     should "return Vanilla::Renderers::Base if the render_as property is blank" do
       snip = create_snip(:name => "blah", :render_as => '')
-      assert_equal Vanilla::Renderers::Base, @app.renderer_for(snip)
+      assert_equal Vanilla::Renderers::Base, app.renderer_for(snip)
     end
 
     should "raise an error if the specified renderer doesn't exist" do
@@ -75,9 +101,11 @@ describe Vanilla::App do
     should "load constants presented as a string" do
       class ::MyRenderer
       end
-      app = Vanilla::App.new(:soup => soup_path, :renderers => {"my_renderer" => "MyRenderer"})
+      TestApp.configure do |c|
+        c.renderers = {"my_renderer" => "MyRenderer"}
+      end
       snip = create_snip(:name => "blah", :render_as => "my_renderer")
-      assert_equal MyRenderer, app.renderer_for(snip)
+      assert_equal MyRenderer, TestApp.new.renderer_for(snip)
     end
   end
 end

data/test/vanilla_presenting_test.rb

@@ -21,10 +21,10 @@ context "When presenting" do
     end
 
     should "have a response code of 200" do
-      assert_equal 200, response_code_for("/test")
-      assert_equal 200, response_code_for("/test.html")
-      assert_equal 200, response_code_for("/test/part")
-      assert_equal 200, response_code_for("/test/part.html")
+      assert_response_status 200, "/test"
+      assert_response_status 200, "/test.html"
+      assert_response_status 200, "/test/part"
+      assert_response_status 200, "/test/part.html"
     end
 
     should "not allow rendering of the layout to produce infinite recursion" do
@@ -42,8 +42,8 @@ context "When presenting" do
     end
 
     should "have a response code of 200" do
-      assert_equal 200, response_code_for("/test.text")
-      assert_equal 200, response_code_for("/test/part.text")
+      assert_response_status 200, "/test.text"
+      assert_response_status 200, "/test/part.text"
     end
   end
 
@@ -61,8 +61,8 @@ context "When presenting" do
     end
 
     should "have a response code of 200" do
-      assert_equal 200, response_code_for("/test.raw")
-      assert_equal 200, response_code_for("/test/part.raw")
+      assert_response_status 200, "/test.raw"
+      assert_response_status 200, "/test/part.raw"
     end
   end
 
@@ -82,7 +82,7 @@ context "When presenting" do
 
   context "a snip using a renderer that specifies a template" do
     setup do
-      @app.register_renderer CustomRenderer, "custom"
+      app.register_renderer CustomRenderer, "custom"
       create_snip :name => "custom-layout", :content => "<custom>{current_snip}</custom>"
     end
 
@@ -100,7 +100,7 @@ context "When presenting" do
 
   context "and a custom default renderer has been provided" do
     should "use that renderer" do
-      @app = Vanilla::App.new(:soup => soup_path, :default_renderer => ::Vanilla::Renderers::Bold)
+      app.config[:default_renderer] = ::Vanilla::Renderers::Bold
       create_snip :name => "layout", :content => "{test}", :render_as => "base"
       create_snip :name => "test", :content => "test"
       assert_response_body "<b>test</b>", "/test"
@@ -113,13 +113,13 @@ context "When presenting" do
     end
 
     should "have a 404 response code" do
-      assert_equal 404, response_code_for("/missing_snip")
+      assert_response_status 404, "/missing_snip"
     end
   end
 
   context "requesting an unknown format" do
     should "return a 500 status code" do
-      assert_equal 500, response_code_for("/test.monkey")
+      assert_response_status 500, "/test.monkey"
     end
   end
 end

data/test/vanilla_request_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Vanilla::Request do
   context "when requesting the root" do
-    setup { @request = Vanilla::Request.new(mock_env_for_url("/"), @app) }
+    setup { @request = Vanilla::Request.new(mock_env_for_url("/"), app) }
 
     should "set snip to 'start' by default" do
       assert_equal "start", @request.snip_name
@@ -14,14 +14,14 @@ describe Vanilla::Request do
   end
 
   context "when requesting urls" do
-    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip"), @app) }
+    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip"), app) }
 
     should "use the first segement as the snip name" do
       assert_equal "snip", @request.snip_name
     end
 
     should "try to load the snip based on the snip name" do
-      @app.soup.expects(:[]).with('snip').returns(:snip)
+      app.soup.expects(:[]).with('snip').returns(:snip)
       assert_equal :snip, @request.snip
     end
 
@@ -39,7 +39,7 @@ describe Vanilla::Request do
   end
 
   context "when requesting a snip part" do
-    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip/part"), @app) }
+    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip/part"), app) }
 
     should "use the first segment as the snip, and the second segment as the part" do
       assert_equal "snip", @request.snip_name
@@ -52,7 +52,7 @@ describe Vanilla::Request do
   end
 
   context "when requesting a snip with a format" do
-    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip.raw"), @app) }
+    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip.raw"), app) }
 
     should "use the extension as the format" do
       assert_equal "raw", @request.format
@@ -64,7 +64,7 @@ describe Vanilla::Request do
   end
 
   context "when requesting a snip part with a format" do
-    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip/part.raw"), @app) }
+    setup { @request = Vanilla::Request.new(mock_env_for_url("/snip/part.raw"), app) }
 
     should "use the extension as the format" do
       assert_equal "raw", @request.format
@@ -81,7 +81,13 @@ describe Vanilla::Request do
 
   context "when requested with a _method parameter" do
     should "return the method using the parameter" do
-      assert_equal 'put', Vanilla::Request.new(mock_env_for_url("/snip?_method=put"), @app).method
+      assert_equal 'put', Vanilla::Request.new(mock_env_for_url("/snip?_method=put"), app).method
     end
   end
+
+  private
+
+  def mock_env_for_url(url)
+    Rack::MockRequest.env_for(url)
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vanilla
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 45
   prerelease: 
   segments: 
   - 1
-  - 16
-  - 2
-  version: 1.16.2
+  - 17
+  version: "1.17"
 platform: ruby
 authors: 
 - James Adam
@@ -15,11 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +01:00
+date: 2011-05-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +29,11 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
+  requirement: *id001
   prerelease: false
+  name: rack
   type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: soup
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +45,11 @@ dependencies:
         - 0
         - 6
         version: 1.0.6
+  requirement: *id002
   prerelease: false
+  name: soup
   type: :runtime
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: ratom
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,11 +61,11 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
+  requirement: *id003
   prerelease: false
+  name: ratom
   type: :runtime
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,11 +77,11 @@ dependencies:
         - 1
         - 1
         version: 4.1.1
+  requirement: *id004
   prerelease: false
+  name: RedCloth
   type: :runtime
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: BlueCloth
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,25 +93,26 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id005
   prerelease: false
+  name: BlueCloth
   type: :runtime
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: haml
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
+        - 3
+        - 1
+        version: "3.1"
+  requirement: *id006
   prerelease: false
+  name: haml
   type: :runtime
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: parslet
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -125,12 +124,28 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
+  requirement: *id007
   prerelease: false
+  name: parslet
   type: :runtime
-  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: kintama
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 5
+        - 7
+        version: 0.5.7
+  requirement: *id008
+  prerelease: false
+  name: rack-test
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,12 +156,12 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
+  requirement: *id009
   prerelease: false
+  name: kintama
   type: :development
-  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,9 +170,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id010
   prerelease: false
+  name: mocha
   type: :development
-  requirement: *id009
 description: 
 email: james@lazyatom.com.com
 executables: 
@@ -170,6 +186,22 @@ files:
 - Rakefile
 - README
 - .gemtest
+- test/dynasnip_test.rb
+- test/dynasnips/link_to_current_snip_test.rb
+- test/dynasnips/link_to_test.rb
+- test/dynasnips/page_title_test.rb
+- test/renderers/base_renderer_test.rb
+- test/renderers/erb_renderer_test.rb
+- test/renderers/haml_renderer_test.rb
+- test/renderers/markdown_renderer_test.rb
+- test/renderers/raw_renderer_test.rb
+- test/renderers/ruby_renderer_test.rb
+- test/snip_inclusion_test.rb
+- test/snip_reference_parser_test.rb
+- test/test_helper.rb
+- test/vanilla_app_test.rb
+- test/vanilla_presenting_test.rb
+- test/vanilla_request_test.rb
 - lib/vanilla/app.rb
 - lib/vanilla/console.rb
 - lib/vanilla/dynasnip.rb
@@ -186,11 +218,12 @@ files:
 - lib/vanilla/routes.rb
 - lib/vanilla/snip_reference_parser.rb
 - lib/vanilla/static.rb
+- lib/vanilla/test_helper.rb
 - lib/vanilla.rb
 - bin/vanilla
+- pristine_app/application.rb
 - pristine_app/config.ru
 - pristine_app/Gemfile
-- pristine_app/Gemfile.lock
 - pristine_app/public/vanilla.css
 - pristine_app/README
 - pristine_app/soups/base/layout.snip
@@ -223,23 +256,6 @@ files:
 - pristine_app/soups/tutorial/tutorial.snip.markdown
 - pristine_app/soups/tutorial/vanilla-rb.snip
 - pristine_app/soups/tutorial/vanilla.snip
-- pristine_app/tmp/restart.txt
-- test/dynasnip_test.rb
-- test/dynasnips/link_to_current_snip_test.rb
-- test/dynasnips/link_to_test.rb
-- test/dynasnips/page_title_test.rb
-- test/renderers/base_renderer_test.rb
-- test/renderers/erb_renderer_test.rb
-- test/renderers/haml_renderer_test.rb
-- test/renderers/markdown_renderer_test.rb
-- test/renderers/raw_renderer_test.rb
-- test/renderers/ruby_renderer_test.rb
-- test/snip_inclusion_test.rb
-- test/snip_reference_parser_test.rb
-- test/test_helper.rb
-- test/vanilla_app_test.rb
-- test/vanilla_presenting_test.rb
-- test/vanilla_request_test.rb
 has_rdoc: true
 homepage: http://github.com/lazyatom/vanilla-rb
 licenses: []
@@ -271,24 +287,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: vanilla
-rubygems_version: 1.5.0
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: A bliki-type web content thing.
-test_files: 
-- test/dynasnip_test.rb
-- test/dynasnips/link_to_current_snip_test.rb
-- test/dynasnips/link_to_test.rb
-- test/dynasnips/page_title_test.rb
-- test/renderers/base_renderer_test.rb
-- test/renderers/erb_renderer_test.rb
-- test/renderers/haml_renderer_test.rb
-- test/renderers/markdown_renderer_test.rb
-- test/renderers/raw_renderer_test.rb
-- test/renderers/ruby_renderer_test.rb
-- test/snip_inclusion_test.rb
-- test/snip_reference_parser_test.rb
-- test/test_helper.rb
-- test/vanilla_app_test.rb
-- test/vanilla_presenting_test.rb
-- test/vanilla_request_test.rb
+test_files: []
+

data/pristine_app/Gemfile.lock

@@ -1,32 +0,0 @@
-PATH
-  remote: /Users/james/Code/lazyatom/vanilla-rb
-  specs:
-    vanilla (1.16.1)
-      BlueCloth (>= 1.0.0)
-      RedCloth (>= 4.1.1)
-      haml
-      parslet (>= 1.2.0)
-      rack (>= 0.9.1)
-      ratom (>= 0.3.5)
-      soup (>= 1.0.6)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    BlueCloth (1.0.1)
-    RedCloth (4.2.7)
-    blankslate (2.1.2.4)
-    haml (3.1.1)
-    libxml-ruby (2.0.4)
-    parslet (1.2.0)
-      blankslate (~> 2.0)
-    rack (1.2.2)
-    ratom (0.6.8)
-      libxml-ruby (>= 1.1.2)
-    soup (1.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  vanilla!