gds-api-adapters 0.0.36 → 0.0.37

data/lib/gds_api/base.rb

@@ -23,6 +23,7 @@ class GdsApi::Base
 
   class << self
     attr_writer :logger
+    attr_accessor :default_options
   end
 
   def self.logger
@@ -31,11 +32,13 @@ class GdsApi::Base
 
   def initialize(platform, options_or_endpoint_url=nil, maybe_options=nil)
     if options_or_endpoint_url.is_a?(String)
-      @options = maybe_options || {}
-      @options[:endpoint_url] = options_or_endpoint_url
+      options = maybe_options || {}
+      options[:endpoint_url] = options_or_endpoint_url
     else
-      @options = options_or_endpoint_url || {}
+      options = options_or_endpoint_url || {}
     end
+    default_options = GdsApi::Base.default_options || {}
+    @options = default_options.merge(options)
     self.endpoint = options[:endpoint_url] || endpoint_for_platform(adapter_name, platform)
   end
 

data/lib/gds_api/json_client.rb

@@ -41,7 +41,9 @@ module GdsApi
       path = path + "?" + url.query if url.query
 
       response = Net::HTTP.start(url.host, url.port, nil, nil, nil, nil, {use_ssl: url.port == 443, verify_mode: (OpenSSL::SSL::VERIFY_NONE if url.port == 443)}) do |http|
-        http.read_timeout = options[:timeout] || DEFAULT_TIMEOUT_IN_SECONDS
+        unless options[:disable_timeout]
+          http.read_timeout = options[:timeout] || DEFAULT_TIMEOUT_IN_SECONDS
+        end
         request = method_class.new(path, REQUEST_HEADERS)
         request.basic_auth(@options[:basic_auth][:user], @options[:basic_auth][:password]) if @options[:basic_auth]
         request.body = params.to_json if params

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
 end

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors: 
 - James Stewart
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4150429579943977469
+      hash: 3917338129765576762
       segments: 
       - 0
       version: "0"
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4150429579943977469
+      hash: 3917338129765576762
       segments: 
       - 0
       version: "0"