airbrake 3.1.11 → 3.1.12

data/CHANGELOG

@@ -1,3 +1,23 @@
+Version 3.1.12 - 2013-04-29 18:48:40 +0200
+===============================================================================
+
+Arvind Kunday (1):
+      Removing the .erb template handler
+
+Hrvoje Šimić (8):
+      introducing null logger for fallback
+      add missing logger requirement
+      being careful with silencing of rake backtrace in the airbrake:test task
+      support for Rails 4.0
+      start using remote XSD file when verifying XML in tests
+      throw a warning for unsupported user attributes
+      updating outdated step definition for current user feature
+      speeding up the test by using 'runner' instead of 'server'
+
+knapo (1):
+      Fix Airbrake::Sender#log to log messages when logger is not passed to options.
+
+
 Version 3.1.11 - 2013-04-11 12:44:09 +0200
 ===============================================================================
 
@@ -1144,3 +1164,4 @@ Nick Quaranto (3):
 
 
 
+

data/Rakefile

@@ -16,6 +16,7 @@ task :default do
   exec 'rake appraisal:rails-3.0 test '\
   '&& rake appraisal:rails-3.1 test '\
   '&& rake appraisal:rails-3.2 test '\
+  '&& rake appraisal:rails-4.0 test '\
   '&& rake appraisal cucumber'\
 end
 

data/airbrake.gemspec

@@ -23,13 +23,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency("nokogiri",      "~> 1.5.0")
   s.add_development_dependency("rspec",         "~> 2.6.0")
   s.add_development_dependency("sham_rack",     "~> 1.3.0")
-  s.add_development_dependency("shoulda",      "~> 2.11.3")
   s.add_development_dependency("capistrano")
   s.add_development_dependency("aruba")
   s.add_development_dependency("appraisal")
   s.add_development_dependency("rspec-rails")
   s.add_development_dependency("girl_friday")
   s.add_development_dependency("json-schema")
+  s.add_development_dependency("shoulda-matchers")
+  s.add_development_dependency("shoulda-context")
 
   s.authors = ["Airbrake"]
   s.email   = %q{support@airbrake.io}

data/features/rails.feature

@@ -228,7 +228,7 @@ Feature: Install the Gem in a Rails application
       """
          config.api_key = "myapikey"
          config.logger = Logger.new STDOUT
-         config.user_attributes = [:id, :name, :email, :username, :class_name]
+         config.user_attributes = [:id, :name, :email, :username]
       """
     And I define a response for "TestController#index":
       """
@@ -240,6 +240,18 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
     And the Airbrake notification should contain the custom user details
 
+  Scenario: It should warn the user that she's using unsupported attributes for
+    current user
+    When I configure the Airbrake shim
+    And I configure the notifier to use the following configuration lines:
+      """
+         config.api_key = "myapikey"
+         config.logger = Logger.new STDOUT
+         config.user_attributes = [:id, :name, :email, :username, :shoe_size]
+      """
+    And I run `rails runner config/boot.rb`
+    Then I should see "Unsupported user attribute: 'shoe_size'"
+
   Scenario: It should log the notice when failure happens
     When Airbrake server is not responding
     And I configure the notifier to use the following configuration lines:

data/features/step_definitions/rails_application_steps.rb

@@ -84,7 +84,7 @@ end
 
 When /^I perform a request to "([^\"]*)"$/ do |uri|
   perform_request(uri)
-  step %{I run `bundle exec ./script/rails runner request.rb`}
+  step %{I run `bundle exec rails runner request.rb`}
 end
 
 When /^I perform a request to "([^\"]*)" in the "([^\"]*)" environment$/ do |uri, environment|
@@ -247,7 +247,6 @@ Then /^the Airbrake notification should contain the custom user details$/ do
   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

data/lib/airbrake.rb

@@ -6,6 +6,7 @@ end
 require 'net/http'
 require 'net/https'
 require 'rubygems'
+require 'logger'
 
 begin
   require 'active_support/core_ext/object/blank'
@@ -74,7 +75,8 @@ module Airbrake
 
     # Look for the Rails logger currently defined
     def logger
-      self.configuration.logger
+      self.configuration.logger ||
+        Logger.new(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i ? 'NUL:' : '/dev/null')
     end
 
     # Call this method to modify defaults in your initializers.

data/lib/airbrake/configuration.rb

@@ -104,9 +104,10 @@ module Airbrake
     # Should Airbrake catch exceptions from Rake tasks?
     # (boolean or nil; set to nil to catch exceptions when rake isn't running from a terminal; default is nil)
     attr_accessor :rescue_rake_exceptions
+    alias_method :rescue_rake_exceptions?, :rescue_rake_exceptions
 
     # User attributes that are being captured
-    attr_accessor :user_attributes
+    attr_reader :user_attributes
 
     # Only used for JSON API
     attr_accessor :project_id
@@ -116,10 +117,12 @@ module Airbrake
     attr_accessor :test_mode
     alias_method :test_mode?, :test_mode
 
-    DEFAULT_PARAMS_FILTERS = %w(password password_confirmation).freeze
+    DEFAULT_PARAMS_FILTERS  = %w(password password_confirmation).freeze
 
     DEFAULT_USER_ATTRIBUTES = %w(id).freeze
 
+    VALID_USER_ATTRIBUTES   = %w(id name username email).freeze
+
     DEFAULT_BACKTRACE_FILTERS = [
       lambda { |line|
         if defined?(Airbrake.configuration.project_root) && Airbrake.configuration.project_root.to_s != ''
@@ -260,6 +263,10 @@ module Airbrake
       end
     end
 
+    def user_attributes=(user_attributes)
+      @user_attributes = validate_user_attributes user_attributes
+    end
+
     # Should Airbrake send notifications asynchronously
     # (boolean, nil or callable; default is nil).
     # Can be used as callable-setter when block provided.
@@ -319,5 +326,14 @@ module Airbrake
       warn "[AIRBRAKE] You can't use the default async handler without girl_friday."\
         " Please make sure you have girl_friday installed."
     end
+
+    def validate_user_attributes(user_attributes)
+      user_attributes.each do |attribute|
+        next if VALID_USER_ATTRIBUTES.include? attribute
+        warn "[AIRBRAKE] Unsupported user attribute: '#{attribute}'. "\
+          "This attribute will not be shown in the Airbrake UI. "\
+          "Check http://git.io/h6YRpA for more info."
+      end
+    end
   end
 end

data/lib/airbrake/notice.rb

@@ -415,9 +415,9 @@ module Airbrake
     end
 
     def also_use_rack_params_filters
-      if args[:rack_env]
+      if cgi_data
         @params_filters ||= []
-        @params_filters += rack_request.env["action_dispatch.parameter_filter"] || []
+        @params_filters += cgi_data["action_dispatch.parameter_filter"] || []
       end
     end
 

data/lib/airbrake/rails/controller_methods.rb

@@ -45,11 +45,11 @@ module Airbrake
 
         if respond_to?(:filter_parameters) # Rails 2
           filter_parameters(hash)
-        elsif defined?(ActionDispatch::Http::ParameterFilter) # Rails 3
-          ActionDispatch::Http::ParameterFilter.new(::Rails.application.config.filter_parameters).filter(hash)
+        # elsif defined?(ActionDispatch::Http::ParameterFilter) # Rails 3
+        #   ActionDispatch::Http::ParameterFilter.new(::Rails.application.config.filter_parameters).filter(hash)
         else
           hash
-        end rescue hash
+        end
 
       end
 

data/lib/airbrake/rails/javascript_notifier.rb

@@ -8,7 +8,7 @@ module Airbrake
       private
 
       def airbrake_javascript_notifier_options
-        path = File.join File.dirname(__FILE__), '..', '..', 'templates', 'javascript_notifier.erb'
+        path = File.join File.dirname(__FILE__), '..', '..', 'templates', 'javascript_notifier'
         host = Airbrake.configuration.host.dup
         port = Airbrake.configuration.port
         host << ":#{port}" unless [80, 443].include?(port)
@@ -17,6 +17,7 @@ module Airbrake
           :file              => path,
           :layout            => false,
           :use_full_path     => false,
+          :handlers          => [:erb],
           :locals            => {
             :host            => host,
             :api_key         => Airbrake.configuration.js_api_key,

data/lib/airbrake/rails3_tasks.rb

@@ -1,12 +1,27 @@
 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
+def stub_rake_exception_handling!
+  # 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_silent(exception)
+        puts exception
+      end
+      alias_method :display_error_message_old, :display_error_message
+      alias_method :display_error_message, :display_error_message_silent
+    end
+  end
+end
+
+def unstub_rake_exception_handling!
+  # Turns Rake exception handling back to normal
+  Rake.application.instance_eval do
+    class << self
+      def display_error_message_silent(exception)
+        display_error_message_old(exception)
+      end
     end
   end
 end
@@ -14,6 +29,9 @@ end
 namespace :airbrake do
   desc "Verify your gem installation by sending a test exception to the airbrake service"
   task :test => [:environment] do
+
+    stub_rake_exception_handling!
+
     Rails.logger = defined?(ActiveSupport::TaggedLogging) ?
       ActiveSupport::TaggedLogging.new(Logger.new(STDOUT)) :
       Logger.new(STDOUT)
@@ -87,7 +105,7 @@ namespace :airbrake do
     end
 
     Rails.application.routes.draw do
-      get 'verify' => 'application#verify', :as => 'verify'
+      get 'verify' => 'application#verify', :as => 'verify', :via => :get
     end
 
     puts 'Processing request.'
@@ -100,5 +118,8 @@ namespace :airbrake do
     Rails.application.call(env)
 
     wait_for_threads if defined? GirlFriday
+
+    unstub_rake_exception_handling!
   end
 end
+

data/lib/airbrake/rake_handler.rb

@@ -8,19 +8,22 @@ module Airbrake::RakeHandler
     end
   end
 
-  def display_error_message_with_airbrake(ex)
+  def display_error_message_with_airbrake(exception)
     if Airbrake.sender && Airbrake.configuration &&
         (Airbrake.configuration.rescue_rake_exceptions ||
           (Airbrake.configuration.rescue_rake_exceptions===nil && !self.tty_output?))
 
-      Airbrake.notify_or_ignore(ex, :component => 'rake', :action => reconstruct_command_line, :cgi_data => environment_info)
+      Airbrake.notify_or_ignore(exception,
+                                :component => 'rake',
+                                :action => reconstruct_command_line,
+                                :cgi_data => environment_info)
     end
 
-    display_error_message_without_airbrake(ex)
+    display_error_message_without_airbrake(exception)
   end
 
   def reconstruct_command_line
-    ARGV.join( ' ' )
+    ARGV.join(' ')
   end
 
   def environment_info

data/lib/airbrake/sender.rb

@@ -137,7 +137,7 @@ module Airbrake
     end
 
     def log(opts = {})
-      opts[:logger].send opts[:level], LOG_PREFIX + opts[:message] if opts[:logger]
+      (opts[:logger] || logger).send(opts[:level], LOG_PREFIX + opts[:message])
       Airbrake.report_environment_info
       Airbrake.report_response_body(opts[:response].body) if opts[:response] && opts[:response].respond_to?(:body)
       Airbrake.report_notice(opts[:notice]) if opts[:notice]

data/lib/airbrake/version.rb

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

data/resources/notice.xml

@@ -1 +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>
+<?xml version="1.0" encoding="UTF-8"?><notice version="2.4"><api-key>myapikey</api-key><notifier><name>Airbrake Notifier</name><version>3.1.11</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-4.0.0.beta1/lib/action_controller/metal/implicit_render.rb" method="send_action"/><line number="189" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/abstract_controller/base.rb" method="process_action"/><line number="10" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal/rendering.rb" method="process_action"/><line number="18" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/abstract_controller/callbacks.rb" method="block in process_action"/><line number="373" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/callbacks.rb" method="_run__2671352232143607105__process_action__callbacks"/><line number="78" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/callbacks.rb" method="run_callbacks"/><line number="17" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/abstract_controller/callbacks.rb" method="process_action"/><line number="29" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal/rescue.rb" method="process_action"/><line number="31" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal/instrumentation.rb" method="block in process_action"/><line number="158" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/notifications.rb" method="block in instrument"/><line number="20" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/notifications/instrumenter.rb" method="instrument"/><line number="158" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/notifications.rb" method="instrument"/><line number="30" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal/instrumentation.rb" method="process_action"/><line number="245" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal/params_wrapper.rb" method="process_action"/><line number="136" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/abstract_controller/base.rb" method="process"/><line number="44" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/abstract_controller/rendering.rb" method="process"/><line number="196" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal.rb" method="dispatch"/><line number="13" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal/rack_delegation.rb" method="dispatch"/><line number="232" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_controller/metal.rb" method="block in action"/><line number="78" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/routing/route_set.rb" method="call"/><line number="78" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/routing/route_set.rb" method="dispatch"/><line number="46" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/routing/route_set.rb" method="call"/><line number="69" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/journey/router.rb" method="block in call"/><line number="57" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/journey/router.rb" method="each"/><line number="57" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/journey/router.rb" method="call"/><line number="651" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/routing/route_set.rb" method="call"/><line number="23" file="[GEM_ROOT]/gems/rack-1.5.2/lib/rack/etag.rb" method="call"/><line number="25" file="[GEM_ROOT]/gems/rack-1.5.2/lib/rack/conditionalget.rb" method="call"/><line number="11" file="[GEM_ROOT]/gems/rack-1.5.2/lib/rack/head.rb" method="call"/><line number="27" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/params_parser.rb" method="call"/><line number="241" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/flash.rb" method="call"/><line number="225" file="[GEM_ROOT]/gems/rack-1.5.2/lib/rack/session/abstract/id.rb" method="context"/><line number="220" file="[GEM_ROOT]/gems/rack-1.5.2/lib/rack/session/abstract/id.rb" method="call"/><line number="452" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/cookies.rb" method="call"/><line number="29" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/callbacks.rb" method="block in call"/><line number="373" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/callbacks.rb" method="_run__4190110547367303363__call__callbacks"/><line number="78" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/callbacks.rb" method="run_callbacks"/><line number="27" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/callbacks.rb" method="call"/><line number="76" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/remote_ip.rb" method="call"/><line number="17" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/debug_exceptions.rb" method="call"/><line number="30" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/show_exceptions.rb" method="call"/><line number="38" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/rack/logger.rb" method="call_app"/><line number="21" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/rack/logger.rb" method="block in call"/><line number="67" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/tagged_logging.rb" method="block in tagged"/><line number="25" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/tagged_logging.rb" method="tagged"/><line number="67" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/tagged_logging.rb" method="tagged"/><line number="21" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/rack/logger.rb" method="call"/><line number="21" file="[GEM_ROOT]/gems/actionpack-4.0.0.beta1/lib/action_dispatch/middleware/request_id.rb" method="call"/><line number="21" file="[GEM_ROOT]/gems/rack-1.5.2/lib/rack/methodoverride.rb" method="call"/><line number="17" file="[GEM_ROOT]/gems/rack-1.5.2/lib/rack/runtime.rb" method="call"/><line number="72" file="[GEM_ROOT]/gems/activesupport-4.0.0.beta1/lib/active_support/cache/strategy/local_cache.rb" method="call"/><line number="510" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/engine.rb" method="call"/><line number="96" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/application.rb" method="call"/><line number="30" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/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-4.0.0.beta1/lib/rails/commands/runner.rb" method="eval"/><line number="51" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/commands/runner.rb" method="&lt;top (required)&gt;"/><line number="86" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/commands.rb" method="require"/><line number="86" file="[GEM_ROOT]/gems/railties-4.0.0.beta1/lib/rails/commands.rb" method="&lt;top (required)&gt;"/><line number="4" file="bin/rails" method="require"/><line number="4" file="bin/rails" method="&lt;main&gt;"/></backtrace></error><request><url>http://example.com:123/test/index</url><component>test</component><action>index</action><params><var key="controller">test</var><var key="action">index</var></params><cgi-data><var key="rack.version">["1", "2"]</var><var key="rack.input">#&lt;StringIO:0x000000037d48a0&gt;</var><var key="rack.errors">#&lt;StringIO:0x000000037d4940&gt;</var><var key="rack.multithread">true</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"></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</var><var key="action_dispatch.routes">#&lt;ActionDispatch::Routing::RouteSet:0x0000000291e5e0&gt;</var><var key="action_dispatch.parameter_filter">["password"]</var><var key="action_dispatch.redirect_filter">[]</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::Logger:0x00000002645210&gt;</var><var key="action_dispatch.backtrace_cleaner">#&lt;Rails::BacktraceCleaner:0x00000003bcb030&gt;</var><var key="action_dispatch.key_generator">#&lt;ActiveSupport::CachingKeyGenerator:0x00000003bca6d0&gt;</var><var key="action_dispatch.http_auth_salt">http authentication</var><var key="action_dispatch.signed_cookie_salt">signed cookie</var><var key="action_dispatch.encrypted_cookie_salt">encrypted cookie</var><var key="action_dispatch.encrypted_signed_cookie_salt">signed encrypted cookie</var><var key="ROUTES_21558000_SCRIPT_NAME"></var><var key="action_dispatch.request_id">5978a867-c5e6-45a9-b2a8-442314b1d5b5</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="id"></var></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:0x00000002729f00&gt;</var><var key="action_dispatch.request.content_type"></var><var key="action_dispatch.request.request_parameters"></var><var key="rack.request.query_string"></var><var key="rack.request.query_hash"></var><var key="action_dispatch.request.query_parameters"></var><var key="action_dispatch.request.parameters"><var key="controller">test</var><var key="action">index</var></var><var key="action_dispatch.request.formats">["text/html"]</var><var key="rack.request.cookie_hash"></var><var key="action_dispatch.cookies">#&lt;ActionDispatch::Cookies::CookieJar:0x00000003b11cc0&gt;</var><var key="action_dispatch.request.unsigned_session_cookie"></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><current-user><id>1</id><name>Bender</name><email>bender@beer.com</email><username>b3nd0r</username></current-user><framework>Rails: 4.0.0.beta1</framework></notice>

data/test/catcher_test.rb

@@ -12,7 +12,7 @@ module ActionDispatch
 
     # Silence logger
     def logger
-      nil
+      Logger.new("/dev/null")
     end
   end
 end
@@ -144,148 +144,109 @@ class ActionControllerCatcherTest < ActionDispatch::IntegrationTest
   end
 
 
-   should "deliver notices from exceptions raised in public requests" do
-     @app = AirbrakeTestController.action(:boom)
-     get '/'
-     assert_caught_and_sent
-   end
+  def deliver_notices_from_exceptions_raised_in_public_requests
+    @app = AirbrakeTestController.action(:boom)
+    get '/'
+    assert_caught_and_sent
+  end
+
+  def not_deliver_notices_from_exceptions_in_development_environments
+    Airbrake.configuration.development_environments = ["test"]
+    Airbrake.configuration.environment_name = "test"
+    @app = AirbrakeTestController.action(:boom)
+    get '/'
+    assert_caught_and_not_sent
+  end
+
+  def not_deliver_notices_from_actions_that_dont_raise
+    @app = AirbrakeTestController.action(:hello)
+    get '/'
+    assert_caught_and_not_sent
+    assert_equal 'hello', response.body
+  end
+
+  def not_deliver_ignored_exceptions_raised_by_actions
+    @app = AirbrakeTestController.action(:boom)
+    ignore(RuntimeError)
+    get '/'
+    assert_caught_and_not_sent
+  end
 
-  should "not deliver notices from exceptions in development environments" do
-     Airbrake.configuration.development_environments = ["test"]
-     Airbrake.configuration.environment_name = "test"
-     @app = AirbrakeTestController.action(:boom)
-     get '/'
-     assert_caught_and_not_sent
+  def deliver_ignored_exception_raised_manually
+    @app = AirbrakeTestController.action(:manual_airbrake)
+    ignore(RuntimeError)
+    get '/'
+    assert_caught_and_sent
   end
 
-   should "not deliver notices from actions that don't raise" do
-     @app = AirbrakeTestController.action(:hello)
-     get '/'
-     assert_caught_and_not_sent
-     assert_equal 'hello', response.body
-   end
-
-   should "not deliver ignored exceptions raised by actions" do
-     @app = AirbrakeTestController.action(:boom)
-     ignore(RuntimeError)
-     get '/'
-     assert_caught_and_not_sent
-   end
-
-   should "deliver ignored exception raised manually" do
-     @app = AirbrakeTestController.action(:manual_airbrake)
-     ignore(RuntimeError)
-     get '/'
-     assert_caught_and_sent
-   end
-
-   should "not deliver manually sent notices in local requests" do
-     AirbrakeTestController.local = true
-     @app = AirbrakeTestController.action(:manual_airbrake)
-     get '/'
-     assert_caught_and_not_sent
-     AirbrakeTestController.local = false
-   end
-
-   should "not create actions from Airbrake methods" do
-     Airbrake::Rails::ControllerMethods.instance_methods.each do |method|
-       assert !(AirbrakeTestController.new.action_methods.include?(method))
-     end
-   end
-
-   should "ignore exceptions when user agent is being ignored by regular expression" do
-     Airbrake.configuration.ignore_user_agent_only = [/Ignored/]
-     @app = AirbrakeTestController.action(:boom)
-     get "/", {}, {"HTTP_USER_AGENT" => "ShouldBeIgnored"}
-     assert_caught_and_not_sent
-   end
-
-   should "ignore exceptions when user agent is being ignored by string" do
-     Airbrake.configuration.ignore_user_agent_only = ['IgnoredUserAgent']
-     @app = AirbrakeTestController.action(:boom)
-     get "/", {}, {"HTTP_USER_AGENT" => "IgnoredUserAgent"}
-     assert_caught_and_not_sent
-   end
-
-   should "not ignore exceptions when user agent is not being ignored" do
-     Airbrake.configuration.ignore_user_agent_only = ['IgnoredUserAgent']
-     @app = AirbrakeTestController.action(:boom)
-     get "/", {}, {"HTTP_USER_AGENT" => "NonIgnoredAgent"}
-     assert_caught_and_sent
-   end
-
-   should "send session data for manual notifications" do
-     @app = AirbrakeTestController.action(:manual_airbrake)
-     data = { 'one' => 'two' }
-     get "/", :session => data
-     assert_sent_hash data, "/notice/request/session"
-   end
-
-   should "send request data for manual notification" do
-     params = { 'controller' => "airbrake_test", 'action' => "index" }
-     @app = AirbrakeTestController.action(:manual_airbrake)
-     get "/", params
-     assert_sent_request_info_for @request
-   end
-
-   should "send request data for manual notification with non-standard port" do
-     params = { 'controller' => "airbrake_test", 'action' => "index" }
-     @app = AirbrakeTestController.action(:manual_airbrake)
-     get "/", params, {"SERVER_PORT" => 81}
-     assert_sent_request_info_for @request
+  def not_deliver_manually_sent_notices_in_local_requests
+    AirbrakeTestController.local = true
+    @app = AirbrakeTestController.action(:manual_airbrake)
+    get '/'
+    assert_caught_and_not_sent
+    AirbrakeTestController.local = false
   end
 
-   should "send request data for automatic notification" do
-     params = { 'controller' => "airbrake_test", 'action' => "index" }
-     @app = AirbrakeTestController.action(:boom)
-     get "/", params
-     assert_sent_request_info_for @request
-   end
-
-   should "send request data for automatic notification with non-standard port" do
-     params = { 'controller' => "airbrake_test", 'action' => "index" }
-     @app = AirbrakeTestController.action(:boom)
-     get "/", params, {"SERVER_PORT" => 81}
-     assert_sent_request_info_for @request
-     assert_sent_element 81, "/notice/request/cgi-data/var[@key = 'SERVER_PORT']"
-   end
-
-  # should "call session.to_hash if available" do
-  #   hash_data = {:key => :value}
-
-  #   session = ActionController::TestSession.new
-  #   ActionController::TestSession.stubs(:new).returns(session)
-  #   session.stubs(:to_hash).returns(hash_data)
-
-  #   Airbrake.configuration.environment_name = "production"
-
-  #   @app = AirbrakeTestController.action(:boom)
-  #   get '/'
-
-  #   assert_received(session, :to_hash)
-  #   assert_received(session, :data) { |expect| expect.never }
-  #   assert_caught_and_sent
-  # end
-
-  # should "call session.data if session.to_hash is undefined" do
-  #   hash_data = {:key => :value}
-
-  #   session = ActionController::TestSession.new
-  #   ActionController::TestSession.stubs(:new).returns(session)
-  #   session.stubs(:data).returns(hash_data)
-  #   if session.respond_to?(:to_hash)
-  #     class << session
-  #       undef to_hash
-  #     end
-  #   end
-
-  #   Airbrake.configuration.environment_name = "production"
-
-  #   @app = AirbrakeTestController.action(:boom)
-  #   get '/'
-
-  #   assert_received(session, :to_hash) { |expect| expect.never }
-  #   assert_received(session, :data) { |expect| expect.at_least_once }
-  #   assert_caught_and_sent
-  # end
+  def not_create_actions_from_airbrake_methods
+    Airbrake::Rails::ControllerMethods.instance_methods.each do |method|
+      assert !(AirbrakeTestController.new.action_methods.include?(method))
+    end
+  end
+
+  def ignore_exceptions_when_user_agent_is_being_ignored_by_regular_expression
+    Airbrake.configuration.ignore_user_agent_only = [/Ignored/]
+    @app = AirbrakeTestController.action(:boom)
+    get "/", {}, {"HTTP_USER_AGENT" => "ShouldBeIgnored"}
+    assert_caught_and_not_sent
+  end
+
+  def ignore_exceptions_when_user_agent_is_being_ignored_by_string
+    Airbrake.configuration.ignore_user_agent_only = ['IgnoredUserAgent']
+    @app = AirbrakeTestController.action(:boom)
+    get "/", {}, {"HTTP_USER_AGENT" => "IgnoredUserAgent"}
+    assert_caught_and_not_sent
+  end
+
+  def not_ignore_exceptions_when_user_agent_is_not_being_ignored
+    Airbrake.configuration.ignore_user_agent_only = ['IgnoredUserAgent']
+    @app = AirbrakeTestController.action(:boom)
+    get "/", {}, {"HTTP_USER_AGENT" => "NonIgnoredAgent"}
+    assert_caught_and_sent
+  end
+
+  def send_session_data_for_manual_notifications
+    @app = AirbrakeTestController.action(:manual_airbrake)
+    data = { 'one' => 'two' }
+    get "/", :session => data
+    assert_sent_hash data, "/notice/request/session"
+  end
+
+  def send_request_data_for_manual_notification
+    params = { 'controller' => "airbrake_test", 'action' => "index" }
+    @app = AirbrakeTestController.action(:manual_airbrake)
+    get "/", params
+    assert_sent_request_info_for @request
+  end
+
+  def send_request_data_for_manual_notification_with_non_standard_port
+    params = { 'controller' => "airbrake_test", 'action' => "index" }
+    @app = AirbrakeTestController.action(:manual_airbrake)
+    get "/", params, {"SERVER_PORT" => 81}
+    assert_sent_request_info_for @request
+  end
+
+  def send_request_data_for_automatic_notification
+    params = { 'controller' => "airbrake_test", 'action' => "index" }
+    @app = AirbrakeTestController.action(:boom)
+    get "/", params
+    assert_sent_request_info_for @request
+  end
+
+  def send_request_data_for_automatic_notification_with_non_standard_port
+    params = { 'controller' => "airbrake_test", 'action' => "index" }
+    @app = AirbrakeTestController.action(:boom)
+    get "/", params, {"SERVER_PORT" => 81}
+    assert_sent_request_info_for @request
+    assert_sent_element 81, "/notice/request/cgi-data/var[@key = 'SERVER_PORT']"
+  end
 end

data/test/helper.rb

@@ -5,7 +5,6 @@ $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require 'thread'
 
-require 'shoulda'
 require 'mocha'
 
 require 'abstract_controller'
@@ -24,6 +23,9 @@ require 'json-schema'
 
 require "airbrake"
 
+require "shoulda-matchers"
+require "shoulda-context"
+
 begin require 'redgreen'; rescue LoadError; end
 
 # Show backtraces for deprecated behavior for quicker cleanup.
@@ -47,77 +49,76 @@ class RoutedRackApp
   end
 end
 
-class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
-  setup do
-    @routes = SharedTestRoutes
-  end
-end
-
-class ActionController::IntegrationTest < ActiveSupport::TestCase
-  def self.build_app(routes = nil)
-    RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-      middleware.use "ActionDispatch::Callbacks"
-      middleware.use "ActionDispatch::ParamsParser"
-      middleware.use "ActionDispatch::Cookies"
-      middleware.use "ActionDispatch::Flash"
-      middleware.use "ActionDispatch::Head"
-      yield(middleware) if block_given?
+unless defined?(ActionDispatch::IntegrationTest)
+  class ActionController::IntegrationTest < ActiveSupport::TestCase
+    def self.build_app(routes = nil)
+      RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
+        yield(middleware) if block_given?
+      end
     end
-  end
 
-  self.app = build_app
+    self.app = build_app
 
-  # Stub Rails dispatcher so it does not get controller references and
-  # simply return the controller#action as Rack::Body.
-  class StubDispatcher < ::ActionDispatch::Routing::RouteSet::Dispatcher
-    protected
-    def controller_reference(controller_param)
-      controller_param
-    end
+    # Stub Rails dispatcher so it does not get controller references and
+    # simply return the controller#action as Rack::Body.
+    class StubDispatcher < ::ActionDispatch::Routing::RouteSet::Dispatcher
+      protected
+      def controller_reference(controller_param)
+        controller_param
+      end
 
-    def dispatch(controller, action, env)
-      [200, {'Content-Type' => 'text/html'}, ["#{controller}##{action}"]]
+      def dispatch(controller, action, env)
+        [200, {'Content-Type' => 'text/html'}, ["#{controller}##{action}"]]
+      end
     end
-  end
 
-  def self.stub_controllers
-    old_dispatcher = ActionDispatch::Routing::RouteSet::Dispatcher
-    ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
-    ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, StubDispatcher }
-    yield ActionDispatch::Routing::RouteSet.new
-  ensure
-    ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
-    ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, old_dispatcher }
-  end
+    def self.stub_controllers
+      old_dispatcher = ActionDispatch::Routing::RouteSet::Dispatcher
+      ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
+      ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, StubDispatcher }
+      yield ActionDispatch::Routing::RouteSet.new
+    ensure
+      ActionDispatch::Routing::RouteSet.module_eval { remove_const :Dispatcher }
+      ActionDispatch::Routing::RouteSet.module_eval { const_set :Dispatcher, old_dispatcher }
+    end
 
-  def with_routing(&block)
-    temporary_routes = ActionDispatch::Routing::RouteSet.new
-    old_app, self.class.app = self.class.app, self.class.build_app(temporary_routes)
-    old_routes = SharedTestRoutes
-    silence_warnings { Object.const_set(:SharedTestRoutes, temporary_routes) }
+    def with_routing(&block)
+      temporary_routes = ActionDispatch::Routing::RouteSet.new
+      old_app, self.class.app = self.class.app, self.class.build_app(temporary_routes)
+      old_routes = SharedTestRoutes
+      silence_warnings { Object.const_set(:SharedTestRoutes, temporary_routes) }
 
-    yield temporary_routes
-  ensure
-    self.class.app = old_app
-    silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
-  end
+      yield temporary_routes
+    ensure
+      self.class.app = old_app
+      silence_warnings { Object.const_set(:SharedTestRoutes, old_routes) }
+    end
 
-  def with_autoload_path(path)
-    path = File.join(File.dirname(__FILE__), "fixtures", path)
-    if ActiveSupport::Dependencies.autoload_paths.include?(path)
-      yield
-    else
-      begin
-        ActiveSupport::Dependencies.autoload_paths << path
+    def with_autoload_path(path)
+      path = File.join(File.dirname(__FILE__), "fixtures", path)
+      if ActiveSupport::Dependencies.autoload_paths.include?(path)
         yield
-      ensure
-        ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
-        ActiveSupport::Dependencies.clear
+      else
+        begin
+          ActiveSupport::Dependencies.autoload_paths << path
+          yield
+        ensure
+          ActiveSupport::Dependencies.autoload_paths.reject! {|p| p == path}
+          ActiveSupport::Dependencies.clear
+        end
       end
     end
   end
 end
 
+class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
+  setup do
+    @routes = SharedTestRoutes
+  end
+end
+
+
+
 module ActionController
   class Base
     include ActionController::Testing

data/test/notice_test.rb

@@ -1,5 +1,8 @@
 require File.expand_path '../helper', __FILE__
 
+XSD_SCHEMA_PATH  = "http://airbrake.io/airbrake_#{Airbrake::API_VERSION.tr(".","_")}.xsd"
+FakeWeb.allow_net_connect = %r{#{XSD_SCHEMA_PATH}}
+
 class NoticeTest < Test::Unit::TestCase
 
   include DefinesConstants
@@ -61,8 +64,8 @@ class NoticeTest < Test::Unit::TestCase
   end
 
   def assert_valid_notice_document(document)
-    xsd_path = File.expand_path(File.join(File.dirname(__FILE__),"..", "resources", "airbrake_2_4.xsd"))
-    schema = Nokogiri::XML::Schema.new(IO.read(xsd_path))
+    xsd_path = URI(XSD_SCHEMA_PATH)
+    schema = Nokogiri::XML::Schema.new(Net::HTTP.get(xsd_path))
     errors = schema.validate(document)
     assert errors.empty?, errors.collect{|e| e.message }.join
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 3.1.11
+  version: 3.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -156,23 +156,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: girl_friday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -236,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: girl_friday
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -252,7 +252,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: shoulda-matchers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -310,12 +326,11 @@ files:
 - lib/airbrake/sinatra.rb
 - lib/airbrake/response.rb
 - lib/rails/generators/airbrake/airbrake_generator.rb
-- lib/templates/javascript_notifier.erb
+- lib/templates/javascript_notifier
 - lib/templates/rescue.erb
 - lib/airbrake_tasks.rb
 - rails/init.rb
 - resources/ca-bundle.crt
-- resources/airbrake_2_4.xsd
 - resources/README.md
 - resources/airbrake_3_0.json
 - resources/notice.xml

data/resources/airbrake_2_4.xsd

@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <xs:element name="notice">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="api-key" type="xs:string"/>
-        <xs:element name="notifier" type="notifier"/>
-        <xs:element name="error" type="error"/>
-        <xs:element name="request" type="request" minOccurs="0"/>
-        <xs:element name="server-environment" type="serverEnvironment"/>
-        <xs:element name="current-user" type="current-user" minOccurs="0"/>
-        <xs:element name="framework" type="xs:string" minOccurs="0"/>
-      </xs:all>
-      <xs:attribute name="version" type="xs:string" use="required"/>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:complexType name="notifier">
-    <xs:all>
-      <xs:element name="name" type="xs:string"/>
-      <xs:element name="version" type="xs:string"/>
-      <xs:element name="url" type="xs:string"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="error">
-    <xs:all>
-      <xs:element name="class" type="xs:string"/>
-      <xs:element name="message" type="xs:string" minOccurs="0"/>
-      <xs:element name="backtrace" type="backtrace"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="backtrace">
-    <xs:sequence>
-      <xs:element name="line" maxOccurs="unbounded" minOccurs="0">
-        <xs:complexType>
-          <xs:attribute name="file" type="xs:string" use="required"/>
-          <xs:attribute name="number" type="xs:string" use="required"/>
-          <xs:attribute name="method" type="xs:string" use="optional"/>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="request">
-    <xs:all>
-      <xs:element name="url" type="xs:string"/>
-      <xs:element name="component" type="xs:string"/>
-      <xs:element name="action" type="xs:string" minOccurs="0"/>
-      <xs:element name="params" type="varList" minOccurs="0"/>
-      <xs:element name="session" type="varList" minOccurs="0"/>
-      <xs:element name="cgi-data" type="varList" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-  <xs:complexType name="varList">
-    <xs:sequence>
-      <xs:element name="var" type="var" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="var" mixed="true">
-    <xs:sequence>
-      <xs:element name="var" type="var" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="key" type="xs:string" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="serverEnvironment">
-    <xs:sequence>
-      <xs:element name="project-root" type="xs:string" minOccurs="0"/>
-      <xs:element name="environment-name" type="xs:string"/>
-      <xs:element name="app-version" type="xs:string" minOccurs="0"/>
-      <xs:element name="hostname" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="current-user">
-    <xs:all>
-      <xs:element name="id" type="xs:string"/>
-      <xs:element name="name" type="xs:string" minOccurs="0"/>
-      <xs:element name="email" type="xs:string" minOccurs="0"/>
-      <xs:element name="username" type="xs:string" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
-</xs:schema>