worldpay 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20cbed5cfe20208a51c49208f69b27822c694495
-  data.tar.gz: ababe1423feb1bf1cc424685522f5f3c5edaa7fa
+  metadata.gz: e92644d37cb8da4444775fd15e0baa0499324e37
+  data.tar.gz: 05d4eb59966c00ca06031043c3afe56f398a2454
 SHA512:
-  metadata.gz: b7c34cd032e0ce74db5ef717048eb35fd40b600723202a50f2875d70643d7ca9eebacd180445ac3e752e4385e0e2dc18165b8510e92cd9cf361d6eccc29447bf
-  data.tar.gz: ccad3df3e536835d4a50babf774459a878c6f4fb1517a503dd87ed255d20de35380a23d85d6bda0c37080ab0ed20806d35535130572bcb914475e1b3f858c86a
+  metadata.gz: 4d768380d5dd922350c15793d05d91e0c8aaf38fe19f44a6617c6a76b9627301cdf4e4987e408b37c47e0c0ef5438cf941c48b161d59e35396535839e6933558
+  data.tar.gz: 027ffd22c1f2ab8e4af06c5891c12f53bc0439cf2a3b875e48d89b2fd7b5855aea6457e64740af1ca5643dd0acd2c3f18542e4e5614c4f042787455ea8a23391

data/Gemfile.lock

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

data/lib/worldpay.rb

@@ -14,7 +14,7 @@ class Worldpay
   @errors = {}
   @raise_errors = true
 
-  @version = '1.0.4'
+  @version = '1.0.5'
 
 
   def initialize(service_key='', timeout=3, raise_errors=true)
@@ -59,6 +59,11 @@ class Worldpay
   end
 
 
+  def setEndpoint(endpoint)
+      @endpoint = endpoint
+  end
+
+
   #Disable SSL Check ~ Use only for testing!
   def disableSSLCheck(disable = false)
     @disable_ssl = disable
@@ -139,19 +144,30 @@ class Worldpay
     fmt = "%05.2f" % order['amount']
     cost_cents = fmt.split('.').join('')
 
-    json = {
+    request = {
         'token' => order['token'],
         'orderDescription' => order['orderDescription'],
         'amount' => cost_cents,
+        'is3DSOrder' => order['3DS'],
         'currencyCode' => order['currencyCode'],
         'name' => order['name'],
         'orderType' => order['orderType'],
         'billingAddress' => order['billingAddress'],
         'customerOrderCode' => order['customerOrderCode'],
         'customerIdentifiers' => order['customerIdentifiers']
-    }.to_json
+    }
 
-    response = sendRequest('orders', json, true)
+    if(request['is3DSOrder'] == true)
+        threeDsInfo = {
+            'shopperIpAddress' => order['shopperIpAddress'],
+            'shopperSessionId' => order['shopperSessionId'],
+            'shopperUserAgent' => order['shopperUserAgent'],
+            'shopperAcceptHeader' => order['shopperAcceptHeader']
+        }
+        request.merge!(threeDsInfo)
+    end
+
+    response = sendRequest('orders', request.to_json, true)
 
     if (response['body']['orderCode'])
       #success
@@ -162,12 +178,36 @@ class Worldpay
 
   end
 
+  def authorise3DSOrder(orderCode, responseCode, threeDsInfo)
+      request = {
+          'threeDSResponseCode' => responseCode,
+          'shopperSessionId' => threeDsInfo['shopperSessionId'],
+          'shopperAcceptHeader' => threeDsInfo['shopperAcceptHeader'],
+          'shopperUserAgent' => threeDsInfo['shopperUserAgent'],
+          'shopperIpAddress' => threeDsInfo['shopperIpAddress']
+      }
+
+      response = sendRequest('orders/'+orderCode, request.to_json, true, 'PUT')
+
+      if (response['body']['orderCode'])
+          #success
+          return response
+      else
+          onError('apierror', response.to_s)
+      end
+  end
+
   #Refund Worldpay order
-  def refundOrder(orderCode=false)
+  def refundOrder(orderCode=false, amount=false)
     if (orderCode==false || orderCode!=orderCode.to_s)
       onError('ip', @errors['refund']['ordercode'])
     end
-    sendRequest('orders/'+orderCode+'/refund')
+    if (amount!=false)
+      json = {'refundAmount'=>amount}.to_json
+    else
+      json = false
+    end
+    sendRequest('orders/'+orderCode+'/refund', json)
   end
 
 
@@ -176,9 +216,8 @@ class Worldpay
 
   #REQUESTS
   def sendRequest(action='', json=false, expectResponse=false, method='POST')
-    url = @endpoint
+    net = Net::HTTP.new(@endpoint, '443')
 
-    net = Net::HTTP.new(url, "443")
     if (method=="POST")
       request = Net::HTTP::Post.new('/v1/'+action)
     elsif (method=="GET")
@@ -241,6 +280,7 @@ class Worldpay
 
     response = sendRequest('tokens/'+token, false, true, 'GET')
 
+
     if (response['body']['paymentMethod'])
       return response['body']['paymentMethod']
     else

data/worldpay.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldpay
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
-- Andrew Odendaal
+- Andrew Odendaal, Paul Beckford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,10 @@ files:
 - worldpay-0.0.2.gem
 - worldpay-0.0.3.gem
 - worldpay-1.0.0.gem
+- worldpay-1.0.1.gem
+- worldpay-1.0.2.gem
+- worldpay-1.0.3.gem
+- worldpay-1.0.4.gem
 - worldpay.gemspec
 homepage: https://online.worldpay.com
 licenses: