hops-airborne 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb0b2fd1e4a53b993af78cf3a22c35de02d7bcd9f59ab7927bc46e6b4ceddeb7
-  data.tar.gz: e2c0d3159268bdaae55cf575afc988b4b0bbc29b4c6b16fa65759a15ef832943
+  metadata.gz: fdf1ef7572ef317118ca584ecf101d31be80e9bb21c3f95101cc2338f1afd64e
+  data.tar.gz: 9da9c825a3e0f5cb1177728dfb940a7c486c9ac2a5d22e1a05ec64faf357cbcd
 SHA512:
-  metadata.gz: bbb646be6ccd33956a6f170652522b3e4ee79370cfeca1aebaccc949653d6674020940e6152f9b1d6dc9fb5cb5477771d8e93f58fc3d044df6f530b99d60eec3
-  data.tar.gz: 97e940080c7db8a175213cdf57c5930dbf5ce5521f4dd487930d22ec576afe35bfb66e8c77062492d11f31b6ed2d19d18d0e49061da38dbc393ea845c8dbab50
+  metadata.gz: 1adaad6ea699b981e3a4453407ea0cfb2235aabf17a4378722ab8bfcdc58110bce69797f24f5b8858871129ae7d6a53a0ae5594f354b9868b2aa0565a9efaf4f
+  data.tar.gz: e1f3639b7338b6f1d69e651f38e8ca2a45d506abd24cedae118d6288142b7ced307ff2a58abd53e90e42c579e337ed1bbebdb9a365b0cd0f77fc56b0fccacc08

data/hops-airborne.gemspec

@@ -2,11 +2,11 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'hops-airborne'
-  s.version     = '0.2.16'
+  s.version     = '0.2.17'
   s.date        = Date.today.to_s
   s.summary     = 'RSpec driven API testing framework - LogicalClocks maintained fork'
-  s.authors     = ['Alex Friedman', 'Seth Pollack', 'Fabio Buso']
-  s.email       = ['fabio@logicalclocks.com']
+  s.authors     = ['Alex Friedman', 'Seth Pollack', 'Fabio Buso', 'Antonios Kouzoupis']
+  s.email       = ['fabio@logicalclocks.com', 'antonios@logicalclocks.com']
   s.require_paths = ['lib']
   s.files = `git ls-files`.split("\n")
   s.license     = 'MIT'

data/lib/airborne/base.rb

@@ -29,32 +29,32 @@ module Airborne
     RSpec.configuration
   end
 
-  def get(url, headers = nil)
-    @response = make_request(:get, url, headers: headers)
+  def get(url, headers = nil, timeout = base_timeout)
+    @response = make_request(:get, url, headers: headers, timeout: timeout)
   end
 
-  def post(url, post_body = nil, headers = nil)
-    @response = make_request(:post, url, body: post_body, headers: headers)
+  def post(url, post_body = nil, headers = nil, timeout = base_timeout)
+    @response = make_request(:post, url, body: post_body, headers: headers, timeout: timeout)
   end
 
-  def patch(url, patch_body = nil, headers = nil)
-    @response = make_request(:patch, url, body: patch_body, headers: headers)
+  def patch(url, patch_body = nil, headers = nil, timeout = base_timeout)
+    @response = make_request(:patch, url, body: patch_body, headers: headers, timeout: timeout)
   end
 
-  def put(url, put_body = nil, headers = nil)
-    @response = make_request(:put, url, body: put_body, headers: headers)
+  def put(url, put_body = nil, headers = nil, timeout = base_timeout)
+    @response = make_request(:put, url, body: put_body, headers: headers, timeout: timeout)
   end
 
-  def delete(url, delete_body = nil, headers = nil)
-    @response = make_request(:delete, url, body: delete_body, headers: headers)
+  def delete(url, delete_body = nil, headers = nil, timeout = base_timeout)
+    @response = make_request(:delete, url, body: delete_body, headers: headers, timeout: timeout)
   end
 
-  def head(url, headers = nil)
-    @response = make_request(:head, url, headers: headers)
+  def head(url, headers = nil, timeout = base_timeout)
+    @response = make_request(:head, url, headers: headers, timeout: timeout)
   end
 
-  def options(url, headers = nil)
-    @response = make_request(:options, url, headers: headers)
+  def options(url, headers = nil, timeout = base_timeout)
+    @response = make_request(:options, url, headers: headers, timeout: timeout)
   end
 
   def response
@@ -79,4 +79,8 @@ module Airborne
     base = Airborne.configuration.base_url || ''
     base + url
   end
+
+  def base_timeout
+    Airborne.configuration.timeout || 60
+  end
 end

data/lib/airborne/rest_client_requester.rb

@@ -4,19 +4,22 @@ module Airborne
   module RestClientRequester
     def make_request(method, url, options = {})
       headers = base_headers.merge(options[:headers] || {})
+      timeout = options.fetch(:timeout, 60)
       res = if method == :post || method == :patch || method == :put
         begin
           request_body = options[:body].nil? ? '' : options[:body]
           request_body = request_body.to_json if options[:body].is_a?(Hash)
           RestClient::Request.execute(:method => method, :url => get_url(url), :payload => request_body, 
-                                      :headers => headers , :verify_ssl => Airborne.configuration.verify_ssl)
+                                      :headers => headers , :verify_ssl => Airborne.configuration.verify_ssl,
+                                      :timeout => timeout)
         rescue RestClient::Exception => e
           e.response
         end
       else
         begin
           RestClient::Request.execute(:method => method, :url => get_url(url), :headers => headers,
-                                      :verify_ssl => Airborne.configuration.verify_ssl)
+                                      :verify_ssl => Airborne.configuration.verify_ssl,
+                                      :timeout => timeout)
         rescue RestClient::Exception => e
           e.response
         end

data/lib/hops-airborne.rb

@@ -17,11 +17,14 @@ RSpec.configure do |config|
   config.add_setting :rack_app
   config.add_setting :requester_type
   config.add_setting :requester_module
+  config.add_setting :timeout, default: 60
   config.before do |example|
     config.match_expected = example.metadata[:match_expected].nil? ?
       Airborne.configuration.match_expected_default? : example.metadata[:match_expected]
     config.match_actual = example.metadata[:match_actual].nil? ?
       Airborne.configuration.match_actual_default? : example.metadata[:match_actual]
+    config.timeout = example.metadata[:timeout].nil? ?
+      Airborne.configuration.timeout? : example.metadata[:timeout]
   end
 
   # Include last since it depends on the configuration already being added

data/spec/airborne/client_requester_spec.rb

@@ -10,6 +10,7 @@ describe 'client requester' do
   after do
     allow(RestClient).to receive(:send).and_call_original
     Airborne.configure { |config| config.headers =  {} }
+    Airborne.configure { |config| config.timeout = 123 }
   end
 
   it 'should set :content_type to :json by default' do
@@ -17,7 +18,8 @@ describe 'client requester' do
 
     expect(RestClient::Request).to have_received(:execute)
                             .with(:method => :get, :url => 'http://www.example.com/foo', 
-                            :headers => { content_type: :json }, :verify_ssl => OpenSSL::SSL::VERIFY_NONE)
+                                  :headers => { content_type: :json }, :verify_ssl => OpenSSL::SSL::VERIFY_NONE,
+                                  :timeout => 60)
   end
 
   it 'should override headers with option[:headers]' do
@@ -26,7 +28,8 @@ describe 'client requester' do
     expect(RestClient::Request).to have_received(:execute)
                             .with(:method => :get, :url => 'http://www.example.com/foo', 
                             :headers => { content_type: 'application/x-www-form-urlencoded' }, 
-                            :verify_ssl => OpenSSL::SSL::VERIFY_NONE)
+                            :verify_ssl => OpenSSL::SSL::VERIFY_NONE,
+                            :timeout => 123)
   end
 
   it 'should override headers with airborne config headers' do
@@ -37,6 +40,7 @@ describe 'client requester' do
     expect(RestClient::Request).to have_received(:execute)
                             .with(:method => :get, :url => 'http://www.example.com/foo', 
                             :headers => { content_type: 'text/plain' },
-                            :verify_ssl => OpenSSL::SSL::VERIFY_NONE)
+                            :verify_ssl => OpenSSL::SSL::VERIFY_NONE,
+                            :timeout => 123)
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'coveralls'
 Coveralls.wear!
-require 'airborne'
+require 'hops-airborne'
 require 'stub_helper'
 
 Airborne.configure do |config|

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: hops-airborne
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Alex Friedman
 - Seth Pollack
 - Fabio Buso
+- Antonios Kouzoupis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -111,6 +112,7 @@ dependencies:
 description: 
 email:
 - fabio@logicalclocks.com
+- antonios@logicalclocks.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -199,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RSpec driven API testing framework - LogicalClocks maintained fork