vanilla 1.17.6 → 1.17.8

data/Rakefile

@@ -29,7 +29,7 @@ end
 if Object.const_defined?(:Gem)
 
   def files_for_inclusion
-    base_files = %w(Rakefile README .gemtest) + Dir.glob("{test,lib,bin,pristine_app}/**/*")
+    base_files = %w(Rakefile README .gemtest) + Dir.glob("{test,lib,bin,pristine_app}/**/*").select { |f| File.file?(f) }
     files_to_ignore = File.readlines(".gitignore").inject([]) do |a,p|
       path = p.strip
       a += Dir.glob(path)

data/lib/vanilla/app.rb

@@ -6,6 +6,7 @@ module Vanilla
   # be subclassed for each instance of Vanilla that you want to run.
   class App
     include Vanilla::Routing
+    class NotFound < RuntimeError; end
 
     class << self
       attr_reader :config
@@ -42,7 +43,11 @@ module Vanilla
 
       begin
         output = render_in_format(request.snip, request.part, request.format)
+      rescue NotFound => e
+        @response.status = 404
+        output = e.to_s
       rescue => e
+        raise e if config.raise_errors
         @response.status = 500
         output = e.to_s + e.backtrace.join("\n")
       end
@@ -116,6 +121,7 @@ module Vanilla
       renderer_instance = renderer_for(snip).new(self)
       yield renderer_instance
     rescue Exception => e
+      raise e if config.raise_errors
       response.status = 500
       snip_name = snip ? snip.name : nil
       "<pre>[Error rendering '#{snip_name}' - \"" +
@@ -124,6 +130,7 @@ module Vanilla
     end
 
     def render_in_format(snip, part=nil, format=nil)
+      format = nil unless snip
       case format
       when 'html', nil
         layout = layout_for(snip)
@@ -137,7 +144,7 @@ module Vanilla
       when 'text', 'atom', 'xml'
         render(snip, part)
       else
-        raise "Unknown format '#{format}'"
+        raise NotFound, "Unknown format '#{format}'"
       end
     end
 

data/lib/vanilla/config.rb

@@ -22,7 +22,8 @@ module Vanilla
                   :soups,
                   :renderers,
                   :default_layout_snip,
-                  :default_renderer
+                  :default_renderer,
+                  :raise_errors
 
     def initialize
       @root = Dir.pwd
@@ -30,6 +31,7 @@ module Vanilla
       @soups = ["soups/base", "soups/system"]
       @default_layout_snip = "layout"
       @default_renderer = Vanilla::Renderers::Base
+      @raise_errors = false
       @renderers = {
         "base" => Vanilla::Renderers::Base,
         "markdown" => Vanilla::Renderers::Markdown,

data/lib/vanilla/renderers/base.rb

@@ -95,7 +95,12 @@ module Vanilla
       end
 
       def render_without_including_snips(snip, part=:content)
-        process_text(raw_content(snip, part))
+        if content = raw_content(snip, part)
+          process_text(content)
+        else
+          app.response.status = 404
+          %{Couldn't find part "#{part}" for snip "#{snip.name}"}
+        end
       end
 
       # Handles processing the text of the content.

data/lib/vanilla.rb

@@ -1,5 +1,5 @@
 module Vanilla
-  VERSION = "1.17.6"
+  VERSION = "1.17.8"
 
   autoload :Renderers, "vanilla/renderers"
   autoload :App, "vanilla/app"

data/test/core/vanilla_presenting_test.rb

@@ -132,8 +132,8 @@ context "When presenting" do
   end
 
   context "requesting an unknown format" do
-    should "return a 500 status code" do
-      assert_response_status 500, "/test.monkey"
+    should "return a 404 status code" do
+      assert_response_status 404, "/test.monkey"
     end
   end
 end

data/test/pristine_app/current_snip_test.rb

@@ -43,4 +43,32 @@ context "The current_snip dynasnip" do
       assert_equal 404, page.status_code
     end
   end
+
+  context "when the requested snip with extension is missing" do
+    setup do
+      set_main_template "<layout>{current_snip}</layout>"
+      visit "/monkey.png"
+    end
+
+    should "set the response code to 404" do
+      assert_equal 404, page.status_code
+    end
+  end
+
+  context "when the requested part of a snip is missing" do
+    setup do
+      set_main_template "<layout>{current_snip}</layout>"
+      create_snip :name => "test", :content => "test"
+
+      visit "/test/monkey"
+    end
+
+    should "render an explanatory message" do
+      assert page.has_content?(%{Couldn't find part "monkey" for snip "test"})
+    end
+
+    should "set the response code to 404" do
+      assert_equal 404, page.status_code
+    end
+  end
 end

data/test/pristine_app/raise_errors_test.rb

@@ -0,0 +1,67 @@
+require "test_helper"
+
+context "The rack app" do
+  should "handle exceptions by default" do
+    create_snip :name => "test", :content => "test"
+
+    app.stubs(:render_in_format).raises("exception-message")
+
+    assert_nothing_raised { visit "/test" }
+    assert_equal 500, page.status_code
+  end
+
+  should "handle exceptions when raise_errors is false" do
+    create_snip :name => "test", :content => "test"
+
+    app.stubs(:render_in_format).raises("exception-message")
+
+    with_raise_errors(false) do
+      assert_nothing_raised { visit "/test" }
+      assert_equal 500, page.status_code
+    end
+  end
+
+  should "raise exceptions when raise_errors is true" do
+    create_snip :name => "test", :content => "test"
+
+    app.stubs(:render_in_format).raises("exception-message")
+
+    with_raise_errors(true) do
+      assert_raises("exception-message") { visit "/test" }
+    end
+  end
+
+  should "handle missing renderer by default" do
+    create_snip :name => "test", :content => "test", :render_as => "unknown"
+
+    assert_nothing_raised { visit "/test" }
+    assert_equal 500, page.status_code
+  end
+
+  should "handle missing renderer when raise_errors is false" do
+    create_snip :name => "test", :content => "test", :render_as => "unknown"
+
+    with_raise_errors(false) do
+      assert_nothing_raised { visit "/test" }
+      assert_equal 500, page.status_code
+    end
+  end
+
+  should "raise exceptions when raise_errors is true" do
+    create_snip :name => "test", :content => "test", :render_as => "unknown"
+
+    with_raise_errors(true) do
+      assert_raises("exception-message") { visit "/test" }
+    end
+  end
+
+  private
+
+  def with_raise_errors(raise_errors)
+    original_raise_errors = app.config.raise_errors
+    app.config.raise_errors = raise_errors
+    yield
+  ensure
+    app.config.raise_errors = original_raise_errors
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vanilla
 version: !ruby/object:Gem::Version
-  version: 1.17.6
+  version: 1.17.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -252,6 +252,7 @@ files:
 - test/pristine_app/link_to_current_snip_test.rb
 - test/pristine_app/link_to_test.rb
 - test/pristine_app/page_title_test.rb
+- test/pristine_app/raise_errors_test.rb
 - test/pristine_app/raw_test.rb
 - test/pristine_app/site_test.rb
 - test/pristine_app/test_helper.rb
@@ -329,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2037710849477528713
+      hash: 2864118613837164250
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -338,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2037710849477528713
+      hash: 2864118613837164250
 requirements: []
 rubyforge_project: vanilla
 rubygems_version: 1.8.23