pesapal 1.8.0 → 2.0.0

data/lib/pesapal/oauth.rb

@@ -48,7 +48,7 @@ module Pesapal
       chars = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ0123456789'
       nonce = ''
       length.times { nonce << chars[rand(chars.size)] }
-      "#{nonce}"
+      nonce
     end
 
     # Generate the oAuth signature using HMAC-SHA1 algorithm.
@@ -116,12 +116,10 @@ module Pesapal
     def self.generate_signature_base_string(http_method, absolute_url, params)
       # step 1: convert the http method to uppercase
       http_method = http_method.upcase
-
       # step 2: percent encode the url
       url_encoded = parameter_encode(normalized_request_uri(absolute_url))
-
       # step 3: percent encode the parameter string
-      parameter_string_encoded = parameter_encode(generate_signable_encoded_params_query_string params)
+      parameter_string_encoded = parameter_encode(generate_signable_encoded_params_query_string(params))
 
       "#{http_method}&#{url_encoded}&#{parameter_string_encoded}"
     end
@@ -176,15 +174,19 @@ module Pesapal
     #
     # @return [String] valid constructed URL as per the spec.
     def self.normalized_request_uri(absolute_url)
-      u = URI.parse(absolute_url)
+      uri = URI.parse(absolute_url)
+
+      scheme = uri.scheme.downcase
+      host = uri.host.downcase
+      path = uri.path
+      port = uri.port
 
-      scheme = u.scheme.downcase
-      host = u.host.downcase
-      path = u.path
-      port = u.port
+      non_standard_http = scheme == 'http' && port != 80
+      non_standard_https = scheme == 'https' && port != 443
+      uri_with_path = path && (path != '')
 
-      port = (scheme == 'http' && port != 80) || (scheme == 'https' && port != 443) ? ":#{port}" : ''
-      path = (path && path != '') ? path : '/'
+      port = non_standard_http || non_standard_https ? ":#{port}" : ''
+      path = uri_with_path ? path : '/'
 
       "#{scheme}://#{host}#{port}#{path}"
     end

data/lib/pesapal/version.rb

@@ -4,5 +4,5 @@ module Pesapal
   # This gem's version (learn about [Semantic Versioning][1]).
   #
   # [1]: http://semver.org/
-  VERSION = '1.8.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/pesapal.gemspec

@@ -8,12 +8,15 @@ Gem::Specification.new do |spec|
   spec.date          = Time.new.getutc.strftime('%Y-%m-%d')
   spec.authors       = ['Job King\'ori Maina']
   spec.email         = ['j@kingori.co']
-  spec.description   = 'Make authenticated Pesapal API calls without the fuss!'
-  spec.summary       = 'Make authenticated Pesapal API calls without the fuss! Handles all the oAuth stuff abstracting any direct interaction with the API endpoints so that you can focus on what matters. Building awesome.'
-  spec.homepage      = 'http://itsmrwave.github.io/pesapal-gem'
+  spec.homepage      = 'http://itskingori.github.io/pesapal-gem'
   spec.license       = 'MIT'
+  spec.description   = 'Make authenticated Pesapal API calls without the fuss!'
+  spec.summary       = 'Make authenticated Pesapal API calls without the fuss! '\
+                       'Handles all the oAuth stuff abstracting any direct ' \
+                       'interaction with the API endpoints so that you can ' \
+                       'focus on what matters. Building awesome.'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
@@ -24,9 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'faker'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'redcarpet'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'yard'
 
   spec.add_runtime_dependency 'htmlentities'
 end

data/spec/pesapal_merchant_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Pesapal::Merchant do
-
   let(:order_details) do
-    { amount: 1000,
+    {
+      amount: 1000,
       description: Faker::Lorem.sentence,
       type: 'MERCHANT',
       reference: '111-222-333',
@@ -16,32 +16,17 @@ describe Pesapal::Merchant do
   end
 
   let(:default_credentials) do
-    { callback_url: 'http://0.0.0.0:3000/pesapal/callback',
+    {
+      callback_url: 'http://0.0.0.0:3000/pesapal/callback',
       consumer_key: '<YOUR_CONSUMER_KEY>',
       consumer_secret: '<YOUR_CONSUMER_SECRET>'
     }
   end
 
-  let(:demo_endpoints) do
-    { postpesapaldirectorderv4: 'https://demo.pesapal.com/API/PostPesapalDirectOrderV4',
-      querypaymentstatus: 'https://demo.pesapal.com/API/QueryPaymentStatus',
-      querypaymentdetails: 'https://demo.pesapal.com/API/QueryPaymentDetails'
-    }
-  end
-
-  let(:production_endpoints) do
-    { postpesapaldirectorderv4: 'https://www.pesapal.com/API/PostPesapalDirectOrderV4',
-      querypaymentstatus: 'https://www.pesapal.com/API/QueryPaymentStatus',
-      querypaymentdetails: 'https://www.pesapal.com/API/QueryPaymentDetails'
-    }
-  end
-
   context 'when mode not specified' do
-
     let(:pesapal) { Pesapal::Merchant.new }
 
     describe '#new' do
-
       it 'is valid object' do
         expect(pesapal).to be_an_instance_of(Pesapal::Merchant)
       end
@@ -59,20 +44,7 @@ describe Pesapal::Merchant do
       end
     end
 
-    describe '#change_env' do
-
-      it 'sets default environment variable' do
-        pesapal.change_env
-        expect(pesapal.send(:env)).to eq 'development'
-      end
-
-      it 'sets endpoints for default environment' do
-        expect(pesapal.change_env).to eq(demo_endpoints)
-      end
-    end
-
     describe '#generate_order_url' do
-
       it 'generates iframe url string' do
         pesapal.order_details = order_details
         expect(pesapal.generate_order_url).to match %r{https://demo.pesapal.com/API/PostPesapalDirectOrderV4\?oauth_callback=.*oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_request_data=.*}
@@ -80,7 +52,6 @@ describe Pesapal::Merchant do
     end
 
     describe '#query_payment_status' do
-
       let(:request) { stub_request(:get, %r{https://demo.pesapal.com/API/QueryPaymentStatus\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets pending payment status' do
@@ -105,21 +76,21 @@ describe Pesapal::Merchant do
     end
 
     describe '#query_payment_details' do
-
       let(:request) { stub_request(:get, %r{https://demo.pesapal.com/API/QueryPaymentDetails\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets pending payment details' do
         request.to_return(status: 200, body: 'pesapal_response_data=transaction_tracking_id,payment_method,payment_status,merchant_reference')
-        expect(pesapal.query_payment_details('merchant_reference', 'transaction_tracking_id')).to eq(method: 'payment_method',
-                                                                                                     status: 'payment_status',
-                                                                                                     merchant_reference: 'merchant_reference',
-                                                                                                     transaction_tracking_id: 'transaction_tracking_id'
-                                                                                                    )
+        expected_result = {
+          method: 'payment_method',
+          status: 'payment_status',
+          merchant_reference: 'merchant_reference',
+          transaction_tracking_id: 'transaction_tracking_id'
+        }
+        expect(pesapal.query_payment_details('merchant_reference', 'transaction_tracking_id')).to eq(expected_result)
       end
     end
 
     describe '#ipn_listener' do
-
       let(:request) { stub_request(:get, %r{https://demo.pesapal.com/API/QueryPaymentStatus\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets ipn response for pending status' do
@@ -145,11 +116,9 @@ describe Pesapal::Merchant do
   end
 
   context 'when mode is specified as development' do
-
     let(:pesapal) { Pesapal::Merchant.new(:development) }
 
     describe '#new(:development)' do
-
       it 'is valid object' do
         expect(pesapal).to be_an_instance_of(Pesapal::Merchant)
       end
@@ -167,20 +136,7 @@ describe Pesapal::Merchant do
       end
     end
 
-    describe '#change_env(:development)' do
-
-      it 'sets environment variable' do
-        pesapal.change_env :development
-        expect(pesapal.send(:env)).to eq 'development'
-      end
-
-      it 'sets endpoints for environment' do
-        expect(pesapal.change_env :development).to eq(demo_endpoints)
-      end
-    end
-
     describe '#generate_order_url' do
-
       it 'generates iframe url string' do
         pesapal.order_details = order_details
         expect(pesapal.generate_order_url).to match %r{https://demo.pesapal.com/API/PostPesapalDirectOrderV4\?oauth_callback=.*oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_request_data=.*}
@@ -188,7 +144,6 @@ describe Pesapal::Merchant do
     end
 
     describe '#query_payment_status' do
-
       let(:request) { stub_request(:get, %r{https://demo.pesapal.com/API/QueryPaymentStatus\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets pending payment status' do
@@ -213,21 +168,21 @@ describe Pesapal::Merchant do
     end
 
     describe '#query_payment_details' do
-
       let(:request) { stub_request(:get, %r{https://demo.pesapal.com/API/QueryPaymentDetails\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets pending payment details' do
         request.to_return(status: 200, body: 'pesapal_response_data=transaction_tracking_id,payment_method,payment_status,merchant_reference')
-        expect(pesapal.query_payment_details('merchant_reference', 'transaction_tracking_id')).to eq(method: 'payment_method',
-                                                                                                     status: 'payment_status',
-                                                                                                     merchant_reference: 'merchant_reference',
-                                                                                                     transaction_tracking_id: 'transaction_tracking_id'
-                                                                                                    )
+        expected_result = {
+          method: 'payment_method',
+          status: 'payment_status',
+          merchant_reference: 'merchant_reference',
+          transaction_tracking_id: 'transaction_tracking_id'
+        }
+        expect(pesapal.query_payment_details('merchant_reference', 'transaction_tracking_id')).to eq(expected_result)
       end
     end
 
     describe '#ipn_listener' do
-
       let(:request) { stub_request(:get, %r{https://demo.pesapal.com/API/QueryPaymentStatus\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets ipn response for pending status' do
@@ -253,11 +208,9 @@ describe Pesapal::Merchant do
   end
 
   context 'when mode is specified as production' do
-
     let(:pesapal) { Pesapal::Merchant.new(:production) }
 
     describe '#new(:production)' do
-
       it 'is valid object' do
         expect(pesapal).to be_an_instance_of(Pesapal::Merchant)
       end
@@ -275,20 +228,7 @@ describe Pesapal::Merchant do
       end
     end
 
-    describe '#change_env(:production)' do
-
-      it 'sets environment variable' do
-        pesapal.change_env :production
-        expect(pesapal.send(:env)).to eq 'production'
-      end
-
-      it 'sets endpoints for environment' do
-        expect(pesapal.change_env :production).to eq(production_endpoints)
-      end
-    end
-
     describe '#generate_order_url' do
-
       it 'generates iframe url string' do
         pesapal.order_details = order_details
         expect(pesapal.generate_order_url).to match %r{https://www.pesapal.com/API/PostPesapalDirectOrderV4\?oauth_callback=.*oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_request_data=.*}
@@ -296,7 +236,6 @@ describe Pesapal::Merchant do
     end
 
     describe '#query_payment_status' do
-
       let(:request) { stub_request(:get, %r{https://www.pesapal.com/API/QueryPaymentStatus\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets pending payment status' do
@@ -321,21 +260,21 @@ describe Pesapal::Merchant do
     end
 
     describe '#query_payment_details' do
-
       let(:request) { stub_request(:get, %r{https://www.pesapal.com/API/QueryPaymentDetails\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets pending payment details' do
         request.to_return(status: 200, body: 'pesapal_response_data=transaction_tracking_id,payment_method,payment_status,merchant_reference')
-        expect(pesapal.query_payment_details('merchant_reference', 'transaction_tracking_id')).to eq(method: 'payment_method',
-                                                                                                     status: 'payment_status',
-                                                                                                     merchant_reference: 'merchant_reference',
-                                                                                                     transaction_tracking_id: 'transaction_tracking_id'
-                                                                                                    )
+        expected_result = {
+          method: 'payment_method',
+          status: 'payment_status',
+          merchant_reference: 'merchant_reference',
+          transaction_tracking_id: 'transaction_tracking_id'
+        }
+        expect(pesapal.query_payment_details('merchant_reference', 'transaction_tracking_id')).to eq(expected_result)
       end
     end
 
     describe '#ipn_listener' do
-
       let(:request) { stub_request(:get, %r{https://www.pesapal.com/API/QueryPaymentStatus\?oauth_consumer_key=.*oauth_nonce=.*oauth_signature=.*oauth_signature_method=HMAC-SHA1&oauth_timestamp.*oauth_version=1.0&pesapal_merchant_reference=.*&pesapal_transaction_tracking_id=.*}) }
 
       it 'gets ipn response for pending status' do

metadata

@@ -1,125 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: pesapal
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Job King'ori Maina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Make authenticated Pesapal API calls without the fuss!
@@ -129,34 +157,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .hound.yml
-- .rspec
-- .rubocop.yml
-- .travis.yml
-- .yardopts
+- ".coveralls.yml"
+- ".gitignore"
+- ".hound.yml"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
-- lib/generators/pesapal/install_generator.rb
-- lib/generators/templates/README.md
-- lib/generators/templates/pesapal.yml
+- docs/.ruby-version
+- docs/Gemfile
+- docs/README.md
+- docs/_config.yml
+- docs/_includes/google-analytics.html
+- docs/_layouts/default.html
+- docs/assets/javascripts/scale.fix.js
+- docs/assets/stylesheets/pygment_trac.css
+- docs/assets/stylesheets/styles.css
+- docs/favicon.ico
+- docs/index.md
 - lib/pesapal.rb
 - lib/pesapal/helper/details.rb
 - lib/pesapal/helper/post.rb
 - lib/pesapal/helper/status.rb
 - lib/pesapal/merchant.rb
 - lib/pesapal/oauth.rb
-- lib/pesapal/railtie.rb
 - lib/pesapal/version.rb
 - pesapal.gemspec
 - spec/pesapal_merchant_spec.rb
 - spec/spec_helper.rb
-homepage: http://itsmrwave.github.io/pesapal-gem
+homepage: http://itskingori.github.io/pesapal-gem
 licenses:
 - MIT
 metadata: {}
@@ -166,17 +201,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Make authenticated Pesapal API calls without the fuss! Handles all the oAuth
@@ -185,4 +220,3 @@ summary: Make authenticated Pesapal API calls without the fuss! Handles all the
 test_files:
 - spec/pesapal_merchant_spec.rb
 - spec/spec_helper.rb
-has_rdoc: