bugsnag 1.2.5 → 1.2.6

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/bugsnag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bugsnag"
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2012-10-18"
+  s.date = "2012-12-02"
   s.description = "Ruby notifier for bugsnag.com"
   s.email = "james@bugsnag.com"
   s.extra_rdoc_files = [

data/lib/bugsnag/capistrano.rb

@@ -14,17 +14,18 @@ module Bugsnag
           desc "Notify Bugsnag that new production code has been deployed"
           task :deploy, :except => { :no_release => true }, :on_error => :continue do
             # Build the rake command
-            rake = fetch(:rake, "rake")
-            rails_env = fetch(:rails_env, "production")
-            rake_command = "cd '#{current_path}' && #{rake} bugsnag:deploy RAILS_ENV=#{rails_env}"
+            rake         = fetch(:rake, "rake")
+            rails_env    = fetch(:rails_env, "production")
+            bugsnag_env  = fetch(:bugsnag_env, rails_env)
+            rake_command = "cd '#{current_path}' && RAILS_ENV=#{rails_env} #{rake} bugsnag:deploy"
 
             # Build the new environment to pass through to rake
             new_env = {
-              "BUGSNAG_RELEASE_STAGE" => rails_env,
-              "BUGSNAG_REVISION" => fetch(:current_revision, nil),
-              "BUGSNAG_REPOSITORY" => fetch(:repository, nil),
-              "BUGSNAG_BRANCH" => fetch(:branch, nil)
-            }.reject {|k,v| v.nil? }
+              "BUGSNAG_RELEASE_STAGE" => bugsnag_env,
+              "BUGSNAG_REVISION"      => fetch(:current_revision, nil),
+              "BUGSNAG_REPOSITORY"    => fetch(:repository, nil),
+              "BUGSNAG_BRANCH"        => fetch(:branch, nil)
+            }.reject { |_, v| v.nil? }
 
             # Pass through any existing env variables
             ALLOWED_ENV_SETTINGS.each { |opt| new_env[opt] = ENV[opt] if ENV[opt] }

data/lib/bugsnag/middleware_stack.rb

@@ -13,11 +13,11 @@ module Bugsnag
     end
   
     def insert_after(after, new_middleware)
-      index = (@middlewares.rindex(after) + 1)
-      if index >= @middlewares.length
+      index = @middlewares.rindex(after)
+      if index.nil?
         @middlewares << new_middleware
       else
-        @middlewares.insert index, new_middleware
+        @middlewares.insert index + 1, new_middleware
       end
     end
   

data/lib/bugsnag/rack.rb

@@ -1,6 +1,7 @@
 require "bugsnag/middleware/rack_request"
 require "bugsnag/middleware/warden_user"
 require "bugsnag/middleware/callbacks"
+require "bugsnag/middleware/rails3_request"
 
 module Bugsnag
   class Rack
@@ -22,7 +23,7 @@ module Bugsnag
         end
 
         # Hook up rack-based notification middlewares
-        config.middleware.use Bugsnag::Middleware::RackRequest if defined?(::Rack)
+        config.middleware.insert_before(Bugsnag::Middleware::Rails3Request, Bugsnag::Middleware::RackRequest) if defined?(::Rack)
         config.middleware.use Bugsnag::Middleware::WardenUser if defined?(Warden)
       end
     end

data/lib/bugsnag/rails/action_controller_rescue.rb

@@ -10,17 +10,13 @@ module Bugsnag::Rails
       base.send(:alias_method, :rescue_action_locally, :rescue_action_locally_with_bugsnag)
 
       # Run filters on requests to capture request data
-      base.send(:before_filter, :set_bugsnag_request_data)
-      base.send(:after_filter, :clear_bugsnag_request_data)
+      base.send(:prepend_before_filter, :set_bugsnag_request_data)
     end
 
     private
     def set_bugsnag_request_data
-      Bugsnag.set_request_data(:rails2_request, request)
-    end
-    
-    def clear_bugsnag_request_data
       Bugsnag.clear_request_data
+      Bugsnag.set_request_data(:rails2_request, request)
     end
 
     def rescue_action_in_public_with_bugsnag(exception)

data/lib/bugsnag/railtie.rb

@@ -3,6 +3,7 @@
 require "rails"
 require "bugsnag"
 require "bugsnag/middleware/rails3_request"
+require "bugsnag/middleware/rack_request"
 
 module Bugsnag
   class Railtie < Rails::Railtie
@@ -17,6 +18,7 @@ module Bugsnag
         config.release_stage = Rails.env.to_s
         config.project_root = Rails.root.to_s
         config.params_filters += Rails.configuration.filter_parameters
+        config.middleware.insert_after Bugsnag::Middleware::RackRequest, Bugsnag::Middleware::Rails3Request
       end
 
       # Auto-load configuration settings from config/bugsnag.yml if it exists
@@ -37,11 +39,5 @@ module Bugsnag
         app.config.middleware.use "Bugsnag::Rack"
       end
     end
-
-    config.after_initialize do
-      Bugsnag.configure do |config|
-        config.middleware.use Bugsnag::Middleware::Rails3Request
-      end
-    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-18 00:00:00 Z
+date: 2012-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement