airbrake 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92520a721aab5d73da3d97a7014615e3488fad82
-  data.tar.gz: 0b6fa7570aec43283532474d468eeda973d4b45b
+  metadata.gz: ded8541777d75a9ba2c09642bdd86597ea50a27b
+  data.tar.gz: 906c8494c89ba2eea2e11ccac54aeba0b8c2a8c9
 SHA512:
-  metadata.gz: d36f715cdaef5b5f3af800ec998df09fcd55ce2304b76879df71dd8a68b42202871b4b4443beda2a7c8071f677a14941915ce91cd92ec3908fa515004589df41
-  data.tar.gz: ae00ca913a519e76a6fa8fb7fe31f8daf4a9d9daf94db4d97953d654ab1b8ece9a8b4bd61f656420609c9a1c9f5b53f857e8dff2d58ec1fb43ff1746e71f7869
+  metadata.gz: ec4e5304b839b160469c95ee8fd7865854710d68bc98aca71cf7d31ddf5b998c30da88b37413ad85aeafc29a3785a13e087b7e1c0cf54bd32c09bf3034e31a7a
+  data.tar.gz: 3a111f2210212d4cf7df1f66030949ef623cc7a56242b636f12637330a2a81261013e9af286e5fb59a52ff172ccd04ff2055764f7c3724f1c686f60f9b4c46b3

data/CHANGELOG

@@ -1,3 +1,74 @@
+Version 4.2.0 - 2015-05-27 19:05:32 -0500
+===============================================================================
+
+Abdelkader Boudih (1):
+      Update sidekiq.rb
+
+Adam King (1):
+      Fix DEFAULT_BACKTRACE_FILTERS bug that caused backtrace to not show up in certain contexts. See https://github.com/airbrake/airbrake/issues/343.
+
+David (8):
+      Merge pull request #329 from grosser/grosser/gemspec
+      Merge pull request #335 from airbrake/fix/cucumber-suite
+      Merge pull request #327 from airbrake/feature/faster-params-cleaning
+      Merge pull request #337 from airbrake/fix/rails4-is-here
+      Merge pull request #326 from airbrake/fix/cast-ENV-to-Hash
+      Merge pull request #328 from grosser/grosser/dup
+      Merge pull request #334 from airbrake/fix/user-info-consumes-db-connections
+      Merge pull request #340 from grosser/grosser/dup
+
+David Palm (9):
+      Cast CGI data to hash, as that's what the code really expects
+      Speed up notice generation by avoiding copying data and putting most common cases on top
+      Refactor #airbrake_current_user
+      Typo
+      Add comment explaining why we release connections
+      Comment out @wip scenarios to facilitate running parts of the suite
+      Add 4 to version sniffing code
+      PR feedback
+      Clone to ensure we do not mess with the provided data
+
+Eero Raun (1):
+      Ignore RACK_ENV if it is empty (capistrano deploy), fixes #341.
+
+Jonathan Worek (1):
+      Assumption of existence of :app role may not be valid
+
+Marko Šiftar (3):
+      Merge pull request #354 from wojobucco/patch-1
+      Merge pull request #342 from oree/341
+      Merge pull request #382 from airbrake/fix/use-proper-capistrano-hook
+
+Martin Tepper (1):
+      This should fix #369
+
+grosser (3):
+      cleanup gemspec
+      fix having symbols in the environment blows up filter_parameters with blocks
+      If we cannot stringify then at least rescue the dup exceptions ...
+
+halida (1):
+      fix rails request.fullpath behavior change in 4.1.6 -- no longer has leading /
+
+shifi (17):
+      add test for filtering frozen objects
+      Merge branch 'Promptus-issue_369_frozen_array_issue'
+      update Appraisals file
+      Merge branch 'master' of https://github.com/halida/airbrake into halida-master
+      remove whitespaces
+      add test for airbrake_request_url
+      Merge branch 'halida-master'
+      update year in license and readme
+      use proper capistrano hook depending on capistrano version
+      set localhost IP to satisfy web console when testing in development
+      Merge branch 'patch-1' of https://github.com/seuros/airbrake into seuros-patch-1
+      fix syntax error in Sidekiq configuration
+      Merge branch 'seuros-patch-1'
+      Merge branch 'master' of https://github.com/developwithvelocity/airbrake into developwithvelocity-master
+      tests for backtrace default filters - gem paths
+      Merge branch 'developwithvelocity-master'
+
+
 Version 4.1.0 - 2014-09-04 23:16:08 +0200
 ===============================================================================
 
@@ -1443,5 +1514,6 @@ Nick Quaranto (3):
 
 
 
+
 
 

data/LICENSE

@@ -25,7 +25,7 @@ See https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt
 
 
 All other components of this product are
-Copyright (c) 2007-2014 Rackspace, Inc.
+Copyright (c) 2007-2015 Rackspace, Inc.
 
 Subject to the terms of this notice, Rackspace, Inc. grants you a
 nonexclusive, nontransferable license, without the right to
@@ -36,25 +36,25 @@ foregoing grant, you must provide this notice along with each copy you
 distribute and you must not remove, alter, or obscure this notice. All
 other use, reproduction, modification, distribution, or other
 exploitation of these files is strictly prohibited, except as may be set
-forth in a separate written license agreement between you and ERackspace, 
+forth in a separate written license agreement between you and ERackspace,
 Inc.  The terms of any such license agreement will control over this
 notice.  The license stated above will be automatically terminated and
 revoked if you exceed its scope or violate any of the terms of this
 notice.
 
 This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of Rackspace, Inc., 
-Airbrake, Exceptional, Airbrake.io, Exceptional.io except as 
-required for reasonable and customary use in describing the origin 
-of this file and reproducing the content of this notice.  You may 
-not mark or brand this file with any trade name, trademarks, 
-servicemarks, or product names other than the original brand 
+trademarks, service marks, or product names of Rackspace, Inc.,
+Airbrake, Exceptional, Airbrake.io, Exceptional.io except as
+required for reasonable and customary use in describing the origin
+of this file and reproducing the content of this notice.  You may
+not mark or brand this file with any trade name, trademarks,
+servicemarks, or product names other than the original brand
 (if any)provided by Rackspace, Inc.
 
-Unless otherwise expressly agreed by Rackspace, Inc., in a 
+Unless otherwise expressly agreed by Rackspace, Inc., in a
 separate written license agreement, these files are provided AS IS,
 WITHOUT WARRANTY OF ANY KIND, including without any implied warranties
-of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT. 
+of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, or NON-INFRINGEMENT.
 As a condition to your use of these files, you are solely responsible for
 such use. Rackspace, Inc. will have no liability to you for direct,
 indirect, consequential, incidental, special, or punitive damages or

data/README.md

@@ -145,4 +145,4 @@ The names and logos for Airbrake, thoughtbot are trademarks of their respective
 License
 -------
 
-Airbrake is Copyright © 2008-2013 Airbrake.
+Airbrake is Copyright © 2008-2015 Airbrake.

data/Rakefile

@@ -1,16 +1,11 @@
-require 'rubygems'
+require 'rubygems' unless RUBY_VERSION > "1.8"
 require 'bundler/setup'
 require 'appraisal'
 require 'rake'
 require 'rake/testtask'
 require 'coveralls/rake/task'
 require 'rubygems/package_task'
-begin
-  require 'cucumber/rake/task'
-rescue LoadError
-  $stderr.puts "Please install cucumber: `gem install cucumber`"
-  exit 1
-end
+require 'cucumber/rake/task'
 require './lib/airbrake/version'
 
 Coveralls::RakeTask.new

data/airbrake.gemspec

@@ -1,14 +1,11 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "airbrake/version"
+require "./lib/airbrake/version"
 
 Gem::Specification.new do |s|
-  s.name        = %q{airbrake}
+  s.name        = "airbrake"
   s.version     = Airbrake::VERSION.dup
-  s.summary     = %q{Send your application errors to our hosted service and reclaim your inbox.}
-  s.license     = %q{MIT}
+  s.summary     = "Send your application errors to our hosted service and reclaim your inbox."
+  s.license     = "MIT"
 
-  s.require_paths = ["lib"]
   s.executables   << "airbrake"
   s.files         = Dir["{generators/**/*,lib/**/*,rails/**/*,resources/*,script/*}"]  +
     %w(airbrake.gemspec CHANGELOG Gemfile Guardfile INSTALL LICENSE Rakefile README_FOR_HEROKU_ADDON.md README.md TESTED_AGAINST install.rb)
@@ -35,10 +32,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency("pry")
   s.add_development_dependency("coveralls")
   s.add_development_dependency("minitest", ["~> 4.0"])
+  s.add_development_dependency("test-unit")
+  
 
   s.authors = ["Airbrake"]
-  s.email   = %q{support@airbrake.io}
+  s.email   = "support@airbrake.io"
   s.homepage = "http://www.airbrake.io"
-
-  s.platform = Gem::Platform::RUBY
 end

data/features/rails.feature

@@ -81,30 +81,30 @@ Feature: Install the Gem in a Rails application
     And I run `rails generate airbrake -k myapikey`
     Then "config/deploy.rb" should not contain "capistrano"
 
-  @wip
-  Scenario: Support the Heroku addon in the generator
-    When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey -t`
-    And I configure the Heroku shim with "myapikey"
-    And I successfully run `rails generate airbrake --heroku`
-    Then I should receive a Airbrake notification
-    And I should see the Rails version
-    And my Airbrake configuration should contain the following line:
-      """
-      config.api_key = ENV['HOPTOAD_API_KEY']
-      """
+  # @wip
+  # Scenario: Support the Heroku addon in the generator
+  #   When I configure the Airbrake shim
+  #   And I run `rails generate airbrake -k myapikey -t`
+  #   And I configure the Heroku shim with "myapikey"
+  #   And I run `rails generate airbrake --heroku`
+  #   Then I should receive a Airbrake notification
+  #   And I should see the Rails version
+  #   And my Airbrake configuration should contain the following line:
+  #     """
+  #     config.api_key = 'myapikey'
+  #     """
 
-  @wip
-  Scenario: Support the --app option for the Heroku addon in the generator
-    When I configure the Airbrake shim
-    And I configure the Heroku shim with "myapikey" and multiple app support
-    And I run `rails generate airbrake --heroku -a myapp -t`
-    Then I should receive a Airbrake notification
-    And I should see the Rails version
-    And my Airbrake configuration should contain the following line:
-      """
-      config.api_key = ENV['HOPTOAD_API_KEY']
-      """
+  # @wip
+  # Scenario: Support the --app option for the Heroku addon in the generator
+  #   When I configure the Airbrake shim
+  #   And I configure the Heroku shim with "myapikey" and multiple app support
+  #   And I run `rails generate airbrake --heroku -a myapp -t`
+  #   Then I should receive a Airbrake notification
+  #   And I should see the Rails version
+  #   And my Airbrake configuration should contain the following line:
+  #     """
+  #     config.api_key = 'myapikey'
+  #     """
 
   Scenario: Filtering parameters in a controller
     When I configure the Airbrake shim
@@ -165,6 +165,25 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
     And the Airbrake notification should not contain any of the sensitive Rack variables
 
+  Scenario: Filtering vs symbols
+    When I configure the Airbrake shim
+    And I run `rails generate airbrake -k myapikey -t`
+    When I configure the notifier to use the following configuration lines:
+      """
+      config.api_key = "myapikey"
+      config.logger = Logger.new STDOUT
+      """
+    And I configure the application to filter parameter "block"
+    And I define a response for "TestController#index":
+      """
+      request.env["foo"] = {:foo => "bar"}
+      raise RuntimeError, "some message"
+      """
+    And I route "/test/index" to "test#index"
+    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 "some message"
+
   Scenario: Notify airbrake within the controller
     When I configure the Airbrake shim
     And I run `rails generate airbrake -k myapikey -t`

data/features/rake.feature

@@ -27,7 +27,7 @@ Feature: Use the Gem to catch errors in a Rake application
     When I run rake with airbrake autodetect not from terminal
     Then Airbrake should catch the exception
 
-  @wip
-  Scenario: Airbrake should also send the command name
-    When I run `rake airbrake_autodetect_not_from_terminal`
-    Then command "airbrake_autodetect_not_from_terminal" should be reported
+  # @wip
+  # Scenario: Airbrake should also send the command name
+  #   When I run `rake airbrake_autodetect_not_from_terminal`
+  #   Then command "airbrake_autodetect_not_from_terminal" should be reported

data/features/step_definitions/rails_application_steps.rb

@@ -184,8 +184,8 @@ When /^I configure the application to filter parameter "([^\"]*)"$/ do |paramete
   application_definition_line       = application_lines.detect { |line| line =~ /Application/ }
   application_definition_line_index = application_lines.index(application_definition_line)
 
-  application_lines.insert(application_definition_line_index + 1,
-                           "    config.filter_parameters += [#{parameter.inspect}]")
+  parameter = (parameter == "block" ? "lambda { |x,y| x }" : parameter.inspect)
+  application_lines.insert(application_definition_line_index + 1, "    config.filter_parameters += [#{parameter}]")
 
   File.open(application_filename, "w") do |file|
     file.puts application_lines.join("\n")

data/features/support/rails.rb

@@ -24,8 +24,8 @@ module RailsHelpers
     controller_filename = File.join(rails_root, 'app', 'controllers', "application_controller.rb")
   end
 
-  def rails3?
-    rails_version =~ /^3/
+  def rails_3_or_4?
+    rails_version =~ /\A[34]/
   end
 
   def rails_root
@@ -33,7 +33,7 @@ module RailsHelpers
   end
 
   def rails_uses_rack?
-    rails3? || rails_version =~ /^2\.3/
+    rails_3_or_4? || rails_version =~ /^2\.3/
   end
 
   def rails_version
@@ -58,15 +58,15 @@ module RailsHelpers
   end
 
   def rails_manages_gems?
-    rails_version =~ /^2\.[123]/
+    rails_version =~ /\A2\.[123]/
   end
 
   def rails_supports_initializers?
-    rails3? || rails_version =~ /^2\./
+    rails_3_or_4? || rails_version =~ /\A2\./
   end
 
   def rails_finds_generators_in_gems?
-    rails3? || rails_version =~ /^2\./
+    rails_3_or_4? || rails_version =~ /\A2\./
   end
 
   def version_string

data/lib/airbrake/capistrano.rb

@@ -71,13 +71,13 @@ module Airbrake
               - Run remotely so we use remote API keys, environment, etc.
           DESC
           task :deploy, :except => { :no_release => true } do
-            rack_env = fetch(:rack_env, "production")
-            rails_env = fetch(:rails_env, "production")
-            airbrake_env = fetch(:airbrake_env, rack_env || rails_env)
+            rack_env = fetch(:rack_env, nil)
+            rails_env = fetch(:rails_env, nil)
+            airbrake_env = fetch(:airbrake_env, rack_env || rails_env || "production")
             local_user = ENV['USER'] || ENV['USERNAME']
             executable = RUBY_PLATFORM.downcase.include?('mswin') ? fetch(:rake, 'rake.bat') : fetch(:rake, 'bundle exec rake ')
             directory = configuration.release_path
-            notify_command = "cd #{directory}; #{executable} RACK_ENV=#{rack_env} RAILS_ENV=#{rails_env} airbrake:deploy TO=#{airbrake_env} REVISION=#{current_revision} REPO=#{repository} USER=#{Airbrake::Capistrano::shellescape(local_user)}"
+            notify_command = "cd #{directory}; #{executable} #{'RACK_ENV='+rack_env if rack_env} #{'RAILS_ENV='+rails_env if rails_env} airbrake:deploy TO=#{airbrake_env} REVISION=#{current_revision} REPO=#{repository} USER=#{Airbrake::Capistrano::shellescape(local_user)}"
             notify_command << " DRY_RUN=true" if dry_run
             notify_command << " API_KEY=#{ENV['API_KEY']}" if ENV['API_KEY']
             logger.info "Notifying Airbrake of Deploy (#{notify_command})"

data/lib/airbrake/configuration.rb

@@ -130,11 +130,8 @@ module Airbrake
       },
       lambda { |line| line.gsub(/^\.\//, "") },
       lambda { |line|
-        if defined?(Gem)
-          Gem.path.inject(line) do |l, path|
-            l.gsub(/#{path}/, "[GEM_ROOT]")
-          end
-        end
+        Gem.path.each{ |path| line.sub!(/#{path}/, "[GEM_ROOT]") unless path.to_s.strip.empty? } if defined?(Gem)
+        line
       },
       lambda { |line| line if line !~ %r{lib/airbrake} }
     ].freeze
@@ -259,7 +256,7 @@ module Airbrake
     # Determines if the notifier will send notices.
     # @return [Boolean] Returns +false+ if in a development environment, +true+ otherwise.
     def public?
-      !development_environments.include?(environment_name)
+      @public ||= !development_environments.include?(environment_name)
     end
 
     def port

data/lib/airbrake/notice.rb

@@ -116,7 +116,7 @@ module Airbrake
       @action              = args[:action] || parameters['action']
 
       @environment_name = args[:environment_name]
-      @cgi_data         = (args[:cgi_data] && args[:cgi_data].dup) || args[:rack_env] || {}
+      @cgi_data         = (args[:cgi_data].respond_to?(:to_hash) && args[:cgi_data].to_hash.dup) || args[:rack_env] || {}
       @backtrace        = Backtrace.parse(exception_attribute(:backtrace, caller), :filters => @backtrace_filters)
       @error_class      = exception_attribute(:error_class) {|exception| exception.class.name }
       @error_message    = exception_attribute(:error_message, 'Notification') do |exception|

data/lib/airbrake/rails/controller_methods.rb

@@ -10,7 +10,7 @@ module Airbrake
           :action           => params[:action],
           :url              => airbrake_request_url,
           :cgi_data         => airbrake_filter_if_filtering(request.env),
-          :user             => airbrake_current_user
+          :user             => airbrake_current_user || {}
         }
       end
 
@@ -44,20 +44,31 @@ module Airbrake
 
         if respond_to?(:filter_parameters) # Rails 2
           filter_parameters(hash)
-        elsif rails3?
+        elsif rails_3_or_4?
           filter_rails3_parameters(hash)
         else
           hash
         end
       end
 
-      def rails3?
-        defined?(::Rails.version) && ::Rails.version =~ /\A3/
+      def rails_3_or_4?
+        defined?(::Rails.version) && ::Rails.version =~ /\A[34]/
       end
 
       def filter_rails3_parameters(hash)
         ActionDispatch::Http::ParameterFilter.new(
-          ::Rails.application.config.filter_parameters).filter(hash)
+          ::Rails.application.config.filter_parameters
+        ).filter(recursive_stringify_keys(hash))
+      end
+
+      def recursive_stringify_keys(hash)
+        hash = hash.stringify_keys
+        hash.each do |k, v|
+          if v.is_a?(Hash)
+            hash[k] = v.respond_to?(:stringify_keys) ? recursive_stringify_keys(v) : nil # Rack::Session::Abstract::SessionHash has a stringify_keys method we should not call
+          end
+        end
+        hash
       end
 
       def airbrake_session_data
@@ -79,20 +90,34 @@ module Airbrake
           url << ":#{request.port}"
         end
 
-        url << request.fullpath
-        url
+        URI.join(url, request.fullpath).to_s
       end
 
       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
+        user = fetch_user
+
+        if user
+          Airbrake.configuration.user_attributes.map(&:to_sym).inject({}) do |hsh, attr|
+            hsh[attr.to_sym] = user.send(attr) if user.respond_to? attr
+            hsh
+          end
+        end
+      end
+
+      def fetch_user
+        if defined?(current_user)
+          current_user
+        elsif defined?(current_member)
+          current_member
+        else
+          nil
+        end
+      ensure
+        # The Airbrake middleware is first in the chain, before ActiveRecord::ConnectionAdapters::ConnectionManagement
+        # kicks in to do its thing. This can cause the connection pool to run out of connections.
+        if defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:connection_pool)
+          ActiveRecord::Base.connection_pool.release_connection
         end
-        h
-      rescue NoMethodError, NameError
-        {}
       end
     end
   end