style(tokenManager): remove underscores before method definitions

Author: mamoonraja

lib/ibm_watson/iam_token_manager.rb

@@ -59,14 +59,14 @@ def token
     return @user_access_token unless @user_access_token.nil? || (@user_access_token.respond_to?(:empty?) && @user_access_token.empty?)
 
     if @token_info.all? { |_k, v| v.nil? }
-      token_info = _request_token
-      _save_token_info(
+      token_info = request_token
+      save_token_info(
         token_info: token_info
       )
       return @token_info["access_token"]
-    elsif _is_token_expired?
-      token_info = _is_refresh_token_expired? ? _request_token : _refresh_token
-      _save_token_info(
+    elsif token_expired?
+      token_info = refresh_token_expired? ? request_token : refresh_token
+      save_token_info(
         token_info: token_info
       )
       return @token_info["access_token"]
@@ -78,7 +78,7 @@ def token
   private
 
   # Request an IAM token using an API key
-  def _request_token
+  def request_token
     headers = {
       "Content-Type" => CONTENT_TYPE,
       "Authorization" => DEFAULT_AUTHORIZATION,
@@ -99,7 +99,7 @@ def _request_token
   end
 
   # Refresh an IAM token using a refresh token
-  def _refresh_token
+  def refresh_token
     headers = {
       "Content-Type" => CONTENT_TYPE,
       "Authorization" => DEFAULT_AUTHORIZATION,
@@ -122,7 +122,7 @@ def _refresh_token
   # Using a buffer to prevent the edge case of the
   # token expiring before the request could be made.
   # The buffer will be a fraction of the total TTL. Using 80%.
-  def _is_token_expired?
+  def token_expired?
     return true if @token_info["expiration"].nil? || @token_info["expires_in"].nil?
 
     fraction_of_ttl = 0.8
@@ -136,7 +136,7 @@ def _is_token_expired?
   # Used as a fail-safe to prevent the condition of a refresh token expiring,
   # which could happen after around 30 days. This function will return true
   # if it has been at least 7 days and 1 hour since the last token was set
-  def _is_refresh_token_expired?
+  def refresh_token_expired?
     return true if @token_info["expiration"].nil?
 
     seven_days = 7 * 24 * 3600
@@ -146,7 +146,7 @@ def _is_refresh_token_expired?
   end
 
   # Save the response from the IAM service request to the object's state
-  def _save_token_info(token_info:)
+  def save_token_info(token_info:)
     @token_info = token_info
   end
 end

lib/ibm_watson/watson_service.rb

@@ -61,7 +61,7 @@ def initialize(vars)
     end
 
     if !vars[:iam_access_token].nil? || !vars[:iam_apikey].nil?
-      _token_manager(iam_apikey: vars[:iam_apikey], iam_access_token: vars[:iam_access_token], iam_url: vars[:iam_url])
+      set_token_manager(iam_apikey: vars[:iam_apikey], iam_access_token: vars[:iam_access_token], iam_url: vars[:iam_url])
     elsif !vars[:username].nil? && !vars[:password].nil?
       if vars[:username] == "apikey" && !@icp_prefix
         iam_apikey(iam_apikey: vars[:password])
@@ -188,7 +188,7 @@ def configure_http_client(proxy: {}, timeout: {})
 
   private
 
-  def _token_manager(iam_apikey: nil, iam_access_token: nil, iam_url: nil)
+  def set_token_manager(iam_apikey: nil, iam_access_token: nil, iam_url: nil)
     @iam_apikey = iam_apikey
     @iam_access_token = iam_access_token
     @iam_url = iam_url

test/unit/test_iam_token_manager.rb

@@ -33,7 +33,7 @@ def test_request_token
           "Host" => "iam.bluemix.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
-    token_response = token_manager.send(:_request_token)
+    token_response = token_manager.send(:request_token)
     assert_equal(response, token_response)
   end
 
@@ -61,7 +61,7 @@ def test_refresh_token
           "Host" => "iam.bluemix.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
-    token_response = token_manager.send(:_refresh_token)
+    token_response = token_manager.send(:refresh_token)
     assert_equal(response, token_response)
   end
 
@@ -79,9 +79,9 @@ def test_is_token_expired
       "refresh_token" => "jy4gl91BQ"
     }
 
-    refute(token_manager.send(:_is_token_expired?))
+    refute(token_manager.send(:token_expired?))
     token_manager.token_info["expiration"] = Time.now.to_i - 3600
-    assert(token_manager.send(:_is_token_expired?))
+    assert(token_manager.send(:token_expired?))
   end
 
   def test_is_refresh_token_expired
@@ -98,9 +98,9 @@ def test_is_refresh_token_expired
       "refresh_token" => "jy4gl91BQ"
     }
 
-    refute(token_manager.send(:_is_refresh_token_expired?))
+    refute(token_manager.send(:refresh_token_expired?))
     token_manager.token_info["expiration"] = Time.now.to_i - (8 * 24 * 3600)
-    assert(token_manager.send(:_is_token_expired?))
+    assert(token_manager.send(:token_expired?))
   end
 
   def test_get_token