Merge pull request #423 from nateberkopec/rails5

Rails 5 support

Author: nateberkopec

.travis.yml

@@ -14,6 +14,7 @@ gemfile:
   - gemfiles/rails32.gemfile
   - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
+  - gemfiles/rails5.gemfile
 
 sudo: false
 
@@ -39,3 +40,13 @@ matrix:
       gemfile: gemfiles/rails32.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails32.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: ree
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: 2.1.8
+      gemfile: gemfiles/rails5.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails5.gemfile

gemfiles/rails42.gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", '4.2.0'
+gem "rails", "~> 4.2.0"
 gem "rspec"
 
 gemspec :path => "../"

gemfiles/rails5.gemfile

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem "rails", "5.0.0.beta2"
+gem "rspec"
+
+gemspec :path => "../"

lib/raven/integrations/rails.rb

@@ -3,7 +3,7 @@
 module Raven
   class Rails < ::Rails::Railtie
     initializer "raven.use_rack_middleware" do |app|
-      app.config.middleware.insert 0, "Raven::Rack"
+      app.config.middleware.insert 0, Raven::Rack
     end
 
     initializer 'raven.action_controller' do

lib/raven/integrations/rails/middleware/debug_exceptions_catcher.rb

@@ -6,8 +6,10 @@ def self.included(base)
           base.send(:alias_method_chain, :render_exception, :raven)
         end
 
-        def render_exception_with_raven(env, exception)
+        def render_exception_with_raven(env_or_request, exception)
+          env = env_or_request.respond_to?(:env) ? env_or_request.env : env_or_request
           Raven::Rack.capture_exception(exception, env)
+        ensure
           render_exception_without_raven(env, exception)
         end
       end