cheetahmails 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0ba4bd29038677e67d57cb0577484dfbb8b209
-  data.tar.gz: 652bdfc20d6ae2af735c94dcd2cc108de10f8e56
+  metadata.gz: aee984ac6a9285db5c84668cfe43c3984168a747
+  data.tar.gz: 17caa4d68620ab641c8052048ad26129c1c4a3a2
 SHA512:
-  metadata.gz: e402bf99b4b365005ea9b0a04006f4b928ecae91421baea0c2aeb6e3f54c74b3b7ab902be0a3fd995f85075a339afced82d7398aa7c2cba307cf076d0036045e
-  data.tar.gz: 55c5cf6e4afc6568b494cb9697638a0b9367bdb033ce7213d32dcd8591e83d201de863be3d44b2362b6c04fb025ee406b3454dbb7fcd6e0c20ef09767e8d922d
+  metadata.gz: 650fff6a0faf9565dfd90f2a789ab6bec812b97bac59c073b3e25d2674706bc8ccd5784e9917b43c5cf117e111b2d3ef298ca75d9d415c273a5fb7182c3a466b
+  data.tar.gz: f52b315512e4567510e989ac18aeb0df8c5742336ad3b2948ed018f4f5467b6e09fecedaeba2cbbc4f3342ae1c091def25dedff2ac0ff04c76b2d511ff25d6e8

data/lib/cheetahmails.rb

@@ -1,16 +1,16 @@
-require 'httparty'
+require 'faraday'
 require 'json'
 require 'redis'
 
 module Cheetahmails
-  include HTTParty
-  base_uri 'https://login.eccmp.com'
+  @base_uri = 'https://login.eccmp.com'
 
   class << self
     attr_accessor :configuration
   end
 
-  def self.getToken(clear_cache = false)
+  def self.get_token(clear_cache = false)
+    tries ||= 2
 
     redis = Redis.new(Cheetahmails.configuration.redis)
 
@@ -18,21 +18,26 @@ module Cheetahmails
 
     if not token = redis.get("cheetahmails_access_token")
 
-      @options = {
-        headers: {"Content-Type" => "application/x-www-form-urlencoded"},
-        body: {
-          "username" => Cheetahmails.configuration.username,
-          "password" => Cheetahmails.configuration.password,
-          "grant_type" => "password"
-        }
+      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
+      end
+
+      params = {
+        "username" => Cheetahmails.configuration.username,
+        "password" => Cheetahmails.configuration.password,
+        "grant_type" => "password"
       }
 
-      response = self.post('/services2/authorization/oAuth2/Token', @options)
+      response = faraday.post '/services2/authorization/oAuth2/Token', params
+
+      raise RetryException, response.status.to_s + " " + response.body if response.status != 200
 
       begin
         jsonresponse = JSON.parse(response.body)
       rescue JSON::ParserError => error
-        return nil
+        raise response.status.to_s + " " + response.body
       end
 
       if token = jsonresponse["access_token"]
@@ -44,35 +49,44 @@ module Cheetahmails
 
     token
 
+  rescue RetryException => e
+    if (tries -= 1) > 0
+      retry
+    else
+      raise e
+    end
   end
 
-  def self.customerExists(email)
+  def self.find_list_member(email)
     tries ||= 2
 
-    @options = {
-      headers: {
-        "Authorization" => "Bearer " + self.getToken(tries < 2),
-        "Content-Type" => "application/json",
-        "Accept" => "application/json"
-      },
-      query: {
-        "viewName" => Cheetahmails.configuration.view_name,
-        "prop" => '', #first_name,last_name
-        "columnName" => "email_address",
-        "operation" => "=",
-        "param" => email
-      }
+    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
+    end
+
+    faraday.headers["Authorization"] = "Bearer " + self.get_token(tries < 2)
+    faraday.headers["Content-Type"] = "application/json"
+    faraday.headers["Accept"] = "application/json"
+
+    params = {
+      "viewName" => Cheetahmails.configuration.view_name,
+      "prop" => '', #first_name,last_name
+      "columnName" => "email_address",
+      "operation" => "=",
+      "param" => email
     }
 
-    response = self.get('/services2/api/SearchRecords', @options)
+    response = faraday.get '/services2/api/SearchRecords', params
 
     begin
       jsonresponse = JSON.parse(response.body)
     rescue JSON::ParserError => error
-      return nil
+      raise response.status.to_s + " " + response.body
     end
 
-    raise RetryException, jsonresponse["message"] if response.code == 401
+    raise RetryException, jsonresponse["message"] if response.status == 401
 
     begin
       id = jsonresponse[0]["id"]
@@ -86,7 +100,7 @@ module Cheetahmails
     end
   end
 
-  def self.addCustomer(api_post_id, key_data)
+  def self.add_list_member(api_post_id, key_data)
     tries ||= 2
 
     data = []
@@ -97,26 +111,28 @@ module Cheetahmails
 
     data = {"apiPostId" => api_post_id, "data" => data}
 
-    @options = {
-      headers: {
-        "Authorization" => "Bearer " + self.getToken(tries < 2),
-        "Content-Type" => "application/json",
-        "Accept" => "application/json"
-      },
-      body: data.to_json
-    }
+    faraday = Faraday.new(:url => @base_uri) do |faraday|
+      #faraday.response :logger                  # log requests to STDOUT
+      faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+    end
 
-    response = self.post('/services2/api/Recipients', @options)
+    response = faraday.post do |req|
+      req.url '/services2/api/Recipients'
+      req.headers["Authorization"] = "Bearer " + self.get_token(tries < 2)
+      req.headers["Content-Type"] = "application/json"
+      req.headers["Accept"] = "application/json"
+      req.body = data.to_json
+    end
 
     begin
       jsonresponse = JSON.parse(response.body)
     rescue JSON::ParserError => error
-      return nil
+      raise response.status.to_s + " " + response.body
     end
 
-    raise RetryException, jsonresponse["message"] if response.code == 401
+    raise RetryException, jsonresponse["message"] if response.status == 401
 
-    return response.code == 200 && jsonresponse["success"]
+    return response.status == 200 && jsonresponse["success"]
 
   rescue RetryException => e
     if (tries -= 1) > 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheetahmails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Holder
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement