docdata 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4522413a11b26b3dfdfd86eba1c75266e2e75fd
-  data.tar.gz: 59ec267e42dc78db14c0ae8e24ff262198f14dc7
+  metadata.gz: 4760635525904b78d47e8390f2c371e45f316a18
+  data.tar.gz: a91306598ed4b29b5adf81eb172da822ac4e3b3e
 SHA512:
-  metadata.gz: 6e7708006984099623dd4eb12229b6913285525705e3ac6e0b398e3a7626902896e5431f1f95afb745e97201da551c10bac842b0545b6027e1331671bd46a1a8
-  data.tar.gz: 3440473688ded10b3412bc588d3dc949beba30b2a0704123a0017af786b5582951124f4d64534494e608719927ba5674e1d5d4bba2669f978605559e14200e9a
+  metadata.gz: 2ad18cf614968cb60eccb8abc1c9577462ee8b9e67bfe701d9887f092d9a42cb55da399d80ac6932578431b81b62d53ffe8fbebde142719b78349f2fb79129b6
+  data.tar.gz: 9f31c54925a1b75fd2bda0ddc6341438256a6de96817153204a7be24121470b7665a9793401a08ca1df93c4eed5fb39875eb0a351b6fe63933a95eb2c971a876

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.1.7
+* Bug fixed where the gem didn't handle docdata XML response with multiple 'payment' nodes well. The gem assumed that the nodes where in chronological order, but they aren't.
+
 ## v0.1.6
 * Bug fixed where a description contained an illegal character (& in this case)
 

data/lib/docdata/response.rb

@@ -212,12 +212,14 @@ module Docdata
     private
 
     # Sometimes a single response has multiple payment nodes. When a payment fails first and 
-    # succeeds later, for example. In that case, always use the last (== newest) node.
+    # succeeds later, for example. In that case, always use the newest (== highest id) node.
     def self.payment_node(hash)
       if hash[:payment] && hash[:payment].is_a?(Hash)
         hash[:payment]
       elsif hash[:payment] && hash[:payment].is_a?(Array)
-        hash[:payment].last
+        # use the node with the highest ID, for it is the newest
+        list = hash[:payment].sort_by { |k| k[:id] }
+        return list.last
       else
         false
       end

data/lib/docdata/version.rb

@@ -1,3 +1,3 @@
 module Docdata
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/response_spec.rb

@@ -17,7 +17,7 @@ describe Docdata::Response do
     end
   end
 
-  describe "response with multiple payment nodes" do
+  describe "response with multiple payment nodes (canceled first, paid later)" do
     before(:each) do
       file = "#{File.dirname(__FILE__)}/xml/status-paid-ideal-multiple.xml"
       @xml = open(file)
@@ -33,6 +33,23 @@ describe Docdata::Response do
     end
   end
 
+  describe "response with multiple payment nodes (paid first, canceled later)" do
+    before(:each) do
+      file = "#{File.dirname(__FILE__)}/xml/status-paid-canceled-ideal-multiple.xml"
+      @xml = open(file)
+      @response = Docdata::Response.parse(:status, @xml)
+    end    
+
+    it "returs a response object" do
+      expect(@response).to be_kind_of(Docdata::Response)
+    end
+
+    it "is paid" do
+      expect(@response.paid).to eq(true)
+    end
+  end
+
+
   describe "different payment methods" do
     context ":status, paid iDeal" do
       before(:each) do

data/spec/xml/status-paid-canceled-ideal-multiple.xml

@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='UTF-8'?>
+	<S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/">
+		<S:Body>
+			<statusResponse xmlns="http://www.docdatapayments.com/services/paymentservice/1_1/"><statusSuccess>
+				<success code="SUCCESS">Operation successful.</success>
+				<report>
+					<approximateTotals exchangedTo="EUR" exchangeRateDate="2014-09-24 09:29:54">
+						<totalRegistered>2000</totalRegistered>
+						<totalShopperPending>0</totalShopperPending>
+						<totalAcquirerPending>0</totalAcquirerPending>
+						<totalAcquirerApproved>2000</totalAcquirerApproved>
+						<totalCaptured>2000</totalCaptured>
+						<totalRefunded>0</totalRefunded>
+						<totalChargedback>0</totalChargedback>
+					</approximateTotals>
+					<payment>
+						<id>2502836079</id>
+						<paymentMethod>IDEAL</paymentMethod>
+						<authorization>
+							<status>AUTHORIZED</status>
+							<amount currency="EUR">2000</amount>
+							<confidenceLevel>ACQUIRER_APPROVED</confidenceLevel>
+							<capture>
+								<status>CAPTURED</status>
+								<amount currency="EUR">2000</amount>
+							</capture>
+						</authorization>
+					</payment>
+					<payment>
+						<id>2502835583</id>
+						<paymentMethod>IDEAL</paymentMethod>
+						<authorization>
+							<status>CANCELED</status>
+							<amount currency="EUR">2000</amount>
+							<confidenceLevel></confidenceLevel>
+						</authorization>
+					</payment>
+				</report>
+			</statusSuccess>
+		</statusResponse>
+	</S:Body>
+</S:Envelope>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docdata
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Henk Meijer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -283,6 +283,7 @@ files:
 - spec/xml/status-canceled-creditcard.xml
 - spec/xml/status-canceled-ideal.xml
 - spec/xml/status-new.xml
+- spec/xml/status-paid-canceled-ideal-multiple.xml
 - spec/xml/status-paid-creditcard.xml
 - spec/xml/status-paid-ideal-multiple.xml
 - spec/xml/status-paid-ideal.xml
@@ -324,6 +325,7 @@ test_files:
 - spec/xml/status-canceled-creditcard.xml
 - spec/xml/status-canceled-ideal.xml
 - spec/xml/status-new.xml
+- spec/xml/status-paid-canceled-ideal-multiple.xml
 - spec/xml/status-paid-creditcard.xml
 - spec/xml/status-paid-ideal-multiple.xml
 - spec/xml/status-paid-ideal.xml