From 1ee3dac2aa880269f184404088e957576e48359e Mon Sep 17 00:00:00 2001
From: Logan Koester <lkoester@agoragames.com>
Date: Mon, 19 Sep 2011 13:43:41 -0400
Subject: [PATCH] Removes haml altogether

---
 Gemfile                             |  1 -
 Gemfile.lock                        |  2 --
 app/views/errship/standard.html.erb | 14 --------------
 lib/errship.rb                      |  4 ----
 4 files changed, 21 deletions(-)
 delete mode 100644 app/views/errship/standard.html.erb

diff --git a/Gemfile b/Gemfile
index 6252b92..264f6e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
   gem "rcov", ">= 0"
-  gem 'haml'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 85e0960..906a431 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -38,7 +38,6 @@ GEM
     builder (3.0.0)
     erubis (2.7.0)
     git (1.2.5)
-    haml (3.1.1)
     hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.6.2)
@@ -115,7 +114,6 @@ PLATFORMS
 DEPENDENCIES
   bson_ext
   bundler (~> 1.0.0)
-  haml
   jeweler (~> 1.6.0)
   mocha
   mongo_mapper
diff --git a/app/views/errship/standard.html.erb b/app/views/errship/standard.html.erb
deleted file mode 100644
index 00b4669..0000000
--- a/app/views/errship/standard.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<% content_for :head do %>
-<%= stylesheet_link_tag 'errship', :media => 'screen, projection' %>
-<% end %>
-
-<div class='errship'>
-  <h1 class='error_code'><%= status_code %></h1>
-  <% if errship_scope %>
-  <h2><%= t "errship.#{status_code}.#{errship_scope}.title" %></h2>
-  <p><%= t "errship.#{status_code}.#{errship_scope}.description" %></p>
-  <% else %>
-  <h2><%= t "errship.#{status_code}.title" %></h2>
-  <p><%= t "errship.#{status_code}.description" %></p>
-  <% end %>
-</div>
diff --git a/lib/errship.rb b/lib/errship.rb
index f3bcc2f..da63ef2 100644
--- a/lib/errship.rb
+++ b/lib/errship.rb
@@ -1,7 +1,3 @@
-begin
-  require 'haml'
-rescue LoadError
-end
 require 'rescuers/active_record'
 require 'rescuers/mongoid'
 require 'rescuers/mongo_mapper'