airbrake 3.0.4 → 3.0.5

data/script/integration_test.rb

@@ -14,7 +14,7 @@ require 'rails/init'
 fail "Please supply an API Key as the first argument" if ARGV.empty?
 
 host = ARGV[1]
-host ||= "airbrakeapp.com"
+host ||= "airbrake.io"
 
 secure = (ARGV[2] == "secure")
 

data/test/airbrake_tasks_test.rb

@@ -39,15 +39,19 @@ class AirbrakeTasksTest < Test::Unit::TestCase
 
       context "given an optional HTTP proxy and valid options" do
         setup do
-          @response   = stub("response", :body => "stub body")
-          @http_proxy = stub("proxy", :post_form => @response)
+          @response         = stub("response", :body => "stub body")
+          @http_proxy       = stub("proxy",    :request => @response)
+          @http_proxy_class = stub("proxy_class", :new => @http_proxy)
+          @post             = stub("post",     :set_form_data => nil)
 
+          @http_proxy.expects(:use_ssl=).with(Airbrake.configuration.secure)
           Net::HTTP.expects(:Proxy).
             with(Airbrake.configuration.proxy_host,
                  Airbrake.configuration.proxy_port,
                  Airbrake.configuration.proxy_user,
                  Airbrake.configuration.proxy_pass).
-            returns(@http_proxy)
+            returns(@http_proxy_class)
+          Net::HTTP::Post.expects(:new).with("/deploys.txt").returns(@post)
 
           @options    = { :rails_env => "staging", :dry_run => false }
         end
@@ -57,7 +61,7 @@ class AirbrakeTasksTest < Test::Unit::TestCase
 
           should "return true without performing any actual request" do
             assert_equal true, @output
-            assert_received(@http_proxy, :post_form) do|expects|
+            assert_received(@http_proxy, :request) do|expects|
               expects.never
             end
           end
@@ -68,57 +72,54 @@ class AirbrakeTasksTest < Test::Unit::TestCase
             @output = AirbrakeTasks.deploy(@options)
           end
 
-          before_should "post to http://airbrakeapp.com/deploys.txt" do
-            URI.stubs(:parse).with('http://airbrakeapp.com/deploys.txt').returns(:uri)
-            @http_proxy.expects(:post_form).with(:uri, kind_of(Hash)).returns(successful_response)
+          before_should "post to http://airbrake.io:80/deploys.txt" do
+            @http_proxy_class.expects(:new).with("airbrake.io", 80).returns(@http_proxy)
+            @post.expects(:set_form_data).with(kind_of(Hash))
+            @http_proxy.expects(:request).with(any_parameters).returns(successful_response)
           end
 
           before_should "use the project api key" do
-            @http_proxy.expects(:post_form).
-              with(kind_of(URI), has_entries('api_key' => "1234123412341234")).
-              returns(successful_response)
+            @post.expects(:set_form_data).
+              with(has_entries('api_key' => "1234123412341234"))
           end
 
           before_should "use send the rails_env param" do
-            @http_proxy.expects(:post_form).
-              with(kind_of(URI), has_entries("deploy[rails_env]" => "staging")).
-              returns(successful_response)
+            @post.expects(:set_form_data).
+              with(has_entries("deploy[rails_env]" => "staging"))
           end
 
           [:local_username, :scm_repository, :scm_revision].each do |key|
             before_should "use send the #{key} param if it's passed in." do
               @options[key] = "value"
-              @http_proxy.expects(:post_form).
-                with(kind_of(URI), has_entries("deploy[#{key}]" => "value")).
-                returns(successful_response)
+              @post.expects(:set_form_data).
+                with(has_entries("deploy[#{key}]" => "value"))
             end
           end
 
           before_should "use the :api_key param if it's passed in." do
             @options[:api_key] = "value"
-            @http_proxy.expects(:post_form).
-              with(kind_of(URI), has_entries("api_key" => "value")).
-              returns(successful_response)
+            @post.expects(:set_form_data).
+              with(has_entries("api_key" => "value"))
           end
 
           before_should "puts the response body on success" do
             AirbrakeTasks.expects(:puts).with("body")
-            @http_proxy.expects(:post_form).with(any_parameters).returns(successful_response('body'))
+            @http_proxy.expects(:request).with(any_parameters).returns(successful_response('body'))
           end
 
           before_should "puts the response body on failure" do
             AirbrakeTasks.expects(:puts).with("body")
-            @http_proxy.expects(:post_form).with(any_parameters).returns(unsuccessful_response('body'))
+            @http_proxy.expects(:request).with(any_parameters).returns(unsuccessful_response('body'))
           end
 
           should "return false on failure", :before => lambda {
-            @http_proxy.expects(:post_form).with(any_parameters).returns(unsuccessful_response('body'))
+            @http_proxy.expects(:request).with(any_parameters).returns(unsuccessful_response('body'))
           } do
             assert !@output
           end
 
           should "return true on success", :before => lambda {
-            @http_proxy.expects(:post_form).with(any_parameters).returns(successful_response('body'))
+            @http_proxy.expects(:request).with(any_parameters).returns(successful_response('body'))
           } do
             assert @output
           end
@@ -138,8 +139,17 @@ class AirbrakeTasksTest < Test::Unit::TestCase
         setup { @output = AirbrakeTasks.deploy(:rails_env => "staging") }
 
         before_should "post to the custom host" do
-          URI.stubs(:parse).with('http://custom.host/deploys.txt').returns(:uri)
-          Net::HTTP.expects(:post_form).with(:uri, kind_of(Hash)).returns(successful_response)
+          @post             = stub("post",     :set_form_data => nil)
+          @http_proxy       = stub("proxy",    :request => @response)
+          @http_proxy.expects(:use_ssl=).with(Airbrake.configuration.secure)
+          @http_proxy_class = stub("proxy_class", :new => @http_proxy)
+          @http_proxy_class.expects(:new).with("custom.host", 80).returns(@http_proxy)
+          Net::HTTP.expects(:Proxy).with(any_parameters).returns(@http_proxy_class)
+          Net::HTTP::Post.expects(:new).with("/deploys.txt").returns(@post)
+          # URI.stubs(:parse).with('http://custom.host/deploys.txt').returns(:uri)
+          # Net::HTTP.expects(:post_form).with(:uri, kind_of(Hash)).returns(successful_response)
+          @post.expects(:set_form_data).with(kind_of(Hash))
+          @http_proxy.expects(:request).with(any_parameters).returns(successful_response)
         end
       end
     end

data/test/capistrano_test.rb

@@ -20,6 +20,7 @@ class CapistranoTest < Test::Unit::TestCase
   should "log when calling airbrake:deploy task" do
     @configuration.set(:current_revision, '084505b1c0e0bcf1526e673bb6ac99fbcb18aecc')
     @configuration.set(:repository, 'repository')
+    @configuration.set(:current_release, '/home/deploy/rails_app/hoptoad')
     io = StringIO.new
     logger = Capistrano::Logger.new(:output => io)
     logger.level = Capistrano::Logger::MAX_LEVEL
@@ -30,4 +31,4 @@ class CapistranoTest < Test::Unit::TestCase
     assert io.string.include?('** Notifying Airbrake of Deploy')
     assert io.string.include?('** Airbrake Notification Complete')
   end
-end
+end

data/test/configuration_test.rb

@@ -14,9 +14,9 @@ class ConfigurationTest < Test::Unit::TestCase
     assert_config_default :logger,              nil
     assert_config_default :notifier_version,    Airbrake::VERSION
     assert_config_default :notifier_name,       'Airbrake Notifier'
-    assert_config_default :notifier_url,        'http://airbrakeapp.com'
+    assert_config_default :notifier_url,        'http://airbrake.io'
     assert_config_default :secure,              false
-    assert_config_default :host,                'airbrakeapp.com'
+    assert_config_default :host,                'airbrake.io'
     assert_config_default :http_open_timeout,   2
     assert_config_default :http_read_timeout,   5
     assert_config_default :ignore_by_filters,   []

data/test/notice_test.rb

@@ -349,6 +349,13 @@ class NoticeTest < Test::Unit::TestCase
     end
   end
 
+
+  should "ensure #to_ary is called on objects that support it" do
+    assert_nothing_raised do
+      build_notice(:session => { :object => stub(:to_ary => {}) })
+    end
+  end
+
   should "extract data from a rack environment hash" do
     url = "https://subdomain.happylane.com:100/test/file.rb?var=value&var2=value2"
     parameters = { 'var' => 'value', 'var2' => 'value2' }

data/test/notifier_test.rb

@@ -82,6 +82,19 @@ class NotifierTest < Test::Unit::TestCase
     assert_sent(notice, notice_args)
   end
 
+  should "create and send a notice for an exception that responds to to_hash" do
+    set_public_env
+    exception = build_exception
+    notice = stub_notice!
+    notice_args = { :error_message => 'uh oh' }
+    exception.stubs(:to_hash).returns(notice_args)
+    stub_sender!
+
+    Airbrake.notify(exception)
+
+    assert_sent(notice, notice_args.merge(:exception => exception))
+  end
+
   should "create and sent a notice for an exception and hash" do
     set_public_env
     exception = build_exception

data/test/sender_test.rb

@@ -39,7 +39,7 @@ class SenderTest < Test::Unit::TestCase
     proxy    = stub(:new => http)
     Net::HTTP.stubs(:Proxy => proxy)
 
-    url = "http://airbrakeapp.com:80#{Airbrake::Sender::NOTICES_URI}"
+    url = "http://airbrake.io:80#{Airbrake::Sender::NOTICES_URI}"
     uri = URI.parse(url)
 
     proxy_host = 'some.host'
@@ -98,7 +98,7 @@ class SenderTest < Test::Unit::TestCase
 
   should "post to the right url for non-ssl" do
     http = stub_http
-    url = "http://airbrakeapp.com:80#{Airbrake::Sender::NOTICES_URI}"
+    url = "http://airbrake.io:80#{Airbrake::Sender::NOTICES_URI}"
     uri = URI.parse(url)
     send_exception(:secure => false)
     assert_received(http, :post) {|expect| expect.with(uri.path, anything, Airbrake::HEADERS) }
@@ -111,7 +111,7 @@ class SenderTest < Test::Unit::TestCase
   end
 
   should "verify the SSL peer when the use_ssl option is set to true" do
-    url = "https://airbrakeapp.com#{Airbrake::Sender::NOTICES_URI}"
+    url = "https://airbrake.io#{Airbrake::Sender::NOTICES_URI}"
     uri = URI.parse(url)
 
     real_http = Net::HTTP.new(uri.host, uri.port)
@@ -121,13 +121,13 @@ class SenderTest < Test::Unit::TestCase
     File.stubs(:exist?).with(OpenSSL::X509::DEFAULT_CERT_FILE).returns(false)
 
     send_exception(:secure => true)
-    assert(real_http.use_ssl)
+    assert(real_http.use_ssl?)
     assert_equal(OpenSSL::SSL::VERIFY_PEER,        real_http.verify_mode)
-    assert_nil real_http.ca_file
+    assert_equal(Airbrake::Sender.local_cert_path, real_http.ca_file)
   end
 
   should "verify the SSL peer when the use_ssl option is set to true and the default cert exists" do
-    url = "https://airbrakeapp.com#{Airbrake::Sender::NOTICES_URI}"
+    url = "https://airbrake.io#{Airbrake::Sender::NOTICES_URI}"
     uri = URI.parse(url)
 
     real_http = Net::HTTP.new(uri.host, uri.port)
@@ -137,7 +137,7 @@ class SenderTest < Test::Unit::TestCase
     File.stubs(:exist?).with(OpenSSL::X509::DEFAULT_CERT_FILE).returns(true)
 
     send_exception(:secure => true)
-    assert(real_http.use_ssl)
+    assert(real_http.use_ssl?)
     assert_equal(OpenSSL::SSL::VERIFY_PEER,        real_http.verify_mode)
     assert_equal(OpenSSL::X509::DEFAULT_CERT_FILE, real_http.ca_file)
   end
@@ -169,13 +169,13 @@ class SenderTest < Test::Unit::TestCase
   should "connect to the right port for ssl" do
     stub_http
     send_exception(:secure => true)
-    assert_received(Net::HTTP, :new) {|expect| expect.with("airbrakeapp.com", 443) }
+    assert_received(Net::HTTP, :new) {|expect| expect.with("airbrake.io", 443) }
   end
 
   should "connect to the right port for non-ssl" do
     stub_http
     send_exception(:secure => false)
-    assert_received(Net::HTTP, :new) {|expect| expect.with("airbrakeapp.com", 80) }
+    assert_received(Net::HTTP, :new) {|expect| expect.with("airbrake.io", 80) }
   end
 
   should "use ssl if secure" do

metadata

@@ -1,235 +1,165 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: airbrake
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 3.0.5
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 4
-  version: 3.0.4
 platform: ruby
-authors: 
+authors:
 - thoughtbot, inc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70183356319840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356319840
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70183356319180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356319180
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70183356318180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356318180
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70183356317420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356317420
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70183356316420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bourne
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356316420
+- !ruby/object:Gem::Dependency
+  name: bourne
+  requirement: &70183356312020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356312020
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70183356311240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 10
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.10.6
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356311240
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70183356310280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356310280
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70183356309460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 113
-        segments: 
-        - 1
-        - 4
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.4.3.1
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356309460
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70183356308000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356308000
+- !ruby/object:Gem::Dependency
+  name: sham_rack
+  requirement: &70183356307040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356307040
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70183356306320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 2
-        - 11
-        - 3
+      - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70183356306320
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: &70183356305220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
-  version_requirements: *id013
+  prerelease: false
+  version_requirements: *70183356305220
 description: 
-email: support@airbrakeapp.com
+email: support@airbrake.io
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - CHANGELOG
@@ -292,6 +222,8 @@ files:
 - lib/templates/javascript_notifier.erb
 - lib/templates/rescue.erb
 - rails/init.rb
+- resources/README.md
+- resources/ca-bundle.crt
 - script/integration_test.rb
 - test/airbrake_2_2.xsd
 - test/airbrake_tasks_test.rb
@@ -309,40 +241,37 @@ files:
 - test/recursion_test.rb
 - test/sender_test.rb
 - test/user_informer_test.rb
-homepage: http://www.airbrakeapp.com
+homepage: http://www.airbrake.io
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3313650858108623652
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3313650858108623652
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Send your application errors to our hosted service and reclaim your inbox.
-test_files: 
+test_files:
 - features/metal.feature
 - features/rack.feature
 - features/rails.feature