pesapal 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 066f9356c08b057b12dee36ca4c18ac4ce6e4b2e
-  data.tar.gz: dd01f73ffa683da11339838be6d73ee1244d6619
+  metadata.gz: 8af57eb900f2972e33b0415d47f6dd829bf1e292
+  data.tar.gz: 73ea9770d4c51b81fcc92bff9dfaaac46f1779c3
 SHA512:
-  metadata.gz: d86aba866c7fe7ee64ca72c6f2a5f865d0d3da2b5f79cad59e71e9da575a09d5e98f7b8f25c3eefc652b71665da1366c66f12ad2f309c49c7992c140f3599324
-  data.tar.gz: 5a921459134fa6dd99ab76c3d58045e43ad6a20bc8b6d390e6dd17773e422a065701e95e49f5b307afbaf442611d8680a6eb8cc87ef9916db1977495ec48f01b
+  metadata.gz: 5594d62643eec3357558ea3f133735be428c682e58e9f3040aaa2196e5aa758999b62e124e9956af5f0b42c96b681fbf0fc71b79077db24a49f222dacd5abe2a
+  data.tar.gz: dfe9baaca9c4488dcaa6e4744975e65937ebc013152033fca9912059e8dbbdca7ccfd038ea7acbf81116a3defbe93dc5ca35391471964b8f4a0c1c50a2923b5f

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,15 @@
+AllCops:
+  Include:
+    - '**/*.gemspec'
+    - '**/Gemfile'
+    - '**/Rakefile'
+  Exclude:
+    - 'vendor/**/*'
+Metrics/LineLength:
+  Enabled: false
+Metrics/ClassLength:
+  CountComments: false
+  Max: 150
+Metrics/MethodLength:
+  CountComments: false
+  Max: 20

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
+  - 2.1.2
+  - 2.1.1
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+v1.6.0
+------
+
+* Enforce minimum required Ruby version, gem is tested for Ruby '>= 1.9.3'
+* Add Rubocop as a development dependency and Hound to the workflow since we will use them to detect style guide violations
+* Code cleanup here and there
+* Avoid using set_ on method name, this changes the API slightly since we can't use set_env which was public
+
+
 v1.5.6
 ------
 

data/CONTRIBUTING.md

@@ -0,0 +1,29 @@
+CONTRIBUTING
+============
+
+Submitting a Pull Request
+-------------------------
+
+1. [Fork the repository][fork].
+2. [Create a topic branch][branch] (`git checkout -b BRANCH_NAME`).
+3. [Install bundler][bundler].
+4. Check that tests pass with `rspec spec`.
+5. Write a failing test to capture existing bug or lack of feature.
+6. Run `rspec spec` to verify that test fails.
+7. Implement your feature or bug fix.
+8. Ensure tests pass.
+9. If it's a new feature or a bug fix, please add an entry to the CHANGELOG file.
+10. Check code style violations using [Rubocop][rubocop].
+11. Add a commit (`git commit -am 'AWESOME COMMIT MESSAGE'`).
+12. Push your changes to the branch (`git push origin BRANCH_NAME`).
+13. [Submit a pull request.][pr]
+14. You will get some feedback and may need to push additional commits
+    with more fixes to the same branch; this will update your pull request
+    automatically.
+
+[branch]: http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches
+[bundler]: http://bundler.io
+[fork]: https://help.github.com/articles/fork-a-repo/
+[pr]: https://help.github.com/articles/using-pull-requests
+[rubocop]: https://github.com/bbatsov/rubocop
+

data/lib/generators/pesapal/install_generator.rb

@@ -1,19 +1,20 @@
+# Since generators are not specific to this project, it's preferable you refer
+# to the official documentation on the Rails site here;
+# http://guides.rubyonrails.org/generators.html
 module Pesapal
-  # Since generators are not specific to this project, it's preferable you refer
-  # to the official documentation on the Rails site here;
-  # http://guides.rubyonrails.org/generators.html
   module Generators
+    # Install pesapal generator
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
+      source_root File.expand_path('../../templates', __FILE__)
 
-      desc "Creates a Pesapal config file to your application."
+      desc 'Creates a Pesapal config file to your application.'
 
       def copy_config
-        copy_file "pesapal.yml", "config/pesapal.yml"
+        copy_file 'pesapal.yml', 'config/pesapal.yml'
       end
 
       def show_readme
-        readme "README.md" if behavior == :invoke
+        readme 'README.md' if behavior == :invoke
       end
     end
   end

data/lib/pesapal.rb

@@ -9,4 +9,3 @@ require 'pesapal/oauth'
 require 'pesapal/version'
 
 require 'pesapal/railtie' if defined?(Rails)
-

data/lib/pesapal/helper/details.rb

@@ -4,9 +4,11 @@ module Pesapal
     # Contains helper methods relating to any queries for payment details. See
     # {Pesapal::Merchant#query_payment_details} source.
     module Details
-      # Prepares parameters to be used during the QueryPaymentDetails oAuth 1.0 call.
+      # Prepares parameters to be used during the QueryPaymentDetails oAuth 1.0
+      # call.
       #
-      # The QueryPaymentDetails oAuth 1.0 call requires the following parameters;
+      # The QueryPaymentDetails oAuth 1.0 call requires the following
+      # parameters;
       #
       # 1. `oauth_consumer_key` - your Pesapal consumer key sent to you via email or obtained from the dashboard
       # 2. `oauth_nonce` - a random string, uniquely generated for each request. See [section 8 of the oAuth 1.0 spec][3]
@@ -17,10 +19,11 @@ module Pesapal
       # 7. `pesapal_merchant_reference` - the transaction merchant reference (same as `merchant_reference` defined below)
       # 8. `pesapal_transaction_tracking_id` - the transaction tracking id (same as `transaction_tracking_id` defined below)
       #
-      # This method generates all the above **except** the `oauth_signature` which
-      # is generated later by {Pesapal::Oauth.generate_oauth_signature} since
-      # generation of this `oauth_signature` requires these parameters as inputs
-      # anyway. See [section 9.2.1 of the oAuth 1.0 spec][1] for more details.
+      # This method generates all the above **except** the `oauth_signature`
+      # which is generated later by {Pesapal::Oauth.generate_oauth_signature}
+      # since generation of this `oauth_signature` requires these parameters as
+      # inputs anyway. See [section 9.2.1 of the oAuth 1.0 spec][1] for more
+      # details.
       #
       # [1]: http://oauth.net/core/1.0/#anchor16
       # [2]: http://oauth.net/core/1.0/#signing_process
@@ -36,16 +39,17 @@ module Pesapal
       # @param transaction_tracking_id [String] the unique id assigned by Pesapal
       #   to the transaction after it's posted
       #
-      # @return [Hash] parameters to be used in generating the oAuth 1.0 URL query parameters and the `oauth_signature` itself.
+      # @return [Hash] parameters to be used in generating the oAuth 1.0 URL
+      #   query parameters and the `oauth_signature` itself.
       def self.set_parameters(consumer_key, merchant_reference, transaction_tracking_id)
         timestamp = Time.now.to_i.to_s
-        { :oauth_consumer_key => consumer_key,
-          :oauth_nonce => "#{timestamp}" + Pesapal::Oauth.generate_nonce(12),
-          :oauth_signature_method => 'HMAC-SHA1',
-          :oauth_timestamp => "#{timestamp}",
-          :oauth_version => '1.0',
-          :pesapal_merchant_reference => merchant_reference,
-          :pesapal_transaction_tracking_id => transaction_tracking_id
+        { oauth_consumer_key: consumer_key,
+          oauth_nonce: "#{timestamp}" + Pesapal::Oauth.generate_nonce(12),
+          oauth_signature_method: 'HMAC-SHA1',
+          oauth_timestamp: "#{timestamp}",
+          oauth_version: '1.0',
+          pesapal_merchant_reference: merchant_reference,
+          pesapal_transaction_tracking_id: transaction_tracking_id
         }
       end
     end

data/lib/pesapal/helper/post.rb

@@ -82,15 +82,15 @@ module Pesapal
       #
       # ```
       # order_details = {
-      #   :amount => 1000,
-      #   :description => 'this is the transaction description',
-      #   :type => 'MERCHANT',
-      #   :reference => '808-707-606',
-      #   :first_name => 'Swaleh',
-      #   :last_name => 'Mdoe',
-      #   :email => 'user@example.com',
-      #   :phonenumber => '+254722222222',
-      #   :currency => 'KES'
+      #   amount: 1000,
+      #   description: 'this is the transaction description',
+      #   type: 'MERCHANT',
+      #   reference: '808-707-606',
+      #   first_name: 'Swaleh',
+      #   last_name: 'Mdoe',
+      #   email: 'user@example.com',
+      #   phonenumber: '+254722222222',
+      #   currency: 'KES'
       # }
       # ```
       #
@@ -124,7 +124,7 @@ module Pesapal
 
         # Encode the XML
         encoder = HTMLEntities.new(:xhtml1)
-        post_xml = encoder.encode post_xml
+        encoder.encode post_xml
       end
 
       # Prepares parameters to be used during the PostPesapalDirectOrderV4 oAuth 1.0 call.
@@ -163,13 +163,13 @@ module Pesapal
       # @return [Hash] parameters to be used in generating the oAuth 1.0 URL query parameters and the `oauth_signature` itself.
       def self.set_parameters(callback_url, consumer_key, post_xml)
         timestamp = Time.now.to_i.to_s
-        { :oauth_callback => callback_url,
-          :oauth_consumer_key => consumer_key,
-          :oauth_nonce => "#{timestamp}" + Pesapal::Oauth.generate_nonce(12),
-          :oauth_signature_method => 'HMAC-SHA1',
-          :oauth_timestamp => "#{timestamp}",
-          :oauth_version => '1.0',
-          :pesapal_request_data => post_xml
+        { oauth_callback: callback_url,
+          oauth_consumer_key: consumer_key,
+          oauth_nonce: "#{timestamp}" + Pesapal::Oauth.generate_nonce(12),
+          oauth_signature_method: 'HMAC-SHA1',
+          oauth_timestamp: "#{timestamp}",
+          oauth_version: '1.0',
+          pesapal_request_data: post_xml
         }
       end
     end

data/lib/pesapal/helper/status.rb

@@ -39,15 +39,15 @@ module Pesapal
       # @return [Hash] parameters to be used in generating the oAuth 1.0 URL query parameters and the `oauth_signature` itself.
       def self.set_parameters(consumer_key, merchant_reference, transaction_tracking_id = nil)
         timestamp = Time.now.to_i.to_s
-        params = { :oauth_consumer_key => consumer_key,
-                   :oauth_nonce => "#{timestamp}" + Pesapal::Oauth.generate_nonce(12),
-                   :oauth_signature_method => 'HMAC-SHA1',
-                   :oauth_timestamp => "#{timestamp}",
-                   :oauth_version => '1.0',
-                   :pesapal_merchant_reference => merchant_reference
+        params = { oauth_consumer_key: consumer_key,
+                   oauth_nonce: "#{timestamp}" + Pesapal::Oauth.generate_nonce(12),
+                   oauth_signature_method: 'HMAC-SHA1',
+                   oauth_timestamp: "#{timestamp}",
+                   oauth_version: '1.0',
+                   pesapal_merchant_reference: merchant_reference
                 }
         params[:pesapal_transaction_tracking_id] = transaction_tracking_id unless transaction_tracking_id.nil?
-        return params
+        params
       end
     end
   end

data/lib/pesapal/merchant.rb

@@ -140,17 +140,17 @@ module Pesapal
     # }
     # ```
     #
-    # @note You can change the environment at runtime using {#set_env}
+    # @note You can change the environment at runtime using {#change_env}
     #
     # @param env [Symbol] the environment we want to use i.e. `:development` or
     #   `:production`. Leaving it blank sets environment intelligently to
     #   `Rails.env` (if Rails) or `:development` (if non-Rails).
     def initialize(env = false)
-      set_env env
+      change_env env
       if defined?(Rails)
-        set_configuration Rails.application.config.pesapal_credentials
+        configure Rails.application.config.pesapal_credentials
       else
-        set_configuration
+        configure
       end
     end
 
@@ -159,7 +159,7 @@ module Pesapal
     # PesaPal will present the user with a page which contains the available
     # payment options and will redirect to your site to the _callback url_ once
     # the user has completed the payment process. A tracking id will be returned
-    # as a query parameter – this can be used subsequently to track the payment
+    # as a query parameter - this can be used subsequently to track the payment
     # status on Pesapal for the transaction later on.
     #
     # Generating the URL is a 3-step process:
@@ -190,7 +190,7 @@ module Pesapal
       @params = Pesapal::Helper::Post.set_parameters(@config[:callback_url], @config[:consumer_key], @post_xml)
 
       # generate oauth signature and add signature to the request parameters
-      @params[:oauth_signature] = Pesapal::Oauth::generate_oauth_signature("GET", @api_endpoints[:postpesapaldirectorderv4], @params, @config[:consumer_secret], @token_secret)
+      @params[:oauth_signature] = Pesapal::Oauth.generate_oauth_signature('GET', @api_endpoints[:postpesapaldirectorderv4], @params, @config[:consumer_secret], @token_secret)
 
       # change params (with signature) to a query string
       query_string = Pesapal::Oauth.generate_encoded_params_query_string @params
@@ -239,7 +239,7 @@ module Pesapal
       @params = Pesapal::Helper::Details.set_parameters(@config[:consumer_key], merchant_reference, transaction_tracking_id)
 
       # generate oauth signature and add signature to the request parameters
-      @params[:oauth_signature] = Pesapal::Oauth.generate_oauth_signature("GET", @api_endpoints[:querypaymentdetails], @params, @config[:consumer_secret], @token_secret)
+      @params[:oauth_signature] = Pesapal::Oauth.generate_oauth_signature('GET', @api_endpoints[:querypaymentdetails], @params, @config[:consumer_secret], @token_secret)
 
       # change params (with signature) to a query string
       query_string = Pesapal::Oauth.generate_encoded_params_query_string @params
@@ -255,10 +255,10 @@ module Pesapal
       response = CGI.parse response.body
       response = response['pesapal_response_data'][0].split(',')
 
-      { :method => response[1],
-        :status => response[2],
-        :merchant_reference => response[3],
-        :transaction_tracking_id => response[0]
+      { method: response[1],
+        status: response[2],
+        merchant_reference: response[3],
+        transaction_tracking_id: response[0]
       }
     end
 
@@ -294,7 +294,7 @@ module Pesapal
       @params = Pesapal::Helper::Status.set_parameters(@config[:consumer_key], merchant_reference, transaction_tracking_id)
 
       # generate oauth signature and add signature to the request parameters
-      @params[:oauth_signature] = Pesapal::Oauth.generate_oauth_signature("GET", @api_endpoints[:querypaymentstatus], @params, @config[:consumer_secret], @token_secret)
+      @params[:oauth_signature] = Pesapal::Oauth.generate_oauth_signature('GET', @api_endpoints[:querypaymentstatus], @params, @config[:consumer_secret], @token_secret)
 
       # change params (with signature) to a query string
       query_string = Pesapal::Oauth.generate_encoded_params_query_string @params
@@ -344,7 +344,7 @@ module Pesapal
     #
     # @return [Hash] contains Pesapal endpoints appropriate for the set
     #   environment
-    def set_env(env = false)
+    def change_env(env = false)
       env = env.to_s.downcase
       if env == 'production'
         @env = 'production'
@@ -352,7 +352,7 @@ module Pesapal
         @env = 'development'
         @env = Rails.env if defined?(Rails)
       end
-      set_endpoints
+      assign_endpoints
     end
 
     # Generates the appropriate IPN response depending on the status of the
@@ -381,8 +381,8 @@ module Pesapal
     # @note It's up to you to send the response back to Pesapal by providing the
     #   `:response` back to the IPN. The hard part is done.
     #
-    # @param notification_type [String] the IPN notification type, should be set
-    #   to CHANGE always
+    # @param notification_type [String] the IPN notification type, overridden
+    #   and set to CHANGE internally. Left here for extensibility.
     #
     # @param merchant_reference [String] the unique id generated for the
     #   transaction by your application before posting the order
@@ -393,12 +393,13 @@ module Pesapal
     # @return [Hash] contains the status and IPN response that should be sent
     #   back to Pesapal
     def ipn_listener(notification_type, merchant_reference, transaction_tracking_id)
+      notification_type = 'CHANGE'
       status = query_payment_status(merchant_reference, transaction_tracking_id)
-      output = { :status => status, :response => nil }
+      output = { status: status, response: nil }
 
       case status
-      when 'COMPLETED' then output[:response] = "pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=#{transaction_tracking_id}&pesapal_merchant_reference=#{merchant_reference}"
-      when 'FAILED'    then output[:response] = "pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=#{transaction_tracking_id}&pesapal_merchant_reference=#{merchant_reference}"
+      when 'COMPLETED' then output[:response] = "pesapal_notification_type=#{notification_type}&pesapal_transaction_tracking_id=#{transaction_tracking_id}&pesapal_merchant_reference=#{merchant_reference}"
+      when 'FAILED'    then output[:response] = "pesapal_notification_type=#{notification_type}&pesapal_transaction_tracking_id=#{transaction_tracking_id}&pesapal_merchant_reference=#{merchant_reference}"
       end
 
       output
@@ -406,8 +407,8 @@ module Pesapal
 
     private
 
-    # Set API endpoints depending on the environment.
-    def set_endpoints
+    # Assign API endpoints depending on the environment.
+    def assign_endpoints
       if @env == 'production'
         @api_domain = 'https://www.pesapal.com'
       else
@@ -422,13 +423,12 @@ module Pesapal
       @api_endpoints
     end
 
-    # Set credentials through hash that passed in (does a little processing to
-    # remove unwanted data & uses default if nothing is input).
-    def set_configuration(consumer_details = {})
-      # set the configuration
-      @config = { :callback_url => 'http://0.0.0.0:3000/pesapal/callback',
-                  :consumer_key => '<YOUR_CONSUMER_KEY>',
-                  :consumer_secret => '<YOUR_CONSUMER_SECRET>'
+    # Configure credentials through hash that passed in (does a little
+    # processing to remove unwanted data & uses default if nothing is input).
+    def configure(consumer_details = {})
+      @config = { callback_url: 'http://0.0.0.0:3000/pesapal/callback',
+                  consumer_key: '<YOUR_CONSUMER_KEY>',
+                  consumer_secret: '<YOUR_CONSUMER_SECRET>'
                 }
 
       valid_config_keys = @config.keys

data/lib/pesapal/oauth.rb

@@ -114,7 +114,6 @@ module Pesapal
     #
     # @return [String] valid signature base string.
     def self.generate_signature_base_string(http_method, absolute_url, params)
-
       # step 1: convert the http method to uppercase
       http_method = http_method.upcase
 
@@ -156,11 +155,11 @@ module Pesapal
     # > String MUST include the scheme, authority, and path, and MUST exclude
     # > the query and fragment as defined by [RFC3986] section 3._
     #
-    # > _If the absolute request URL is not available to the Service Provider (it
-    # > is always available to the Consumer), it can be constructed by combining
-    # > the scheme being used, the HTTP Host header, and the relative HTTP
-    # > request URL. If the Host header is not available, the Service Provider
-    # > SHOULD use the host name communicated to the Consumer in the
+    # > _If the absolute request URL is not available to the Service Provider
+    # > (it is always available to the Consumer), it can be constructed by
+    # > combining the scheme being used, the HTTP Host header, and the relative
+    # > HTTP request URL. If the Host header is not available, the Service
+    # > Provider SHOULD use the host name communicated to the Consumer in the
     # > documentation or other means._
     #
     # > _The Service Provider SHOULD document the form of URL used in the
@@ -184,7 +183,7 @@ module Pesapal
       path = u.path
       port = u.port
 
-      port = (scheme == 'http' && port != 80) || (scheme == 'https' && port != 443) ? ":#{port}" : ""
+      port = (scheme == 'http' && port != 80) || (scheme == 'https' && port != 443) ? ":#{port}" : ''
       path = (path && path != '') ? path : '/'
 
       "#{scheme}://#{host}#{port}#{path}"
@@ -209,8 +208,8 @@ module Pesapal
     def self.parameter_encode(str)
       # reserved character regexp, per section 5.1
       reserved_characters = /[^a-zA-Z0-9\-\.\_\~]/
-      # Apparently we can't force_encoding on a frozen string since that would modify it.
-      # What we can do is work with a copy
+      # Apparently we can't force_encoding on a frozen string since that would
+      # modify it. What we can do is work with a copy
       URI.escape(str.dup.to_s.force_encoding(Encoding::UTF_8), reserved_characters)
     end
   end

data/lib/pesapal/railtie.rb

@@ -9,14 +9,16 @@ module Pesapal
         begin
           config.pesapal_credentials = YAML.load(IO.read(path_to_yaml))[Rails.env]
         rescue Errno::ENOENT
-          logger.info('YAML configuration file couldn\'t be found.'); return
+          logger.info('YAML configuration file couldn\'t be found.')
+          return
         rescue Psych::SyntaxError
-          logger.info('YAML configuration file contains invalid syntax. Will use using defaults.'); return
+          logger.info('YAML configuration file contains invalid syntax. Will use using defaults.')
+          return
         end
       else
-        config.pesapal_credentials = { :callback_url => 'http://0.0.0.0:3000/pesapal/callback',
-                                       :consumer_key => '<YOUR_CONSUMER_KEY>',
-                                       :consumer_secret => '<YOUR_CONSUMER_SECRET>'
+        config.pesapal_credentials = { callback_url: 'http://0.0.0.0:3000/pesapal/callback',
+                                       consumer_key: '<YOUR_CONSUMER_KEY>',
+                                       consumer_secret: '<YOUR_CONSUMER_SECRET>'
                                       }
       end
     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.5.6'
+  VERSION = '1.6.0'
 end

data/pesapal.gemspec

@@ -1,5 +1,6 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'english'
 require 'pesapal/version'
 
 Gem::Specification.new do |spec|
@@ -13,17 +14,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'http://itsmrwave.github.io/pesapal-gem'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 1.9.2'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'faker'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'webmock'
 
   spec.add_runtime_dependency 'htmlentities'

data/spec/pesapal_merchant_spec.rb

@@ -2,401 +2,361 @@ require 'spec_helper'
 
 describe Pesapal::Merchant do
 
+  let(:order_details) do
+    { amount: 1000,
+      description: Faker::Lorem.sentence,
+      type: 'MERCHANT',
+      reference: '111-222-333',
+      first_name: Faker::Name.first_name,
+      last_name: Faker::Name.last_name,
+      email: Faker::Internet.email,
+      phonenumber: Faker::PhoneNumber.phone_number,
+      currency: 'KES' # ['USD', 'KES', 'UGX', 'TZA'].sample
+    }
+  end
+
+  let(:default_credentials) do
+    { 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: 'http://demo.pesapal.com/API/PostPesapalDirectOrderV4',
+      querypaymentstatus: 'http://demo.pesapal.com/API/QueryPaymentStatus',
+      querypaymentdetails: 'http://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
 
-    before :each do
-      @pesapal = Pesapal::Merchant.new
-    end
+    let(:pesapal) { Pesapal::Merchant.new }
 
     describe '#new' do
 
       it 'is valid object' do
-        expect(@pesapal).to be_an_instance_of(Pesapal::Merchant)
+        expect(pesapal).to be_an_instance_of(Pesapal::Merchant)
       end
 
       it 'sets default environment variable' do
-        expect(@pesapal.send(:env)).to eq 'development'
+        expect(pesapal.send(:env)).to eq 'development'
       end
 
       it 'sets default credentials' do
-        expect(@pesapal.config).to eq(default_credentials)
+        expect(pesapal.config).to eq(default_credentials)
       end
 
       it 'sets default order details' do
-        expect(@pesapal.order_details).to eq({})
+        expect(pesapal.order_details).to eq({})
       end
     end
 
-    describe '#set_env' do
+    describe '#change_env' do
 
       it 'sets default environment variable' do
-        @pesapal.set_env
-        expect(@pesapal.send(:env)).to eq 'development'
+        pesapal.change_env
+        expect(pesapal.send(:env)).to eq 'development'
       end
 
       it 'sets endpoints for default environment' do
-        expect(@pesapal.set_env).to eq(demo_endpoints)
+        expect(pesapal.change_env).to eq(demo_endpoints)
       end
     end
 
     describe '#generate_order_url' do
 
       it 'generates iframe url string' do
-        @pesapal.order_details = { :amount => 1000,
-                                   :description => 'This is the description for the test transaction.',
-                                   :type => 'MERCHANT',
-                                   :reference => '111-222-333',
-                                   :first_name => 'Swaleh',
-                                   :last_name => 'Mdoe',
-                                   :email => 'test@example.com',
-                                   :phonenumber => '+254711000333',
-                                   :currency => 'KES'
-                                }
-        expect(@pesapal.generate_order_url).to match /http:\/\/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=.*/
+        pesapal.order_details = order_details
+        expect(pesapal.generate_order_url).to match %r{http://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=.*}
       end
     end
 
     describe '#query_payment_status' do
 
-      before :each do
-        @request = stub_request(:get, /http:\/\/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=.*/)
-      end
+      let(:request) { stub_request(:get, %r{http://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
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=PENDING')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('PENDING')
+        request.to_return(status: 200, body: 'pesapal_response_data=PENDING')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('PENDING')
       end
 
       it 'gets completed payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=COMPLETED')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('COMPLETED')
+        request.to_return(status: 200, body: 'pesapal_response_data=COMPLETED')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('COMPLETED')
       end
 
       it 'gets failed payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=FAILED')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('FAILED')
+        request.to_return(status: 200, body: 'pesapal_response_data=FAILED')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('FAILED')
       end
 
       it 'gets invalid payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=INVALID')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('INVALID')
+        request.to_return(status: 200, body: 'pesapal_response_data=INVALID')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('INVALID')
       end
     end
 
     describe '#query_payment_details' do
 
-      before :each do
-        @request = stub_request(:get, /http:\/\/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=.*/)
-      end
+      let(:request) { stub_request(:get, %r{http://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'
-                                                                                                      })
+        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'
+                                                                                                    )
       end
     end
 
     describe '#ipn_listener' do
 
-      before :each do
-        @request = stub_request(:get, /http:\/\/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=.*/)
-      end
+      let(:request) { stub_request(:get, %r{http://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
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=PENDING')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'PENDING', :response => nil})
+        request.to_return(status: 200, body: 'pesapal_response_data=PENDING')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'PENDING', response: nil)
       end
 
       it 'gets ipn response for completed status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=COMPLETED')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'COMPLETED', :response => 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference'})
+        request.to_return(status: 200, body: 'pesapal_response_data=COMPLETED')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'COMPLETED', response: 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference')
       end
 
       it 'gets ipn response for failed status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=FAILED')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'FAILED', :response => 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference'})
+        request.to_return(status: 200, body: 'pesapal_response_data=FAILED')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'FAILED', response: 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference')
       end
 
       it 'gets ipn response for invalid status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=INVALID')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'INVALID', :response => nil})
+        request.to_return(status: 200, body: 'pesapal_response_data=INVALID')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'INVALID', response: nil)
       end
     end
   end
 
   context 'when mode is specified as development' do
 
-    before :each do
-      @pesapal = Pesapal::Merchant.new(:development)
-    end
+    let(:pesapal) { Pesapal::Merchant.new(:development) }
 
     describe '#new(:development)' do
 
       it 'is valid object' do
-        expect(@pesapal).to be_an_instance_of(Pesapal::Merchant)
+        expect(pesapal).to be_an_instance_of(Pesapal::Merchant)
       end
 
       it 'sets environment variable' do
-        expect(@pesapal.send(:env)).to eq 'development'
+        expect(pesapal.send(:env)).to eq 'development'
       end
 
       it 'sets credentials' do
-        expect(@pesapal.config).to eq(default_credentials)
+        expect(pesapal.config).to eq(default_credentials)
       end
 
       it 'sets order details' do
-        expect(@pesapal.order_details).to eq({})
+        expect(pesapal.order_details).to eq({})
       end
     end
 
-    describe '#set_env(:development)' do
+    describe '#change_env(:development)' do
 
       it 'sets environment variable' do
-        @pesapal.set_env :development
-        expect(@pesapal.send(:env)).to eq 'development'
+        pesapal.change_env :development
+        expect(pesapal.send(:env)).to eq 'development'
       end
 
       it 'sets endpoints for environment' do
-        expect(@pesapal.set_env :development).to eq(demo_endpoints)
+        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 = { :amount => 1000,
-                                   :description => 'This is the description for the test transaction.',
-                                   :type => 'MERCHANT',
-                                   :reference => '111-222-333',
-                                   :first_name => 'Swaleh',
-                                   :last_name => 'Mdoe',
-                                   :email => 'test@example.com',
-                                   :phonenumber => '+254711000333',
-                                   :currency => 'KES'
-                                }
-        expect(@pesapal.generate_order_url).to match /http:\/\/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=.*/
+        pesapal.order_details = order_details
+        expect(pesapal.generate_order_url).to match %r{http://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=.*}
       end
     end
 
     describe '#query_payment_status' do
 
-      before :each do
-        @request = stub_request(:get, /http:\/\/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=.*/)
-      end
+      let(:request) { stub_request(:get, %r{http://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
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=PENDING')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('PENDING')
+        request.to_return(status: 200, body: 'pesapal_response_data=PENDING')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('PENDING')
       end
 
       it 'gets completed payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=COMPLETED')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('COMPLETED')
+        request.to_return(status: 200, body: 'pesapal_response_data=COMPLETED')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('COMPLETED')
       end
 
       it 'gets failed payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=FAILED')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('FAILED')
+        request.to_return(status: 200, body: 'pesapal_response_data=FAILED')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('FAILED')
       end
 
       it 'gets invalid payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=INVALID')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('INVALID')
+        request.to_return(status: 200, body: 'pesapal_response_data=INVALID')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('INVALID')
       end
     end
 
     describe '#query_payment_details' do
 
-      before :each do
-        @request = stub_request(:get, /http:\/\/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=.*/)
-      end
+      let(:request) { stub_request(:get, %r{http://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'
-                                                                                                      })
+        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'
+                                                                                                    )
       end
     end
 
     describe '#ipn_listener' do
 
-      before :each do
-        @request = stub_request(:get, /http:\/\/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=.*/)
-      end
+      let(:request) { stub_request(:get, %r{http://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
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=PENDING')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'PENDING', :response => nil})
+        request.to_return(status: 200, body: 'pesapal_response_data=PENDING')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'PENDING', response: nil)
       end
 
       it 'gets ipn response for completed status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=COMPLETED')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'COMPLETED', :response => 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference'})
+        request.to_return(status: 200, body: 'pesapal_response_data=COMPLETED')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'COMPLETED', response: 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference')
       end
 
       it 'gets ipn response for failed status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=FAILED')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'FAILED', :response => 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference'})
+        request.to_return(status: 200, body: 'pesapal_response_data=FAILED')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'FAILED', response: 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference')
       end
 
       it 'gets ipn response for invalid status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=INVALID')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'INVALID', :response => nil})
+        request.to_return(status: 200, body: 'pesapal_response_data=INVALID')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'INVALID', response: nil)
       end
     end
   end
 
   context 'when mode is specified as production' do
 
-    before :each do
-      @pesapal = Pesapal::Merchant.new(:production)
-    end
+    let(:pesapal) { Pesapal::Merchant.new(:production) }
 
     describe '#new(:production)' do
 
       it 'is valid object' do
-        expect(@pesapal).to be_an_instance_of(Pesapal::Merchant)
+        expect(pesapal).to be_an_instance_of(Pesapal::Merchant)
       end
 
       it 'sets environment variable' do
-        expect(@pesapal.send(:env)).to eq 'production'
+        expect(pesapal.send(:env)).to eq 'production'
       end
 
       it 'sets credentials' do
-        expect(@pesapal.config).to eq(default_credentials)
+        expect(pesapal.config).to eq(default_credentials)
       end
 
       it 'sets order details' do
-        expect(@pesapal.order_details).to eq({})
+        expect(pesapal.order_details).to eq({})
       end
     end
 
-    describe '#set_env(:production)' do
+    describe '#change_env(:production)' do
 
       it 'sets environment variable' do
-        @pesapal.set_env :production
-        expect(@pesapal.send(:env)).to eq 'production'
+        pesapal.change_env :production
+        expect(pesapal.send(:env)).to eq 'production'
       end
 
       it 'sets endpoints for environment' do
-        expect(@pesapal.set_env :production).to eq(production_endpoints)
+        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 = { :amount => 1000,
-                                   :description => 'This is the description for the test transaction.',
-                                   :type => 'MERCHANT',
-                                   :reference => '111-222-333',
-                                   :first_name => 'Swaleh',
-                                   :last_name => 'Mdoe',
-                                   :email => 'test@example.com',
-                                   :phonenumber => '+254711000333',
-                                   :currency => 'KES'
-                                }
-        expect(@pesapal.generate_order_url).to match /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=.*/
+        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=.*}
       end
     end
 
     describe '#query_payment_status' do
 
-      before :each do
-        @request = stub_request(:get, /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=.*/)
-      end
+      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
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=PENDING')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('PENDING')
+        request.to_return(status: 200, body: 'pesapal_response_data=PENDING')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('PENDING')
       end
 
       it 'gets completed payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=COMPLETED')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('COMPLETED')
+        request.to_return(status: 200, body: 'pesapal_response_data=COMPLETED')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('COMPLETED')
       end
 
       it 'gets failed payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=FAILED')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('FAILED')
+        request.to_return(status: 200, body: 'pesapal_response_data=FAILED')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('FAILED')
       end
 
       it 'gets invalid payment status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=INVALID')
-        expect(@pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('INVALID')
+        request.to_return(status: 200, body: 'pesapal_response_data=INVALID')
+        expect(pesapal.query_payment_status('merchant_reference', 'transaction_tracking_id')).to eq('INVALID')
       end
     end
 
     describe '#query_payment_details' do
 
-      before :each do
-        @request = stub_request(:get, /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=.*/)
-      end
+      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'
-                                                                                                      })
+        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'
+                                                                                                    )
       end
     end
 
     describe '#ipn_listener' do
 
-      before :each do
-        @request = stub_request(:get, /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=.*/)
-      end
+      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
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=PENDING')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'PENDING', :response => nil})
+        request.to_return(status: 200, body: 'pesapal_response_data=PENDING')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'PENDING', response: nil)
       end
 
       it 'gets ipn response for completed status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=COMPLETED')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'COMPLETED', :response => 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference'})
+        request.to_return(status: 200, body: 'pesapal_response_data=COMPLETED')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'COMPLETED', response: 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference')
       end
 
       it 'gets ipn response for failed status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=FAILED')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'FAILED', :response => 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference'})
+        request.to_return(status: 200, body: 'pesapal_response_data=FAILED')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'FAILED', response: 'pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=transaction_tracking_id&pesapal_merchant_reference=merchant_reference')
       end
 
       it 'gets ipn response for invalid status' do
-        @request.to_return(:status => 200, :body => 'pesapal_response_data=INVALID')
-        expect(@pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq({:status => 'INVALID', :response => nil})
+        request.to_return(status: 200, body: 'pesapal_response_data=INVALID')
+        expect(pesapal.ipn_listener('CHANGE', 'merchant_reference', 'transaction_tracking_id')).to eq(status: 'INVALID', response: nil)
       end
     end
   end
-
-  private
-
-  def default_credentials
-    { :callback_url => 'http://0.0.0.0:3000/pesapal/callback',
-      :consumer_key => '<YOUR_CONSUMER_KEY>',
-      :consumer_secret => '<YOUR_CONSUMER_SECRET>'
-    }
-  end
-
-  def demo_endpoints
-    { :postpesapaldirectorderv4 => 'http://demo.pesapal.com/API/PostPesapalDirectOrderV4',
-      :querypaymentstatus=>'http://demo.pesapal.com/API/QueryPaymentStatus',
-      :querypaymentdetails=>'http://demo.pesapal.com/API/QueryPaymentDetails'
-    }
-  end
-
-  def production_endpoints
-    { :postpesapaldirectorderv4 => 'https://www.pesapal.com/API/PostPesapalDirectOrderV4',
-      :querypaymentstatus=>'https://www.pesapal.com/API/QueryPaymentStatus',
-      :querypaymentdetails=>'https://www.pesapal.com/API/QueryPaymentDetails'
-    }
-  end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'coveralls'
 Coveralls.wear!
 
+require 'faker'
 require 'webmock/rspec'
 require_relative '../lib/pesapal'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pesapal
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0
 platform: ruby
 authors:
 - Job King'ori Maina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !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
@@ -66,6 +80,20 @@ dependencies:
     - - '>='
       - !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
@@ -103,10 +131,13 @@ extra_rdoc_files: []
 files:
 - .coveralls.yml
 - .gitignore
+- .hound.yml
 - .rspec
+- .rubocop.yml
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -137,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='