airbrake 3.1.10 → 3.1.11

data/CHANGELOG

@@ -1,3 +1,32 @@
+Version 3.1.11 - 2013-04-11 12:44:09 +0200
+===============================================================================
+
+Eric Jensen (1):
+      add --scm-revision option to cli
+
+Hrvoje Šimić (10):
+      update tested rails versions
+      reverting parts of 8768b1 that caused broken XML
+      update integration test
+      stop cluttering STDERR from rake airbrake:test
+      test coverage for Airbrake::Response
+      introduce configurable test mode
+      add the test mode option to the generator
+      update the test suite to use the test mode accordingly
+      stop using the 'progress' format when running features
+      fix defaults in integration test
+
+Kenneth Kalmer (2):
+      Wrap the JS notifier configuration in a try..catch, since the notifier JS might have failed to load
+      Set a noop window.onerror in the event Airbrake is not available
+
+Mark J. Titorenko (1):
+      Use env rather than @env when constructing fallback request data.
+
+Marko Šiftar (1):
+      pretty formatting of notice details
+
+
 Version 3.1.10 - 2013-04-03 15:41:13 +0200
 ===============================================================================
 
@@ -1114,3 +1143,4 @@ Nick Quaranto (3):
 
 
 
+

data/README.md

@@ -34,9 +34,9 @@ The generator creates a file under `config/initializers/airbrake.rb` configuring
 The default behaviour of the gem is to only operate in Rails environments that are NOT **development**, **test** & **cucumber**. 
 
 You can change this by altering this array:
-    
+
     config.development_environments = ["development", "test", "cucumber", "custom"]
-    
+
 Set it to empty array and it will report errors on all environments.
 
 
@@ -45,7 +45,7 @@ Set it to empty array and it will report errors on all environments.
 Add the airbrake gem to your app. In config/environment.rb:
 
     config.gem 'airbrake'
-    
+
 or if you are using bundler:
 
     gem 'airbrake', :require => 'airbrake/rails'
@@ -89,6 +89,19 @@ After this, you're ready to run the suite with:
 
 This will include cucumber features we use to fully test the integration.
 
+Maintainers
+-----------
+
+Make sure all tests are passing before pushing the new version. Also, make sure integration
+test is passing. You can run it with:
+
+    ./script/integration_test.rb <api_key> <host>
+
+After this is passing, change the version inside *lib/airbrake/version.rb* and
+push the new version with Changeling:
+
+    rake changeling:change
+
 Credits
 -------
 

data/Rakefile

@@ -123,7 +123,7 @@ LOCAL_GEM_ROOT = File.join(GEM_ROOT, 'tmp', 'local_gems').freeze
 # various gemfiles. We don't want to, for instance, test sinatra features when 
 # using the rails gemfile and vice versa.
 def cucumber_opts
-  opts = "--tags ~@wip --format progress "
+  opts = "--tags ~@wip "
 
   opts << ENV["FEATURE"] and return if ENV["FEATURE"]
 

data/features/rails.feature

@@ -6,7 +6,7 @@ Feature: Install the Gem in a Rails application
 
   Scenario: Use the gem without vendoring the gem in a Rails application
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     Then I should receive a Airbrake notification
     And I should see the Rails version
 
@@ -18,7 +18,7 @@ Feature: Install the Gem in a Rails application
 
   Scenario: Configuration within initializer isn't overridden by Railtie
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     And I configure the notifier to use the following configuration lines:
       """
       config.api_key = "myapikey"
@@ -26,7 +26,6 @@ Feature: Install the Gem in a Rails application
       """
     And I define a response for "TestController#index":
       """
-      session[:value] = "test"
       raise RuntimeError, "some message"
       """
     And I route "/test/index" to "test#index"
@@ -47,7 +46,7 @@ Feature: Install the Gem in a Rails application
   Scenario: Configure and deploy using only installed gem
     When I run `capify .`
     And I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     And I run `cap -T`
     Then I should see "airbrake:deploy"
 
@@ -60,20 +59,18 @@ Feature: Install the Gem in a Rails application
 
   Scenario: Rescue an exception in a controller
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     And I define a response for "TestController#index":
       """
-      session[:value] = "test"
       raise RuntimeError, "some message"
       """
     And I route "/test/index" to "test#index"
     And I perform a request to "http://example.com:123/test/index?param=value"
     Then I should receive a Airbrake notification
-    Then I should see "test"
 
   Scenario: The gem should not be considered a framework gem
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     And I run `rake gems`
     Then I should see that "airbrake" is not considered a framework gem
 
@@ -87,7 +84,7 @@ Feature: Install the Gem in a Rails application
   @wip
   Scenario: Support the Heroku addon in the generator
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    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
@@ -101,7 +98,7 @@ Feature: Install the Gem in a Rails application
   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`
+    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:
@@ -111,7 +108,7 @@ Feature: Install the Gem in a Rails application
 
   Scenario: Filtering parameters in a controller
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key = "myapikey"
@@ -128,13 +125,13 @@ Feature: Install the Gem in a Rails application
     And I route "/test/index" to "test#index"
     And I perform a request to "http://example.com:123/test/index?param=value" in the "production" environment
     Then I should receive a Airbrake notification
-    Then I should not see "red23"
-    Then I should not see "blue42"
-    And I should see "FILTERED"
+    And the Airbrake notification should not contain "red23"
+    And the Airbrake notification should not contain "blue42"
+    And the Airbrake notification should contain "FILTERED"
 
   Scenario: Filtering session and params based on Rails parameter filters
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     When I configure the notifier to use the following configuration lines:
       """
       config.logger = Logger.new STDOUT
@@ -149,23 +146,23 @@ Feature: Install the Gem in a Rails application
     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 I should not see "red23"
-    And I should not see "blue42"
-    And I should see "FILTERED"
+    And the Airbrake notification should not contain "red23"
+    And the Airbrake notification should not contain "blue42"
+    And the Airbrake notification should contain "FILTERED"
 
   Scenario: Notify airbrake within the controller
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     And I define a response for "TestController#index":
       """
-      session[:value] = "test"
+      session[:value] = "unicorn"
       notify_airbrake(RuntimeError.new("some message"))
       render :nothing => true
       """
     And I route "/test/index" to "test#index"
     And I perform a request to "http://example.com:123/test/index?param=value" in the "production" environment
     Then I should receive a Airbrake notification
-    And I should see "test"
+    And the Airbrake notification should contain "unicorn"
 
   Scenario: Reporting 404s should be disabled by default
     When I configure the Airbrake shim
@@ -179,7 +176,7 @@ Feature: Install the Gem in a Rails application
 
   Scenario: Reporting 404s should work when configured properly
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     When I configure the notifier to use the following configuration lines:
       """
       config.ignore_only = []
@@ -191,7 +188,7 @@ Feature: Install the Gem in a Rails application
   @wip
   Scenario: reporting over SSL with utf8 check should work
     When I configure the Airbrake shim
-    And I run `rails generate airbrake -k myapikey`
+    And I run `rails generate airbrake -k myapikey -t`
     When I configure the notifier to use the following configuration lines:
       """
       config.secure = true

data/features/step_definitions/rails_application_steps.rb

@@ -43,6 +43,7 @@ end
 When /^I configure the notifier to use the following configuration lines:$/ do |configuration_lines|
   initializer_code = <<-EOF
     Airbrake.configure do |config|
+      config.test_mode = true
       #{configuration_lines}
     end
   EOF
@@ -234,19 +235,38 @@ When /^I have set up authentication system in my app that uses "([^\"]*)"$/ do |
   File.open(application_controller, "w") {|file| file.puts definition }
 end
 
+Then /^the Airbrake notification should contain "([^\"]*)"$/ do |content|
+  step %{the last notice sent should contain "#{content}"}
+end
+
+Then /^the Airbrake notification should not contain "([^\"]*)"$/ do |content|
+  step %{the last notice sent should not contain "#{content}"}
+end
+
 Then /^the Airbrake notification should contain the custom user details$/ do
-  step %{I should see "<name>Bender</name>"}
-  step %{I should see "<email>bender@beer.com</email>"}
-  step %{I should see "<username>b3nd0r</username>"}
-  step %{I should see "<class_name>User</class_name>"}
+  step %{the last notice sent should contain "<name>Bender</name>"}
+  step %{the last notice sent should contain "<email>bender@beer.com</email>"}
+  step %{the last notice sent should contain "<username>b3nd0r</username>"}
+  step %{the last notice sent should contain "<class_name>User</class_name>"}
 end
 
 Then /^the Airbrake notification should contain user details$/ do
-  step %{I should see "<id>1</id>"}
+  step %{the last notice sent should contain "<id>1</id>"}
+end
+
+Then /^the last notice sent should contain "([^\"]*)"$/ do |data|
+  last_notice = File.read(LAST_NOTICE)
+  last_notice.should match(%r{#{data}})
+end
+
+Then /^the last notice sent should not contain "([^\"]*)"$/ do |data|
+  last_notice = File.read(LAST_NOTICE)
+  last_notice.should_not match(%r{#{data}})
 end
 
+
 Then /^the Airbrake notification should contain the framework information$/ do
-  step %{the output should contain "Rails: #{ENV["RAILS_VERSION"]}"}
+  step %{the last notice sent should contain "Rails: #{ENV["RAILS_VERSION"]}"}
 end
 
 When /^I list the application's middleware and save it into a file$/ do
@@ -261,4 +281,3 @@ Then /^the Airbrake middleware should be placed correctly$/ do
     middleware.rindex("use ActionDispatch::ShowExceptions")
   (airbrake_index > middleware_index).should be_true
 end
-

data/features/support/airbrake_shim.rb.template

@@ -6,9 +6,6 @@ ShamRack.at("api.airbrake.io") do |env|
 <id>b6817316-9c45-ed26-45eb-780dbb86aadb</id>
 <url>http://airbrake.io/locate/b6817316-9c45-ed26-45eb-780dbb86aadb</url>
 </notice>
-
-Request:
-#{env["rack.input"].read}
   end_xml
   ["200 OK", { "Content-type" => "text/xml" }, [response]]
 end

data/features/support/env.rb

@@ -7,6 +7,7 @@ PROJECT_ROOT     = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'
 TEMP_DIR         = File.join(PROJECT_ROOT, 'tmp').freeze
 LOCAL_RAILS_ROOT = File.join(TEMP_DIR, 'rails_root').freeze
 RACK_FILE        = File.join(TEMP_DIR, 'rack_app.rb').freeze
+LAST_NOTICE      = File.join(PROJECT_ROOT, 'resources', 'notice.xml')
 
 Before do
   FileUtils.rm_rf(LOCAL_RAILS_ROOT)

data/features/support/rails.rb

@@ -122,11 +122,10 @@ module RailsHelpers
     File.open(rakefile_path, 'wb') { |file| file.write(content) }
   end
 
-def perform_request(uri, environment = 'production')
+  def perform_request(uri, environment = 'production')
       request_script = <<-SCRIPT
         require File.expand_path('../config/environment', __FILE__)
 
-
         env      = Rack::MockRequest.env_for(#{uri.inspect})
         response = RailsRoot::Application.call(env)
 

data/lib/airbrake.rb

@@ -19,6 +19,7 @@ require 'airbrake/version'
 require 'airbrake/configuration'
 require 'airbrake/notice'
 require 'airbrake/sender'
+require 'airbrake/response'
 require 'airbrake/backtrace'
 require 'airbrake/rack'
 require 'airbrake/sinatra'
@@ -51,7 +52,7 @@ module Airbrake
 
     # Prints out the response body from Airbrake for debugging help
     def report_response_body(response)
-      write_verbose_log("Response from Airbrake: \n#{response}")
+      write_verbose_log("Response from Airbrake: \n#{Response.pretty_format(response)}")
     end
 
     # Prints out the details about the notice that wasn't sent to server
@@ -85,7 +86,12 @@ module Airbrake
     #   end
     def configure(silent = false)
       yield(configuration)
-      self.sender = Sender.new(configuration)
+      self.sender = if configuration.test_mode?
+                      CollectingSender.new(configuration)
+                    else
+                      Sender.new(configuration)
+                    end
+
       report_ready unless silent
       self.sender
     end

data/lib/airbrake/cli/client.rb

@@ -33,7 +33,9 @@ module Client
     "/projects/1/deploys.xml"
     http = Net::HTTP.new(uri.host,uri.port)
     request = Net::HTTP::Post.new(uri.request_uri)
-    request.set_form_data('deploy[rails_env]' => options.rails_env,"api_key" => options.api_key)
+    opts = {'deploy[rails_env]' => options.rails_env,"api_key" => options.api_key}
+    opts.merge!('deploy[scm_revision]' => options.scm_revision) if options.scm_revision
+    request.set_form_data(opts)
     response = http.request(request)
     puts response.body
   end

data/lib/airbrake/cli/options.rb

@@ -1,6 +1,6 @@
 class Options
 
-  ATTRIBUTES = [:error, :message, :api_key, :host, :port, :auth_token, :name, :account, :rails_env]
+  ATTRIBUTES = [:error, :message, :api_key, :host, :port, :auth_token, :name, :account, :rails_env, :scm_revision]
 
   ATTRIBUTES.each do |attribute|
     attr_reader attribute
@@ -27,6 +27,7 @@ class Options
     self.name          = opts.delete("-n")  || opts.delete("--name")
     self.account       = opts.delete("-a")  || opts.delete("--account")    || ENV["AIRBRAKE_ACCOUNT"]
     self.rails_env     = opts.delete("-E")  || opts.delete("--rails-env")  || ENV["RAILS_ENV"] || "production"
+    self.scm_revision  = opts.delete("-r")  || opts.delete("--scm-revision")
     opts
   end
 

data/lib/airbrake/configuration.rb

@@ -8,7 +8,8 @@ module Airbrake
         :ignore_user_agent, :notifier_name, :notifier_url, :notifier_version,
         :params_filters, :project_root, :port, :protocol, :proxy_host,
         :proxy_pass, :proxy_port, :proxy_user, :secure, :use_system_ssl_cert_chain,
-        :framework, :user_information, :rescue_rake_exceptions, :rake_environment_filters].freeze
+        :framework, :user_information, :rescue_rake_exceptions, :rake_environment_filters,
+        :test_mode].freeze
 
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -110,6 +111,10 @@ module Airbrake
     # Only used for JSON API
     attr_accessor :project_id
 
+    # Setting this to true will use the CollectingSender instead of
+    # the default one which will cause storing the last notice locally
+    attr_accessor :test_mode
+    alias_method :test_mode?, :test_mode
 
     DEFAULT_PARAMS_FILTERS = %w(password password_confirmation).freeze
 

data/lib/airbrake/notice.rb

@@ -159,7 +159,7 @@ module Airbrake
               backtrace.line(
                 :number      => line.number,
                 :file        => line.file,
-                :method_name => line.method_name
+                :method      => line.method_name
               )
             end
           end

data/lib/airbrake/rails3_tasks.rb

@@ -1,6 +1,16 @@
 require 'airbrake'
 require File.join(File.dirname(__FILE__), 'shared_tasks')
 
+# Override error handling in Rack so we don't clutter STDERR
+# with unnecesarry stack trace
+Rake.application.instance_eval do
+  class << self
+    def display_error_message(exception)
+      puts exception
+    end
+  end
+end
+
 namespace :airbrake do
   desc "Verify your gem installation by sending a test exception to the airbrake service"
   task :test => [:environment] do
@@ -27,6 +37,7 @@ namespace :airbrake do
     end
 
     # Override Rails exception middleware, so we stop cluttering STDOUT
+    # with stack trace from Rails
     class ActionDispatch::DebugExceptions; def call(env); @app.call(env); end; end
     class ActionDispatch::ShowExceptions; def call(env); @app.call(env); end; end
 

data/lib/airbrake/response.rb

@@ -0,0 +1,31 @@
+module Airbrake
+  class Response
+    def self.pretty_format(xml_body)
+      new(xml_body)
+    rescue
+      xml_body
+    end
+
+    def to_s
+      output = "\n"
+      output = "UUID: #{id}"
+      output << "\n"
+      output << "URL:  #{url}"
+      output
+    end
+
+    private
+
+    attr_accessor :xml_body, :url, :id
+
+    def initialize(xml_body)
+      self.xml_body = xml_body
+      self.url      = parse_tag("url")
+      self.id       = parse_tag("id")
+    end
+
+    def parse_tag(name)
+      xml_body.match(%r{<#{name}[^>]*>(.*?)</#{name}>})[1]
+    end
+  end
+end

data/lib/airbrake/sender.rb

@@ -177,4 +177,30 @@ module Airbrake
         project_id.present?
     end
   end
+
+  class CollectingSender < Sender
+    # Used when test mode is enabled, to store the last XML notice locally
+
+    attr_writer :last_notice_path
+
+    def last_notice
+      File.read last_notice_path
+    end
+
+    def last_notice_path
+      File.expand_path(File.join("..", "..", "..", "resources", "notice.xml"), __FILE__)
+    end
+
+    def send_to_airbrake(notice)
+      data = prepare_notice(notice)
+
+      notices_file = File.open(last_notice_path, "w") do |file|
+        file.puts data
+      end
+
+      super(notice)
+    ensure
+      notices_file.close if notices_file
+    end
+  end
 end

data/lib/airbrake/version.rb

@@ -1,3 +1,3 @@
 module Airbrake
-  VERSION = "3.1.10"
+  VERSION = "3.1.11"
 end

data/lib/rails/generators/airbrake/airbrake_generator.rb

@@ -15,6 +15,9 @@ class AirbrakeGenerator < Rails::Generators::Base
   class_option :secure, :type => :boolean,
     :desc => "Use SSL connection"
 
+  class_option :test_mode, :aliases => "-t", :type => :boolean,
+    :desc => "Use Airbrake in test mode"
+
   def self.source_root
     @_airbrake_source_root ||= File.expand_path("../../../../../generators/airbrake/templates", __FILE__)
   end
@@ -93,6 +96,10 @@ class AirbrakeGenerator < Rails::Generators::Base
     options[:secure]
   end
 
+  def test_mode?
+    options[:test_mode]
+  end
+
   def heroku?
     options[:heroku] ||
       system("grep AIRBRAKE_API_KEY config/initializers/airbrake.rb") ||
@@ -117,7 +124,8 @@ Airbrake.configure do |config|
   config.api_key = #{api_key_expression}
     eos
 
-    output << "  config.secure = true" if secure?
-    output << "\nend"
+    output << "  config.secure = true\n" if secure?
+    output << "  config.test_mode = true\n" if test_mode?
+    output << "end"
   end
 end

data/lib/templates/javascript_notifier.erb

@@ -6,10 +6,15 @@
 }%>
 
 <%= javascript_tag %Q{
+  try {
     window.Airbrake = (typeof(Airbrake) == 'undefined' && typeof(Hoptoad) != 'undefined') ? Hoptoad : Airbrake
     Airbrake.setKey('#{api_key}');
     Airbrake.setHost('#{host}');
     Airbrake.setEnvironment('#{environment}');
     Airbrake.setErrorDefaults({ url: "#{escape_javascript url}", component: "#{controller_name}", action: "#{action_name}" });
   }
+  catch (e) {
+    window.onerror = null;
+  }
+  }
 %>

data/resources/airbrake_2_4.xsd

@@ -38,7 +38,7 @@
         <xs:complexType>
           <xs:attribute name="file" type="xs:string" use="required"/>
           <xs:attribute name="number" type="xs:string" use="required"/>
-          <xs:attribute name="method_name" type="xs:string" use="optional"/>
+          <xs:attribute name="method" type="xs:string" use="optional"/>
         </xs:complexType>
       </xs:element>
     </xs:sequence>

data/resources/notice.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><notice version="2.4"><api-key/><notifier><name>Airbrake Notifier</name><version>3.1.10</version><url>https://github.com/airbrake/airbrake</url></notifier><error><class>RuntimeError</class><message>RuntimeError: some message</message><backtrace><line number="5" file="[PROJECT_ROOT]/app/controllers/test_controller.rb" method="index"/><line number="4" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal/implicit_render.rb" method="send_action"/><line number="167" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/abstract_controller/base.rb" method="process_action"/><line number="10" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal/rendering.rb" method="process_action"/><line number="18" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/abstract_controller/callbacks.rb" method="block in process_action"/><line number="414" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="_run__1119964459555507863__process_action__2114797969435458246__callbacks"/><line number="405" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="__run_callback"/><line number="385" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="_run_process_action_callbacks"/><line number="81" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="run_callbacks"/><line number="17" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/abstract_controller/callbacks.rb" method="process_action"/><line number="29" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal/rescue.rb" method="process_action"/><line number="30" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal/instrumentation.rb" method="block in process_action"/><line number="123" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/notifications.rb" method="block in instrument"/><line number="20" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/notifications/instrumenter.rb" method="instrument"/><line number="123" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/notifications.rb" method="instrument"/><line number="29" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal/instrumentation.rb" method="process_action"/><line number="207" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal/params_wrapper.rb" method="process_action"/><line number="121" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/abstract_controller/base.rb" method="process"/><line number="45" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/abstract_controller/rendering.rb" method="process"/><line number="203" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal.rb" method="dispatch"/><line number="14" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal/rack_delegation.rb" method="dispatch"/><line number="246" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_controller/metal.rb" method="block in action"/><line number="73" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/routing/route_set.rb" method="call"/><line number="73" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/routing/route_set.rb" method="dispatch"/><line number="36" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/routing/route_set.rb" method="call"/><line number="68" file="[GEM_ROOT]/gems/journey-1.0.4/lib/journey/router.rb" method="block in call"/><line number="56" file="[GEM_ROOT]/gems/journey-1.0.4/lib/journey/router.rb" method="each"/><line number="56" file="[GEM_ROOT]/gems/journey-1.0.4/lib/journey/router.rb" method="call"/><line number="612" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/routing/route_set.rb" method="call"/><line number="17" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/best_standards_support.rb" method="call"/><line number="23" file="[GEM_ROOT]/gems/rack-1.4.5/lib/rack/etag.rb" method="call"/><line number="25" file="[GEM_ROOT]/gems/rack-1.4.5/lib/rack/conditionalget.rb" method="call"/><line number="14" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/head.rb" method="call"/><line number="21" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/params_parser.rb" method="call"/><line number="242" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/flash.rb" method="call"/><line number="210" file="[GEM_ROOT]/gems/rack-1.4.5/lib/rack/session/abstract/id.rb" method="context"/><line number="205" file="[GEM_ROOT]/gems/rack-1.4.5/lib/rack/session/abstract/id.rb" method="call"/><line number="341" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/cookies.rb" method="call"/><line number="28" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/callbacks.rb" method="block in call"/><line number="405" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="_run__1576280847308009310__call__2543261213916389519__callbacks"/><line number="405" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="__run_callback"/><line number="385" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="_run_call_callbacks"/><line number="81" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/callbacks.rb" method="run_callbacks"/><line number="27" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/callbacks.rb" method="call"/><line number="31" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/remote_ip.rb" method="call"/><line number="16" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/debug_exceptions.rb" method="call"/><line number="56" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/show_exceptions.rb" method="call"/><line number="32" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/rack/logger.rb" method="call_app"/><line number="16" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/rack/logger.rb" method="block in call"/><line number="22" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/tagged_logging.rb" method="tagged"/><line number="16" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/rack/logger.rb" method="call"/><line number="22" file="[GEM_ROOT]/gems/actionpack-3.2.13/lib/action_dispatch/middleware/request_id.rb" method="call"/><line number="21" file="[GEM_ROOT]/gems/rack-1.4.5/lib/rack/methodoverride.rb" method="call"/><line number="17" file="[GEM_ROOT]/gems/rack-1.4.5/lib/rack/runtime.rb" method="call"/><line number="72" file="[GEM_ROOT]/gems/activesupport-3.2.13/lib/active_support/cache/strategy/local_cache.rb" method="call"/><line number="15" file="[GEM_ROOT]/gems/rack-1.4.5/lib/rack/lock.rb" method="call"/><line number="136" file="[GEM_ROOT]/gems/rack-cache-1.2/lib/rack/cache/context.rb" method="forward"/><line number="245" file="[GEM_ROOT]/gems/rack-cache-1.2/lib/rack/cache/context.rb" method="fetch"/><line number="185" file="[GEM_ROOT]/gems/rack-cache-1.2/lib/rack/cache/context.rb" method="lookup"/><line number="66" file="[GEM_ROOT]/gems/rack-cache-1.2/lib/rack/cache/context.rb" method="call!"/><line number="51" file="[GEM_ROOT]/gems/rack-cache-1.2/lib/rack/cache/context.rb" method="call"/><line number="479" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/engine.rb" method="call"/><line number="223" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/application.rb" method="call"/><line number="30" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/railtie/configurable.rb" method="method_missing"/><line number="4" file="request.rb" method="&lt;top (required)&gt;"/><line number="51" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/commands/runner.rb" method="eval"/><line number="51" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/commands/runner.rb" method="&lt;top (required)&gt;"/><line number="64" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/commands.rb" method="require"/><line number="64" file="[GEM_ROOT]/gems/railties-3.2.13/lib/rails/commands.rb" method="&lt;top (required)&gt;"/><line number="6" file="script/rails" method="require"/><line number="6" file="script/rails" method="&lt;main&gt;"/></backtrace></error><request><url>http://example.com:123/test/index?param=value</url><component>test</component><action>index</action><params><var key="param">value</var><var key="controller">test</var><var key="action">index</var></params><cgi-data><var key="rack.version">["1", "1"]</var><var key="rack.input">#&lt;StringIO:0x000000021d3498&gt;</var><var key="rack.errors">#&lt;StringIO:0x000000021d3560&gt;</var><var key="rack.multithread">false</var><var key="rack.multiprocess">true</var><var key="rack.run_once">false</var><var key="REQUEST_METHOD">GET</var><var key="SERVER_NAME">example.com</var><var key="SERVER_PORT">123</var><var key="QUERY_STRING">param=value</var><var key="PATH_INFO">/test/index</var><var key="rack.url_scheme">http</var><var key="HTTPS">off</var><var key="SCRIPT_NAME"></var><var key="CONTENT_LENGTH">0</var><var key="ORIGINAL_FULLPATH">/test/index?param=value</var><var key="action_dispatch.routes">#&lt;ActionDispatch::Routing::RouteSet:0x00000001ae8ea8&gt;</var><var key="action_dispatch.parameter_filter">["password"]</var><var key="action_dispatch.show_exceptions">true</var><var key="action_dispatch.show_detailed_exceptions">false</var><var key="action_dispatch.logger">#&lt;ActiveSupport::TaggedLogging:0x0000000174daf0&gt;</var><var key="action_dispatch.backtrace_cleaner">#&lt;Rails::BacktraceCleaner:0x00000002cb9218&gt;</var><var key="rack-cache.cache_key">Rack::Cache::Key</var><var key="rack-cache.verbose">false</var><var key="rack-cache.storage">#&lt;Rack::Cache::Storage:0x00000002168b70&gt;</var><var key="rack-cache.metastore">rails:/</var><var key="rack-cache.entitystore">rails:/</var><var key="rack-cache.default_ttl">0</var><var key="rack-cache.ignore_headers">["Set-Cookie"]</var><var key="rack-cache.private_headers">["Authorization", "Cookie"]</var><var key="rack-cache.allow_reload">false</var><var key="rack-cache.allow_revalidate">false</var><var key="rack-cache.use_native_ttl">false</var><var key="action_dispatch.request_id">2c43f3810b99b182954b910220833d5a</var><var key="action_dispatch.remote_ip"></var><var key="rack.session"></var><var key="rack.session.options"><var key="path">/</var><var key="domain"></var><var key="expire_after"></var><var key="secure">false</var><var key="httponly">true</var><var key="defer">false</var><var key="renew">false</var><var key="secret">bb299e2337398a11690d55a857c1570cc8f62f19b5907d6b7ff9fd9d495a</var><var key="coder">#&lt;Rack::Session::Cookie::Base64::Marshal:0x000000015f19e0&gt;</var><var key="id"></var></var><var key="rack.request.cookie_hash"></var><var key="action_dispatch.cookies">#&lt;ActionDispatch::Cookies::CookieJar:0x000000030c17e8&gt;</var><var key="action_dispatch.request.unsigned_session_cookie"></var><var key="action_dispatch.request.path_parameters"><var key="controller">test</var><var key="action">index</var></var><var key="action_controller.instance">#&lt;TestController:0x000000025fd7d0&gt;</var><var key="action_dispatch.request.content_type"></var><var key="action_dispatch.request.request_parameters"></var><var key="rack.request.query_string">param=value</var><var key="rack.request.query_hash"><var key="param">value</var></var><var key="action_dispatch.request.query_parameters"><var key="param">value</var></var><var key="action_dispatch.request.parameters"><var key="param">value</var><var key="controller">test</var><var key="action">index</var></var><var key="action_dispatch.request.formats">["text/html"]</var></cgi-data></request><server-environment><project-root>/home/hrvoje/code/airbrake/tmp/rails_root</project-root><environment-name>production</environment-name><hostname>hrvoje-Aspire-5741G</hostname></server-environment><framework>Rails: 3.2.13</framework></notice>

data/script/integration_test.rb

@@ -9,30 +9,27 @@ RAILS_DEFAULT_LOGGER = Logger.new(STDOUT)
 
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'airbrake'
-require 'rails/init'
 
 fail "Please supply an API Key as the first argument" if ARGV.empty?
 
-host = ARGV[1]
-host ||= "api.airbrake.io"
-
-secure = (ARGV[2] == "secure")
-
-exception = begin
-              raise "Testing airbrake notifier with secure = #{secure}. If you can see this, it works."
-            rescue => foo
-              foo
-            end
+host = ARGV[1] || "api.airbrake.io"
+port = ARGV[2] || 80
+secure = (ARGV[3] == "secure")
+exception = RuntimeError.new "Testing airbrake notifier with secure = #{secure}. If you can see this, it works."
 
 Airbrake.configure do |config|
-  config.secure  = secure
-  config.host    = host
-  config.api_key = ARGV.first
+  config.secure          = secure
+  config.host            = host
+  config.port            = port
+  config.api_key         = ARGV.first
 end
+
 puts "Configuration:"
 Airbrake.configuration.to_hash.each do |key, value|
   puts sprintf("%25s: %s", key.to_s, value.inspect.slice(0, 55))
 end
-puts "Sending #{secure ? "" : "in"}secure notification to project with key #{ARGV.first}"
-Airbrake.notify(exception)
 
+puts "Sending #{secure ? "" : "in"}secure notification to project with key #{ARGV.first}"
+if Airbrake.notify(exception) then puts "\nIntegration test passed with success!"
+else puts "\nIntegration test was unsuccessful."
+end

data/test/notice_test.rb

@@ -351,7 +351,7 @@ class NoticeTest < Test::Unit::TestCase
 
       assert_valid_node(@document, "//error/backtrace/line/@number", @notice.backtrace.lines.first.number)
       assert_valid_node(@document, "//error/backtrace/line/@file", @notice.backtrace.lines.first.file)
-      assert_valid_node(@document, "//error/backtrace/line/@method_name", @notice.backtrace.lines.first.method_name)
+      assert_valid_node(@document, "//error/backtrace/line/@method", @notice.backtrace.lines.first.method_name)
 
       assert_valid_node(@document, "//request/url",        @notice.url)
       assert_valid_node(@document, "//request/component", @notice.controller)

data/test/response_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path '../helper', __FILE__
+
+class ResponseTest < Test::Unit::TestCase
+  include DefinesConstants
+
+  def response_body
+    File.read File.expand_path('../support/response_shim.xml', __FILE__)
+  end
+
+  should "output a nicely formatted notice details" do
+    output = Airbrake::Response.pretty_format(response_body)
+
+    assert %r{ID: b6817316-9c45-ed26-45eb-780dbb86aadb}, "#{output}"
+    assert %r{URL: http://airbrake.io/locate/b6817316-9c45-ed26-45eb-780dbb86aadb},
+      "#{output}"
+
+  end
+end

data/test/support/response_shim.xml

@@ -0,0 +1,4 @@
+<notice>
+<id>fd2ec31a-8628-0146-edae-b783ab246f9f</id>
+<url>http://airbrake.io/locate/fd2ec31a-8628-0146-edae-b783ab246f9f</url>
+</notice>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -308,6 +308,7 @@ files:
 - lib/airbrake/capistrano.rb
 - lib/airbrake/rake_handler.rb
 - lib/airbrake/sinatra.rb
+- lib/airbrake/response.rb
 - lib/rails/generators/airbrake/airbrake_generator.rb
 - lib/templates/javascript_notifier.erb
 - lib/templates/rescue.erb
@@ -317,6 +318,7 @@ files:
 - resources/airbrake_2_4.xsd
 - resources/README.md
 - resources/airbrake_3_0.json
+- resources/notice.xml
 - script/integration_test.rb
 - airbrake.gemspec
 - CHANGELOG
@@ -336,6 +338,7 @@ files:
 - test/airbrake_tasks_test.rb
 - test/controller_methods_test.rb
 - test/rack_test.rb
+- test/response_test.rb
 - test/notice_test.rb
 - test/helper.rb
 - test/javascript_notifier_test.rb
@@ -343,6 +346,7 @@ files:
 - test/catcher_test.rb
 - test/rails_initializer_test.rb
 - test/capistrano_test.rb
+- test/support/response_shim.xml
 - test/user_informer_test.rb
 - test/logger_test.rb
 - features/rails.feature
@@ -395,6 +399,7 @@ test_files:
 - test/airbrake_tasks_test.rb
 - test/controller_methods_test.rb
 - test/rack_test.rb
+- test/response_test.rb
 - test/notice_test.rb
 - test/helper.rb
 - test/javascript_notifier_test.rb
@@ -402,6 +407,7 @@ test_files:
 - test/catcher_test.rb
 - test/rails_initializer_test.rb
 - test/capistrano_test.rb
+- test/support/response_shim.xml
 - test/user_informer_test.rb
 - test/logger_test.rb
 - features/rails.feature