gp-ruby-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c17c83bd400ce6e462372c9fb52cb15b99b89c8
-  data.tar.gz: 415d9e1fcc8b3ad7d275868ad3ee1940c8944886
+  metadata.gz: 561123effe59497e101e045b0a9357f86778d9a3
+  data.tar.gz: a3f8bccc0cdcd129a2f0887b5c3b2736d668b2c8
 SHA512:
-  metadata.gz: 9e46889c07fcdb005cee0c990962f8ec7878ab391202c12d912e9195d7cb2599b1888faf82911efd9f26d86703ba888240418dd6fc3ca2ea554749209b728408
-  data.tar.gz: 53612e14f095e22695490b4772cdeba5370e354c83428ea7971cd883e8751bceaab10d70598a719bbec5e15d9e8ea2b356a2a7f1f267f4c2efc735b68bd5899c
+  metadata.gz: 69db20dfef746f04106c603acc78853b9a6e02020cbeb310cd8499052d4082753279409c214d7b3290bedda1b4c1db47fd4ea0031c4c198a9759b173ae717f03
+  data.tar.gz: 9d7222d165f6131b8d50db6df5a74da09157c31f2f953727a0018e0ca442398a5cfe3328999fcf8c2924b6a8507ccebaa184291b7add4f2da7be71d4aeb6e5bd

data/{src → lib}/rest_client.rb

@@ -40,16 +40,16 @@ class RESTClient
 	
 	@supportedLangs = ['en','de','es','fr','it', 'ja','ko', 'pt-BR', 'zh-Hans', 'zh-Hant'] 
 	@expectedMatches = {
-            'en': 'en', 'en_US': 'en', 'en-US': 'en',
-            'de': 'de', 'de_at': 'de', 'de-at': 'de',
-            'es': 'es', 'es_mx': 'es', 'es-mx': 'es',
-            'fr': 'fr', 'fr_FR': 'fr', 'fr-Fr': 'fr', 'fr_CA': 'fr',
-            'it': 'it', 'it_ch': 'it', 'it-ch': 'it', 'it-IT': 'it',
-            'ja': 'ja', 'ja_JA': 'ja', 'ja-JA': 'ja',
-            'ko': 'ko', 'ko_KO': 'ko', 'ko-KO': 'ko',
-            'pt-BR': 'pt-BR', 'pt': nil,
-            'zh': 'zh-Hans', 'zh-tw': 'zh-Hant', 'zh-cn': 'zh-Hans',
-            'zh-hk': 'zh-Hant', 'zh-sg': 'zh-Hans',
+    'en'=> 'en', 'en_US'=> 'en', 'en-US'=> 'en',
+                'de'=> 'de', 'de_at'=> 'de', 'de-at'=> 'de',
+                'es'=> 'es', 'es_mx'=> 'es', 'es-mx'=> 'es',
+                'fr'=> 'fr', 'fr_FR'=> 'fr', 'fr-Fr'=> 'fr', 'fr_CA'=> 'fr',
+                'it'=> 'it', 'it_ch'=> 'it', 'it-ch'=> 'it', 'it-IT'=> 'it',
+                'ja'=> 'ja', 'ja_JA'=> 'ja', 'ja-JA'=> 'ja',
+                'ko'=> 'ko', 'ko_KO'=> 'ko', 'ko-KO'=> 'ko',
+                'pt-BR'=> 'pt-BR', 'pt'=> nil,
+                'zh'=> 'zh-Hans', 'zh-tw'=> 'zh-Hant', 'zh-cn'=> 'zh-Hans',
+                'zh-hk'=> 'zh-Hant', 'zh-sg'=> 'zh-Hans'
     }
 	
 	def initialize(service_account, bundle_id, locale = "")
@@ -158,7 +158,7 @@ private
 		
 		if service_account.is_iam_enabled
       request["Authorization"] = "API-KEY #{service_account.get_api_key}"
-		else if basic_auth
+		elsif basic_auth
 			request.basic_auth(service_account.get_user_id, service_account.get_password)
 		else
 			hmac = HMAC.new

data/{src → lib}/service_account.rb

@@ -98,7 +98,7 @@ class ServiceAccount
 			@instance_id = instance_id
 			@iam_enabled = false
 			
-		else if !url_string.empty? && !instance_id.empty? && !api_key.empty?
+		elsif !url_string.empty? && !instance_id.empty? && !api_key.empty?
       @url_string = url_string
       @instance_id = instance_id
       @api_key = api_key
@@ -117,12 +117,12 @@ class ServiceAccount
                 creds=creds["credentials"]
               end
               account = extractCredsFromJson(creds)
-              if account.nil?
-                raise "Couldn't create a service account"
-              end
             end
       end
-			
+      if account.nil?
+        raise "Couldn't create a service account"
+      end
+      
 			@url_string = account[0]
 			@user_id = account[1]
 			@pwd = account[2]
@@ -130,14 +130,16 @@ class ServiceAccount
 			@api_key = account[4]
       @iam_enabled = account[5]
 			
-		end
+    end
 	end
 		
 	def is_iam_enabled
     @iam_enabled
+	end
   
   def get_api_key
     @api_key
+  end
     
 	def get_url_string
 		@url_string
@@ -170,58 +172,59 @@ class ServiceAccount
 	def set_instance_id(instance_id)
 		@instance_id = instance_id
 	end
-	
+
+
 private
 
-	def get_service_account_via_env_var
-	
-		url_string = ENV[GP_URL]
-		if url_string.nil?
-			return
-		end
-		
-		instance_id = ENV[GP_INSTANCE_ID]
+  def get_service_account_via_env_var
+  
+    url_string = ENV[GP_URL]
+    if url_string.nil?
+      return
+    end
+    
+    instance_id = ENV[GP_INSTANCE_ID]
     if instance_id.nil?
       return
     end
-		
-		user_id = ENV[GP_USER_ID]
-		pwd = ENV[GP_PWD]
-		api_key=ENV[GP_IAM_API_KEY]
-		
-		if (user_id.nil? || pwd.nil?) && api_key.nil?
-		  return
-		end
-		
-		iam_enabled=api_key.nil?false:true
+    
+    user_id = ENV[GP_USER_ID]
+    pwd = ENV[GP_PWD]
+    api_key=ENV[GP_IAM_API_KEY]
+    
+    if (user_id.nil? || pwd.nil?) && api_key.nil?
+      return
+    end
+    
+    iam_enabled=api_key.nil?false:true
 
-		return [url_string, user_id, pwd, instance_id, api_key, iam_enabled]
-	end
-	
-	def get_service_account_via_vcap_service
-	
-		vcap_services = ENV[VCAP_SERVICES]
+    return [url_string, user_id, pwd, instance_id, api_key, iam_enabled]
+  end
+  
+  def get_service_account_via_vcap_service
+  
+    vcap_services = ENV[VCAP_SERVICES]
 
-		if vcap_services.nil?
-			return
-		end
-		
-		json_vcap_services = JSON.parse(vcap_services)
-		
-		app_name = ""
-		json_vcap_services.each do |key, value|
-			if (key =~ APP_NAME_REGEX or key.equals? (APP_NAME))
-				app_name = key
-				break
-			end
-		end
+    if vcap_services.nil?
+      return
+    end
+    
+    json_vcap_services = JSON.parse(vcap_services)
+    
+    app_name = ""
+    json_vcap_services.each do |key, value|
+      if (key =~ APP_NAME_REGEX or key.equals?(APP_NAME))
+        app_name = key
+        break
+      end
+    end
 
-		credentials_list = JSON.parse(vcap_services)[app_name][CREDENTIALS_INDEX][CREDENTIALS]
-		return extractCredsFromJson(credentials_list)
-	end
-	
-	def extractCredsFromJson(credentials_list)
-	  
+    credentials_list = JSON.parse(vcap_services)[app_name][CREDENTIALS_INDEX][CREDENTIALS]
+    return extractCredsFromJson(credentials_list)
+  end
+  
+  def extractCredsFromJson(credentials_list)
+    
     if credentials_list.nil?
       return
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gp-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Visaahan Anandarajah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies: []
 description: Ruby SDK for Globalization Pipeline on IBM Cloud
 email: icuintl@us.ibm.com
@@ -16,11 +16,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- src/cache_control.rb
-- src/gp-ruby-client.rb
-- src/hmac.rb
-- src/rest_client.rb
-- src/service_account.rb
+- lib/cache_control.rb
+- lib/gp-ruby-client.rb
+- lib/hmac.rb
+- lib/rest_client.rb
+- lib/service_account.rb
 homepage: https://github.com/IBM-Cloud/gp-ruby-client
 licenses:
 - Apache-2.0