orchard-api-client-anm 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3a6c24aa68bebbe5c904d4c2ce159ae7e89ba836a68dc0660107662d2bb381
-  data.tar.gz: 2f6247a62275c2a9bae6123a52450e5b291529101ea01dcfff943b39560a09f8
+  metadata.gz: 5ba7e7eb2a45c832407e65c1303e54ed05fba25ab2285cee00a2e9fcb0f4de45
+  data.tar.gz: be0c19aedd32b4997338ff35a84cdada2dfd18b91e80d977e241df75f513b323
 SHA512:
-  metadata.gz: d651c79664926b55f65d5a85d66979aea3008ae7a52383f2242be392c068a4dfca2b35bb31e9ea6c1cf0aa64cf282c8cdc9b416cebfc3afffce15e0fe9d8b223
-  data.tar.gz: 0ca6f77edc0d1e0a11a2cffedfc456a32d988c9ff4fe424725fc083f0a19e0426fe80bcd628f394c2b463806ea9c4f68467830f2978204847f6cac49dee6eb57
+  metadata.gz: 6ace832e209f9a435860fd531e0dfb835f5e569a24a39b736a19963f4253d5062d75c969513569bd46482897957fbd81a286db17f906dcd580ea0cdc8126d692
+  data.tar.gz: 78b803719e98c5630eb299385a76af36cd33630fd0ef3c78f340782afc5e09fa3c7d31072d337e36215d12032cdd5cb022edc36065d09f2ddbff2f8fd69205dd

data/.rubocop.yml

@@ -18,4 +18,7 @@ Style/Documentation:
   Enabled: false
 
 Metrics/MethodLength:
-  Max: 15
+  Max: 15
+
+Metrics/BlockLength:
+  AllowedMethods: ['describe', 'context', 'it']

data/Gemfile

@@ -6,9 +6,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
-
-gem "rubocop", "~> 1.21"
-
-gem "faraday", "~> 2.6"

data/README.md

@@ -41,9 +41,9 @@ If bundler is not being used to manage dependencies, install the gem by executin
   nw = allowed_parameters['MTN','VOD','AIR']
   
   payment_request_payload = {
-    customer_number: '',
-    reference: '',
-    amount: '',
+    customer_number: '0550000000',
+    reference: 'AppsNmobile Pay',
+    amount: '1',
     exttrid: processing_id,
     nw: 'MTN',
     trans_type: 'CTM',
@@ -53,16 +53,16 @@ If bundler is not being used to manage dependencies, install the gem by executin
     voucher_code: ''
   }
  
-  response = client.send_payment_request(payload, request_configurations)
+  response = client.send_payment_request(payment_request_payload, request_configurations)
 
 #Send Sms
   sms_payload = {
-    sender_id: '',
-    recipient_number: '',
-    msg_body: '',
+    sender_id: 'ANM',
+    recipient_number: '0550000000',
+    msg_body: 'Sample text message',
     trans_type: 'SMS',
     service_id: ENV['SERVICE_ID']
   }
 
-  response = client.send_sms(payload)
+  response = client.send_sms(sms_payload)
 ```

data/lib/orchard/api/base.rb

@@ -20,8 +20,8 @@ module Orchard
         OpenSSL::HMAC.hexdigest(digest, @secret_token.to_s, @payload.to_json)
       end
 
-      def make_post_request
-        response = @connection.post do |request|
+      def make_request(method)
+        response = @connection.send(method) do |request|
           request.url @endpoint
           request.options.timeout = @timeout
           request.body = @payload.to_json
@@ -30,9 +30,13 @@ module Orchard
 
         JSON.parse(response.body)
       rescue StandardError => e
+        error_response(e)
+      end
+
+      def default_response(error)
         {
           "res_code" => "999",
-          "res_desc" => e.message
+          "res_desc" => error.message
         }
       end
     end

data/lib/orchard/api/check_transaction_status.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Orchard
+  module API
+    class CheckTransactionStatus < Orchard::API::Base
+      def call
+        @endpoint = Orchard::API::Constants::CHECK_TRANSACTION_STATUS_ENDPOINT
+        make_request(:post)
+      end
+    end
+  end
+end

data/lib/orchard/api/send_payment_request.rb

@@ -5,7 +5,7 @@ module Orchard
     class SendPaymentRequest < Orchard::API::Base
       def call
         @endpoint = Orchard::API::Constants::SEND_PAYMENT_REQUEST_ENDPOINT
-        make_post_request
+        make_request(:post)
       end
     end
   end

data/lib/orchard/api/send_sms.rb

@@ -7,7 +7,7 @@ module Orchard
         format_recipients_number
         generate_unique_id
         @endpoint = Orchard::API::Constants::SEND_SMS_ENDPOINT
-        make_post_request
+        make_request(:post)
       end
 
       def format_recipients_number

data/lib/orchard/api/service_lookup_request.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Orchard
+  module API
+    class ServiceLookupRequest < Orchard::API::Base
+      def call
+        @endpoint = Orchard::API::Constants::SERVICE_LOOKUP_REQUEST_ENDPOINT
+        make_request(:get)
+      end
+    end
+  end
+end

data/lib/orchard/api_client.rb

@@ -6,21 +6,29 @@ module Orchard
       @secret_token = params[:secret_token]
       @client_token = params[:client_token]
       @url = params[:url]
-      @connection = create_connection
+      create_connection
     end
 
     def send_payment_request(payload, request_configurations = {})
-      Orchard::API::SendPaymentRequest.call(token_and_payload(payload), request_configurations)
+      Orchard::API::SendPaymentRequest.call(payload_with_client_data(payload), request_configurations)
     end
 
     def send_sms(payload, request_configurations = {})
-      Orchard::API::SendSMS.call(token_and_payload(payload), request_configurations)
+      Orchard::API::SendSMS.call(payload_with_client_data(payload), request_configurations)
+    end
+
+    def service_lookup_request(payload, request_configurations = {})
+      Orchard::API::ServiceLookupRequest.call(payload_with_client_data(payload), request_configurations)
+    end
+
+    def check_transaction_status(payload, request_configurations = {})
+      Orchard::API::CheckTransactionStatus.call(payload_with_client_data(payload), request_configurations)
     end
 
     private
 
     def create_connection
-      Faraday.new(
+      @connection = Faraday.new(
         url: @url.to_s,
         headers: {
           "Content-Type" => "application/json"
@@ -28,7 +36,7 @@ module Orchard
       )
     end
 
-    def token_and_payload(payload)
+    def payload_with_client_data(payload)
       {
         payload: payload,
         secret_token: @secret_token,

data/lib/orchard/constants.rb

@@ -5,6 +5,8 @@ module Orchard
     module Constants
       SEND_PAYMENT_REQUEST_ENDPOINT = "/sendRequest"
       SEND_SMS_ENDPOINT = "/sendSms"
+      SERVICE_LOOKUP_REQUEST_ENDPOINT = "/get_service_lookup_req"
+      CHECK_TRANSACTION_STATUS_ENDPOINT = "/checkTransaction"
     end
   end
 end

data/lib/orchard/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orchard
-  VERSION = "0.1.2"
+  VERSION = "0.1.5"
 end

data/lib/orchard.rb

@@ -7,5 +7,7 @@ require_relative "orchard/constants"
 require_relative "orchard/api/base"
 require_relative "orchard/api/send_payment_request"
 require_relative "orchard/api/send_sms"
+require_relative "orchard/api/service_lookup_request"
+require_relative "orchard/api/check_transaction_status"
 
 require_relative "orchard/api_client"

data/orchard.gemspec

@@ -18,22 +18,17 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/appsnmobile-solutions/orchard_api_client_gem"
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop", "~> 1.21"
+  spec.add_dependency "faraday", "~> 2.6"
+
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
       (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     end
   end
-
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  spec.add_dependency "byebug"
-  spec.add_dependency "faraday", "~> 2.6"
-  spec.add_dependency "rspec", "~> 3.0"
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orchard-api-client-anm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Sydney Dapilah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,33 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :runtime
+        version: '3.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.21'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
 description: Orchard API client
 email:
 - sydney@appsnmobilesolutions.com
@@ -59,20 +73,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/orchard.rb
 - lib/orchard/api/base.rb
+- lib/orchard/api/check_transaction_status.rb
 - lib/orchard/api/send_payment_request.rb
 - lib/orchard/api/send_sms.rb
+- lib/orchard/api/service_lookup_request.rb
 - lib/orchard/api_client.rb
 - lib/orchard/constants.rb
 - lib/orchard/version.rb

data/.byebug_history

@@ -1,109 +0,0 @@
-exit
-"2343333333333333"[-9..]
-"2343333333333333".[-9..]
-r
-exit
-client.send_sms(sms_payload, {timeout: 5})
-client.send_sms(sms_payload, {timeout: 10})
-r
-exit
-r
-exit
-r
-exit
-client
-exit
-@connection
-r
-exit
-eit
-@endpoint
-r
-exit
-r
-exit
-r
-exit
-r
-exit
-r
-exit
-continue
-@timeout
-exit
-@timeout
-exit
-r
-exit
-r
-exit
-r
-exit
-r.body
-r.success?
-r.success
-r.body
-r.data
-r
-exit
-@url
-exit
-response
-exit
-response
-exit
-response
-continue
-"#{@client_token}:#{compute_signature}"
-@client_token
-@clieint_token
-@payload
-exit
-@payload
-Orchard::API::Constants::SEND_PAYMENT_REQUEST_URL
-OpenSSL::HMAC.hexdigest(digest, @secret_token.to_s, @payload.to_json)
-@client_token
-@payload
-@secrete_token
-digest
-exit
-digist
-client.ctm_request(payload)
-exit
-payload
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-exit
-params
-client
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-exit
-Orchard::API::SendPaymentRequest.call(payload)
-client.ctm_request(payload)
-client
-payload
-client.ctm_request(payload)
-exit
-payload
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-exit
-client.ctm_request(payload)
-payload
-exit
-Orchard::ApiClient.new(params).ctm_request
-exit
-CLIENT_TOKEN="JYAX4rhY3FI3LtzFwKGoVdnAMOkH3a51hAu3TdHv0cYiCTD4AjqqecZTzdgFjRcuDlGSEnhZQ2HC5BobsHLERQ=="
-SECRETE_TOKEN="Na+oh2ElZk3fDy3kKQItvXm0L+9vZ5j2cPfTX2/bLpFnDZOOxhINR4ouc0kBinwZSeX/68eHkPvwByMhNx7raw=="

data/Gemfile.lock

@@ -1,67 +0,0 @@
-PATH
-  remote: .
-  specs:
-    orchard-api-client-anm (0.1.1)
-      byebug
-      faraday (~> 2.6)
-      rspec (~> 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    byebug (11.1.3)
-    diff-lcs (1.5.0)
-    faraday (2.6.0)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.1)
-    json (2.6.2)
-    parallel (1.22.1)
-    parser (3.1.2.1)
-      ast (~> 2.4.1)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.22.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    unicode-display_width (2.3.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  faraday (~> 2.6)
-  orchard-api-client-anm!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.21)
-
-BUNDLED WITH
-   2.3.20