Merge pull request #2 from agoragames/updated_functional_tests

Updated functional tests, fix for Mongoid module, version bump

Gemfile

@@ -17,6 +17,10 @@ group :test do
   gem 'rails', '3.1.0'
   gem 'sqlite3-ruby'
   gem 'turn'
+  gem 'mocha', :require => false
+  gem 'mongoid'
+  gem 'mongo_mapper'
+  gem 'bson_ext'
 end
 
 gem 'haml'

Gemfile.lock

@@ -33,6 +33,8 @@ GEM
     ansi (1.2.5)
     arel (2.2.1)
     bcrypt-ruby (3.0.0)
+    bson (1.3.1)
+    bson_ext (1.3.1)
     builder (3.0.0)
     erubis (2.7.0)
     git (1.2.5)
@@ -48,7 +50,20 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mocha (0.9.12)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongo_mapper (0.9.2)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.3.8)
+    mongoid (2.2.0)
+      activemodel (~> 3.0)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
     multi_json (1.0.3)
+    plucky (0.3.8)
+      mongo (~> 1.3)
     polyglot (0.3.2)
     rack (1.3.2)
     rack-cache (1.0.3)
@@ -98,9 +113,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bson_ext
   bundler (~> 1.0.0)
   haml
   jeweler (~> 1.6.0)
+  mocha
+  mongo_mapper
+  mongoid
   rails (= 3.1.0)
   rake (= 0.8.7)
   rcov

README.rdoc

@@ -90,6 +90,10 @@ The following methods are provided:
 If Airbrake is installed, every rescuer will report the exception, except for 404.
 
 == Changelog
+2.0.1
+  - Added tests for ActiveRecord, Mongoid and MongoMapper rescuers
+  - Fixed Mongoid module
+
 2.0.0
   - Breaks out ORM error handling into submodules. Not backwards compatible.
 

Rakefile

@@ -19,8 +19,8 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Errship is a Rails 3.1 engine for rendering error pages inside your layout.}
   gem.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.}
-  gem.email = "[email protected]"
-  gem.authors = ["Logan Koester"]
+  gem.email = ["[email protected]", "[email protected]", "[email protected]"]
+  gem.authors = ["Logan Koester", "Matthew Wilson", "David Czarnecki"]
   gem.files = Dir["{lib}/**/*", "{app}/**/*", "{config}/**/*", "{public}/**/*"]
   # dependencies defined in Gemfile
 end

VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

errship.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{errship}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Logan Koester"]
+  s.authors = [%q{Logan Koester}, %q{Matthew Wilson}, %q{David Czarnecki}]
   s.date = %q{2011-09-02}
   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{[email protected]}
+  s.email = [%q{[email protected]}, %q{[email protected]}, %q{[email protected]}]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
     "lib/rescuers/mongoid.rb"
   ]
   s.homepage = %q{http://github.com/logankoester/errship}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Errship is a Rails 3.1 engine for rendering error pages inside your layout.}
 
   if s.respond_to? :specification_version then

lib/rescuers/mongoid.rb

@@ -3,7 +3,7 @@ module Mongoid
     module Rescuers
       def self.included(base)
         unless Rails.application.config.consider_all_requests_local
-          base.rescue_from ::Mongoid::DocumentNotFound, :with => :render_404_error
+          base.rescue_from ::Mongoid::Errors::DocumentNotFound, :with => :render_404_error
         end
       end
     end

test/sandbox/Gemfile

@@ -8,6 +8,9 @@ gem 'airbrake'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'sqlite3-ruby'
+gem 'mongoid'
+gem 'mongo_mapper'
+gem 'bson_ext'
 
 # Use unicorn as the web server
 # gem 'unicorn'

test/sandbox/app/controllers/brains_controller.rb

@@ -1,6 +1,6 @@
 class BrainsController < ApplicationController
-  rescue_from ActiveRecord::RecordNotFound, :with => ->(e){ render_404_error e, 'brainless' }
-
+  include Errship::ActiveRecord::Rescuers
+  
   def index
     raise ActiveRecord::RecordNotFound
   end

test/sandbox/app/controllers/humans_controller.rb

@@ -0,0 +1,7 @@
+class HumansController < ApplicationController
+  include Errship::MongoMapper::Rescuers
+
+  def index
+    raise MongoMapper::DocumentNotFound
+  end
+end

test/sandbox/app/controllers/zombies_controller.rb

@@ -0,0 +1,7 @@
+class ZombiesController < ApplicationController
+  include Errship::Mongoid::Rescuers
+
+  def index
+    raise Mongoid::Errors::DocumentNotFound
+  end
+end

test/sandbox/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

test/sandbox/config/mongoid.yml

@@ -0,0 +1,10 @@
+defaults: &defaults
+  host: localhost
+
+development:
+  <<: *defaults
+  database: mongoid_sandbox_development
+
+test:
+  <<: *defaults
+  database: mongoid_sandbox_test

test/sandbox/config/routes.rb

@@ -1,4 +1,6 @@
 Sandbox::Application.routes.draw do
   match '/try_flashback', :controller => 'application', :action => 'try_flashback'
   match '/brains', :controller => 'brains', :action => 'index'
+  match '/zombies', :controller => 'zombies', :action => 'index'
+  match '/humans', :controller => 'humans', :action => 'index'
 end

test/sandbox/test/functional/brains_controller_test.rb

@@ -1,7 +1,9 @@
 require 'test_helper'
 
 class BrainsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  test "/error routes to errship's standard error page with ActiveRecord::RecordNotFound" do
+    Errship::Rescuers.expects(:render_404_error).with(ActiveRecord::RecordNotFound, anything)
+
+    get :index
+  end
 end

test/sandbox/test/functional/humans_controller_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class HumansControllerTest < ActionController::TestCase
+  test "/error routes to errship's standard error page with MongoMapper::DocumentNotFound exception" do
+    Errship::Rescuers.expects(:render_404_error).with(MongoMapper::DocumentNotFound, anything)
+
+    get :index
+  end
+end

test/sandbox/test/functional/zombies_controller_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class ZombiesControllerTest < ActionController::TestCase
+  test "/error routes to errship's standard error page with Mongoid::Errors::DocumentNotFound" do
+    Errship::Rescuers.expects(:render_404_error).with(Mongoid::Errors::DocumentNotFound, anything)
+
+    get :index
+  end
+end

test/test_helper.rb

@@ -9,6 +9,7 @@
 end
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))