sugarcrb 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724125dd9da860eda1fddf0926c9448aadc8359b
-  data.tar.gz: cfcbc997dcdae9141c15e0206b2bccb1604e0210
+  metadata.gz: 28c88bf9e8829171b432d71cc1bf0ff43ccd59ab
+  data.tar.gz: f20fef0403de24481eafb2b10450d777ce16a530
 SHA512:
-  metadata.gz: f006c2cc07a3a27c86cbff41cecb71ba1fe916d6c28a175b354f47fd41241e06dc8e7c1a2c09d35ba39192a244830abe3d0f1d69975f4acb8635c0bf6b78f3e7
-  data.tar.gz: 488520c13918540a27543c282f1a9593ca2b379a287ffc0e66379101780a5708879360f5f56bb021e2b9f701491bb1d542fe8e6a837ccae92098461887cc23b4
+  metadata.gz: bd5eef173e0f044bda6213d437efab9c6fca3e926f959ea4b51a45dba14f89854b0e4388af2602977e9b8f6560ad07f4e6e8b9a4dd6ffff26f6b9a33b364a192
+  data.tar.gz: 11be8450b19cf68628691b7b36016afc5db86aba1528f20646c5e7e877f62b1c5a43c83ef03f0359ff3f40cece5fd94e87270f31725c9e09a31298092b28adc6

data/lib/sugarcrb/version.rb

@@ -1,3 +1,3 @@
 module Sugarcrb
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/sugarcrb.rb

@@ -2,33 +2,49 @@ require "sugarcrb/version"
 require 'rest-client'
 
 module Sugarcrb
-  class << self
 
-    def initialize(host, username, password, platform, client_id, client_secret)
-      # Instance variables
-      @host = host
-      @username = username
-      @password = password
-      @platform = platform
-      @client_secret = client_secret
-      @client_id = client_id
-      @access_token = ""
-      @refresh_token = ""
-    end
+  def initialize(host, username, password, platform, client_id, client_secret)
+    # Instance variables
+    @host = host
+    @username = username
+    @password = password
+    @platform = platform
+    @client_secret = client_secret
+    @client_id = client_id
+    @access_token = ""
+    @refresh_token = ""
+  end
+
+  attr_accessor :username
+  attr_accessor :access_token
+  attr_accessor :refresh_token
 
-    attr_accessor :username
-    attr_accessor :access_token
-    attr_accessor :refresh_token
+  def oauth2_token (refresh = false)
+    data = {
+       "grant_type": "password",
+       "client_id": @client_id,
+       "client_secret": @client_secret,
+       "username": @username,
+       "password": @password,
+       "platform": @platform
+    }
+    response = RestClient.post "#{@host}/rest/v10/oauth2/token", data
+    response_json = JSON.load(response)
+    if (response.code == 200) then
+      @access_token = response_json['access_token']
+      @refresh_token = response_json['refresh_token']
+    end
+    return response
+  end
 
-    def oauth2_token (refresh = false)
-      data = {
-         "grant_type": "password",
-         "client_id": @client_id,
-         "client_secret": @client_secret,
-         "username": @username,
-         "password": @password,
-         "platform": @platform
-      }
+  def oauth2_refresh_token
+    data = {
+       "grant_type": "refresh_token",
+       "refresh_token": @refresh_token,
+       "client_id": @client_id,
+       "client_secret": @client_secret,
+    }
+    begin
       response = RestClient.post "#{@host}/rest/v10/oauth2/token", data
       response_json = JSON.load(response)
       if (response.code == 200) then
@@ -36,44 +52,26 @@ module Sugarcrb
         @refresh_token = response_json['refresh_token']
       end
       return response
+    rescue RestClient::Unauthorized => err
+      return self.oauth2_token
     end
+  end
 
-    def oauth2_refresh_token
-      data = {
-         "grant_type": "refresh_token",
-         "refresh_token": @refresh_token,
-         "client_id": @client_id,
-         "client_secret": @client_secret,
-      }
-      begin
-        response = RestClient.post "#{@host}/rest/v10/oauth2/token", data
-        response_json = JSON.load(response)
-        if (response.code == 200) then
-          @access_token = response_json['access_token']
-          @refresh_token = response_json['refresh_token']
-        end
-        return response
-      rescue RestClient::Unauthorized => err
-        return self.oauth2_token
+  def call (method, endpoint, data = false, reintents = 0)
+    begin
+      response = case method
+        when "post" then RestClient.post "#{@host}/rest/v10/#{endpoint}", data, headers={"OAuth-Token" => @access_token}
+        when "get" then RestClient.get "#{@host}/rest/v10/#{endpoint}", headers={"OAuth-Token" => @access_token}
+        when "put" then RestClient.put "#{@host}/rest/v10/#{endpoint}", data, headers={"OAuth-Token" => @access_token}
+        when "delete" then RestClient.delete "#{@host}/rest/v10/#{endpoint}", headers={"OAuth-Token" => @access_token}
       end
-    end
 
-    def call (method, endpoint, data = false, reintents = 0)
-      begin
-        response = case method
-          when "post" then RestClient.post "#{@host}/rest/v10/#{endpoint}", data, headers={"OAuth-Token" => @access_token}
-          when "get" then RestClient.get "#{@host}/rest/v10/#{endpoint}", headers={"OAuth-Token" => @access_token}
-          when "put" then RestClient.put "#{@host}/rest/v10/#{endpoint}", data, headers={"OAuth-Token" => @access_token}
-          when "delete" then RestClient.delete "#{@host}/rest/v10/#{endpoint}", headers={"OAuth-Token" => @access_token}
-        end
-
-        return response
-      rescue RestClient::Unauthorized => err
-        if reintents < 3 then
-          self.oauth2_refresh_token
-          reintents = reintents + 1
-          self.call(method, endpoint, data, reintents)
-        end
+      return response
+    rescue RestClient::Unauthorized => err
+      if reintents < 3 then
+        self.oauth2_refresh_token
+        reintents = reintents + 1
+        self.call(method, endpoint, data, reintents)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcrb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - betobaz