genba 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5008fd2a2caff600d01dabd759250bd042f79161810139434ad10d97b39cb54
-  data.tar.gz: 0a82e0e2cc12ed8319eadb0c3feea05d2457bf6c0864bb0153662963dd1387b8
+  metadata.gz: 2549766d6aa78a612a97e0dfde945efb957a5d7ed5fed603b94a063cb09aa89f
+  data.tar.gz: 615bb36c8c85adec6543f009f92feda96ff4efcd503ff9b4b6324474f7bf81ea
 SHA512:
-  metadata.gz: 5929edb64582e34f60093337c76bd70f2e172837c34e4afeaad6a6cf722976149c07b3b1cc1184f1ab8337a5d492c48aa2a25730590eeb6a84978e1f9c6740b8
-  data.tar.gz: c3b2fcd0539b9d7649c3723e9b8ca5bbda1391611c036bc259bfec34f081c5d4e54c48c50f64e6cdb7750d023cb2d8c15678ab8db62102b6f440e96e1ab7e40a
+  metadata.gz: 4fa85bc6bf5e698ed5afb5c51ef550a271d0ca4fd9e2c0973c91a3bbc692e7683e0b887058127d9e80f362ebb46a0f1bda26eb860025f6ee96fbf0e81fa5e511
+  data.tar.gz: 107cd3b48f5980531389d8a38e88f55d296ebc90d5d739fafb1d297c5a6937691568b58d35dbeb8e48479f4177754d7696ae6ffe2de7405605e9e5f9c15c2dfc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    genba (0.1.9)
+    genba (0.1.10)
       oj (~> 3.5)
       rest-client (~> 2.0)
       ruby-mcrypt (= 0.2.0)
@@ -70,7 +70,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     uuidtools (2.1.5)
     webmock (3.4.1)
       addressable (>= 2.3.6)
@@ -93,4 +93,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/genba/client/direct_entitlements.rb

@@ -20,7 +20,8 @@ module Genba
         e_tailer_selling_price_net:,
         e_tailer_selling_price_gross:,
         e_tailer_selling_price_currency_code:,
-        headers: {}
+        headers: {},
+        options: {}
       )
         params = {
           skuId: sku_id,
@@ -37,12 +38,12 @@ module Genba
         }.select { |_, v| !v.nil? }
         params[:saleDate] = sale_date.strftime('%FT%T') if sale_date
         Genba::Util.log_debug "DirectEntitlements activate payload: #{params.inspect}"
-        @client.rest_get_with_token('/directentitlement/activate', params, headers)
+        @client.rest_get_with_token('/directentitlement/activate', params, headers, options)
       end
 
       # Use this method to redeem keys already sold for a Direct Entitlement SKU and link them to the
       # end-user's account. You will not be charged at the point of calling this method.
-      def redeem(sku_id:, key_id:, end_user_id:, end_user_ticket:, headers: {})
+      def redeem(sku_id:, key_id:, end_user_id:, end_user_ticket:, headers: {}, options: {})
         params = {
           customerAccountId: @client.customer_account_id,
           skuId: sku_id,
@@ -50,7 +51,7 @@ module Genba
           endUserId: end_user_id,
           endUserTicket: end_user_ticket
         }
-        @client.rest_get_with_token('/directentitlement/redeem', params, headers)
+        @client.rest_get_with_token('/directentitlement/redeem', params, headers, options)
       end
     end
   end

data/lib/genba/client/keys.rb

@@ -15,35 +15,35 @@ module Genba
         @client.rest_get_with_token('/testKeys', params, headers)
       end
 
-      def get_keys(sku_id, quantity = 1, params = {}, headers = {})
+      def get_keys(sku_id, quantity = 1, params = {}, headers = {}, options: {})
         payload = params.merge(
           skuId: sku_id,
           quantity: quantity,
           customerAccountId: @client.customer_account_id
         )
-        @client.rest_get_with_token('/keys', payload, headers)
+        @client.rest_get_with_token('/keys', payload, headers, options)
       end
 
-      def get_key_code_status(key_code, params = {}, headers = {})
+      def get_key_code_status(key_code, params = {}, headers = {}, options: {})
         payload = params.merge(
           keyCode: key_code
         )
-        @client.rest_get_with_token('/keys', payload, headers)
+        @client.rest_get_with_token('/keys', payload, headers, options)
       end
 
-      def get_key_status(key_id, params = {}, headers = {})
-        @client.rest_get_with_token("/keys/#{key_id}", params, headers)
+      def get_key_status(key_id, params = {}, headers = {}, options: {})
+        @client.rest_get_with_token("/keys/#{key_id}", params, headers, options)
       end
 
-      def get_report_usage(keys = nil, headers = {})
+      def get_report_usage(keys = nil, headers = {}, options: {})
         raise 'ReportUsage keys should be array' unless keys.is_a?(Array)
         raise 'ReportUseag keys should be a KeyReportRequest class' unless key_report_request?(keys)
         payload = keys.map(&:to_genba_json_payload)
         Genba::Util.log_debug "get_report_usage payload: #{payload.inspect}"
-        @client.rest_post_with_token('/keyReport', payload, headers)
+        @client.rest_post_with_token('/keyReport', payload, headers, options)
       end
 
-      def black_list(keys = nil, headers = {})
+      def black_list(keys = nil, headers = {}, options: {})
         raise 'Blacklist keys should be array' unless keys.is_a?(Array)
         raise 'Blacklist keys should be a KeyBlackListRequest class' unless key_black_list_request?(keys)
 
@@ -52,7 +52,7 @@ module Genba
         end
 
         payload = keys.map(&:to_genba_json_payload)
-        @client.rest_post_with_token('/blackListKeys', payload, headers)
+        @client.rest_post_with_token('/blackListKeys', payload, headers, options)
       end
 
       private

data/lib/genba/client.rb

@@ -3,7 +3,8 @@
 module Genba
   # Genba API Client
   class Client
-    attr_accessor :customer_account_id
+    attr_accessor :customer_account_id,
+                  :open_timeout, :read_timeout, :max_retry, :retry_delay
 
     API_URL = 'https://api.genbagames.com/api'.freeze
 
@@ -17,11 +18,15 @@ module Genba
     # * +config+ - Genba API credential attribute
     #
     # ==== Options
-    def initialize(app_id:, username:, api_key:, customer_account_id:)
+    def initialize(app_id:, username:, api_key:, customer_account_id:, options: {})
       @app_id = app_id.strip
       @username = username.strip
       @api_key = api_key.strip
       @customer_account_id = customer_account_id.strip
+      @open_timeout = options[:open_timeout] || 15
+      @read_timeout = options[:read_timeout] || 60
+      @max_retry = options[:max_retry] || 0
+      @retry_delay = options[:retry_delay] || 2
     end
 
     def generate_token
@@ -39,33 +44,71 @@ module Genba
       raw_token
     end
 
-    def rest_get_with_token(path, query_params = {}, headers = {})
+    def rest_get_with_token(path, query_params = {}, headers = {}, options = {})
       genba_headers = token.merge(headers)
-      Genba::Util.log_debug "API Headers: #{genba_headers.inspect}"
       api_url = "#{API_URL}#{path}"
       api_url += "?#{query_params.to_query}" unless query_params.empty?
-      Genba::Util.log_info "api_url: #{api_url}"
-      response = RestClient.get(api_url, genba_headers)
+      response = execute_request(method: :get, url: api_url,
+                                 headers: genba_headers, options: options)
       from_rest_client_response(response)
     end
 
-    def rest_put_with_token(path, body = {}, headers = {})
+    def rest_put_with_token(path, body = {}, headers = {}, options = {})
       genba_headers = token.merge(headers)
-      Genba::Util.log_debug "API Headers: #{genba_headers.inspect}"
-      Genba::Util.log_info "api_url: #{API_URL}#{path}"
-      response = RestClient.put("#{API_URL}#{path}", encode_json(body), genba_headers)
+      response = execute_request(method: :put, url: "#{API_URL}#{path}",
+                                 payload: encode_json(body), headers: genba_headers, options: options)
       from_rest_client_response(response)
     end
 
-    def rest_post_with_token(path, body = {}, headers = {})
+    def rest_post_with_token(path, body = {}, headers = {}, options = {})
       genba_headers = token.merge(headers)
-      Genba::Util.log_debug "API Headers: #{genba_headers.inspect}"
-      Genba::Util.log_info "api_url: #{API_URL}#{path}"
-      Genba::Util.log_info "body: #{body}"
-      response = RestClient.post("#{API_URL}#{path}", encode_json(body), genba_headers)
+      response = execute_request(method: :post, url: "#{API_URL}#{path}",
+                                 payload: encode_json(body), headers: genba_headers, options: options)
       from_rest_client_response(response)
     end
 
+    def execute_request(method:, url:, payload: {}, headers: {}, options: {})
+      request_opts = {
+        headers: headers,
+        method: method,
+        payload: payload,
+        url: url
+      }
+      other_opts = {
+        open_timeout: options[:open_timeout] || @open_timeout,
+        read_timeout: options[:read_timeout] || @read_timeout,
+        max_retry: options[:max_retry] || @max_retry
+      }
+
+      Genba::Util.log_debug "API Headers: #{headers.inspect}"
+      Genba::Util.log_debug "Options: #{other_opts}"
+      Genba::Util.log_info "#{method.upcase}: #{url}"
+      Genba::Util.log_info "payload: #{payload}" if payload.present?
+
+      request_opts.merge! other_opts
+      execute_request_with_rescues(request_opts, other_opts[:max_retry])
+    end
+
+    def execute_request_with_rescues(request_opts, max_retry)
+      num_try = 0
+      begin
+        response = RestClient::Request.execute(request_opts)
+      rescue StandardError => e
+        Genba::Util.log_error "#{e.class} => #{e.message}"
+
+        num_try += 1
+        sleep @retry_delay
+
+        if num_try <= max_retry
+          Genba::Util.log_error "retry ====> #{num_try}"
+          retry
+        end
+
+        raise e
+      end
+      response
+    end
+
     def products
       Products.new(self)
     end

data/lib/genba/util.rb

@@ -3,24 +3,21 @@ require 'cgi'
 module Genba
   module Util
     def self.log_error(message, data = {})
-      if !Genba.logger.nil? ||
-        !Genba.log_level.nil? && Genba.log_level <= Genba::LEVEL_ERROR
+      if !Genba.log_level.nil? && Genba.log_level <= Genba::LEVEL_ERROR
         log_internal(message, data, color: :cyan,
                                     level: Genba::LEVEL_ERROR, logger: Genba.logger, out: $stderr)
       end
     end
 
     def self.log_info(message, data = {})
-      if !Genba.logger.nil? ||
-        !Genba.log_level.nil? && Genba.log_level <= Genba::LEVEL_INFO
+      if !Genba.log_level.nil? && Genba.log_level <= Genba::LEVEL_INFO
         log_internal(message, data, color: :cyan,
                                     level: Genba::LEVEL_INFO, logger: Genba.logger, out: $stdout)
       end
     end
 
     def self.log_debug(message, data = {})
-      if !Genba.logger.nil? ||
-        !Genba.log_level.nil? && Genba.log_level <= Genba::LEVEL_DEBUG
+      if !Genba.log_level.nil? && Genba.log_level <= Genba::LEVEL_DEBUG
         log_internal(message, data, color: :blue,
                                     level: Genba::LEVEL_DEBUG, logger: Genba.logger, out: $stdout)
       end
@@ -35,7 +32,7 @@ module Genba
       magenta: 5, light_magenta: 65,
       cyan:    6, light_cyan:    66,
       white:   7, light_white:   67,
-      default: 9,
+      default: 9
     }.freeze
     private_constant :COLOR_CODES
 

data/lib/genba/version.rb

@@ -1,3 +1,3 @@
 module Genba
-  VERSION = '0.1.9'.freeze
+  VERSION = '0.1.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genba
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Dean Lin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj