pesapal 1.5.2 → 1.5.3

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v1.5.3
+------
+
+* Fix HTTPS calls throwing Timeout::Error (on production)
+* Simplified environment settings (kill :auto)
+
 v1.5.2
 ------
 

data/README.md

@@ -21,7 +21,8 @@ out of their reach.
 The gem should be [up on RubyGems.org][7], it's [accompanying RubyDoc reference
 here][13], the [CHANGELOG here][21] and [all the releases here][12].
 
-If you are [feeling generous and want to contribute, feel free][9].
+If you are [feeling generous and want to contribute, feel free][9]. See [current
+contributors][19].
 
 _Ps: No 3rd party oAuth library dependencies, it handles all the oAuth flows on
 it's own so your app is one dependency less._
@@ -63,20 +64,14 @@ Initialize Pesapal object and choose the environment, there are two environments
 with the testing or the live Pesapal API.
 
 ```ruby
-# defaults to :auto
+# Sets environment intelligently to 'Rails.env' (if Rails) or :development (if non-Rails)
 pesapal = Pesapal::Merchant.new
 
-# Set to :development
+# Sets environment to :development
 pesapal = Pesapal::Merchant.new(:development)
 
-# Set to :production
+# Sets environment to :production
 pesapal = Pesapal::Merchant.new(:production)
-
-# Set to Rails environment in use
-pesapal = Pesapal::Merchant.new(Rails.env)
-
-# Set to intelligently to 'Rails.env' (if Rails) or :development (if non-Rails)
-pesapal = Pesapal::Merchant.new(:auto)
 ```
 
 ####Option 1####
@@ -242,18 +237,19 @@ _Ps: Refer to Pesapal official documentation to make sure you understand what
 data Pesapal sends to IPN and what result they expect back._
 
 
-Contributing
-------------
+Contributing & Testing
+----------------------
 
 1. Make sure you've read the [M.O. ★][14] ([blog article here][16])
 2. Especially [the part about my conventions when writing and merging new features][15]
-2. [Fork it][8]
-2. Create your feature branch (`git checkout -b BRANCH_NAME`)
-3. Commit your changes (`git commit -am 'AWESOME COMMIT MESSAGE'`)
-4. Push to the branch (`git push origin BRANCH_NAME`)
-5. Create new pull request and we can [have the conversations here][17]
-
-_Ps: See [current contributors][19]._
+3. [Fork it][8]
+4. Create your feature branch (`git checkout -b BRANCH_NAME`)
+5. Make your changes, write tests for them if necessary & run `bundle exec rspec spec`
+6. Commit your changes (`git commit -am 'AWESOME COMMIT MESSAGE'`)
+7. Push to the branch (`git push origin BRANCH_NAME`)
+8. Create new pull request and we can [have the conversations here][17]
+
+_Ps: By the time we have a conversation your [pull request tests should pass on Travis-CI][22] or if they aren't at least you know why._
 
 
 References

data/lib/pesapal/merchant.rb

@@ -41,7 +41,7 @@ module Pesapal
     public
 
       # constructor
-      def initialize(env = :auto)
+      def initialize(env = false)
         set_env env
         if defined?(Rails)
           set_configuration Rails.application.config.pesapal_credentials
@@ -82,9 +82,15 @@ module Pesapal
         query_string = Pesapal::Oauth::generate_encoded_params_query_string @params
 
         # get status response
-        response = Net::HTTP.get(URI("#{@api_endpoints[:querypaymentdetails]}?#{query_string}"))
-        response = CGI::parse(response)
-        response = response["pesapal_response_data"][0].split(',')
+        uri = URI.parse "#{@api_endpoints[:querypaymentstatus]}?#{query_string}"
+        http = Net::HTTP.new(uri.host, uri.port)
+        if @env == 'production'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        response = http.request(Net::HTTP::Get.new(uri.request_uri))
+        response = CGI::parse response.body
+        response = response['pesapal_response_data'][0].split(',')
 
         details = { :method => response[1],
                     :status => response[2],
@@ -105,19 +111,21 @@ module Pesapal
         query_string = Pesapal::Oauth::generate_encoded_params_query_string @params
 
         # get status response
-        response = Net::HTTP.get(URI("#{@api_endpoints[:querypaymentstatus]}?#{query_string}"))
-        response = CGI::parse(response)
-
-        # return the string result of what we want
-        response["pesapal_response_data"][0]
+        uri = URI.parse "#{@api_endpoints[:querypaymentstatus]}?#{query_string}"
+        http = Net::HTTP.new(uri.host, uri.port)
+        if @env == 'production'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        response = http.request(Net::HTTP::Get.new(uri.request_uri))
+        response = CGI::parse response.body
+        response['pesapal_response_data'][0]
       end
 
       # set env when called
-      def set_env(env = :auto)
+      def set_env(env = false)
         env = env.to_s.downcase
-        if env == 'development'
-          @env = 'development'
-        elsif env == 'production'
+        if env == 'production'
           @env = 'production'
         else
           @env = 'development'
@@ -130,15 +138,11 @@ module Pesapal
       def ipn_listener(notification_type, merchant_reference, transaction_tracking_id)
 
         status = query_payment_status(merchant_reference, transaction_tracking_id)
+        output = { :status => status, :response => nil }
 
-        output = { :status => status }
-
-        if status == "COMPLETED"
-          output[:response] = "pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=#{transaction_tracking_id}&pesapal_merchant_reference=#{merchant_reference}"
-        elsif status == "FAILED"
-          output[:response] = "pesapal_notification_type=CHANGE&pesapal_transaction_tracking_id=#{transaction_tracking_id}&pesapal_merchant_reference=#{merchant_reference}"
-        else
-          output[:response] = ""
+        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}"
         end
 
         output

data/lib/pesapal/version.rb

@@ -1,3 +1,3 @@
 module Pesapal
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/pesapal.gemspec

@@ -5,7 +5,7 @@ require 'pesapal/version'
 Gem::Specification.new do |spec|
   spec.name          = 'pesapal'
   spec.version       = Pesapal::VERSION
-  spec.date          = Time.new.getlocal('+03:00').strftime('%Y-%m-%d')
+  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!'

data/spec/pesapal_merchant_spec.rb

@@ -4,10 +4,27 @@ describe Pesapal::Merchant do
 
   before :each do
     @pesapal = Pesapal::Merchant.new
+    @pesapal_dev = Pesapal::Merchant.new(:development)
+    @pesapal_prod = Pesapal::Merchant.new(:production)
   end
 
   describe '#new' do
 
+    it 'sets default environment variable' do
+      @pesapal.send(:env).should == 'development'
+      @pesapal.send(:env).should_not == 'production'
+    end
+
+    it 'sets development environment variable' do
+      @pesapal_dev.send(:env).should == 'development'
+      @pesapal_dev.send(:env).should_not == 'production'
+    end
+
+    it 'sets production environment variable' do
+      @pesapal_prod.send(:env).should == 'production'
+      @pesapal_prod.send(:env).should_not == 'development'
+    end
+
     # Check if the initializer successfully sets a Pesapal::Merchant object
     it 'returns a new instance of a pesapal object' do
       @pesapal.should be_an_instance_of Pesapal::Merchant

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pesapal
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler