airbrake 3.1.7 → 3.1.8

data/CHANGELOG

@@ -1,3 +1,14 @@
+Version 3.1.8 - 2013-02-05 16:29:43 +0100
+===============================================================================
+
+Hrvoje Šimić (5):
+      rename SUPPORTED_RAILS_VERSIONS to TESTED_AGAINST
+      don't call id on nil - fixes #177
+      move our middleware right after exception middleware (#178)
+      implement tests for #178
+      be nice to older rails versions
+
+
 Version 3.1.7 - 2013-01-28 13:35:10 +0100
 ===============================================================================
 
@@ -1058,3 +1069,4 @@ Nick Quaranto (3):
 
 
 
+

data/features/rails.feature

@@ -249,3 +249,7 @@ Feature: Install the Gem in a Rails application
     And I perform a request to "http://example.com:123/test/index" in the "production" environment
     Then I should receive a Airbrake notification
     And the Airbrake notification should contain the framework information
+
+  Scenario: Middleware should be correctly placed
+    When I list the application's middleware and save it into a file
+    Then the Airbrake middleware should be placed correctly

data/features/step_definitions/rails_application_steps.rb

@@ -244,3 +244,17 @@ end
 Then /^the Airbrake notification should contain the framework information$/ do
   step %{the output should contain "Rails: #{ENV["RAILS_VERSION"]}"}
 end
+
+When /^I list the application's middleware and save it into a file$/ do
+  step %{I run `bash -c 'bundle exec rake middleware > middleware.dump'`}
+end
+
+Then /^the Airbrake middleware should be placed correctly$/ do
+  middleware_file = File.join(LOCAL_RAILS_ROOT, 'middleware.dump')
+  middleware      = File.read(middleware_file).split(/\n/)
+  airbrake_index  = middleware.rindex("use Airbrake::Rails::Middleware")
+  middleware_index = middleware.rindex("use ActionDispatch::DebugExceptions") ||
+    middleware.rindex("use ActionDispatch::ShowExceptions")
+  (airbrake_index > middleware_index).should be_true
+end
+

data/lib/airbrake.rb

@@ -6,7 +6,15 @@ end
 require 'net/http'
 require 'net/https'
 require 'rubygems'
-require 'active_support/core_ext/object/blank'
+
+begin
+  require 'active_support/core_ext/object/blank'
+rescue
+  require 'activesupport'
+  require 'activesupport/core_ext'
+end
+
+
 require 'airbrake/version'
 require 'airbrake/configuration'
 require 'airbrake/notice'

data/lib/airbrake/rails/controller_methods.rb

@@ -75,6 +75,7 @@ module Airbrake
       def airbrake_current_user
         user = begin current_user rescue current_member end
         h = {}
+        return h if user.nil?
         Airbrake.configuration.user_attributes.map(&:to_sym).each do |attr|
           h[attr.to_sym] = user.send(attr) if user.respond_to? attr
         end

data/lib/airbrake/railtie.rb

@@ -11,7 +11,18 @@ module Airbrake
     end
 
     initializer "airbrake.middleware" do |app|
-      app.config.middleware.use "Airbrake::Rails::Middleware"
+
+      middleware = if defined?(ActionDispatch::DebugExceptions)
+        # Rails >= 3.2.0
+        "ActionDispatch::DebugExceptions"
+      else
+        # Rails < 3.2.0
+        "ActionDispatch::ShowExceptions"
+      end
+
+      app.config.middleware.insert_after middleware,
+        "Airbrake::Rails::Middleware"
+
       app.config.middleware.insert 0, "Airbrake::UserInformer"
     end
 

data/lib/airbrake/version.rb

@@ -1,3 +1,3 @@
 module Airbrake
-  VERSION = "3.1.7"
+  VERSION = "3.1.8"
 end

data/test/controller_methods_test.rb

@@ -0,0 +1,37 @@
+require File.expand_path '../helper', __FILE__
+
+require 'airbrake/rails/controller_methods'
+
+class TestController
+  include Airbrake::Rails::ControllerMethods
+
+  def current_user
+    nil
+  end
+end
+
+class ControllerMethodsTest < Test::Unit::TestCase
+  context "#airbrake_current_user" do
+    setup do
+
+      NilClass.class_eval do
+        @@called = false
+
+        def self.called
+          !! @@called
+        end
+
+        def id
+          @@called = true
+        end
+      end
+
+      @controller = TestController.new
+    end
+
+    should "not call #id on NilClass" do
+      @controller.send(:airbrake_current_user)
+      assert_equal false, NilClass.called
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -329,6 +329,7 @@ files:
 - README.md
 - TESTED_AGAINST
 - install.rb
+- test/controller_methods_test.rb
 - test/configuration_test.rb
 - test/airbrake_tasks_test.rb
 - test/catcher_test.rb
@@ -387,6 +388,7 @@ signing_key:
 specification_version: 3
 summary: Send your application errors to our hosted service and reclaim your inbox.
 test_files:
+- test/controller_methods_test.rb
 - test/configuration_test.rb
 - test/airbrake_tasks_test.rb
 - test/catcher_test.rb