diff --git a/.travis.yml b/.travis.yml index 911bed8..09405c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ script: bundle exec rake before_install: - sudo apt-get update -qq - sudo apt-get install -qq libarchive-dev + - gem update --system + - gem install bundler rvm: - 2.1 @@ -18,8 +20,6 @@ notifications: on_success: change on_failure: change -cache: bundler - branches: only: - master diff --git a/lib/opener/webservice/server.rb b/lib/opener/webservice/server.rb index 186df1e..405a3c6 100644 --- a/lib/opener/webservice/server.rb +++ b/lib/opener/webservice/server.rb @@ -223,7 +223,7 @@ def analyze_async(options, request_id) # Submit the error to the error callback, re-raise so Rollbar can also # report it. rescue Exception => error - ErrorHandler.new.submit(error, request_id) if options['error_callback'] + ErrorHandler.new.submit(error, request_id, options['error_callback']) if options['error_callback'] raise error end diff --git a/opener-webservice.gemspec b/opener-webservice.gemspec index 5f7ebdb..b51b418 100644 --- a/opener-webservice.gemspec +++ b/opener-webservice.gemspec @@ -24,6 +24,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opener-core', '~> 2.3' spec.add_dependency 'puma' spec.add_dependency 'slop', '~> 3.0' + spec.add_dependency 'aws-sdk-v1' spec.add_dependency 'newrelic_rpm' spec.add_dependency 'rollbar', '~> 1.0' diff --git a/spec/opener/webservice/server_spec.rb b/spec/opener/webservice/server_spec.rb index 600c380..bbfa936 100644 --- a/spec/opener/webservice/server_spec.rb +++ b/spec/opener/webservice/server_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +require 'aws-sdk-v1' describe Opener::Webservice::Server, :type => :request do before do @@ -174,7 +175,7 @@ def run(input) context '#analyze_async' do before do - @input = {'input' => 'Hello world', 'error_callback' => 'foo'} + @input = {'input' => 'Hello world', 'error_callback' => 'http://foo'} end example 'analyze the input and submit the output to a callback' do @@ -187,7 +188,7 @@ def run(input) example 'submit errors to the error callback if present' do Opener::Webservice::ErrorHandler.any_instance .should_receive(:submit) - .with(an_instance_of(StandardError), '123') + .with(an_instance_of(StandardError), '123', 'http://foo') @server.stub(:analyze).and_raise(StandardError)