access 2.0.20 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b4f6a0aa7c4c2b34e8889416b993081fadc669
-  data.tar.gz: 8ddb90671e1505f01c9550c0ce00d6559235e3a4
+  metadata.gz: 0243211608932cdb56d93819aec2d16f97e3e9b6
+  data.tar.gz: 6ee0b4ca459a42ac9813337452763431b8e06ff5
 SHA512:
-  metadata.gz: 7f78450d54be6a5b63a93ea31dbe4439fae0351f8473d54ec54823be68ae9b861b05942d13d5c0305e009230b7075defbbdc02672a2f616387a2370a1a877334
-  data.tar.gz: a6df8665aab7014a1d7ae6bb61d0ff7ac9f3e4e6bba8d77767fff733595e84cc8a0dd1165f17cffa41885e5963f55cdc7d7731151732d7b4f2020110d3a02846
+  metadata.gz: 65d28a19875e97f1e4ecbd31c39979c780eef39181a5e9a417b468d5ea85ffc9ecf8619f2ec89b8b76194bf53ef1959aa072b034cf2f6403a7c1d26ae6fc1fae
+  data.tar.gz: d123feef877638060c6de67953e9632e19ac9d6b5e03d0c3be0d00555988cc0c75e940e7ad843387b624646748a4b938ad3b6b963572c2a9dae2c07324292b90

data/README.md

@@ -25,15 +25,16 @@ Or install it yourself as:
 You can configure the following options:
 
   - `access_token` **Required**
-  - `api_environment`: Set as `'demo'` or `'production'`. Default is `'demo'`
+  - `api_environment`: Set as `'demo'` or `'production'`. Default is `'demo'`.
   - `return_json`: Set as `'true'` or `'false'`. Default is `'false'` return ruby objects.
-  - `hashify`: Set as `'true'` or `'false'`. Default is `'false'` return a hashed version of the json response if `return_json` is set to 'true'
+  - `hashify`: Set as `'true'` or `'false'`. Default is `'false'` return a hashed version of the json response if `return_json` is set to 'true'.
+  - `access_timeout`: Set as a number. Default to `'10'`.
 
 #### Config via Environment Variables
 
 You can set config settings by creating environment variables called:
 
-`ENV['ACCESS_TOKEN']`, `ENV['ACCESS_ENVIRONMENT']`, `ENV['ACCESS_RETURN_JSON']`, `ENV['ACCESS_HASHIFY']`
+`ENV['ACCESS_TOKEN']`, `ENV['ACCESS_ENVIRONMENT']`, `ENV['ACCESS_RETURN_JSON']`, `ENV['ACCESS_HASHIFY']`, `ENV['ACCESS_TIMEOUT']`
 
 #### Config via Initializer
 
@@ -55,6 +56,8 @@ You can also set them one at a time
 
 `hashify` can be overwritten by passing in by passing the param `hashify` to the end of any call that accepts options.
 
+`access_token` can be overwritten by passing in by passing the param `access_token` to the end of any call that accepts options.
+
 ###Making Calls
 
 ####Offer

data/lib/access/config.rb

@@ -14,7 +14,7 @@ module Access
 
   class Config
     DOMAINS = {'production' => '', 'demo' => '-demo', 'stage' => '-stage', 'staging' => '-stage' }
-    attr_accessor :access_token, :api_environment, :return_json, :hashify
+    attr_accessor :access_token, :api_environment, :return_json, :hashify, :access_timeout
 
     def initialize
       @access_token = ENV['ACCESS_TOKEN']
@@ -24,6 +24,8 @@ module Access
       @return_json = ENV['ACCESS_RETURN_JSON'] || 'false'
       # only used when return_json is true
       @hashify = ENV['ACCESS_HASHIFY'] || 'false'
+      # how many seconds till we raise a Access::Error::Timeout
+      @access_timeout = ENV['ACCESS_TIMEOUT'] || '10'
     end
 
     def reset
@@ -32,6 +34,7 @@ module Access
       # self.api_version = 'v1'
       self.return_json = ENV['ACCESS_RETURN_JSON'] || 'false'
       self.hashify = ENV['ACCESS_HASHIFY'] || 'false'
+      self.access_timeout = ENV['ACCESS_TIMEOUT'] || '10'
     end
   end
 

data/lib/access/request.rb

@@ -4,7 +4,7 @@ module Access
 
     def get(path, api_type, options={}, &block)
       url = set_base(api_type, path)
-      results = self.class.get(url, headers: headers(options[:access_token]), query: options, timeout: (options[:access_timeout] || 3))
+      results = self.class.get(url, headers: headers(options[:access_token]), query: options, timeout: (options[:access_timeout] || Access.config.access_timeout))
       if should_return_json?(options[:return_json])
         hashify_results?(options[:hashify]) ? results.hashify : results
       else
@@ -13,19 +13,19 @@ module Access
     rescue Net::ReadTimeout, Net::OpenTimeout
       # block.call({"message"=>"Request Timeout Error", "status"=>408})
       raise Access::Error::Timeout
-
+    rescue EOFError
+      raise Access::Error::NoData
     end
 
     def post(path, api_type, options={}, &block)
       url = set_base(api_type, path)
-      results = self.class.post(url, headers: headers(options[:access_token]), body: options.to_json, timeout: (options[:access_timeout] || 10))
+      results = self.class.post(url, headers: headers(options[:access_token]), body: options.to_json, timeout: (options[:access_timeout] || Access.config.access_timeout))
       if should_return_json?(options[:return_json])
         hashify_results?(options[:hashify]) ? results.hashify : results
       else
         block.call results
       end
     rescue Net::ReadTimeout, Net::OpenTimeout
-      # block.call({"message"=>"Request Timeout Error", "status"=>408})
       raise Access::Error::Timeout
     rescue EOFError
       raise Access::Error::NoData
@@ -33,14 +33,13 @@ module Access
 
     def delete(path, api_type, options={}, &block)
       url = set_base(api_type, path)
-      results = self.class.delete(url, headers: headers(options[:access_token]), body: options.to_json, timeout: (options[:access_timeout] || 10))
+      results = self.class.delete(url, headers: headers(options[:access_token]), body: options.to_json, timeout: (options[:access_timeout] || Access.config.access_timeout))
       if should_return_json?(options[:return_json])
         hashify_results?(options[:hashify]) ? results.hashify : results
       else
         block.call results
       end
     rescue Net::ReadTimeout, Net::OpenTimeout
-      # block.call({"message"=>"Request Timeout Error", "status"=>408})
       raise Access::Error::Timeout
     rescue EOFError
       raise Access::Error::NoData
@@ -48,7 +47,7 @@ module Access
 
     def post_for_filter(path, api_type, filter, options={}, &block)
       url = set_base(api_type, path)
-      results = self.class.post(url, headers: headers(options[:access_token]), body: filter, timeout: (options[:access_timeout] || 3))
+      results = self.class.post(url, headers: headers(options[:access_token]), body: filter, timeout: (options[:access_timeout] || Access.config.access_timeout))
       if should_return_json?(options[:return_json])
         hashify_results?(options[:hashify]) ? results.hashify : results
       else
@@ -56,6 +55,8 @@ module Access
       end
     rescue Net::ReadTimeout, Net::OpenTimeout
       raise Access::Error::Timeout
+    rescue EOFError
+      raise Access::Error::NoData
     end
 
     private

data/lib/access/version.rb

@@ -1,4 +1,4 @@
 module Access
-  VERSION = "2.0.20"
+  VERSION = "2.0.21"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: access
 version: !ruby/object:Gem::Version
-  version: 2.0.20
+  version: 2.0.21
 platform: ruby
 authors:
 - Ben Eggett