genba-ruby 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b26858cbcdf74806c55c285a886a950f147311c4c0551315e7b5ab4953c38176
-  data.tar.gz: a328a76b1d1165e4ccecc2c9d44b5623321a461a060d81114fdb7e7edd5a8909
+  metadata.gz: 836249770fcbc24938245ca6e86dad29e46d1988e448e1f97da0bd0d73f5e7e6
+  data.tar.gz: 4e151d88eaee7b974e996e9cd3f296e533d9de5c5dc985a1d2b499c1d8ca603f
 SHA512:
-  metadata.gz: 5a7139d2357bae3b9771d5adcdd5fbece38f9e0f07a42e4df4c434bafa093832698b9f947a1987ae7d9a0a7be2545be3ae2a9678dcfb78da049dff3274addfbe
-  data.tar.gz: 87256758cf9225fa6465306ccb9012daae5d6436618404ec23ecbeff5d06fa04d2db07e7a7c55eaee539b6014afe6b3fc69ec295a3e36a98566c7d4f7642e109
+  metadata.gz: bdae84519ddbd6fa380311b7f685c548b53411733503be70705142352ee8a4fb01ca5dd3506e8e48ab2e12a38057de459b149e45eddd4007cf175f7003e23d42
+  data.tar.gz: 8aa1f6a946b26336b523b93e770f2f2d80fe065968f0000c0aa7e3a0f9178bbc5e19fd40e70b4242be59745d75583a7a4d2e8d4073131cd56268fcb8a5e3a367

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    genba-ruby (0.1.11)
+    genba (0.2.0)
+      dry-validation (~> 0.11.0)
+      jwt (~> 1.5)
       oj (~> 3.5)
       rest-client (~> 2.0)
-      ruby-mcrypt (= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -20,17 +21,46 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     byebug (10.0.2)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    dry-configurable (0.7.0)
+      concurrent-ruby (~> 1.0)
+    dry-container (0.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.8)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.2.2)
+    dry-logic (0.4.2)
+      dry-container (~> 0.2, >= 0.2.6)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-types (0.12.3)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1)
+      dry-container (~> 0.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4, >= 0.4.2)
+      inflecto (~> 0.0.0, >= 0.0.2)
+    dry-validation (0.11.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4.2)
+      dry-types (~> 0.12.0)
     hashdiff (0.3.7)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
+    inflecto (0.0.2)
+    jwt (1.5.6)
     method_source (0.9.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -63,7 +93,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    ruby-mcrypt (0.2.0)
     safe_yaml (1.0.4)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
@@ -84,7 +113,7 @@ DEPENDENCIES
   activemodel
   bundler (~> 1.16)
   byebug
-  genba-ruby!
+  genba!
   pry
   pry-byebug
   rake

data/README.md

@@ -4,234 +4,43 @@
 [![CircleCI](https://circleci.com/gh/iscreen/genba-ruby.svg?style=svg)](https://circleci.com/gh/iscreen/genba-ruby)
 [![Gem Version](https://badge.fury.io/rb/genba-ruby.svg)](https://badge.fury.io/rb/genba-ruby)
 
-The Genba Library provides convenient access to the [Genba API](https://api.genbagames.com/doc/) from applications written in the Ruby language.
+The Genba Library provides convenient access to the [Genba API V3](https://sandbox.genbadigital.io/doc) from applications written in the Ruby language.
+  * [Genba Digital](https://genbadigital.com/)
+  * [Genba API V2](https://api.genbagames.com/doc/)
+  * [Genba API V3 Sandbox](https://sandbox.genbadigital.io/doc/)
+  * [Genba API V3 Production](https://unknown.genbadigital.io/doc)
 
 ## Basic Usage
 
 ```ruby
-    require 'genba'
+require 'genba-ruby'
 
-    genba_client = Genba.client(
-      username: 'api_genba_user',
-      app_id: '00000000-0000-0000-0000-000000000000',
-      api_key: '00000000000000000000000000000000',
-      customer_account_id: '00000000-0000-0000-0000-000000000000'
-    )
-```
-
-## Products
-[Genba Products API](https://api.genbagames.com/doc/#api-Product)
-
-### Product - Changes
-
-Return a list of products which have changed since a given date, including basic or advanced metadata.
-
-```ruby
-payload = {
-  from_date: DateTime.now - 1,
-  country_iso: 'US',
-  include_meta: false
-}
-
-response = genba_client.products.get_changes(payload)
-```
-
-```ruby
-payload = {
-  include_meta: false
-}
-
-response = genba_client.products.get_changes(payload)
-```
-
-### Product - Get
-
-Return a list of product objects, including basic or advanced metadata.
-
-```ruby
-payload = {
-  include_meta: false
-}
-
-response = genba_client.products.get_products(payload)
-```
-
-Return a list of product objects with countryISO
-
-```ruby
-payload = {
-  country_iso: 'US',
-  include_meta: false
-}
-
-response = genba_client.products.get_products(payload)
-```
-
-Retrieve an existing product
-
-```ruby
-payload = {
-  sku_id: '79cf9bb2-e7f5-448f-b996-c52e4b2bb351',
-  include_meta: true
-}
-
-product = genba_client.products.get_products(payload)
+GENBA = Genba.client(
+  resource: 'resource-0000-0000-0000-000000000000',
+  account_id: 'account0-0000-0000-0000-000000000000',
+  cert: 'your.domain.crt',
+  key: 'your.domain.key',
+  sandbox: true # default: false
+)
 ```
 
-### Product - Removed
-
-Return a list of products which have been removed since a given date.
-
-```ruby
-payload = {
-  from_date: DateTime.now - 1,
-  country_iso: 'US',
-  include_meta: false
-}
+## Ping
+[Genba Ping API](https://sandbox.genbadigital.io/doc/#/Ping)
 
-response = genba_client.products.get_removed(payload)
-```
+## Products
+[Genba Products API](https://sandbox.genbadigital.io/doc/#/Products)
 
 ## Prices
-[Genba Prices API](https://api.genbagames.com/doc/#api-Prices)
-
-Get latest prices for all of your available products. It is recommended that you call this daily to get accurate pricing.
-
-```ruby
-response = genba_client.prices.get_prices
-```
-
-## Restrictions
-[Genba Restrictions API](https://api.genbagames.com/doc/#api-Restrictions)
-
-### Restrictions - Get
-
-Returns a list of product sku restrictions, whitelist - can only sold in countries, blacklist - cannot be sold in countries.
-
-Returns a list of product sku restrictions by countryISO
+[Genba Prices API](https://sandbox.genbadigital.io/doc/#/Prices)
 
-```ruby
-payload = {
-  country_iso: 'US'
-}
-
-response = genba_client.restrictions.get_restrictions(payload)
-response[:productRestriction]
-```
-
-Returns a list of product sku restrictions by countryISO, productID and fromDate
-
-```ruby
-payload = {
-  product_id: '84d90a06-f458-4ed8-8f3d-91aa84cc6577',
-  from_date: 1.days.ago.strftime('%FT%T'),
-  country_iso: 'US'
-}
-
-response = genba_client.restrictions.get_restrictions(payload)
-response[:productRestriction]
-```
-
-## Keys
-[Genba Keys API](https://api.genbagames.com/doc/#api-Keys)
-
-### Keys - Get Test Keys
-
-Request Product Test Keys for a SKU
-
-```ruby
-response = genba_client.keys.get_test_keys('84d90a06-f458-4ed8-8f3d-91aa84cc6577')
-
-response[:status]
-response[:keys]
-```
-
-Request Product Keys for a SKU
-
-```ruby
-
-response = genba_client.keys.get_keys('84d90a06-f458-4ed8-8f3d-91aa84cc6577', 1, customerAccountId)
-
-response[:status]
-response[:keys]
-```
+## Promotions
+[Genba Promotions API](https://sandbox.genbadigital.io/doc/#/Promotions)
 
-### Keys - Report Usage
+## Reservations
+[Genba Reservations API](https://sandbox.genbadigital.io/doc/#/Reservations)
 
-Report usage with keyCode
-
-```ruby
-key = KeyReportRequest.new(
-  key: '00000000000000000000000000000000',
-  country_iso: 'US',
-  sale_date: DateTime.now,
-  user_ip_address: '182.212.212.22',
-  e_tailer_buying_price: 3.8,
-  e_tailer_buying_price_currency_code: 'USD',
-  e_tailer_selling_price_net: 3.2,
-  e_tailer_selling_price_gross: 3.8,
-  e_tailer_selling_price_currency_code: 'USD'
-)
-
-response = genba_client.keys.get_report_usage([key])
-
-response[:acceptedCount]
-response[:rejectedCount]
-```
-
-Report usage with key
-```ruby
-key = KeyReportRequest.new(
-  key_id: '00000000-ffff-2222-3333-444444444444',
-  country_iso: 'US',
-  sale_date: DateTime.now,
-  user_ip_address: '182.212.212.22',
-  e_tailer_buying_price: 3.8,
-  e_tailer_buying_price_currency_code: 'USD',
-  e_tailer_selling_price_net: 3.2,
-  e_tailer_selling_price_gross: 3.8,
-  e_tailer_selling_price_currency_code: 'USD'
-)
-key_res = @client.keys.get_report_usage([key])
-response = genba_client.keys.get_report_usage([key])
-
-response[:acceptedCount]
-response[:rejectedCount]
-```
+## Orders
+[Genba Orders API](https://sandbox.genbadigital.io/doc/#/Orders)
 
 ## DirectEntitlement
-
-### DirectEntitlement - Activate
-
-Use this method to get and activate keys for a Direct Entitlement SKU. You will be charged at the point of calling this method.
-
-```ruby
-payload = {
-  sku_id: 'd972e0c7-5ddb-4e0d-9138-a78a6b269e99',
-  country_iso: 'US',
-  end_user_ip_address: '182.212.212.22',
-  sale_date: DateTime.now,
-  end_user_id: '0000001',
-  end_user_ticket: 'ticket0000001',
-  e_tailer_buying_price: 18.29,
-  e_tailer_buying_price_currency_code: 'USD',
-  e_tailer_selling_price_net: 19.89,
-  e_tailer_selling_price_gross: 20.29,
-  e_tailer_selling_price_currency_code: 'USD',
-}
-key_res = @client.direct_entitlements.activate(payload)
-```
-
-### DirectEntitlement - Redeem
-
-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.
-
-```ruby
-payload = {
-  sku_id: 'd972e0c7-5ddb-4e0d-9138-a78a6b269e99',
-  key_id: '00000000-0000-0000-0000-000000000000',
-  end_user_id: '00001',
-  end_user_ticket: 'ticket00001'
-}
-key_res = @client.direct_entitlements.redeem(payload)
-```
+[Genba DirectEntitlement API](https://sandbox.genbadigital.io/doc/#/DirectEntitlement)

data/genba.gemspec

@@ -32,7 +32,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'oj', '~> 3.5'
   spec.add_runtime_dependency 'rest-client', '~> 2.0'
-  spec.add_runtime_dependency 'ruby-mcrypt', '0.2.0'
+  spec.add_runtime_dependency 'jwt', '~> 1.5'
+  spec.add_runtime_dependency 'dry-validation', '~> 0.11.0'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/genba.rb

@@ -1,21 +1,29 @@
 require 'base64'
 require 'digest'
-require 'mcrypt'
+require 'jwt'
 require 'rest-client'
 require 'logger'
 require 'oj'
 require 'active_model'
+require 'dry-validation'
 
 require 'genba/version'
-require 'genba/key_black_list_request'
-require 'genba/key_report_request'
+require 'genba/reservation_request'
+require 'genba/order_request'
+require 'genba/action_request'
+require 'genba/activation_request'
+require 'genba/redemption_request'
+
 require 'genba/util'
-require 'genba/client/direct_entitlements'
-require 'genba/client/keys'
-require 'genba/client/prices'
+require 'genba/client/ping'
 require 'genba/client/products'
-require 'genba/client/reports'
-require 'genba/client/restrictions'
+require 'genba/client/prices'
+require 'genba/client/promotions'
+require 'genba/client/reservations'
+require 'genba/client/orders'
+require 'genba/client/direct_entitlement'
+require 'genba/client/direct_entitlements/activations'
+require 'genba/client/direct_entitlements/redemptions'
 require 'genba/client'
 
 # Genba API module

data/lib/genba/action_request.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Genba
+  class ActionRequest
+    def initialize
+      @schema = Dry::Validation.Schema do
+        required(:Action).filled(:str?)
+        optional(:Reason).filled(:str?)
+      end
+    end
+
+    def call(data)
+      @schema.call(data)
+    end
+  end
+end

data/lib/genba/activation_request.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Genba
+  class ActivationRequest
+    def initialize
+      @schema = Dry::Validation.Schema do
+        required(:ClientTransactionID).filled(:str?)
+        optional(:EtailerID).filled(:str?)
+        required(:Activation).schema do
+          required(:Sku).filled(:str?)
+          required(:CountryCode).filled(:str?)
+          optional(:ConsumerIP).maybe(:str?)
+          optional(:BuyingPrice).schema do
+            required(:Amount).filled(:float?)
+            required(:CurrencyCode).filled(:str?)
+          end
+          required(:SellingPrice).schema do
+            required(:NetAmount).filled(:float?)
+            required(:GrossAmount).filled(:float?)
+            required(:CurrencyCode).filled(:str?)
+          end
+          optional(:EtailerID).filled(:str?)
+        end
+        optional(:Redemption).schema do
+          required(:EndUserID).filled(:str?)
+          required(:EndUserTicket).filled(:str?)
+        end
+      end
+    end
+
+    def call(data)
+      @schema.call(data)
+    end
+  end
+end

data/lib/genba/client.rb

@@ -6,7 +6,8 @@ module Genba
     attr_accessor :customer_account_id,
                   :open_timeout, :read_timeout, :max_retry, :retry_delay
 
-    API_URL = 'https://api.genbagames.com/api'.freeze
+    SANDBOX_API_URL = 'https://sandbox.genbadigital.io/api/v3-0'.freeze
+    PRODUCTION_API_URL = 'https://api.genbadigital.io/api/v3-0'.freeze
 
     @expires_on = nil
     @id_token = nil
@@ -18,11 +19,16 @@ module Genba
     # * +config+ - Genba API credential attribute
     #
     # ==== Options
-    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
+    def initialize(resource:, account_id:, cert:, key:, sandbox: false, options: {})
+      @api_url = sandbox ? SANDBOX_API_URL : PRODUCTION_API_URL
+      @resource = resource
+      @account_id = account_id
+      @cert = cert
+      @key = key
+      @tenant = 'aad.genbadigital.io'
+      @authority_url = "https://login.microsoftonline.com/#{@tenant}"
+      @client_id = "https://aad-snd.genbadigital.io/#{@account_id}"
+
       @open_timeout = options[:open_timeout] || 15
       @read_timeout = options[:read_timeout] || 60
       @max_retry = options[:max_retry] || 0
@@ -31,22 +37,42 @@ module Genba
 
     def generate_token
       unless token_valid?
-        body = { appId: @app_id, signature: genba_signature }
+        certificate = OpenSSL::X509::Certificate.new File.open(@cert)
+        x5t = Base64.encode64 OpenSSL::Digest::SHA1.new(certificate.to_der).digest
+        payload = {
+          exp: (Time.now + 60*60*24).to_i,
+          aud: "#{@authority_url}/oauth2/token",
+          iss: @client_id,
+          sub: @client_id,
+        }
+        rsa_private = OpenSSL::PKey::RSA.new File.open(@key)
+        token = JWT.encode payload, rsa_private, 'RS256', { x5t: x5t }
+
+        body = {
+          resource: @resource,
+          client_id: @client_id,
+          grant_type: 'client_credentials',
+          scope: 'https://graph.microsoft.com/.default',
+          client_assertion_type: 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer',
+          client_assertion: token,
+          tenant: @tenant
+        }
+
         response = RestClient.post(
-          "#{API_URL}/token",
+          "#{@authority_url}/oauth2/token",
           body,
           headers: { accept: 'application/json', 'Content-Type': 'application/json' }
         )
         parsed_response = decode_json(response.body)
-        @id_token = parsed_response['token']
-        @expires_on = Time.parse(parsed_response['expiration'])
+        @id_token = parsed_response['access_token']
+        @expires_on = Time.at(parsed_response['expires_on'].to_i)
       end
       raw_token
     end
 
     def rest_get_with_token(path, query_params = {}, headers = {}, options = {})
       genba_headers = token.merge(headers)
-      api_url = "#{API_URL}#{path}"
+      api_url = "#{@api_url}#{path}"
       api_url += "?#{query_params.to_query}" unless query_params.empty?
       response = execute_request(method: :get, url: api_url,
                                  headers: genba_headers, options: options)
@@ -55,14 +81,14 @@ module Genba
 
     def rest_put_with_token(path, body = {}, headers = {}, options = {})
       genba_headers = token.merge(headers)
-      response = execute_request(method: :put, url: "#{API_URL}#{path}",
+      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 = {}, options = {})
       genba_headers = token.merge(headers)
-      response = execute_request(method: :post, url: "#{API_URL}#{path}",
+      response = execute_request(method: :post, url: "#{@api_url}#{path}",
                                  payload: encode_json(body), headers: genba_headers, options: options)
       from_rest_client_response(response)
     end
@@ -93,7 +119,13 @@ module Genba
       num_try = 0
       begin
         response = RestClient::Request.execute(request_opts)
-      rescue StandardError => e
+      rescue RestClient::Exception, SocketError, Errno::ECONNREFUSED, NoMethodError => e
+        if e.class.parent == RestClient && valid_json?(e.http_body)
+          Genba::Util.log_error "#{e.class} => #{e.message}\n#{e.http_body}"
+          raise e
+          # response = OpenStruct.new(code: e.http_code, body: e.http_body, headers: {})
+          # return response
+        end
         Genba::Util.log_error "#{e.class} => #{e.message}"
 
         num_try += 1
@@ -109,6 +141,17 @@ module Genba
       response
     end
 
+    def valid_json?(json)
+      JSON.parse(json)
+      return true
+    rescue JSON::ParserError => e
+      return false
+    end
+
+    def ping
+      Ping.new(self)
+    end
+
     def products
       Products.new(self)
     end
@@ -117,20 +160,20 @@ module Genba
       Prices.new(self)
     end
 
-    def restrictions
-      Restrictions.new(self)
+    def promotions
+      Promotions.new(self)
     end
 
-    def keys
-      Keys.new(self)
+    def reservations
+      Reservations.new(self)
     end
 
-    def direct_entitlements
-      DirectEntitlements.new(self)
+    def orders
+      Orders.new(self)
     end
 
-    def reports
-      Reports.new(self)
+    def direct_entitlement
+      DirectEntitlement.new(self)
     end
 
     private
@@ -143,22 +186,10 @@ module Genba
       Oj.load(json)
     end
 
-    def genba_signature
-      cipher = Mcrypt.new(
-        :rijndael_256,
-        :cbc,
-        Digest::SHA256.digest(@username),
-        Digest::SHA256.digest(@app_id)
-      )
-      encrypted = cipher.encrypt(@api_key)
-      Base64.strict_encode64(encrypted)
-    end
-
     def raw_token
       if token_valid?
         {
-          token: @id_token,
-          appId: @app_id,
+          Authorization: "Bearer #{@id_token}",
           accept: 'application/json',
           'Content-Type': 'application/json'
         }
@@ -177,8 +208,7 @@ module Genba
     end
 
     def from_rest_client_response(response)
-      if response.code < 200 &&
-         response.code >= 400
+      if response.code < 200
         Genba::Util.log_error "Invalid response object from API: #{response.body}" \
             "(HTTP response code was #{response.code})"
         raise "Invalid response object from API: #{response.body}" \

data/lib/genba/client/direct_entitlement.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Genba
+  class Client
+    # DirectEntitlements client
+    class DirectEntitlement
+      def initialize(client)
+        @client = client
+      end
+
+      def activations
+        DirectEntitlement::Activations.new(@client)
+      end
+
+      def redemptions
+        DirectEntitlement::Redemptions.new(@client)
+      end
+    end
+  end
+end

data/lib/genba/client/direct_entitlements/activations.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Genba
+  class Client
+    class DirectEntitlement
+      # DirectEntitlement Activations client
+      class Activations
+        def initialize(client)
+          @client = client
+        end
+
+        # Perform a direct entitlement activation
+        def perform(activation_request, headers: {}, options: {})
+          errors = Genba::ActivationRequest.new.call(activation_request).messages
+          raise errors.inspect unless errors.empty?
+
+          @client.rest_post_with_token('/directentitlement/activations', activation_request, headers, options)
+        end
+
+        # Retrieve a direct entitlement activation
+        def get(activation_id, headers: {})
+          @client.rest_get_with_token("/directentitlement/activations/#{activation_id}", {}, headers)
+        end
+
+        # Perform an action on an activation
+        def perform_action(activation_id, action_request, headers: {}, options: {})
+          errors = Genba::ActionRequest.new.call(action_request).messages
+          raise errors.inspect unless errors.empty?
+
+          @client.rest_post_with_token("/directentitlement/activations/#{activation_id}", action_request, headers)
+        end
+
+        # Retrieve a direct entitlement activation by its Client Transaction ID
+        def get_by_ctid(ctid, headers: {})
+          @client.rest_get_with_token("/directentitlement/activations/ctid/#{ctid}", {}, headers)
+        end
+      end
+    end
+  end
+end

data/lib/genba/client/direct_entitlements/redemptions.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Genba
+  class Client
+    class DirectEntitlement
+      # DirectEntitlement Redemptions client
+      class Redemptions
+        def initialize(client)
+          @client = client
+        end
+
+        # Perform a direct entitlement redemption
+        def perform(redemption_request, headers: {}, options: {})
+          errors = Genba::RedemptionRequest.new.call(redemption_request).messages
+          raise errors.inspect unless errors.empty?
+
+          @client.rest_post_with_token('/directentitlement/redemptions', redemption_request, headers, options)
+        end
+
+        # Retrieve a direct entitlement redemption
+        def get(redemption_id, headers: {})
+          @client.rest_get_with_token("/directentitlement/redemptions/#{redemption_id}", {}, headers)
+        end
+
+        # Perform an action on an redemption
+        def perform_action(redemption_id, action_request, headers: {}, options: {})
+          errors = Genba::ActionRequest.new.call(action_request).messages
+          raise errors.inspect unless errors.empty?
+
+          @client.rest_post_with_token("/directentitlement/redemptions/#{redemption_id}", action_request, headers)
+        end
+
+        # Retrieve a direct entitlement redemption by its Client Transaction ID
+        def get_by_ctid(ctid, headers: {})
+          @client.rest_get_with_token("/directentitlement/redemptions/ctid/#{ctid}", {}, headers)
+        end
+      end
+    end
+  end
+end

data/lib/genba/client/orders.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Genba
+  class Client
+    class Orders
+      def initialize(client)
+        @client = client
+      end
+
+      # Order a product key
+      def perform(order_request, headers: {}, options: {})
+        errors = Genba::OrderRequest.new.call(order_request).messages
+        raise errors.inspect unless errors.empty?
+
+        @client.rest_post_with_token('/orders', order_request, headers, options)
+      end
+
+      # Retrieve an order
+      def get(order_id, headers: {})
+        @client.rest_get_with_token("/orders/#{order_id}", {}, headers)
+      end
+
+      # Perform an action on a product, like ‘Return’
+      def perform_action(order_id, action_request, headers: {}, options: {})
+        errors = Genba::ActionRequest.new.call(action_request).messages
+        raise errors.inspect unless errors.empty?
+
+        @client.rest_post_with_token("/orders/#{order_id}", action_request, headers)
+      end
+
+      # Retrieve and order based on your Client transaction ID
+      def get_by_ctid(ctid, headers: {})
+        @client.rest_get_with_token("/orders/ctid/#{ctid}", {}, headers)
+      end
+    end
+  end
+end

data/lib/genba/client/ping.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Genba
+  class Client
+    class Ping
+      def initialize(client)
+        @client = client
+      end
+
+      # Test connection to the API
+      def perform
+        @client.rest_get_with_token('/ping', {}, {})
+      end
+    end
+  end
+end

data/lib/genba/client/prices.rb

@@ -2,16 +2,17 @@
 
 module Genba
   class Client
-    # Prices client
     class Prices
       def initialize(client)
         @client = client
       end
 
-      def get_prices(params = {}, headers = {})
-        payload = params.merge(
-          customerAccountId: @client.customer_account_id
-        )
+      # Gets a collection of prices
+      def list(continuation_token: nil, params: {}, headers: {})
+        payload = {
+          continuationtoken: continuation_token
+        }.select { |_, v| !v.nil? }.merge(params)
+
         @client.rest_get_with_token('/prices', payload, headers)
       end
     end

data/lib/genba/client/products.rb

@@ -2,38 +2,30 @@
 
 module Genba
   class Client
-    # Products client
     class Products
       def initialize(client)
         @client = client
       end
 
-      def get_products(sku_id: nil, country_iso: nil, include_meta: false, headers: {})
+      # Return information about a product
+      def get(sku_id, headers: {})
         payload = {
-          skuId: sku_id,
-          countryISO: country_iso,
-          includeMeta: include_meta
         }.select { |_, v| !v.nil? }
 
-        @client.rest_get_with_token('/product', payload, headers)
+        @client.rest_get_with_token("/products/#{sku_id}", payload, headers)
       end
 
-      def get_changes(from_date: nil, country_iso: nil, include_meta: false, params: {}, headers: {})
-        payload = params.merge(
-          countryISO: country_iso,
-          includeMeta: include_meta
-        ).select { |_, v| !v.nil? }
-        payload[:fromDate] = from_date.strftime('%FT%T') if from_date
-        @client.rest_get_with_token('/product/changes', payload, headers)
-      end
+      # Gets a collection of available products
+      def list(country_code: nil, include_meta: nil, from_date: nil, deleted: nil, continuation_token: nil, headers: {})
+        payload = {
+          countryCode: country_code,
+          includeMeta: include_meta,
+          fromDate: from_date,
+          deleted: deleted,
+          continuationtoken: continuation_token
+        }.select { |_, v| !v.nil? }
 
-      def get_removed(from_date: nil, country_iso: nil, params: {}, headers: {})
-        payload = params.merge(
-          countryISO: country_iso,
-          customerAccountId: @client.customer_account_id
-        ).select { |_, v| !v.nil? }
-        payload[:fromDate] = from_date.strftime('%FT%T') if from_date
-        @client.rest_get_with_token('/product/removed', payload, headers)
+        @client.rest_get_with_token('/products', payload, headers)
       end
     end
   end

data/lib/genba/client/promotions.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Genba
+  class Client
+    class Promotions
+      def initialize(client)
+        @client = client
+      end
+
+      # Gets a collection of available promotions
+      def list(from_date: nil, to_date: nil, continuation_token: nil, headers: {})
+        payload = {
+          fromDate: from_date,
+          toDate: to_date,
+          continuationtoken: continuation_token
+        }.select { |_, v| !v.nil? }
+
+        @client.rest_get_with_token('/promotions', payload, headers)
+      end
+    end
+  end
+end

data/lib/genba/client/reservations.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Genba
+  class Client
+    class Reservations
+      def initialize(client)
+        @client = client
+      end
+
+      # Place a reservation for a product
+      def perform(reservation_request, headers: {}, options: {})
+        errors = Genba::ReservationRequest.new.call(reservation_request).messages
+        raise errors.inspect unless errors.empty?
+
+        @client.rest_post_with_token('/reservations', reservation_request, headers, options)
+      end
+
+      # Retrieve a reservation
+      def get(reservation_id, headers: {})
+        payload = {
+        }.select { |_, v| !v.nil? }
+
+        @client.rest_get_with_token("/reservations/#{reservation_id}", payload, headers)
+      end
+    end
+  end
+end

data/lib/genba/order_request.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Genba
+  class OrderRequest
+    def initialize
+      @schema = Dry::Validation.Schema do
+        required(:ClientTransactionID).filled(:str?)
+        optional(:Properties).schema do
+          required(:Sku).filled(:str?)
+          optional(:BuyingPrice).schema do
+            required(:Amount).filled(:float?)
+            required(:CurrencyCode).filled(:str?)
+          end
+          required(:SellingPrice).schema do
+            required(:NetAmount).filled(:float?)
+            required(:GrossAmount).filled(:float?)
+            required(:CurrencyCode).filled(:str?)
+          end
+          optional(:ConsumerIP).maybe(:str?)
+          required(:CountryCode).filled(:str?)
+          optional(:EtailerID).filled(:str?)
+        end
+        optional(:ReservationID).filled(:str?)
+      end
+    end
+
+    def call(data)
+      @schema.call(data)
+    end
+  end
+end

data/lib/genba/redemption_request.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Genba
+  class RedemptionRequest
+    def initialize
+      @schema = Dry::Validation.Schema do
+        required(:ClientTransactionID).filled(:str?)
+        optional(:EtailerID).filled(:str?)
+        required(:ActivationID).filled(:str?)
+        required(:Redemption).schema do
+          required(:EndUserID).filled(:str?)
+          required(:EndUserTicket).filled(:str?)
+        end
+      end
+    end
+
+    def call(data)
+      @schema.call(data)
+    end
+  end
+end

data/lib/genba/reservation_request.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Genba
+  class ReservationRequest
+    def initialize
+      @schema = Dry::Validation.Schema do
+        required(:ClientTransactionID).filled(:str?)
+        required(:Properties).schema do
+          required(:Sku).filled(:str?)
+          optional(:BuyingPrice).schema do
+            required(:Amount).filled(:float?)
+            required(:CurrencyCode).filled(:str?)
+          end
+          required(:SellingPrice).schema do
+            required(:NetAmount).filled(:float?)
+            required(:GrossAmount).filled(:float?)
+            required(:CurrencyCode).filled(:str?)
+          end
+          optional(:ConsumerIP).maybe(:str?)
+          required(:CountryCode).filled(:str?)
+          optional(:EtailerID).filled(:str?)
+        end
+      end
+    end
+
+    def call(data)
+      @schema.call(data)
+    end
+  end
+end

data/lib/genba/version.rb

@@ -1,3 +1,3 @@
 module Genba
-  VERSION = '0.1.11'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: genba-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Dean Lin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ruby-mcrypt
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,17 +130,25 @@ files:
 - circle.yml
 - genba.gemspec
 - lib/genba.rb
+- lib/genba/action_request.rb
+- lib/genba/activation_request.rb
 - lib/genba/client.rb
-- lib/genba/client/direct_entitlements.rb
-- lib/genba/client/keys.rb
+- lib/genba/client/direct_entitlement.rb
+- lib/genba/client/direct_entitlements/activations.rb
+- lib/genba/client/direct_entitlements/redemptions.rb
+- lib/genba/client/orders.rb
+- lib/genba/client/ping.rb
 - lib/genba/client/prices.rb
 - lib/genba/client/products.rb
-- lib/genba/client/reports.rb
-- lib/genba/client/restrictions.rb
-- lib/genba/key_black_list_request.rb
+- lib/genba/client/promotions.rb
+- lib/genba/client/reservations.rb
 - lib/genba/key_report_request.rb
+- lib/genba/order_request.rb
+- lib/genba/redemption_request.rb
+- lib/genba/reservation_request.rb
 - lib/genba/util.rb
 - lib/genba/version.rb
+- tmp/.gitkeep
 homepage: https://api.genbagames.com/doc/
 licenses:
 - MIT

data/lib/genba/client/direct_entitlements.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Genba
-  class Client
-    # DirectEntitlements client
-    class DirectEntitlements
-      def initialize(client)
-        @client = client
-      end
-
-      def activate(
-        sku_id:,
-        country_iso:,
-        end_user_ip_address:,
-        sale_date: DateTime.now,
-        end_user_id: nil,
-        end_user_ticket: nil,
-        e_tailer_buying_price:,
-        e_tailer_buying_price_currency_code:,
-        e_tailer_selling_price_net:,
-        e_tailer_selling_price_gross:,
-        e_tailer_selling_price_currency_code:,
-        headers: {},
-        options: {}
-      )
-        params = {
-          skuId: sku_id,
-          customerAccountId: @client.customer_account_id,
-          countryISO: country_iso,
-          endUserIpAddress: end_user_ip_address,
-          endUserId: end_user_id,
-          endUserTicket: end_user_ticket,
-          ETailerBuyingPrice: e_tailer_buying_price,
-          ETailerBuyingPriceCurrencyCode: e_tailer_buying_price_currency_code,
-          ETailerSellingPriceNet: e_tailer_selling_price_net,
-          ETailerSellingPriceGross: e_tailer_selling_price_gross,
-          ETailerSellingPriceCurrencyCode: e_tailer_selling_price_currency_code
-        }.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, 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: {}, options: {})
-        params = {
-          customerAccountId: @client.customer_account_id,
-          skuId: sku_id,
-          keyId: key_id,
-          endUserId: end_user_id,
-          endUserTicket: end_user_ticket
-        }
-        @client.rest_get_with_token('/directentitlement/redeem', params, headers, options)
-      end
-    end
-  end
-end

data/lib/genba/client/keys.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module Genba
-  class Client
-    # Keys client
-    class Keys
-      def initialize(client)
-        @client = client
-      end
-
-      def get_test_keys(sku_id, headers = {})
-        params = {
-          skuId: sku_id
-        }
-        @client.rest_get_with_token('/testKeys', params, headers)
-      end
-
-      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, options)
-      end
-
-      def get_key_code_status(key_code, params = {}, headers = {}, options: {})
-        payload = params.merge(
-          keyCode: key_code
-        )
-        @client.rest_get_with_token('/keys', payload, headers, options)
-      end
-
-      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 = {}, 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, options)
-      end
-
-      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)
-
-        keys.each do |k|
-          raise k.errors.full_messages.to_s unless k.valid?
-        end
-
-        payload = keys.map(&:to_genba_json_payload)
-        @client.rest_post_with_token('/blackListKeys', payload, headers, options)
-      end
-
-      private
-
-      def key_report_request?(keys)
-        (keys.map { |k| k.is_a?(KeyReportRequest) } & [false]).empty?
-      end
-
-      def key_black_list_request?(keys)
-        (keys.map { |k| k.is_a?(KeyBlackListRequest) } & [false]).empty?
-      end
-    end
-  end
-end

data/lib/genba/client/reports.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Genba
-  class Client
-    # Reports client
-    class Reports
-      def initialize(client)
-        @client = client
-      end
-
-      def publisher_raw_data(year = nil, params = {}, headers = {})
-        payload = params.merge({
-          Year: year || Time.now.strftime('%Y')
-        })
-        @client.rest_get_with_token('/report/publisher/rawdata', payload, headers)
-      end
-    end
-  end
-end

data/lib/genba/client/restrictions.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Genba
-  class Client
-    # Restrictions client
-    class Restrictions
-      def initialize(client)
-        @client = client
-      end
-
-      def get_restrictions(product_id: nil, country_iso: nil, from_date: nil, params: {}, headers: {})
-        payload = params.merge(
-          productId: product_id,
-          countryISO: country_iso
-        ).select { |_, v| !v.nil? }
-        payload[:fromDate] = from_date.strftime('%FT%T') if from_date
-        @client.rest_get_with_token('/restrictions', payload, headers)
-      end
-    end
-  end
-end

data/lib/genba/key_black_list_request.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# keyBlackListRequest
-class KeyBlackListRequest
-  include ActiveModel::Validations
-  attr_accessor :key_id, :reason_text
-
-  validates :key_id, presence: true, allow_blank: false
-  validates :reason_text, presence: true, allow_blank: false
-
-  def initialize(key_id, reason_text)
-    @key_id = key_id
-    @reason_text = reason_text
-  end
-
-  def to_genba_json_payload
-    {
-      keyId: @key_id,
-      reasonText: @reason_text
-    }.select { |_, v| !v.nil? }
-  end
-end