cheetahmails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac87fd52f32e584182c5cf06c60c123e1ad3255
-  data.tar.gz: be0f0e27b5b5fd6ea1041e7dfc84416b239a9f19
+  metadata.gz: d3ec8ac69916c77a941007e1fddc41708398bad7
+  data.tar.gz: 4306f5a649501c0177e142612d875c98d2b5fca8
 SHA512:
-  metadata.gz: f98c72f1a28ac4144d7a00412e028fdbdc20ecfc24dcc3c14c6116ad17841197f2db76ab99235266d0238992ca8fe6edced3e22c5c4d5e430222db06922f5b80
-  data.tar.gz: e45614047fbe3d415c98cf338c27782a42490078b915d487f0b9f6f9e748d945e5891263e089fd97f35390ffb92febd858aecc156a60d94c5f87bb8f04429aec
+  metadata.gz: b2fff01fb3c7628e643a7b4ecb7360ce02ea1ac9f1d8c9c181732f8a29759e6a953ba7fa26e86876f577b5e536285ec78c4ce76aad5b7120ee8d943e3e611df1
+  data.tar.gz: 8297b710d12becd0f287a9e8b93b34213898cbf48d2d5a2fb496f9ede92b83165594582742613c5bed40b760be375b1fde7957d8f59f8cd7f882dfafb908dc0a

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in surveymonkey.gemspec
 gemspec
+
+group :development do
+  gem 'guard-rspec', '~> 4.3.1', require: false
+  gem 'rspec', require: false
+  gem 'dotenv', require: false
+end

data/lib/cheetahmails.rb

@@ -63,22 +63,19 @@ module Cheetahmails
     end
   end
 
-  def self.find_list_member(email, prop='')
-    tries ||= 2
-
+  def self.find_list_member(email, prop = '', allow_retry_qty = 3)
     faraday = Faraday.new(:url => @base_uri) do |faraday|
-      faraday.request  :url_encoded             # form-encode POST params
-      #faraday.response :logger                  # log requests to STDOUT
-      faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+      faraday.request :url_encoded
+      faraday.adapter  Faraday.default_adapter
     end
 
-    faraday.headers["Authorization"] = "Bearer " + self.get_token(tries < 2)
+    faraday.headers["Authorization"] = "Bearer #{Cheetahmails.get_token(false)}"
     faraday.headers["Content-Type"] = "application/json"
     faraday.headers["Accept"] = "application/json"
 
     params = {
       "viewName" => Cheetahmails.configuration.view_name,
-      "prop" => prop, #first_name,last_name
+      "prop" => prop,
       "columnName" => "email_address",
       "operation" => "=",
       "param" => email
@@ -86,25 +83,18 @@ module Cheetahmails
 
     response = faraday.get '/services2/api/SearchRecords', params
 
-    begin
-      jsonresponse = JSON.parse(response.body)
-    rescue JSON::ParserError => error
-      raise response.statzus.to_s + " " + response.body
-    end
-
-    raise RetryException, jsonresponse["message"] if response.status == 401
-
-    return false if response.status == 404
-
-    begin
-      return jsonresponse[0]
-    rescue => error
-      return false
-    end
-
-  rescue RetryException => e
-    if (tries -= 1) > 0
-      retry
+    case response.status
+      when 200
+        return JSON.parse(response.body)[0]
+      when 404
+        return false
+      when 401
+        if allow_retry_qty > 0
+          Cheetahmails.get_token(true)
+          find_list_member(email, prop, allow_retry_qty - 1)
+        else
+          raise "401"
+        end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheetahmails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tom Holder
@@ -38,34 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Some basic cheetah mail API end points implemented
 email: tom@simpleweb.co.uk
 executables: []