sepa 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd5c07cd152f52e2d13b0d3cd2a00f95b40bba4
-  data.tar.gz: 093bbd122e64de202f074c905bb2edd48b224b92
+  metadata.gz: 316f7e846361f530cd610c4a7855b4a4d5caedc7
+  data.tar.gz: c21e65546b876eb0f243c0aa35c79cf425142d18
 SHA512:
-  metadata.gz: d9740f6b8caea5a9bd4564f59deedbcd1519bda122c1e18623bcf1d358e24e8e37812a0c20835e4eb53ba6bcefed9e990c4f900e382aa5c5cdf54421ea8bc88b
-  data.tar.gz: 51e20a22ec96071c1ed5bfcf45bd301e0c1373a840d422fb980304d7d2ef57662ac00f46180897a09265556dd3b40b1bca4179154cd284a7dfa28b66e51a60ea
+  metadata.gz: 17cb2181595f131b274636a22cef58f1dab35d4efe0534cd98462d10a9852e3e474cd715998a06fee7eec7394ab3dca938a418c22159a47a036178b5aa5c1188
+  data.tar.gz: bd89541c1a0b919301ba8fb6d4aecad8d54193f7344789a11b277c715fad849a529f0e7a069cc803406067e6ae59aac27308b6d9a35bdd463a59adb6d258bc97

data/README.md

@@ -73,8 +73,18 @@ a message-id.
 The last line returns a string that you will then need to send to your bank one way or another. For example, you might use an EBICS client. Or your bank might provide
 software to send the file. Or perhaps you can upload it via their website.
 
+If your bank expects a particular time format, do this (for example)
+
+    Sepa::Base.time_format = "%Y-%m-%dT%H:%M:%SZ" # btw, this is the default value
+
+This sets a class variable, which is effectively a global, non-thread-safe variable, so this might change in the future, in case we need to support usage where multiple clients need to generate XML with different time format requirements.
+
 ## History
 
+0.0.17
+* Use 'NOTPROVIDED' instead of BIC (requirement from ABN-AMRO Netherlands) (thanks @joostkuif)
+* Support various ruby kinds of number (thanks @TheConstructor)
+* Configurable time format string for time elements (so far, only CstmrDrctDbtInitn/GrpHdr/CreDtTm)
 0.0.16 BigDecimal to avoid floating-point rounding errors (w/thanks to @joostkuif), support RemittanceInformation (w/thanks to @TheConstructor)
 0.0.15 Ruby 1.8.7 compatibility
 
@@ -91,4 +101,4 @@ Other message types are totally welcome.
 ## Contributors
 
 Author: [Conan Dalton](http://www.conandalton.net), aka [conanite](https://github.com/conanite)
-With thanks to [corny](https://github.com/corny), [TheConstructor](https://github.com/TheConstructor), [joostkuif](https://github.com/joostkuif)
+With thanks to [corny](https://github.com/corny), [TheConstructor](https://github.com/TheConstructor), [joostkuif](https://github.com/joostkuif), [digineo](https://github.com/digineo)

data/lib/sepa/base.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-require 'bigdecimal'
 module Sepa
   class Base
     include Aduki::Initializer
 
+    @@time_format = "%Y-%m-%dT%H:%M:%SZ"
     @@attribute_defs = Hash.new { |h,k| h[k] = [] }
 
     def build_xml_attributes names
@@ -19,9 +19,12 @@ module Sepa
     end
 
     def normalize str
-      return str if str.is_a? Fixnum
-      return ("%.2f" % str) if str.is_a? Float
-      return ("%.2f" % str) if str.is_a? BigDecimal
+      # Integer like Fixnum and Bignum can directly be returned
+      return str if str.is_a? Integer
+      # Check for Numeric to exclude String, but handle Float, BigDecimal, Rational, ... we don't mind.
+      # Kernel#sprintf could handle all to_f implementers, if to_f does not throw an exception
+      return ('%.2f' % str) if str.is_a?(Numeric) && str.respond_to?(:to_f)
+      # For String we need to replace illegal characters by an appropriate alternative
       replacements = {
           'à' => 'a', 'é' => 'e', 'è' => 'e',
           'û' => 'u', 'î' => 'i', 'ô' => 'o', 'ü' => 'u', 'ï' => 'i', 'ö' => 'o',
@@ -29,7 +32,7 @@ module Sepa
           'À' => 'A', 'Á' => 'A', 'Ü' => 'U', 'Ï' => 'I', 'Ö' => 'O', 'ß' => 'ss'
       }
       str = replacements.to_a.
-        inject(str) { |s, kv| s.gsub(kv[0], kv[1]) }.
+        inject(str.to_s) { |s, kv| s.gsub(kv[0], kv[1]) }.
         gsub(/[^a-zA-Z0-9_@ \.,()'+\/\?-]/, '')
     end
 
@@ -50,7 +53,7 @@ module Sepa
             end
           end
         elsif meta[:type] == Time
-          v = item.is_a?(String) ? item : item.strftime("%Y-%m-%dT%H:%M:%SZ")
+          v = item.is_a?(String) ? item : item.strftime(@@time_format)
           builder.__send__(meta[:tag], v, attributes)
         elsif meta[:type] == Date
           v = item.is_a?(String) ? item : item.strftime("%Y-%m-%d")
@@ -99,5 +102,9 @@ module Sepa
       attr_accessor name
       aduki(name => member_type) if member_type
     end
+
+    def self.time_format= new_format
+      @@time_format = new_format
+    end
   end
 end

data/lib/sepa/direct_debit_order.rb

@@ -236,8 +236,13 @@ class Sepa::DirectDebitOrder
     def to_properties prefix, opts
       bic_tag = ( opts[:pain_008_001_version] == "04" ? "bic_fi" : "bic" )
 
-      { "#{prefix}_account.identification.iban"                           => iban.gsub(/\s/, ''),
-        "#{prefix}_agent.financial_institution_identification.#{bic_tag}" => swift }
+      if swift.nil?
+        { "#{prefix}_account.identification.iban"                                     => iban.gsub(/\s/, ''),
+          "#{prefix}_agent.financial_institution_identification.other.identification" => "NOTPROVIDED" }
+      else
+        { "#{prefix}_account.identification.iban"                           => iban.gsub(/\s/, ''),
+          "#{prefix}_agent.financial_institution_identification.#{bic_tag}" => swift }
+      end
     end
   end
 

data/lib/sepa/payments_initiation/financial_identification_scheme_name_1_choice.rb

@@ -0,0 +1,7 @@
+class Sepa::PaymentsInitiation::FinancialIdentificationSchemeName1Choice < Sepa::Base
+  code_or_proprietary
+
+  def empty?
+    [code, proprietary].join.strip == ""
+  end
+end

data/lib/sepa/payments_initiation/financial_institution_identification.rb

@@ -1,4 +1,5 @@
 require "sepa/payments_initiation/postal_address"
+require "sepa/payments_initiation/generic_financial_identification_1"
 
 class Sepa::PaymentsInitiation::FinancialInstitutionIdentification < Sepa::Base
   definition "Unique and unambiguous identification of a financial institution, as assigned under an internationally recognised or proprietary identification scheme."
@@ -6,5 +7,5 @@ class Sepa::PaymentsInitiation::FinancialInstitutionIdentification < Sepa::Base
   attribute :bic,    "BIC"
   attribute :name,   "Nm"
   attribute :postal_address, "PstlAdr", Sepa::PaymentsInitiation::PostalAddress
-
+  attribute :other, "Othr", Sepa::PaymentsInitiation::GenericFinancialIdentification1
 end

data/lib/sepa/payments_initiation/generic_financial_identification_1.rb

@@ -0,0 +1,12 @@
+require 'sepa/payments_initiation/financial_identification_scheme_name_1_choice'
+
+class Sepa::PaymentsInitiation::GenericFinancialIdentification1 < Sepa::Base
+  definition "Unique identification of an agent, as assigned by an institution, using an identification scheme."
+  attribute :identification, "Id"
+  attribute :scheme_name   , "SchmeNm", Sepa::PaymentsInitiation::FinancialIdentificationSchemeName1Choice
+  attribute :issuer        , "Issr"
+
+  def empty?
+    [identification, issuer].join.strip == '' && (scheme_name == nil || scheme_name.empty?)
+  end
+end

data/lib/sepa/version.rb

@@ -1,3 +1,3 @@
 module Sepa
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/sepa/direct_debit_order_spec.rb

@@ -2,27 +2,44 @@
 
 require "spec_helper"
 require "time"
+require 'bigdecimal'
+require 'rational'
 
 describe Sepa::DirectDebitOrder do
 
-  def order sepa_identifier_class, remittance_information = false
+  AMOUNTS = {
+      :Float => [1231.31, 1133.33, 1732.32, 1034.34, 1935.35, 1236.36, 1235.42, 1236.78],
+      :BigDecimal => [BigDecimal.new('1231.31'), BigDecimal.new('1133.33'), BigDecimal.new('1732.32'), BigDecimal.new('1034.34'), BigDecimal.new('1935.35'), BigDecimal.new('1236.36'), BigDecimal.new('1235.42'), BigDecimal.new('1236.78')],
+      :Rational => [Rational(123131, 100), Rational(113333, 100), Rational(173232, 100), Rational(103434, 100), Rational(193535, 100), Rational(123636, 100), Rational(123542, 100), Rational(123678, 100)],
+  }
+
+
+  def order sepa_identifier_class, numeric_class = :Float, remittance_information = false
+    amounts = AMOUNTS[numeric_class]
+
     bank_account0 = Sepa::DirectDebitOrder::BankAccount.new "FRZIZIPAPARAZZI345789", "FRZZPPKOOKOO"
     debtor0 = Sepa::DirectDebitOrder::Party.new "DALTON/CONANMR", "64, Livva de Getamire", nil, "30005", "RENNES", "France", "Conan DALTON", "01234567890", "conan@dalton.sepa.i.hope.this.works"
     mandate0 = Sepa::DirectDebitOrder::MandateInformation.new("mandate-id-0", Date.parse("2010-11-18"), "RCUR")
-    dd00 = Sepa::DirectDebitOrder::DirectDebit.new debtor0, bank_account0, "MONECOLE REG F13789 PVT 3", 1231.31, "EUR", mandate0, remittance_information ? "Transaction 3" : nil
-    dd01 = Sepa::DirectDebitOrder::DirectDebit.new debtor0, bank_account0, "MONECOLE REG F13791 PVT 3", 1133.33, "EUR", mandate0, remittance_information ? "We take your money" : nil
+    dd00 = Sepa::DirectDebitOrder::DirectDebit.new debtor0, bank_account0, "MONECOLE REG F13789 PVT 3", amounts[0], "EUR", mandate0, remittance_information ? "Transaction 3" : nil
+    dd01 = Sepa::DirectDebitOrder::DirectDebit.new debtor0, bank_account0, "MONECOLE REG F13791 PVT 3", amounts[1], "EUR", mandate0, remittance_information ? "We take your money" : nil
 
     bank_account1 = Sepa::DirectDebitOrder::BankAccount.new "FRQUIQUIWIGWAM947551", "FRQQWIGGA"
     debtor1 = Sepa::DirectDebitOrder::Party.new "ADAMS/SAMUELMR", "256, Livva de Getamire", nil, "75048", "BERLIN", "Germany", "Samuel ADAMS", "09876543210", "samuel@adams.sepa.i.hope.this.works"
     mandate1 = Sepa::DirectDebitOrder::MandateInformation.new("mandate-id-1", Date.parse("2012-01-19"), "FRST")
-    dd10 = Sepa::DirectDebitOrder::DirectDebit.new debtor1, bank_account1, "MONECOLE REG F13790 PVT 3", 1732.32, "EUR", mandate1, remittance_information ? "An important transaction" : nil
-    dd11 = Sepa::DirectDebitOrder::DirectDebit.new debtor1, bank_account1, "MONECOLE REG F13792 PVT 3", 1034.34, "EUR", mandate1, remittance_information ? "Thank you, for the money" : nil
+    dd10 = Sepa::DirectDebitOrder::DirectDebit.new debtor1, bank_account1, "MONECOLE REG F13790 PVT 3", amounts[2], "EUR", mandate1, remittance_information ? "An important transaction" : nil
+    dd11 = Sepa::DirectDebitOrder::DirectDebit.new debtor1, bank_account1, "MONECOLE REG F13792 PVT 3", amounts[3], "EUR", mandate1, remittance_information ? "Thank you, for the money" : nil
 
     bank_account2 = Sepa::DirectDebitOrder::BankAccount.new "  FR QU IQ UI WI GW\tAM   947 551  ", "FRQQWIGGA"
     debtor2 = Sepa::DirectDebitOrder::Party.new "Mr. James Joyce", "512, Livva de Meet Agir", nil, "75099", "LONDON", "Angleterre", "Johann S. BACH", "09876543210", "js@bach.sepa.i.hope.this.works"
     mandate2 = Sepa::DirectDebitOrder::MandateInformation.new("mandate-id-2", Date.parse("2013-06-08"), "RCUR")
-    dd20 = Sepa::DirectDebitOrder::DirectDebit.new debtor2, bank_account2, "MONECOLE REG F13793 PVT 3", 1935.35, "EUR", mandate2, remittance_information ? "Another one" : nil
-    dd21 = Sepa::DirectDebitOrder::DirectDebit.new debtor2, bank_account2, "MONECOLE REG F13794 PVT 3", 1236.36, "EUR", mandate2, remittance_information ? "Final transaction" : nil
+    dd20 = Sepa::DirectDebitOrder::DirectDebit.new debtor2, bank_account2, "MONECOLE REG F13793 PVT 3", amounts[4], "EUR", mandate2, remittance_information ? "Another one" : nil
+    dd21 = Sepa::DirectDebitOrder::DirectDebit.new debtor2, bank_account2, "MONECOLE REG F13794 PVT 3", amounts[5], "EUR", mandate2, remittance_information ? "Final transaction" : nil
+
+    bank_account3 = Sepa::DirectDebitOrder::BankAccount.new "NLQUIQUIWIGWAM947551", nil
+    debtor3 = Sepa::DirectDebitOrder::Party.new "R Epelsteeltje", "Spuistraat 42", nil, "75099", "Amsterdam", "Netherlands", "Ron Epelsteeltje", "01234567890", "ron@epelsteeltje.sepa.i.hope.this.works"
+    mandate3 = Sepa::DirectDebitOrder::MandateInformation.new("mandate-id-3", Date.parse("2014-01-23"), "RCUR")
+    dd30 = Sepa::DirectDebitOrder::DirectDebit.new debtor3, bank_account3, "MONECOLE REG F13795 PVT 3", amounts[6], "EUR", mandate3
+    dd31 = Sepa::DirectDebitOrder::DirectDebit.new debtor3, bank_account3, "MONECOLE REG F13796 PVT 3", amounts[7], "EUR", mandate3
 
     sepa_now = Time.local(1992, 2, 28, 18, 30, 0, 0, 0)
     Time.stub(:now).and_return sepa_now
@@ -30,7 +47,7 @@ describe Sepa::DirectDebitOrder do
     creditor = Sepa::DirectDebitOrder::Party.new "Mon École", "3, Livva de Getamire", nil, "75022", "Paris", "Frankreich", "M. le Directeur", "+33 999 999 999", "directeur@monecole.softify.com"
     creditor_account = Sepa::DirectDebitOrder::BankAccount.new "FRGOO GOOY ADDA 9999 999", "FRGGYELLOW99"
     sepa_identifier = sepa_identifier_class.new "FR123ZZZ010203"
-    payment = Sepa::DirectDebitOrder::CreditorPayment.new creditor, creditor_account, "MONECOLE_PAYMENTS_20130703", Date.parse("2013-07-10"), sepa_identifier, [dd00, dd01, dd10, dd11, dd20, dd21]
+    payment = Sepa::DirectDebitOrder::CreditorPayment.new creditor, creditor_account, "MONECOLE_PAYMENTS_20130703", Date.parse("2013-07-10"), sepa_identifier, [dd00, dd01, dd10, dd11, dd20, dd21, dd30, dd31]
 
     initiator = Sepa::DirectDebitOrder::Party.new "SOFTIFY SARL", "289, Livva de Getamire", nil, "75021", "Paris", "FR", "M. Le Gérant", "+33 111 111 111", "gerant@softify.bigbang"
 
@@ -46,8 +63,26 @@ describe Sepa::DirectDebitOrder do
     xml.should == expected
   end
 
+  it "should produce v02 xml corresponding to the given inputs and BigDecimal amounts" do
+    o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier, :BigDecimal
+    xml = o.to_xml :pain_008_001_version => "02"
+    xml = check_doc_header_02 xml
+    expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v02.xml", __FILE__))
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
+    xml.should == expected
+  end
+
+  it "should produce v02 xml corresponding to the given inputs and Rational amounts" do
+    o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier, :Rational
+    xml = o.to_xml :pain_008_001_version => "02"
+    xml = check_doc_header_02 xml
+    expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v02.xml", __FILE__))
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
+    xml.should == expected
+  end
+
   it "should produce v02 xml corresponding to the given inputs with unstructured remittance information" do
-    o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier, true
+    o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier, :Float, true
     xml = o.to_xml :pain_008_001_version => "02"
     xml = check_doc_header_02 xml
     expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v02_with_remittance_information.xml", __FILE__))
@@ -64,6 +99,24 @@ describe Sepa::DirectDebitOrder do
     xml.should == expected
   end
 
+  it "should produce v04 xml corresponding to the given inputs and BigDecimal amounts" do
+    o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier, :BigDecimal
+    xml = o.to_xml :pain_008_001_version => "04"
+    xml = check_doc_header_04 xml
+    expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v04.xml", __FILE__))
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
+    xml.should == expected
+  end
+
+  it "should produce v04 xml corresponding to the given inputs and Rational amounts" do
+    o = order Sepa::DirectDebitOrder::PrivateSepaIdentifier, :Rational
+    xml = o.to_xml :pain_008_001_version => "04"
+    xml = check_doc_header_04 xml
+    expected = File.read(File.expand_path("../expected_customer_direct_debit_initiation_v04.xml", __FILE__))
+    expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
+    xml.should == expected
+  end
+
   it "should produce v04 xml corresponding to the given inputs with an organisation identifier for the creditor" do
     o = order Sepa::DirectDebitOrder::OrganisationSepaIdentifier
     xml = o.to_xml :pain_008_001_version => "04"

data/spec/sepa/expected-grphdr-time-format.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Document>
+  <CstmrDrctDbtInitn>
+    <GrpHdr>
+      <CreDtTm>1992-02-28T18:30</CreDtTm>
+    </GrpHdr>
+  </CstmrDrctDbtInitn>
+</Document>

data/spec/sepa/expected_customer_direct_debit_initiation_v02.xml

@@ -4,8 +4,8 @@
     <GrpHdr>
       <MsgId>MSG0001</MsgId>
       <CreDtTm>1992-02-28T18:30:00Z</CreDtTm>
-      <NbOfTxs>6</NbOfTxs>
-      <CtrlSum>8303.01</CtrlSum>
+      <NbOfTxs>8</NbOfTxs>
+      <CtrlSum>10775.21</CtrlSum>
       <InitgPty>
         <Nm>SOFTIFY SARL</Nm>
       </InitgPty>
@@ -120,8 +120,8 @@
     <PmtInf>
       <PmtInfId>MONECOLE_PAYMENTS_20130703-RCUR</PmtInfId>
       <PmtMtd>DD</PmtMtd>
-      <NbOfTxs>4</NbOfTxs>
-      <CtrlSum>5536.35</CtrlSum>
+      <NbOfTxs>6</NbOfTxs>
+      <CtrlSum>8008.55</CtrlSum>
       <PmtTpInf>
         <SvcLvl>
           <Cd>SEPA</Cd>
@@ -281,6 +281,70 @@
           </Id>
         </DbtrAcct>
       </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13795 PVT 3</EndToEndId>
+        </PmtId>
+        <InstdAmt Ccy="EUR">1235.42</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+            <AdrLine>75099 Amsterdam</AdrLine>
+          </PstlAdr>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13796 PVT 3</EndToEndId>
+        </PmtId>
+        <InstdAmt Ccy="EUR">1236.78</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+            <AdrLine>75099 Amsterdam</AdrLine>
+          </PstlAdr>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
     </PmtInf>
   </CstmrDrctDbtInitn>
 </Document>

data/spec/sepa/expected_customer_direct_debit_initiation_v02_with_remittance_information.xml

@@ -4,8 +4,8 @@
     <GrpHdr>
       <MsgId>MSG0001</MsgId>
       <CreDtTm>1992-02-28T18:30:00Z</CreDtTm>
-      <NbOfTxs>6</NbOfTxs>
-      <CtrlSum>8303.01</CtrlSum>
+      <NbOfTxs>8</NbOfTxs>
+      <CtrlSum>10775.21</CtrlSum>
       <InitgPty>
         <Nm>SOFTIFY SARL</Nm>
       </InitgPty>
@@ -126,8 +126,8 @@
     <PmtInf>
       <PmtInfId>MONECOLE_PAYMENTS_20130703-RCUR</PmtInfId>
       <PmtMtd>DD</PmtMtd>
-      <NbOfTxs>4</NbOfTxs>
-      <CtrlSum>5536.35</CtrlSum>
+      <NbOfTxs>6</NbOfTxs>
+      <CtrlSum>8008.55</CtrlSum>
       <PmtTpInf>
         <SvcLvl>
           <Cd>SEPA</Cd>
@@ -299,6 +299,70 @@
           <Ustrd>Final transaction</Ustrd>
         </RmtInf>
       </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13795 PVT 3</EndToEndId>
+        </PmtId>
+        <InstdAmt Ccy="EUR">1235.42</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+            <AdrLine>75099 Amsterdam</AdrLine>
+          </PstlAdr>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13796 PVT 3</EndToEndId>
+        </PmtId>
+        <InstdAmt Ccy="EUR">1236.78</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+            <AdrLine>75099 Amsterdam</AdrLine>
+          </PstlAdr>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
     </PmtInf>
   </CstmrDrctDbtInitn>
 </Document>

data/spec/sepa/expected_customer_direct_debit_initiation_v04.xml

@@ -4,8 +4,8 @@
     <GrpHdr>
       <MsgId>MSG0001</MsgId>
       <CreDtTm>1992-02-28T18:30:00Z</CreDtTm>
-      <NbOfTxs>6</NbOfTxs>
-      <CtrlSum>8303.01</CtrlSum>
+      <NbOfTxs>8</NbOfTxs>
+      <CtrlSum>10775.21</CtrlSum>
       <InitgPty>
         <Nm>SOFTIFY SARL</Nm>
         <PstlAdr>
@@ -24,8 +24,8 @@
     <PmtInf>
       <PmtInfId>MONECOLE_PAYMENTS_20130703</PmtInfId>
       <PmtMtd>DD</PmtMtd>
-      <NbOfTxs>6</NbOfTxs>
-      <CtrlSum>8303.01</CtrlSum>
+      <NbOfTxs>8</NbOfTxs>
+      <CtrlSum>10775.21</CtrlSum>
       <PmtTpInf>
         <SvcLvl>
           <Cd>SEPA</Cd>
@@ -304,6 +304,88 @@
           </Id>
         </DbtrAcct>
       </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13795 PVT 3</EndToEndId>
+        </PmtId>
+        <PmtTpInf>
+          <SeqTp>RCUR</SeqTp>
+        </PmtTpInf>
+        <InstdAmt Ccy="EUR">1235.42</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <PstCd>75099</PstCd>
+            <TwnNm>Amsterdam</TwnNm>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+          </PstlAdr>
+          <CtctDtls>
+            <Nm>Ron Epelsteeltje</Nm>
+            <PhneNb>01234567890</PhneNb>
+            <EmailAdr>ron@epelsteeltje.sepa.i.hope.this.works</EmailAdr>
+          </CtctDtls>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13796 PVT 3</EndToEndId>
+        </PmtId>
+        <PmtTpInf>
+          <SeqTp>RCUR</SeqTp>
+        </PmtTpInf>
+        <InstdAmt Ccy="EUR">1236.78</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <PstCd>75099</PstCd>
+            <TwnNm>Amsterdam</TwnNm>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+          </PstlAdr>
+          <CtctDtls>
+            <Nm>Ron Epelsteeltje</Nm>
+            <PhneNb>01234567890</PhneNb>
+            <EmailAdr>ron@epelsteeltje.sepa.i.hope.this.works</EmailAdr>
+          </CtctDtls>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
     </PmtInf>
   </CstmrDrctDbtInitn>
 </Document>

data/spec/sepa/expected_customer_direct_debit_initiation_v04_with_org_id.xml

@@ -4,8 +4,8 @@
     <GrpHdr>
       <MsgId>MSG0001</MsgId>
       <CreDtTm>1992-02-28T18:30:00Z</CreDtTm>
-      <NbOfTxs>6</NbOfTxs>
-      <CtrlSum>8303.01</CtrlSum>
+      <NbOfTxs>8</NbOfTxs>
+      <CtrlSum>10775.21</CtrlSum>
       <InitgPty>
         <Nm>SOFTIFY SARL</Nm>
         <PstlAdr>
@@ -24,8 +24,8 @@
     <PmtInf>
       <PmtInfId>MONECOLE_PAYMENTS_20130703</PmtInfId>
       <PmtMtd>DD</PmtMtd>
-      <NbOfTxs>6</NbOfTxs>
-      <CtrlSum>8303.01</CtrlSum>
+      <NbOfTxs>8</NbOfTxs>
+      <CtrlSum>10775.21</CtrlSum>
       <PmtTpInf>
         <SvcLvl>
           <Cd>SEPA</Cd>
@@ -304,6 +304,88 @@
           </Id>
         </DbtrAcct>
       </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13795 PVT 3</EndToEndId>
+        </PmtId>
+        <PmtTpInf>
+          <SeqTp>RCUR</SeqTp>
+        </PmtTpInf>
+        <InstdAmt Ccy="EUR">1235.42</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <PstCd>75099</PstCd>
+            <TwnNm>Amsterdam</TwnNm>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+          </PstlAdr>
+          <CtctDtls>
+            <Nm>Ron Epelsteeltje</Nm>
+            <PhneNb>01234567890</PhneNb>
+            <EmailAdr>ron@epelsteeltje.sepa.i.hope.this.works</EmailAdr>
+          </CtctDtls>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>MONECOLE REG F13796 PVT 3</EndToEndId>
+        </PmtId>
+        <PmtTpInf>
+          <SeqTp>RCUR</SeqTp>
+        </PmtTpInf>
+        <InstdAmt Ccy="EUR">1236.78</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>mandate-id-3</MndtId>
+            <DtOfSgntr>2014-01-23</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <Othr>
+              <Id>NOTPROVIDED</Id>
+            </Othr>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>R Epelsteeltje</Nm>
+          <PstlAdr>
+            <PstCd>75099</PstCd>
+            <TwnNm>Amsterdam</TwnNm>
+            <Ctry>NL</Ctry>
+            <AdrLine>Spuistraat 42</AdrLine>
+          </PstlAdr>
+          <CtctDtls>
+            <Nm>Ron Epelsteeltje</Nm>
+            <PhneNb>01234567890</PhneNb>
+            <EmailAdr>ron@epelsteeltje.sepa.i.hope.this.works</EmailAdr>
+          </CtctDtls>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>NLQUIQUIWIGWAM947551</IBAN>
+          </Id>
+        </DbtrAcct>
+      </DrctDbtTxInf>
     </PmtInf>
   </CstmrDrctDbtInitn>
 </Document>

data/spec/sepa/payments_initiation/financial_identification_scheme_name_1_choice_spec.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+
+describe Sepa::PaymentsInitiation::FinancialIdentificationSchemeName1Choice do
+  it "should be empty by default" do
+    Sepa::PaymentsInitiation::FinancialIdentificationSchemeName1Choice.new({ }).should be_empty
+  end
+end

data/spec/sepa/payments_initiation/generic_financial_identification_1_spec.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+require 'spec_helper'
+
+describe Sepa::PaymentsInitiation::GenericFinancialIdentification1 do
+  it "should be empty by default" do
+    Sepa::PaymentsInitiation::GenericFinancialIdentification1.new({ }).should be_empty
+  end
+end

data/spec/sepa/payments_initiation/pain00800104/customer_direct_debit_initiation_spec.rb

@@ -81,4 +81,21 @@ describe Sepa::PaymentsInitiation::Pain00800104::CustomerDirectDebitInitiation d
     expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
     xml.should == expected
   end
+
+  it "should format time using configured time_format" do
+    short_props = {
+      "group_header.creation_date_time"                                        => Time.new(1992, 02, 28, 18, 30, 22)
+    }
+
+    begin
+      Sepa::Base.time_format = "%Y-%m-%dT%H:%M"
+      xml = Sepa::PaymentsInitiation::Pain00800104::CustomerDirectDebitInitiation.new(short_props).generate_xml(:pain_008_001_version => '04')
+      xml = check_doc_header_04 xml
+      expected = File.read(File.expand_path("../../../expected-grphdr-time-format.xml", __FILE__))
+      expected.force_encoding(Encoding::UTF_8) if expected.respond_to? :force_encoding
+      xml.should == expected
+    ensure
+      Sepa::Base.time_format = "%Y-%m-%dT%H:%M:%SZ"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sepa
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -107,8 +107,10 @@ files:
 - lib/sepa/payments_initiation/cash_account_type_choice.rb
 - lib/sepa/payments_initiation/category_purpose_choice.rb
 - lib/sepa/payments_initiation/contact_details.rb
+- lib/sepa/payments_initiation/financial_identification_scheme_name_1_choice.rb
 - lib/sepa/payments_initiation/financial_institution_identification.rb
 - lib/sepa/payments_initiation/generic_account_identification.rb
+- lib/sepa/payments_initiation/generic_financial_identification_1.rb
 - lib/sepa/payments_initiation/generic_organisation_identification_1.rb
 - lib/sepa/payments_initiation/generic_person_identification_1.rb
 - lib/sepa/payments_initiation/local_instrument_choice.rb
@@ -140,11 +142,14 @@ files:
 - sepa.gemspec
 - spec/sepa/direct_debit_order_spec.rb
 - spec/sepa/direct_debit_properties.yml
+- spec/sepa/expected-grphdr-time-format.xml
 - spec/sepa/expected-simple.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v02.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v02_with_remittance_information.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v04.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v04_with_org_id.xml
+- spec/sepa/payments_initiation/financial_identification_scheme_name_1_choice_spec.rb
+- spec/sepa/payments_initiation/generic_financial_identification_1_spec.rb
 - spec/sepa/payments_initiation/pain00800104/customer_direct_debit_initiation_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/conanite/sepa
@@ -175,10 +180,13 @@ summary: 'pain.008.001.04 and pain.008.001.02 CustomerDirectDebitInitiation ISO2
 test_files:
 - spec/sepa/direct_debit_order_spec.rb
 - spec/sepa/direct_debit_properties.yml
+- spec/sepa/expected-grphdr-time-format.xml
 - spec/sepa/expected-simple.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v02.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v02_with_remittance_information.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v04.xml
 - spec/sepa/expected_customer_direct_debit_initiation_v04_with_org_id.xml
+- spec/sepa/payments_initiation/financial_identification_scheme_name_1_choice_spec.rb
+- spec/sepa/payments_initiation/generic_financial_identification_1_spec.rb
 - spec/sepa/payments_initiation/pain00800104/customer_direct_debit_initiation_spec.rb
 - spec/spec_helper.rb