enrich-api 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 862c6d33a772aa9bfb34cc726757e0f22681b811
-  data.tar.gz: 5a1fddf7db803607fe91d4d4da7e235507f588aa
+  metadata.gz: 7009ec69ccc7069f43056d02cee15e1baf491df5
+  data.tar.gz: 6919a40f16fd82debdc098c9624b72ea26f8851b
 SHA512:
-  metadata.gz: 1a4fae56ccb8fd6a727779fa609eb3733efbe4f825c0ab869dc6d80536a0b815f3cf7d209d627b07225384779777f362f57df28cdb4de0224218239ecbd1027e
-  data.tar.gz: 8e92e6011f4ab016db903d1c61040b5070e33d4a3abca616028695280bf85266c7693b81802de13c5ef9527c76edeb61ff2e9fee36f2826f32e153ab1add5b49
+  metadata.gz: 584e06d362af8955d3b26602a40a6e86619e6b85f907870d4ccdaadef228145b0ab282ef99a112260c300b66e99b1e6e392bd6a530439c8f981012c2db9d3059
+  data.tar.gz: dd5abf7971909e8418fb1f7ac62c5147fcfaeb33bc46f75e83636477b6c5af604058bb50317a1ad1c3f208f66bf10bf56734952bf5ba79906e94de1b405a68be

data/enrich-api.gemspec

@@ -2,7 +2,7 @@ require File.expand_path("../lib/enrich-api", __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'enrich-api'
-  s.version       = '1.1.5'
+  s.version       = '1.2.0'
   s.date          = Date.today
   s.summary       = "Enrich API Ruby"
   s.description   = "Enrich API Ruby"

data/lib/enrich-api.rb

@@ -19,10 +19,6 @@ module Enrich
     attr_accessor :enrich
     attr_accessor :verify
 
-    @@created_status_code = 201
-    @@not_found_status_code = 404
-    @@created_retry_count_max = 10
-
     def initialize()
       @auth = {}
 
@@ -46,64 +42,33 @@ module Enrich
     end
 
     def timeout
-      @timeout || 5
+      @timeout || 40
     end
 
     def _get(resource, query)
-      self._do_get(resource, query, 0, 0)
+      self._do_get(resource, query)
     end
 
     protected
 
-    def _do_get(resource, query, retry_count, hold_for_seconds)
-      # Abort?
-      if retry_count > @@created_retry_count_max
-        raise RestClient::NotFound
-      else
-        # Hold.
-        sleep hold_for_seconds
-
-        begin
-          response = RestClient::Request.execute(
-            :url => self._prepare_rest_url(resource),
-            :method => :get,
-            :timeout => self.timeout,
-
-            :user => @auth["user_id"],
-            :password => @auth["secret_key"],
-
-            :headers => {
-              :user_agent => "enrich-api-ruby/1.1.5",
-              :accept => :json,
-              :content_type => :json,
-              :params => query
-            }
-          )
-
-          status = response.code
-        rescue RestClient::NotFound
-          status = @@not_found_status_code
-        end
-
-        # Re-schedule request? (created)
-        if status == @@created_status_code || (retry_count > 0 &&
-            status == @@not_found_status_code)
-          if response && response.headers[:retry_after]
-            hold_for_seconds = Integer(response.headers[:retry_after])
-          end
-
-          return self._do_get(
-            resource, query, retry_count + 1, hold_for_seconds
-          )
-        end
-
-        # Not found?
-        if status == @@not_found_status_code
-          raise RestClient::NotFound
-        end
-
-        return JSON.parse(response)
-      end
+    def _do_get(resource, query)
+      response = RestClient::Request.execute(
+        :url => self._prepare_rest_url(resource),
+        :method => :get,
+        :timeout => self.timeout,
+
+        :user => @auth["user_id"],
+        :password => @auth["secret_key"],
+
+        :headers => {
+          :user_agent => "enrich-api-ruby/1.2.0",
+          :accept => :json,
+          :content_type => :json,
+          :params => query
+        }
+      )
+
+      return JSON.parse(response)
     end
 
     def _prepare_rest_url(resource)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enrich-api
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Valerian Saliou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client