bugsnag 1.1.2 → 1.1.3

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "multi_json", "~> 1.3.4"
+gem "multi_json", "~> 1.0"
 gem "httparty", "~> 0.8.3"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -30,6 +30,6 @@ PLATFORMS
 DEPENDENCIES
   httparty (~> 0.8.3)
   jeweler (~> 1.6.4)
-  multi_json (~> 1.3.4)
+  multi_json (~> 1.0)
   rcov
   shoulda

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/bugsnag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bugsnag"
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2012-07-25"
+  s.date = "2012-09-12"
   s.description = "Ruby notifier for bugsnag.com"
   s.email = "james@bugsnag.com"
   s.extra_rdoc_files = [
@@ -54,20 +54,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<multi_json>, ["~> 1.3.4"])
+      s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
       s.add_runtime_dependency(%q<httparty>, ["~> 0.8.3"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<multi_json>, ["~> 1.3.4"])
+      s.add_dependency(%q<multi_json>, ["~> 1.0"])
       s.add_dependency(%q<httparty>, ["~> 0.8.3"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<multi_json>, ["~> 1.3.4"])
+    s.add_dependency(%q<multi_json>, ["~> 1.0"])
     s.add_dependency(%q<httparty>, ["~> 0.8.3"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/bugsnag/helpers.rb

@@ -30,5 +30,22 @@ module Bugsnag
     def self.request_context(request)
       "#{request.request_method} #{request.path}" if request
     end
+
+    # Helper functions to work around MultiJson changes in 1.3+
+    def self.dump_json(object, options={})
+      if MultiJson.respond_to?(:adapter)
+        MultiJson.dump(object, options)
+      else
+        MultiJson.encode(object, options)
+      end
+    end
+
+    def self.load_json(json, options={})
+      if MultiJson.respond_to?(:adapter)
+        MultiJson.load(json, options)
+      else
+        MultiJson.decode(json, options)
+      end
+    end
   end
 end

data/lib/bugsnag/notification.rb

@@ -80,7 +80,7 @@ module Bugsnag
         }.reject {|k,v| v.nil? }]
       }
 
-      self.class.deliver_exception_payload(endpoint, MultiJson.dump(payload))
+      self.class.deliver_exception_payload(endpoint, Bugsnag::Helpers.dump_json(payload))
     end
 
     def ignore?

data/lib/bugsnag/rack.rb

@@ -2,6 +2,11 @@ module Bugsnag
   class Rack
     def initialize(app)
       @app = app
+
+      # Automatically set the release_stage
+      Bugsnag.configuration.release_stage = ENV['RACK_ENV'] if ENV['RACK_ENV']
+
+      # Automatically set the project_root if possible
       if Bugsnag.configuration.project_root.nil? || Bugsnag.configuration.project_root.empty?
         if defined?(settings)
           Bugsnag.configuration.project_root = settings.root
@@ -20,44 +25,46 @@ module Bugsnag
       begin
         response = @app.call(env)
       rescue Exception => raised
-        Bugsnag.auto_notify(raised, bugsnag_request_data(env))
+        Bugsnag.auto_notify(raised, self.class.bugsnag_request_data(env))
         raise
       end
 
       if env['rack.exception']
-        Bugsnag.auto_notify(env['rack.exception'], bugsnag_request_data(env))
+        Bugsnag.auto_notify(env['rack.exception'], self.class.bugsnag_request_data(env))
       end
 
       response
     end
-    
-    private
-    def bugsnag_request_data(env)
-      request = ::Rack::Request.new(env)
-
-      session = env["rack.session"]
-      params = env["action_dispatch.request.parameters"] || request.params
-      user_id = session[:session_id] || session["session_id"] if session
-
-      {
-        :user_id => user_id,
-        :context => Bugsnag::Helpers.param_context(params) || Bugsnag::Helpers.request_context(request),
-        :meta_data => {
-          :request => {
-            :url => request.url,
-            :controller => params[:controller],
-            :action => params[:action],
-            :params => bugsnag_filter_if_filtering(env, Bugsnag::Helpers.cleanup_hash(params.to_hash)),
-          },
-          :session => bugsnag_filter_if_filtering(env, Bugsnag::Helpers.cleanup_hash(session)),
-          :environment => bugsnag_filter_if_filtering(env, Bugsnag::Helpers.cleanup_hash(env))
+
+    class << self
+      def bugsnag_request_data(env)
+        request = ::Rack::Request.new(env)
+
+        session = env["rack.session"]
+        params = env["action_dispatch.request.parameters"] || request.params
+        user_id = session[:session_id] || session["session_id"] rescue nil
+
+        {
+          :user_id => user_id,
+          :context => Bugsnag::Helpers.param_context(params) || Bugsnag::Helpers.request_context(request),
+          :meta_data => {
+            :request => {
+              :url => request.url,
+              :controller => params[:controller],
+              :action => params[:action],
+              :params => bugsnag_filter_if_filtering(env, Bugsnag::Helpers.cleanup_hash(params.to_hash)),
+            },
+            :session => bugsnag_filter_if_filtering(env, Bugsnag::Helpers.cleanup_hash(session)),
+            :environment => bugsnag_filter_if_filtering(env, Bugsnag::Helpers.cleanup_hash(env))
+          }
         }
-      }
-    end
+      end
 
-    def bugsnag_filter_if_filtering(env, hash)
-      @params_filters ||= env["action_dispatch.parameter_filter"]
-      Bugsnag::Helpers.apply_filters(hash, @params_filters)
+      private
+      def bugsnag_filter_if_filtering(env, hash)
+        @params_filters ||= env["action_dispatch.parameter_filter"]
+        Bugsnag::Helpers.apply_filters(hash, @params_filters)
+      end
     end
   end
 end

data/lib/bugsnag/railtie.rb

@@ -10,7 +10,11 @@ module Bugsnag
     end
 
     initializer "bugsnag.use_rack_middleware" do |app|
-      app.config.middleware.use "Bugsnag::Rack"
+      begin
+        app.config.middleware.insert_after ActionDispatch::ShowExceptions, "Bugsnag::Rack"
+      rescue
+        app.config.middleware.use "Bugsnag::Rack"
+      end
     end
 
     config.after_initialize do

data/lib/tasks/bugsnag.rake

@@ -26,7 +26,7 @@ namespace :bugsnag do
                + "/deploy"
 
       HTTParty.post(endpoint, {
-        :body => MultiJson.dump(payload),
+        :body => Bugsnag::Helpers.dump_json(payload),
         :headers => {"Content-Type" => "application/json"}
       })
     rescue Exception => e

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -23,16 +23,15 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 1
-        - 3
-        - 4
-        version: 1.3.4
-  version_requirements: *id001
-  name: multi_json
+        - 0
+        version: "1.0"
   prerelease: false
   type: :runtime
+  name: multi_json
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,10 +44,10 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
-  version_requirements: *id002
-  name: httparty
   prerelease: false
   type: :runtime
+  name: httparty
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,10 +58,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: shoulda
   prerelease: false
   type: :development
+  name: shoulda
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,10 +74,10 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id004
-  name: jeweler
   prerelease: false
   type: :development
+  name: jeweler
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -89,10 +88,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: rcov
   prerelease: false
   type: :development
+  name: rcov
+  version_requirements: *id005
 description: Ruby notifier for bugsnag.com
 email: james@bugsnag.com
 executables: []