diff --git a/Gemfile b/Gemfile
index 38f19bc..6252b92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,7 @@ group :development do
gem "bundler", "~> 1.0.0"
gem "jeweler", "~> 1.6.0"
gem "rcov", ">= 0"
+ gem 'haml'
end
group :test do
@@ -23,4 +24,3 @@ group :test do
gem 'bson_ext'
end
-gem 'haml'
diff --git a/app/views/errship/standard.html.erb b/app/views/errship/standard.html.erb
new file mode 100644
index 0000000..00b4669
--- /dev/null
+++ b/app/views/errship/standard.html.erb
@@ -0,0 +1,14 @@
+<% content_for :head do %>
+<%= stylesheet_link_tag 'errship', :media => 'screen, projection' %>
+<% end %>
+
+
+
<%= status_code %>
+ <% if errship_scope %>
+
<%= t "errship.#{status_code}.#{errship_scope}.title" %>
+
<%= t "errship.#{status_code}.#{errship_scope}.description" %>
+ <% else %>
+
<%= t "errship.#{status_code}.title" %>
+
<%= t "errship.#{status_code}.description" %>
+ <% end %>
+
diff --git a/errship.gemspec b/errship.gemspec
index 453131e..572d4c1 100644
--- a/errship.gemspec
+++ b/errship.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = [%q{Logan Koester}, %q{Matthew Wilson}, %q{David Czarnecki}]
- s.date = %q{2011-09-03}
+ s.date = %q{2011-09-19}
s.description = %q{Errship is a Rails 3.1 engine for rendering error pages inside your layout. It supports i18n, custom exceptions, and Airbrake (Hoptoad) error tracking.}
s.email = [%q{lkoester@agoragames.com}, %q{mwilson@agoragames.com}, %q{dczarnecki@agoragames.com}]
s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
s.files = [
"app/assets/javascripts/application.js",
"app/assets/stylesheets/errship.css",
+ "app/views/errship/standard.html.erb",
"app/views/errship/standard.html.haml",
"config/locales/en.yml",
"config/routes.rb",
@@ -30,34 +31,34 @@ Gem::Specification.new do |s|
s.homepage = %q{https://github.com/agoragames/errship}
s.licenses = [%q{MIT}]
s.require_paths = [%q{lib}]
- s.rubygems_version = %q{1.8.6}
+ s.rubygems_version = %q{1.8.9}
s.summary = %q{Errship is a Rails 3.1 engine for rendering error pages inside your layout.}
if s.respond_to? :specification_version then
s.specification_version = 3
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q, [">= 0"])
s.add_development_dependency(%q, ["= 0.8.7"])
s.add_development_dependency(%q, [">= 0"])
s.add_development_dependency(%q, ["~> 1.0.0"])
s.add_development_dependency(%q, ["~> 1.6.0"])
s.add_development_dependency(%q, [">= 0"])
+ s.add_development_dependency(%q, [">= 0"])
else
- s.add_dependency(%q, [">= 0"])
s.add_dependency(%q, ["= 0.8.7"])
s.add_dependency(%q, [">= 0"])
s.add_dependency(%q, ["~> 1.0.0"])
s.add_dependency(%q, ["~> 1.6.0"])
s.add_dependency(%q, [">= 0"])
+ s.add_dependency(%q, [">= 0"])
end
else
- s.add_dependency(%q, [">= 0"])
s.add_dependency(%q, ["= 0.8.7"])
s.add_dependency(%q, [">= 0"])
s.add_dependency(%q, ["~> 1.0.0"])
s.add_dependency(%q, ["~> 1.6.0"])
s.add_dependency(%q, [">= 0"])
+ s.add_dependency(%q, [">= 0"])
end
end
diff --git a/lib/errship.rb b/lib/errship.rb
index b7d9757..f3bcc2f 100644
--- a/lib/errship.rb
+++ b/lib/errship.rb
@@ -1,4 +1,7 @@
-require 'haml'
+begin
+ require 'haml'
+rescue LoadError
+end
require 'rescuers/active_record'
require 'rescuers/mongoid'
require 'rescuers/mongo_mapper'