airbrake 3.1.0 → 3.1.1

data/CHANGELOG

@@ -1,3 +1,22 @@
+Version 3.1.1 - 2012-06-06 20:35:00 -0700
+===============================================================================
+
+Hrvoje Šimić (10):
+      minor fixes for Rakefile
+      change color of user informer tests
+      remove unnecessary shim
+      use shim instead of server response in tests
+      add a note about informing the user
+      fix typo in Rakefile
+      valid mock responses
+      add a failing scenario for #92
+      404s reporting fixed, closes #92
+      update mocks for rack and sinatra
+
+Jonathan Siegel (1):
+      Updated copyright/trademarks
+
+
 Version 3.1.0 - 2012-05-28 02:25:09 +0200
 ===============================================================================
 
@@ -801,3 +820,4 @@ Nick Quaranto (3):
 
 
 
+

data/Rakefile

@@ -7,6 +7,7 @@ rescue LoadError
   $stderr.puts "Please install cucumber: `gem install cucumber`"
   exit 1
 end
+require './lib/airbrake/version'
 
 FEATURES = ["sinatra","rack","metal","user_informer"]
 
@@ -170,7 +171,7 @@ end
 task :cucumber => [:vendor_test_gems]
 
 
-def run_rails_cucumbr_task(version, additional_cucumber_args)
+def run_rails_cucumber_task(version, additional_cucumber_args)
   puts "Testing Rails #{version}"
   if version.empty?
     raise "No Rails version specified - make sure ENV['RAILS_VERSION'] is set, e.g. with `rake cucumber:rails:all`"
@@ -186,14 +187,14 @@ def define_rails_cucumber_tasks(additional_cucumber_args = '')
     RAILS_VERSIONS.each do |version|
       desc "Test integration of the gem with Rails #{version}"
       task version => [:vendor_test_gems] do
-        exit 1 unless run_rails_cucumbr_task(version, additional_cucumber_args)
+        exit 1 unless run_rails_cucumber_task(version, additional_cucumber_args)
       end
     end
 
     desc "Test integration of the gem with all Rails versions"
     task :all do
       results = RAILS_VERSIONS.map do |version|
-        run_rails_cucumbr_task(version, additional_cucumber_args)
+        run_rails_cucumber_task(version, additional_cucumber_args)
       end
 
       exit 1 unless results.all?

data/TESTING.md

@@ -17,6 +17,11 @@ Then, to start the suite, run
     rake
     # NOT: bundle exec rake
 
+Finally, this test suite runs against many rails versions. If you
+prefer to run it against specific version hit
+
+    rake cucumber:rails:<VERSION>
+
 
 For Maintainers
 ================

data/features/rack.feature

@@ -19,5 +19,5 @@ Feature: Use the notifier in a plain Rack app
       end
       """
     When I perform a Rack request to "http://example.com:123/test/index?param=value"
-    Then I should receive a Airbrake notification for rack
+    Then I should receive a Airbrake notification
 

data/features/rails.feature

@@ -2,10 +2,10 @@ Feature: Install the Gem in a Rails application
 
   Background:
     Given I have built and installed the "airbrake" gem
+    And I generate a new Rails application
 
   Scenario: Use the gem without vendoring the gem in a Rails application
-    When I generate a new Rails application
-    And I configure the Airbrake shim
+    When I configure the Airbrake shim
     And I configure my application to require the "airbrake" gem
     And I run the airbrake generator with "-k myapikey"
     Then the command should have run successfully
@@ -13,8 +13,7 @@ Feature: Install the Gem in a Rails application
     And I should see the Rails version
 
   Scenario: vendor the gem and uninstall
-    When I generate a new Rails application
-    And I configure the Airbrake shim
+    When I configure the Airbrake shim
     And I configure my application to require the "airbrake" gem
     And I unpack the "airbrake" gem
     And I run the airbrake generator with "-k myapikey"
@@ -26,18 +25,15 @@ Feature: Install the Gem in a Rails application
     And I should receive two Airbrake notifications
 
   Scenario: Configure the notifier by hand
-    When I generate a new Rails application
-    And I configure the Airbrake shim
+    When I configure the Airbrake shim
     And I configure the notifier to use "myapikey" as an API key
     And I configure my application to require the "airbrake" gem
     And I run the airbrake generator with ""
     Then I should receive a Airbrake notification
 
   Scenario: Configuration within initializer isn't overridden by Railtie
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
+    When I configure the Airbrake shim
+    And I configure usage of Airbrake
     Then the command should have run successfully
     When I configure the notifier to use the following configuration lines:
       """
@@ -54,14 +50,12 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
 
   Scenario: Try to install without an api key
-    When I generate a new Rails application
-    And I configure my application to require the "airbrake" gem
+    When I configure my application to require the "airbrake" gem
     And I run the airbrake generator with ""
     Then I should see "Must pass --api-key or --heroku or create config/initializers/airbrake.rb"
 
   Scenario: Configure and deploy using only installed gem
-    When I generate a new Rails application
-    And I run "capify ."
+    When I run "capify ."
     And I configure the Airbrake shim
     And I configure my application to require the "airbrake" gem
     And I run the airbrake generator with "-k myapikey"
@@ -70,8 +64,7 @@ Feature: Install the Gem in a Rails application
     Then I should see "airbrake:deploy"
 
   Scenario: Configure and deploy using only vendored gem
-    When I generate a new Rails application
-    And I run "capify ."
+    When I run "capify ."
     And I configure the Airbrake shim
     And I configure my application to require the "airbrake" gem
     And I unpack the "airbrake" gem
@@ -83,8 +76,7 @@ Feature: Install the Gem in a Rails application
     Then I should see "airbrake:deploy"
 
   Scenario: Try to install when the airbrake plugin still exists
-    When I generate a new Rails application
-    And I install the "airbrake" plugin
+    When I install the "airbrake" plugin
     And I configure the Airbrake shim
     And I configure the notifier to use "myapikey" as an API key
     And I configure my application to require the "airbrake" gem
@@ -92,10 +84,8 @@ Feature: Install the Gem in a Rails application
     Then I should see "You must first remove the airbrake plugin. Please run: script/plugin remove airbrake"
 
   Scenario: Rescue an exception in a controller
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
+    When I configure the Airbrake shim
+    And I configure usage of Airbrake
     And I define a response for "TestController#index":
       """
       session[:value] = "test"
@@ -106,16 +96,14 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
 
   Scenario: The gem should not be considered a framework gem
-    When I generate a new Rails application
-    And I configure the Airbrake shim
+    When I configure the Airbrake shim
     And I configure my application to require the "airbrake" gem
     And I run the airbrake generator with "-k myapikey"
     And I run "rake gems"
     Then I should see that "airbrake" is not considered a framework gem
 
   Scenario: The app uses Vlad instead of Capistrano
-    When I generate a new Rails application
-    And I configure the Airbrake shim
+    When I configure the Airbrake shim
     And I configure my application to require the "airbrake" gem
     And I run "touch config/deploy.rb"
     And I run "rm Capfile"
@@ -123,8 +111,7 @@ Feature: Install the Gem in a Rails application
     Then "config/deploy.rb" should not contain "capistrano"
 
   Scenario: Support the Heroku addon in the generator
-    When I generate a new Rails application
-    And I configure the Airbrake shim
+    When I configure the Airbrake shim
     And I configure the Heroku rake shim
     And I configure the Heroku gem shim with "myapikey"
     And I configure my application to require the "airbrake" gem
@@ -138,8 +125,7 @@ Feature: Install the Gem in a Rails application
       """
 
   Scenario: Support the --app option for the Heroku addon in the generator
-    When I generate a new Rails application
-    And I configure the Airbrake shim
+    When I configure the Airbrake shim
     And I configure the Heroku rake shim
     And I configure the Heroku gem shim with "myapikey" and multiple app support
     And I configure my application to require the "airbrake" gem
@@ -153,10 +139,8 @@ Feature: Install the Gem in a Rails application
       """
 
   Scenario: Filtering parameters in a controller
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
+    When I configure the Airbrake shim
+    And I configure usage of Airbrake
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key = "myapikey"
@@ -172,10 +156,8 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
 
   Scenario: Filtering session in a controller
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
+    When I configure the Airbrake shim
+    And I configure usage of Airbrake
     When I configure the notifier to use the following configuration lines:
       """
       config.api_key = "myapikey"
@@ -191,10 +173,8 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
 
   Scenario: Filtering session and params based on Rails parameter filters
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
+    When I configure the Airbrake shim
+    And I configure usage of Airbrake
     And I configure the application to filter parameter "secret"
     And I define a response for "TestController#index":
       """
@@ -207,10 +187,8 @@ Feature: Install the Gem in a Rails application
     Then I should receive a Airbrake notification
 
   Scenario: Notify airbrake within the controller
-    When I generate a new Rails application
-    And I configure the Airbrake shim
-    And I configure my application to require the "airbrake" gem
-    And I run the airbrake generator with "-k myapikey"
+    When I configure the Airbrake shim
+    And I configure usage of Airbrake
     And I define a response for "TestController#index":
       """
       session[:value] = "test"
@@ -220,3 +198,10 @@ 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"
     Then I should receive a Airbrake notification
+
+  Scenario: Reporting 404s
+    When I configure the Airbrake shim
+    And I configure usage of Airbrake
+    And I perform a request to "http://example.com:123/this/route/does/not/exist"
+    And I should see "The page you were looking for doesn't exist."
+    And I should receive a Airbrake notification

data/features/sinatra.feature

@@ -25,5 +25,5 @@ Feature: Use the notifier in a Sinatra app
       app = FontaneApp
       """
     When I perform a Rack request to "http://example.com:123/test/index?param=value"
-    Then I should receive a Airbrake notification for rack
+    Then I should receive a Airbrake notification
 

data/features/step_definitions/rails_application_steps.rb

@@ -1,6 +1,10 @@
 require 'uri'
 require 'active_support/core_ext/string/inflections'
 
+Given /^I have built and installed the "([^\"]*)" gem$/ do |gem_name|
+  @terminal.build_and_install_gem(File.join(PROJECT_ROOT, "#{gem_name}.gemspec"))
+end
+
 When /^I generate a new Rails application$/ do
   @terminal.cd(TEMP_DIR)
 
@@ -48,9 +52,6 @@ Given /^I have installed the "([^\"]*)" gem$/ do |gem_name|
   @terminal.install_gem(gem_name)
 end
 
-Given /^I have built and installed the "([^\"]*)" gem$/ do |gem_name|
-  @terminal.build_and_install_gem(File.join(PROJECT_ROOT, "#{gem_name}.gemspec"))
-end
 
 When /^I configure my application to require the "capistrano" gem if necessary$/ do
   When %{I configure my application to require the "capistrano" gem} if version_string >= "3.0.0"
@@ -423,3 +424,10 @@ Then /^I should not see notifier JavaScript$/ do
   response = Nokogiri::HTML.parse('<html>' + @terminal.output.split('<html>').last)
   response.at_css("script[type='text/javascript'][src$='/javascripts/notifier.js']").should be_nil
 end
+
+
+When /^I configure usage of Airbrake$/ do
+    When %{I configure my application to require the "airbrake" gem}
+    When %{I run the airbrake generator with "-k myapikey"}
+    @terminal.flush!                                              # flush the results of setting up Airbrake (generates notification)
+end

data/features/support/rails.rb

@@ -120,7 +120,7 @@ module RailsHelpers
 
 
         env      = Rack::MockRequest.env_for(#{uri.inspect})
-        response = RailsRoot::Application.call(env).last
+        response = RailsRoot::Application.call(env)
 
         if response.is_a?(Array)
           puts response.join

data/features/support/terminal.rb

@@ -60,6 +60,10 @@ class Terminal
     logger.debug(string)
   end
 
+  def flush!
+    @output = ""
+  end
+
   def build_and_install_gem(gemspec)
     pkg_dir = File.join(TEMP_DIR, 'pkg')
     FileUtils.mkdir_p(pkg_dir)

data/lib/airbrake/rails/middleware/exceptions_catcher.rb

@@ -15,7 +15,9 @@ module Airbrake
 
         def render_exception_with_airbrake(env,exception)
           controller = env['action_controller.instance']
-          env['airbrake.error_id'] = Airbrake.notify_or_ignore(exception, controller.airbrake_request_data) unless skip_user_agent?(env)
+          env['airbrake.error_id'] = Airbrake.
+            notify(exception,
+                   controller.try(:airbrake_request_data) || :rack_env => env) unless skip_user_agent?(env)
           if defined?(controller.rescue_action_in_public_without_airbrake)
             controller.rescue_action_in_public_without_airbrake(exception)
           end

data/lib/airbrake/version.rb

@@ -1,3 +1,3 @@
 module Airbrake
-  VERSION = "3.1.0"
+  VERSION = "3.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-03 00:00:00.000000000Z
+date: 2012-06-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70167650892280 !ruby/object:Gem::Requirement
+  requirement: &70339779074320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167650892280
+  version_requirements: *70339779074320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70167650891860 !ruby/object:Gem::Requirement
+  requirement: &70339779073820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167650891860
+  version_requirements: *70339779073820
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70167650891360 !ruby/object:Gem::Requirement
+  requirement: &70339779073120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.8
   type: :development
   prerelease: false
-  version_requirements: *70167650891360
+  version_requirements: *70339779073120
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70167650890840 !ruby/object:Gem::Requirement
+  requirement: &70339779071900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.8
   type: :development
   prerelease: false
-  version_requirements: *70167650890840
+  version_requirements: *70339779071900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70167650890380 !ruby/object:Gem::Requirement
+  requirement: &70339779071440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.3.8
   type: :development
   prerelease: false
-  version_requirements: *70167650890380
+  version_requirements: *70339779071440
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70167650889900 !ruby/object:Gem::Requirement
+  requirement: &70339779070860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70167650889900
+  version_requirements: *70339779070860
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70167650889440 !ruby/object:Gem::Requirement
+  requirement: &70339779070400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.10.6
   type: :development
   prerelease: false
-  version_requirements: *70167650889440
+  version_requirements: *70339779070400
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70167650888980 !ruby/object:Gem::Requirement
+  requirement: &70339779069940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70167650888980
+  version_requirements: *70339779069940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70167650888520 !ruby/object:Gem::Requirement
+  requirement: &70339779069460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.4.3.1
   type: :development
   prerelease: false
-  version_requirements: *70167650888520
+  version_requirements: *70339779069460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70167650888020 !ruby/object:Gem::Requirement
+  requirement: &70339779069000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70167650888020
+  version_requirements: *70339779069000
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &70167650887500 !ruby/object:Gem::Requirement
+  requirement: &70339779068540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70167650887500
+  version_requirements: *70339779068540
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70167650886880 !ruby/object:Gem::Requirement
+  requirement: &70339779068080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *70167650886880
+  version_requirements: *70339779068080
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70167650886040 !ruby/object:Gem::Requirement
+  requirement: &70339779067620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70167650886040
+  version_requirements: *70339779067620
 description: 
 email: support@airbrake.io
 executables: []