k2-connect-ruby 1.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f16b31dad92f44afc4fecd11658daedb06dd25dc248dc91aac55108e231c567
-  data.tar.gz: f92ca5e74163589b853eaad34856cc9477b0ea0be2794a207070f4a6e02e5906
+  metadata.gz: 39452b9ce27762de19e13888108a4e6500beb4e8f73e3319183ae2748be63b54
+  data.tar.gz: 40277be4b8a546de3a0da71658f9a4aa5e91d360bd1152844b97588e57fc843b
 SHA512:
-  metadata.gz: 2c3e9fb52c6d643c0aa19bc7295db3f03a6b2831b6bff0fd804f49505895242e86ee551c37f0da6b417a86728c0ae4f330d612e82f961d6f9ec55da44c972881
-  data.tar.gz: 2098c75cdc7f5f86a65dcfe0bdc42138bba2a87eb05e0c244bf5c0e7accd3d5977b0d6ae22840ad423b2b0157980998cbcf8aa2ba791f5f3f41ea86d64701204
+  metadata.gz: 9824461475aca1c8adf231457a80c209a54bc05dfff5a9da7b2c58a27cf6d69340a9d207c780aba751b753ac69b801208a3d8d2987f32b39a7fc87f689b0cd0c
+  data.tar.gz: 82808613065a33e5a377f6207c135f2dc9bc973c0577992d272cd5b7655c83078c75083a3cd0fda1eacf4c2f96f220af1adaaf9ad12ee4eb0d211ca661caacc8

data/.ruby-version

@@ -0,0 +1 @@
+3.3.5

data/Gemfile.lock

@@ -1,41 +1,54 @@
 PATH
   remote: .
   specs:
-    k2-connect-ruby (0.0.4)
-      activemodel (~> 6.1.3.1)
-      activesupport (~> 6.1.3.1)
+    k2-connect-ruby (3.0.0)
+      activemodel (~> 7.2.2)
+      activesupport (~> 7.2.2)
+      json (~> 2.8.2)
       rest-client (~> 2.1.0)
-      yajl-ruby (~> 1.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activesupport (6.1.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (7.2.2)
+      activesupport (= 7.2.2)
+    activesupport (7.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    crack (0.4.5)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    diff-lcs (1.4.4)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.0)
-    formatador (0.2.5)
-    guard (2.16.2)
+    diff-lcs (1.5.1)
+    domain_name (0.6.20240107)
+    drb (2.2.1)
+    faker (3.5.1)
+      i18n (>= 1.8.11, < 2)
+    ffi (1.17.0)
+    formatador (1.1.0)
+    guard (2.19.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -43,85 +56,86 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (1.0.1)
+    hashdiff (1.1.2)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
-    i18n (1.8.10)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    listen (3.5.1)
+    json (2.8.2)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
-    mime-types (3.3.1)
+    logger (1.6.1)
+    lumberjack (1.2.10)
+    method_source (1.1.0)
+    mime-types (3.6.0)
+      logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
+    mime-types-data (3.2024.1105)
+    minitest (5.25.2)
     nenv (0.3.0)
     netrc (0.11.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.14.0)
+    pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rexml (3.3.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.13.0)
     rspec-nc (0.3.0)
       rspec (>= 3)
       terminal-notifier (>= 1.4)
-    rspec-support (3.10.2)
+    rspec-support (3.13.1)
+    securerandom (0.3.2)
     shellany (0.0.1)
     terminal-notifier (2.0.0)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    thor (1.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    vcr (6.0.0)
-    webmock (3.12.2)
-      addressable (>= 2.3.6)
+    vcr (6.3.1)
+      base64
+    webmock (3.24.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yajl-ruby (1.4.1)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
-  guard (~> 2.16.2)
+  bundler (~> 2.5.16)
+  faker (~> 3.5.1)
+  guard (~> 2.19)
   guard-rspec (~> 4.7.3)
   k2-connect-ruby!
-  rake (~> 13.0.3)
-  rspec (~> 3.10.0)
+  rake (~> 13.2.1)
+  rspec (~> 3.13.0)
   rspec-nc (~> 0.3.0)
-  vcr (~> 6.0.0)
-  webmock (~> 3.12.2)
+  vcr (~> 6.3.1)
+  webmock (~> 3.24)
 
 BUNDLED WITH
-   2.2.11
+   2.5.16

data/README.md

@@ -25,6 +25,7 @@ All calls made without authentication will also fail.
     - [SMS Notifications](#sms-notifications)
     - [STK Push](#stk-push)
     - [PAY](#pay)
+    - [Settlemennt accounts](#settlement-accounts)
     - [Transfers](#transfers)
     - [Polling](#polling)
     - [Parsing the JSON Payload](#parsing-the-json-payload)
@@ -55,9 +56,21 @@ Add the require line to use the gem:
 
     require 'k2-connect-ruby'
 
+To set the base_url:
+
+```ruby
+K2ConnectRuby::K2Utilities::Config::K2Config.set_base_url("https://sandbox.kopokopo.com/")
+```
+
+To set the api version:
+
+```ruby
+K2ConnectRuby::K2Utilities::Config::K2Config.set_version(1)
+```
+
 ### Authorization
 
-Ensure you first Register your application with the [Kopo Kopo Sandbox](To be added later when launched).
+Ensure you first Register your application with the [Kopo Kopo Sandbox](https://sandbox.kopokopo.com).
 Once an application is registered you will obtain your `client_id` and `client_secret` (aka client credentials), which will be used to identify your application when calling the Kopo Kopo API.
 
 For more Information, visit our [API docs]().
@@ -65,7 +78,7 @@ For more Information, visit our [API docs]().
 In order to request for application authorization and receive an access token, we need to execute the client credentials flow, this is done so by having your application server make a HTTPS request to the Kopo Kopo authorization server, through the K2AccessToken class.
 
 ```ruby
-k2_token = K2AccessToken.new('your_client_id', 'your_client_secret').request_token
+k2_token = K2ConnectRuby::K2Entity::K2Token.new('your_client_id', 'your_client_secret').request_token
 ```
 
 ### Webhook Subscription
@@ -80,17 +93,16 @@ Ensure the following arguments are passed:
  - scope reference: is `REQUIRED` if scope is till
  
 Code example;
-    
+
 ```ruby
 require 'k2-connect-ruby'
-k2_token = K2AccessToken.new('your_client_id', 'your_client_secret').request_token
-k2subscriber = K2Subscribe.new(k2_token)
-
+k2_token = K2ConnectRuby::K2Entity::K2Token.new('your_client_id', 'your_client_secret').request_token
+k2subscriber = K2ConnectRuby::K2Entity::K2Subscribe.new(k2_token)
 your_request = {
-        event_type: 'buygoods_transaction_received',
-        url: callback_url,
-        scope: 'till',
-        scope_reference: '112233'
+  event_type: 'buygoods_transaction_received',
+  url: callback_url,
+  scope: 'till',
+  scope_reference: '112233'
 }
 k2subscriber.webhook_subscribe(your_request)
 ```
@@ -107,13 +119,12 @@ Code example;
 
 ```ruby
 require 'k2-connect-ruby'
-k2_token = K2AccessToken.new('your_client_id', 'your_client_secret').request_token
-k2_notification = K2Notification.new(k2_token)
-
+k2_token = K2ConnectRuby::K2Entity::K2Token.new('your_client_id', 'your_client_secret').request_token
+k2_notification = K2ConnectRuby::K2Entity::K2Notification.new(k2_token)
 request_payload = {
-        webhook_event_reference: 'c271535c-687f-4a40-a589-8b66b894792e',
-        message: 'message',
-        callback_url: 'callback_url'
+  webhook_event_reference: 'c271535c-687f-4a40-a589-8b66b894792e',
+  message: 'message',
+  callback_url: 'callback_url'
 }
 k2_notification.send_sms_transaction_notification(request_payload)
 ```
@@ -125,7 +136,7 @@ k2_notification.send_sms_transaction_notification(request_payload)
  
  To receive payments from M-PESA users via STK Push we first create a K2Stk Object, passing the access_token that was created prior.
  
-    k2_stk = K2Stk.new(your_access_token)
+    k2_stk = K2ConnectRuby::K2Entity::K2Stk.new(your_access_token)
   
  Afterwards we send a POST request for receiving Payments by calling the following method and passing the params value received from the POST Form Request: 
 
@@ -159,7 +170,7 @@ As a result a JSON payload will be returned, accessible with the k2_response_bod
 Code example;
     
 ```ruby
-k2_stk = K2Stk.new(your_access_token)
+k2_stk = K2ConnectRuby::K2Entity::K2Stk.new(your_access_token)
 
 your_request = {
         payment_channel: 'M-PESA',
@@ -181,7 +192,7 @@ k2_stk.query_resource(k2_stk.location_url)
 First Create the K2Pay Object passing the access token
 
 
-    k2_pay = K2Pay.new(access_token)
+    k2_pay = K2ConnectRuby::K2Entity::K2Pay.new(access_token)
 
 #### Add PAY Recipients
 
@@ -202,8 +213,20 @@ Add a PAY Recipient, with the following arguments:
 - bank_branch_ref `REQUIRED`
 - settlement_method: 'EFT' or 'RTS' `REQUIRED`
 
-  
-    k2_pay.add_recipients(your_input)
+**Paybill** PAY Recipient
+- type: 'paybill' `REQUIRED`
+- paybill_name `REQUIRED`
+- paybill_number `REQUIRED`
+- paybill_account_number `REQUIRED`
+
+**Till** PAY Recipient
+- type: 'till' `REQUIRED`
+- till_name `REQUIRED`
+- till_number `REQUIRED`
+
+```ruby
+k2_pay.add_recipients(your_input)
+```
     
 The type value can either be `mobile_wallet` or `bank_account`
 
@@ -221,6 +244,9 @@ The following arguments should be passed within a hash:
 - destination_type `REQUIRED`
 - currency default is `KES`
 - value `REQUIRED`
+- description `REQUIRED`
+- category
+- tags
 - callback_url `REQUIRED`
 
 A Successful Response is returned with the URL of the Payment resource in the HTTP Location Header.
@@ -246,10 +272,28 @@ As a result a JSON payload will be returned, accessible with the k2_response_bod
 Code example;
     
 ```ruby
-k2_pay = K2Pay.new(your_access_token)
+k2_pay = K2ConnectRuby::K2Entity::K2Pay.new(your_access_token)
 k2_pay.add_recipient(your_recipient_input)
 k2_pay.query_resource(k2_pay.recipients_location_url)
-k2_pay.create_payment(your_payment_input)
+
+your_request = {
+        destination_type: "mobile_wallet",
+        destination_reference: "example_reference",
+        amount: {
+                "currency": "KES",
+                "value": "500"
+        },
+        description: "k2-connect",
+        category: "general",
+        tags: ["tag_1", "tag_2"],
+        metadata: {
+                "something": "",
+                "something_else": "Something else"
+        },
+        _links: { "callback_url": "https://example.site/example" }
+}
+
+k2_pay.create_payment(your_request)
 k2_pay.query_resource(k2_pay.payments_location_url)
 ```
 
@@ -273,7 +317,7 @@ Add pre-approved settlement accounts, to which one can transfer funds to. Can be
 - settlement_method: 'EFT' or 'RTS' `REQUIRED`
 
 ```ruby
-k2_settlement = K2Settlement.new(your_access_token)
+k2_settlement = K2ConnectRuby::K2Entity::K2Settlement.new(your_access_token)
 # Add a mobile merchant wallet
 k2_settlement.add_settlement_account(merchant_wallet)
 # Add a merchant bank account
@@ -286,7 +330,7 @@ This will Enable one to transfer funds to your settlement accounts.
 
 First Create the K2Transfer Object
 
-    k2_transfers = K2Transfer.new(access_token)
+    k2_transfers =  K2ConnectRuby::K2Entity::K2Transfer.new(access_token)
 
 #### Create Transfer Request
 
@@ -295,7 +339,7 @@ or one can have a `targeted` transfer with a specified settlement account in min
 
 ##### Blind Transfer
 
-     k2_transfers.transfer_funds(nil, params)
+     k2_transfers.transfer_funds(params)
 
 With `nil` representing that there are no specified destinations.
 
@@ -322,7 +366,7 @@ The Params are passed as the argument containing all the form data sent. A Succe
 Sample code example:
 
 ```ruby
-k2_transfer = K2Transfer.new(your_access_token)
+k2_transfer =  K2ConnectRuby::K2Entity::K2Transfer.new(your_access_token)
 # Blind or Targeted Transfer
 k2_transfer.transfer_funds(your_input)
 ```
@@ -341,30 +385,35 @@ A HTTP Response will be returned in a JSON Payload, accessible with the k2_respo
 
 ### Polling
 
-Tallows you to poll transactions received on the Kopo Kopo system within a certain time range, and either a company or a specific till.
-
-First Create the K2Notification Object
+Allows you to poll transactions received on the Kopo Kopo system within a certain time range, and either for a company or a specific till.
 
-    k2_notification = K2Notification.new(access_token)
+First Create the K2Polling Object
 
-#### Send SMS Notification
+    k2_polling = K2ConnectRuby::K2Entity::K2Polling.new(access_token)
 
-The Following Details should be passed for creating the notification:
+The following details should be passed:
 
-- fromTime `REQUIRED`
-- toTime `REQUIRED`
 - scope `REQUIRED`
-- scopeReference `REQUIRED`
+- scope_reference
+- from_time `REQUIRED`
+- to_time `REQUIRED`
 - callback_url `REQUIRED`
 
-The Params are passed as the argument containing all the form data sent. A Successful Response is returned with the URL of the request in the HTTP Location Header.
-
 Sample code example:
 
 ```ruby
-k2_notification = K2Notification.new(your_access_token)
-# Blind or Targeted Transfer
-k2_notification.send_sms_transaction_notification(request_payload)
+your_input =
+        {
+                scope: "company",
+                scope_reference: "",
+                from_time: "2021-04-12T08:50:22+03:00",
+                to_time: "2021-04-19T08:50:22+03:00",
+                callback_url: 'https://call_back_to_your_app.your_application.com'
+        }
+
+k2_polling = K2ConnectRuby::K2Entity::K2Polling.new("your_access_token")
+k2_polling.poll(your_input)
+k2_polling.location_url # => "https://sandbox.kopokopo.com/api/v1/polling/247b1bd8-f5a0-4b71-a898-f62f67b8ae1c"
 ```
 
 #### Query Request
@@ -388,7 +437,7 @@ K2ProcessResult Classes will be used.
 
 First Create an Object of the K2Client class to Parse the response, passing the client_secret_key received from Kopo Kopo:
 
-     k2_parse = K2Client.new(client_secret)
+     k2_parse = K2ConnectRuby::K2Services::K2Client.new(client_secret)
 
 ###### Parse the request
 
@@ -398,14 +447,18 @@ First Create an Object of the K2Client class to Parse the response, passing the
 
 Create an Object to receive the components resulting from processing the parsed request results which will be returned by the following method:
 
-     k2_components = K2ProcessResult.process(k2_parse.hash_body)
+     k2_components = K2ConnectRuby::K2Utilities::K2ProcessResult.process(k2_parse.hash_body, API_KEY, k2_parse.k2_signature)
+
+or the parsed webhook results which will be returned by the following method:
+
+     k2_components = K2ConnectRuby::K2Utilities::K2ProcessWebhook.process(k2_parse.hash_body, API_KEY, k2_parse.k2_signature)
      
 Code example:
 
 ```ruby
-k2_parse = K2Client.new(client_secret)
+k2_parse = K2ConnectRuby::K2Services::K2Client.new(API_KEY)
 k2_parse.parse_request(request)
-k2_components = K2ProcessResult.process(k2_parse.hash_body)
+k2_components = K2ConnectRuby::K2Utilities::K2ProcessResult.process(k2_parse.hash_body, API_KEY, k2_parse.k2_signature)
 ```
          
  Below is a list of key symbols accessible for each of the Results retrieved after processing it into an Object.
@@ -501,23 +554,8 @@ k2_components = K2ProcessResult.process(k2_parse.hash_body)
     - `links_self`
     - `links_resource`
     - `sending_till`
-
-6. Merchant to Merchant Transaction:
-    - `id`
-    - `resource_id`
-    - `topic`
-    - `created_at`
-    - `event_type`
-    - `reference`
-    - `origination_time`
-    - `amount`
-    - `currency`
-    - `status`
-    - `links_self`
-    - `links_resource`
-    - `resource_sending_merchant`
     
-7. Process STK Push Payment Request Result
+6. Process STK Push Payment Request Result
     - `id`
     - `type`
     - `initiation_time`
@@ -540,7 +578,7 @@ k2_components = K2ProcessResult.process(k2_parse.hash_body)
     - `links_self`
     - `callback_url`
 
-8. Process PAY Result
+7. Process PAY Result
     - `id`
     - `type`
     - `created_at`
@@ -552,7 +590,7 @@ k2_components = K2ProcessResult.process(k2_parse.hash_body)
     - `links_self`
     - `callback_url`
 
-9. Process Settlement Transfer Result
+8. Process Settlement Transfer Result
    - `id`
    - `type`
    - `created_at`
@@ -567,13 +605,13 @@ If you want to convert the Object into a Hash or Array, the following methods ca
 - Hash:
    
    
-        k2_hash_components = K2ProcessResult.return_obj_hash(k2_components)
+        k2_hash_components = K2ConnectRuby::K2Utilities::K2ProcessResult.return_obj_hash(k2_components)
     
     
 - Array:
    
     
-        k2_array_components = K2ProcessResult.return_obj_array(k2_components)
+        k2_array_components = K2ConnectRuby::K2Utilities::K2ProcessResult.return_obj_array(k2_components)
 
 
 Sample Web Application examples written in Rails and Sinatra frameworks that utilize this library are available in the example_app folder or in the following GitHub hyperlinks:

data/k2-connect-ruby.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description           = 'Ruby SDK for the Kopo Kopo K2 Connect API, with webhook subscriptions, STK Push, Pay and Settlement Transfer capabilities. Allows decomposition and break down of results and webhooks returned from the K2 Connect APIx``.'
   spec.homepage              = 'https://github.com/kopokopo/k2-connect-ruby.git'
   spec.license               = 'MIT'
-  spec.required_ruby_version = '~> 2.6.5'
+  spec.required_ruby_version = '~> 3.3.5'
 
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -38,16 +38,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
 
-  spec.add_dependency 'activesupport', '~> 6.1.3.1'
-  spec.add_dependency 'activemodel', '~> 6.1.3.1'
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency "guard", '~> 2.16.2'
-  spec.add_development_dependency "guard-rspec", '~> 4.7.3'
+  spec.add_dependency 'activesupport', '~> 7.2.2'
+  spec.add_dependency 'activemodel', '~> 7.2.2'
   spec.add_dependency 'rest-client', '~> 2.1.0'
-  spec.add_development_dependency 'rake', '~> 13.0.3'
-  spec.add_development_dependency 'rspec', '~> 3.10.0'
+  spec.add_dependency 'json', '~> 2.8.2'
+  spec.add_development_dependency 'bundler', '~> 2.5.16'
+  spec.add_development_dependency "guard", '~> 2.19'
+  spec.add_development_dependency "guard-rspec", '~> 4.7.3'
+  spec.add_development_dependency 'rake', '~> 13.2.1'
+  spec.add_development_dependency 'rspec', '~> 3.13.0'
   spec.add_development_dependency "rspec-nc", '~> 0.3.0'
-  spec.add_development_dependency 'vcr', '~> 6.0.0'
-  spec.add_development_dependency 'webmock', '~> 3.12.2'
-  spec.add_dependency 'yajl-ruby', '~> 1.4.1'
+  spec.add_development_dependency 'vcr', '~> 6.3.1'
+  spec.add_development_dependency 'webmock', '~> 3.24'
+  spec.add_development_dependency 'faker', '~> 3.5.1'
 end

data/lib/k2-connect-ruby/{k2_entity/entity.rb → entity.rb}

@@ -1,3 +1,4 @@
+require 'k2-connect-ruby/k2_entity/k2_entity'
 require 'k2-connect-ruby/k2_entity/k2_token'
 require 'k2-connect-ruby/k2_entity/k2_polling'
 require 'k2-connect-ruby/k2_entity/k2_subscribe'
@@ -6,3 +7,7 @@ require 'k2-connect-ruby/k2_entity/k2_financial_entities/k2_stk'
 require 'k2-connect-ruby/k2_entity/k2_financial_entities/k2_pay'
 require 'k2-connect-ruby/k2_entity/k2_financial_entities/k2_transfer'
 require 'k2-connect-ruby/k2_entity/k2_financial_entities/k2_settlement'
+
+module K2ConnectRuby
+  module Entity; end
+end

data/lib/k2-connect-ruby/k2_entity/k2_entity.rb

@@ -1,34 +1,32 @@
 # Common Class Behaviours for stk, pay and transfers
-class K2Entity
-  attr_accessor :access_token, :the_array
-  attr_reader :k2_response_body, :query_hash, :location_url
-  include K2Validation, K2Utilities
+module K2ConnectRuby
+  module K2Entity
+    class K2Entity
+      attr_accessor :access_token, :the_array
+      attr_reader :k2_response_body, :query_hash, :location_url
+      include K2ConnectRuby::K2Utilities::K2Validation, K2ConnectRuby::K2Utilities
 
-  # Initialize with access token from Subscriber Class
-  def initialize(access_token)
-    @access_token = access_token
-    @threads = []
-    @exception_array = %w[authenticity_token]
-  end
+      # Initialize with access token from Subscriber Class
+      def initialize(access_token)
+        @access_token = access_token
+        @exception_array = %w[authenticity_token]
+      end
 
-  # Query/Check the status of a previously initiated request
-  def query_status(class_type, path_url)
-    query(class_type, path_url)
-  end
+      # Query/Check the status of a previously initiated request
+      def query_status(class_type, path_url)
+        query(class_type, path_url)
+      end
 
-  # Query Location URL
-  def query_resource(class_type, url)
-    query(class_type, url)
-  end
+      # Query Location URL
+      def query_resource(class_type, url)
+        query(class_type, url)
+      end
 
-  def query(class_type, path_url)
-    # TODO: Add back the validation to ensure only https location urls are returned
-    # path_url = validate_url(@location_url)
-    query_hash = make_hash(path_url, 'get', @access_token, class_type, nil)
-    @threads << Thread.new do
-      sleep 0.25
-      @k2_response_body = K2Connect.make_request(query_hash)
+      def query(class_type, path_url)
+        path_url = validate_url(path_url)
+        query_hash = make_hash(path_url, 'get', @access_token, class_type, nil)
+        @k2_response_body = K2ConnectRuby::K2Utilities::K2Connection.make_request(query_hash)
+      end
     end
-    @threads.each(&:join)
   end
 end