worldpay 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ba198883106b578590c3c123785e6f27a9382d
-  data.tar.gz: d11022746be5463e30af4feffc43bb90c103c90c
+  metadata.gz: 07921b21668dcab1eb895654f29f9a2b1e5a022c
+  data.tar.gz: 6293b0665af755ce4578af19ea3f88187cba4e49
 SHA512:
-  metadata.gz: da3a6e09dcaa2e83ce4dab76ad58f9900a31db41a2f8f45a2d13120bfc09452bf70e34c9ed2c5994286ed38926e6cf43bf756f4f6261ea5be5b3d1744144600c
-  data.tar.gz: ed5716b466076d10668658a43534c3fbdda895261f78bfd27ec20125f1bd9f8c6d61c59efe5097fb9329fb8c57ebeeb4e779c6b7cfccc1ee710facb655d41686
+  metadata.gz: ec447e561ddb4b5b9654c14667cdcec5b47a3e6ad4d1e289b5c7e1ebd9f92df736a4efe2f4bb0b227e2002b91ce68bbcff2717554eb81736b0a94b4d25e7330b
+  data.tar.gz: 8aa70abe84111a4ca22d1cee235d9014133a586e0d2f4ef2422a6d95e3879959d809f8e95dd5254a0317d3aba200be64a2a6f21f61211c2f536ad2efc3df67ac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    worldpay (1.2.6)
+    worldpay (1.2.8)
 
 GEM
   remote: https://rubygems.org/

data/lib/worldpay.rb

@@ -12,14 +12,14 @@ class Worldpay
 	@endpoint = ''
 
 	@errors = {}
-	@raise_errors = true
+	@raise_errors = false
 
 	@version = '1.2.3'
 
 	@orderTypes = ['ECOM','MOTO','RECURRING','APM']
 
 
-	def initialize(service_key='', timeout=3, raise_errors=true)
+	def initialize(service_key='', timeout=3, raise_errors=false)
 		if service_key.empty?
 			raise "Please set a Service Key"
 		else
@@ -30,35 +30,35 @@ class Worldpay
 			@endpoint = 'https://api.worldpay.com'
 
 			@errors = {
-					'ip' => 'Invalid parameters',
-					'cine' => 'php_curl was not found',
-					'to' => 'Request timed out',
-					'nf' => 'Not found',
-					'apierror' => 'API Error',
-					'uanv' => 'Worldpay is currently unavailable, please try again later',
-					'contact' => 'Error contacting Worldpay, please try again later',
-					'ssl' => 'You must enable SSL check in production mode',
-					'verify' => 'Worldpay not verifying SSL connection',
-					'orderInput' => {
-							'token' => 'No token found',
-							'orderCode' => 'No order_code entered',
-							'orderDescription' => 'No order_description found',
-							'amount' => 'No amount found, or it is not a whole number',
-							'currencyCode' => 'No currency_code found',
-							'name' => 'No name found',
-							'billingAddress' => 'No billing_address found'
-					},
-					'notificationPost' => 'Notification Error: Not a post',
-					'notificationUnknown' => 'Notification Error: Cannot be processed',
-					'capture' => {
-							'ordercode' => 'No order code entered'
-					},
-					'refund' => {
-							'ordercode' => 'No order code entered'
-					},
-					'json' => 'JSON could not be decoded',
-					'key' => 'Please enter your service key',
-					'sslerror' => 'Worldpay SSL certificate could not be validated'
+				'ip' => 'Invalid parameters',
+				'cine' => 'php_curl was not found',
+				'to' => 'Request timed out',
+				'nf' => 'Not found',
+				'apierror' => 'API Error',
+				'uanv' => 'Worldpay is currently unavailable, please try again later',
+				'contact' => 'Error contacting Worldpay, please try again later',
+				'ssl' => 'You must enable SSL check in production mode',
+				'verify' => 'Worldpay not verifying SSL connection',
+				'orderInput' => {
+								'token' => 'No token found',
+								'orderCode' => 'No order_code entered',
+								'orderDescription' => 'No order_description found',
+								'amount' => 'No amount found, or it is not a whole number',
+								'currencyCode' => 'No currency_code found',
+								'name' => 'No name found',
+								'billingAddress' => 'No billing_address found'
+				},
+				'notificationPost' => 'Notification Error: Not a post',
+				'notificationUnknown' => 'Notification Error: Cannot be processed',
+				'capture' => {
+								'ordercode' => 'No order code entered'
+				},
+				'refund' => {
+								'ordercode' => 'No order code entered'
+				},
+				'json' => 'JSON could not be decoded',
+				'key' => 'Please enter your service key',
+				'sslerror' => 'Worldpay SSL certificate could not be validated'
 			}
 			@raise_errors = raise_errors
 		end
@@ -85,7 +85,16 @@ class Worldpay
 		if (@raise_errors)
 			raise message.to_s
 		else
-			p message.to_s
+			if (code!=nil && httpStatusCode!=nil && description!=nil && customCode!=nil)
+				return {
+						'message'=>message,
+						'code'=>code,
+						'httpStatusCode'=>httpStatusCode,
+						'description'=>description,
+						'customCode'=>customCode
+				}
+			end
+			return message.to_s
 		end
 	end
 
@@ -94,7 +103,7 @@ class Worldpay
 		errors2 = []
 
 		if (!order.any?)
-			onError('ip')
+			return onError('ip')
 		end
 		if (order['token']==nil)
 			errors2 << @errors['orderInput']['token']
@@ -116,7 +125,7 @@ class Worldpay
 		end
 
 		if (errors2.length > 0)
-			onError('ip', errors2.join(', '))
+			return onError('ip', errors2.join(', '))
 		end
 	end
 
@@ -125,7 +134,7 @@ class Worldpay
 		self.checkOrderInput(order)
 
 		defaults = {
-			'orderType' => 'ECOM',  #Order Type: ECOM/MOTO/RECURRING
+			'orderType' => 'ECOM',  #Order Type: ECOM/MOTO/RECURRING/APM
 			'customerIdentifiers' => nil,
 			'billingAddress' => nil,
 			'deliveryAddress' => nil
@@ -169,11 +178,11 @@ class Worldpay
 
 		response = sendRequest('orders', request.to_json, true)
 
-		if (response['body']['orderCode'])
+		if (response['body'] && response['body']['orderCode'])
 			#success
 			return response
 		else
-			onError('apierror', response.to_s)
+			return {'response'=> response, 'error'=> onError('apierror', response.to_s)}
 		end
 
 	end
@@ -183,12 +192,12 @@ class Worldpay
 		self.checkOrderInput(order)
 
 		defaults = {
-				'deliveryAddress' => nil,
-				'billingAddress' => nil,
-				'successUrl' => nil,
-				'pendingUrl' => nil,
-				'failureUrl' => nil,
-				'cancelUrl' => nil
+			'deliveryAddress' => nil,
+			'billingAddress' => nil,
+			'successUrl' => nil,
+			'pendingUrl' => nil,
+			'failureUrl' => nil,
+			'cancelUrl' => nil
 		}
 
 		order = defaults.merge(order)
@@ -197,22 +206,22 @@ class Worldpay
 		cost_cents = fmt.split('.').join('')
 
 		request = {
-				'token' => order['token'],
-				'orderDescription' => order['orderDescription'],
-				'amount' => cost_cents,
-				'currencyCode' => order['currencyCode'],
-				'name' => order['name'],
-				'shopperEmailAddress' => order['shopperEmailAddress'],
-				'billingAddress' => order['billingAddress'],
-				'deliveryAddress' => order['deliveryAddress'],
-				'customerOrderCode' => order['customerOrderCode'],
-				'successUrl' => order['successUrl'],
-				'pendingUrl' => order['pendingUrl'],
-				'failureUrl' => order['failureUrl'],
-				'cancelUrl' => order['cancelUrl'],
-				'statementNarrative' => order['statementNarrative'],
-				'settlementCurrency' => order['settlementCurrency'],
-				'customerIdentifiers' => order['customerIdentifiers'].present? ? JSON.parse(order['customerIdentifiers']) : nil,
+			'token' => order['token'],
+			'orderDescription' => order['orderDescription'],
+			'amount' => cost_cents,
+			'currencyCode' => order['currencyCode'],
+			'name' => order['name'],
+			'shopperEmailAddress' => order['shopperEmailAddress'],
+			'billingAddress' => order['billingAddress'],
+			'deliveryAddress' => order['deliveryAddress'],
+			'customerOrderCode' => order['customerOrderCode'],
+			'successUrl' => order['successUrl'],
+			'pendingUrl' => order['pendingUrl'],
+			'failureUrl' => order['failureUrl'],
+			'cancelUrl' => order['cancelUrl'],
+			'statementNarrative' => order['statementNarrative'],
+			'settlementCurrency' => order['settlementCurrency'],
+			'customerIdentifiers' => order['customerIdentifiers'].present? ? JSON.parse(order['customerIdentifiers']) : nil,
 		}
 
 		response = sendRequest('orders', request.to_json, true)
@@ -221,7 +230,7 @@ class Worldpay
 			#success
 			return response
 		else
-			onError('apierror', response.to_s)
+			return onError('apierror', response.to_s)
 		end
 
 	end
@@ -230,22 +239,22 @@ class Worldpay
 		authorize3DSOrder(orderCode, responseCode, threeDsInfo)
 	end
 	def authorize3DSOrder(orderCode, responseCode, threeDsInfo)
-			request = {
-					'threeDSResponseCode' => responseCode,
-					'shopperSessionId' => threeDsInfo['shopperSessionId'],
-					'shopperAcceptHeader' => threeDsInfo['shopperAcceptHeader'],
-					'shopperUserAgent' => threeDsInfo['shopperUserAgent'],
-					'shopperIpAddress' => threeDsInfo['shopperIpAddress']
-			}
+		request = {
+			'threeDSResponseCode' => responseCode,
+			'shopperSessionId' => threeDsInfo['shopperSessionId'],
+			'shopperAcceptHeader' => threeDsInfo['shopperAcceptHeader'],
+			'shopperUserAgent' => threeDsInfo['shopperUserAgent'],
+			'shopperIpAddress' => threeDsInfo['shopperIpAddress']
+		}
 
-			response = sendRequest('orders/'+orderCode, request.to_json, true, 'PUT')
+		response = sendRequest('orders/'+orderCode, request.to_json, true, 'PUT')
 
-			if (response['body']['orderCode'])
-					#success
-					return response
-			else
-					onError('apierror', response.to_s)
-			end
+		if (response['body']['orderCode'])
+			#success
+			return response
+		else
+			return onError('apierror', response.to_s)
+		end
 	end
 
 	#Capture Authorized Worldpay Order
@@ -256,7 +265,7 @@ class Worldpay
 		if (orderCode || orderCode.is_a?(String))
 			#
 		else
-			onError('ip', @errors['capture']['ordercode'])
+			return onError('ip', @errors['capture']['ordercode'])
 		end
 
 		if (amount && amount.is_a?(Integer))
@@ -274,7 +283,7 @@ class Worldpay
 		if (orderCode || orderCode.is_a?(String))
 			#
 		else
-			onError('ip', @errors['capture']['ordercode'])
+			return onError('ip', @errors['capture']['ordercode'])
 		end
 
 		sendRequest('orders/'+orderCode, false, false, 'DELETE')
@@ -283,7 +292,7 @@ class Worldpay
 	#Refund Worldpay order
 	def refundOrder(orderCode=false, amount=false)
 		if (orderCode==false || orderCode!=orderCode.to_s)
-			onError('ip', @errors['refund']['ordercode'])
+			return onError('ip', @errors['refund']['ordercode'])
 		end
 		if (amount!=false)
 			json = {'refundAmount'=>amount}.to_json
@@ -339,35 +348,35 @@ class Worldpay
 		end
 
 		if (expectResponse && !response.present?)
-				onError('uanv', @errors['json'], 503);
+			return onError('uanv', @errors['json'], 503);
 		end
 
 		if (response && response["httpStatusCode"].present?)
 
 			if (response["httpStatusCode"] != '200')
-					onError(
-							false,
-							response["message"],
-							result.code,
-							response['httpStatusCode'],
-							response['description'],
-							response['customCode']
-					)
+				return onError(
+					false,
+					response["message"],
+					result.code,
+					response['httpStatusCode'],
+					response['description'],
+					response['customCode']
+				)
 			end
 		elsif (expectResponse && result.code != '200')
 			# If we expect a result and we have an error
-			onError('uanv', @errors['json'], 503)
+			return onError('uanv', @errors['json'], 503)
 		elsif (!expectResponse)
-				if (result.code != '200')
-						onError('apierror', result.read_body, result.code)
-				else
-						response = true
-				end
+			if (result.code != '200')
+				return onError('apierror', result.read_body, result.code)
+			else
+				response = true
+			end
 		end
 
 		return {
-				"code"=>result.code,
-				"body"=>response
+			"code"=>result.code,
+			"body"=>response
 		}
 
 	end
@@ -381,12 +390,11 @@ class Worldpay
 	#Get card details from Worldpay token
 	def getStoredCardDetails(token=false)
 		if (token==false || token!=token.to_s)
-			onError('ip', @errors['orderInput']['token'])
+			return onError('ip', @errors['orderInput']['token'])
 		end
 
 		response = sendRequest('tokens/'+token, false, true, 'GET')
 
-
 		if (response['body']['paymentMethod'])
 			return response['body']['paymentMethod']
 		else
@@ -397,13 +405,13 @@ class Worldpay
 
 	def getOrder(orderCode = false)
 		if (orderCode==false || !orderCode.present?)
-			onError('ip', @errors['orderInput']['orderCode']);
+			return onError('ip', @errors['orderInput']['orderCode']);
 		end
 
 		response = sendRequest('orders/' + orderCode, false, true, 'GET');
 
 		if (!response['body']['orderCode'].present?)
-				onError('apierror')
+			return onError('apierror')
 		end
 
 		return response

data/worldpay.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "worldpay"
-  spec.version       = "1.2.7"
+  spec.version       = "1.2.8"
   spec.authors       = ["Andrew Odendaal, Paul Beckford"]
   spec.email         = ["andrew.odendaal@worldpay.com"]
   spec.summary       = %q{online.worldpay.com ruby lib.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldpay
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Andrew Odendaal, Paul Beckford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,6 @@ files:
 - lib/worldpay.rb
 - test/test_helper.rb
 - test/worldpay_test.rb
-- worldpay-1.2.5.gem
 - worldpay.gemspec
 homepage: https://online.worldpay.com
 licenses: