sepa_king 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 770829019aef0e261d784bff74bba479c2bc629d5b5cd29fd8ed5987dd3f2a36
-  data.tar.gz: 2929b12cc5c35646e0991f1747e8d329b1d88293bad2ed0d1ddc0f4c0c90522c
+  metadata.gz: 90e4af1e7d2d11456cc48e339006078182b067cd6a2c49c3314ba296fc295fc3
+  data.tar.gz: f224fa0fcd711759b1b56baf53c78b1bf5b8f90f1828ced8a6ce7dc21ad80e0c
 SHA512:
-  metadata.gz: f78107df5faad7d6cd0f71ceeefcc8ed385aba409aab707c6d7552530d425cdad7d33fd5f4e9087236ea68d57c1b35888a29f9ffc176802c36e7c459afa2a6b0
-  data.tar.gz: 2d42905a7c00c9d5daa8fd64a4eaa6018c3210b542d935a962beab83e035b6ec227501c5bfa847645382381dbca5c953eea68c7df547dab53454af92083cb4f6
+  metadata.gz: 9d8c42503c8bc1e42669d624376b74b741797824b3115e2314152f7340ab2d5740850db08bc6c7cf81afa6bfd4fba66237e41003c00803f7c7adae1215a437ff
+  data.tar.gz: 21174103026c3987e78a71703124bb41be4fd8e19098c02a519ed8cc8d9524da593295531557ae4104a3fcc2f7a40ababde3bac23042f9b2735aa031556427c0

data/README.md

@@ -130,11 +130,17 @@ sdd.add_transaction(
     creditor_identifier: 'NL53ZZZ091734220000'
   )
 
-  # OPTIONAL: Specify the country & address of the debtor (REQUIRED for SEPA debits outside of EU)
+  # OPTIONAL: Specify the country & address of the debtor (REQUIRED for SEPA debits outside of EU. The individually required fields depend on the target country)
   debtor_address: SEPA::DebtorAddress.new(
     country_code:        'CH',
+    # Not required if individual fields are used
     address_line1:       'Mustergasse 123a',
     address_line2:       '1234 Musterstadt'
+    # Not required if address_line1 and address_line2 are used
+    street_name:         'Mustergasse',
+    building_number:     '123a',
+    post_code:           '1234',
+    town_name:           'Musterstadt'
   )
 )
 sdd.add_transaction ...
@@ -210,6 +216,23 @@ sct.add_transaction(
   #   'SEPA' ("SEPA-Zahlung")
   #   'URGP' ("Taggleiche Eilüberweisung")
   service_level: 'URGP'
+
+  # OPTIONAL: Unstructured information to indicate the purpose of the payment
+  # String, max. 4 char
+  category_purpose:         'SALA',
+
+  # OPTIONAL: Specify the country & address of the creditor (REQUIRED for SEPA debits outside of EU. The individually required fields depend on the target country)
+  creditor_address: SEPA::CreditorAddress.new(
+    country_code:        'CH',
+    # Not required if individual fields are used
+    address_line1:       'Mustergasse 123a',
+    address_line2:       '1234 Musterstadt'
+    # Not required if address_line1 and address_line2 are used
+    street_name:         'Mustergasse',
+    building_number:     '123a',
+    post_code:           '1234',
+    town_name:           'Musterstadt'
+  )
 )
 sct.add_transaction ...
 

data/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/lib/sepa_king/account/creditor_address.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+module SEPA
+  class CreditorAddress
+    include ActiveModel::Validations
+    extend Converter
+
+    attr_accessor :street_name,
+                  :building_number,
+                  :post_code,
+                  :town_name,
+                  :country_code,
+                  :address_line1,
+                  :address_line2
+
+    convert :street_name,     to: :text
+    convert :building_number, to: :text
+    convert :post_code,       to: :text
+    convert :town_name,       to: :text
+    convert :country_code,    to: :text
+    convert :address_line1,   to: :text
+    convert :address_line2,   to: :text
+
+    validates_length_of :street_name,     maximum: 70
+    validates_length_of :building_number, maximum: 16
+    validates_length_of :post_code,       maximum: 16
+    validates_length_of :town_name,       maximum: 35
+    validates_length_of :country_code,    is: 2
+    validates_length_of :address_line1,   maximum: 70
+    validates_length_of :address_line2,   maximum: 70
+
+    def initialize(attributes = {})
+      attributes.each do |name, value|
+        public_send("#{name}=", value)
+      end
+    end
+  end
+end

data/lib/sepa_king/account/debtor_address.rb

@@ -4,15 +4,29 @@ module SEPA
     include ActiveModel::Validations
     extend Converter
 
-    attr_accessor :country_code, :address_line1, :address_line2
+    attr_accessor :street_name,
+                  :building_number,
+                  :post_code,
+                  :town_name,
+                  :country_code,
+                  :address_line1,
+                  :address_line2
 
-    convert :country_code, to: :text
-    convert :address_line1, to: :text
-    convert :address_line2, to: :text
+    convert :street_name,     to: :text
+    convert :building_number, to: :text
+    convert :post_code,       to: :text
+    convert :town_name,       to: :text
+    convert :country_code,    to: :text
+    convert :address_line1,   to: :text
+    convert :address_line2,   to: :text
 
-    validates_length_of :country_code, is: 2
-    validates_length_of :address_line1, maximum: 70
-    validates_length_of :address_line2, maximum: 70
+    validates_length_of :street_name,     maximum: 70
+    validates_length_of :building_number, maximum: 16
+    validates_length_of :post_code,       maximum: 16
+    validates_length_of :town_name,       maximum: 35
+    validates_length_of :country_code,    is: 2
+    validates_length_of :address_line1,   maximum: 70
+    validates_length_of :address_line2,   maximum: 70
 
     def initialize(attributes = {})
       attributes.each do |name, value|

data/lib/sepa_king/error.rb

@@ -0,0 +1,4 @@
+module SEPA
+  class Error < RuntimeError
+  end
+end

data/lib/sepa_king/message/credit_transfer.rb

@@ -12,7 +12,8 @@ module SEPA
     def transaction_group(transaction)
       { requested_date: transaction.requested_date,
         batch_booking:  transaction.batch_booking,
-        service_level:  transaction.service_level
+        service_level:  transaction.service_level,
+        category_purpose: transaction.category_purpose
       }
     end
 
@@ -27,8 +28,15 @@ module SEPA
           builder.NbOfTxs(transactions.length)
           builder.CtrlSum('%.2f' % amount_total(transactions))
           builder.PmtTpInf do
-            builder.SvcLvl do
-              builder.Cd(group[:service_level])
+            if group[:service_level]
+              builder.SvcLvl do
+                builder.Cd(group[:service_level])
+              end
+            end
+            if group[:category_purpose]
+              builder.CtgyPurp do
+                builder.Cd(group[:category_purpose])
+              end
             end
           end
           builder.ReqdExctnDt(group[:requested_date].iso8601)
@@ -80,6 +88,44 @@ module SEPA
         end
         builder.Cdtr do
           builder.Nm(transaction.name)
+          if transaction.creditor_address
+            builder.PstlAdr do
+              # Only set the fields that are actually provided.
+              # StrtNm, BldgNb, PstCd, TwnNm provide a structured address
+              # separated into its individual fields.
+              # AdrLine provides the address in free format text.
+              # Both are currently allowed and the actual preference depends on the bank.
+              # Also the fields that are required legally may vary depending on the country
+              # or change over time.
+              if transaction.creditor_address.street_name
+                builder.StrtNm transaction.creditor_address.street_name
+              end
+
+              if transaction.creditor_address.building_number
+                builder.BldgNb transaction.creditor_address.building_number
+              end
+
+              if transaction.creditor_address.post_code
+                builder.PstCd transaction.creditor_address.post_code
+              end
+
+              if transaction.creditor_address.town_name
+                builder.TwnNm transaction.creditor_address.town_name
+              end
+
+              if transaction.creditor_address.country_code
+                builder.Ctry transaction.creditor_address.country_code
+              end
+
+              if transaction.creditor_address.address_line1
+                builder.AdrLine transaction.creditor_address.address_line1
+              end
+
+              if transaction.creditor_address.address_line2
+                builder.AdrLine transaction.creditor_address.address_line2
+              end
+            end
+          end
         end
         builder.CdtrAcct do
           builder.Id do

data/lib/sepa_king/message/direct_debit.rb

@@ -111,6 +111,9 @@ module SEPA
                 builder.PrvtId do
                   builder.Othr do
                     builder.Id(transaction.original_creditor_account.creditor_identifier)
+                    builder.SchmeNm do
+                      builder.Prtry('SEPA')
+                    end
                   end
                 end
               end
@@ -151,9 +154,40 @@ module SEPA
           builder.Nm(transaction.name)
           if transaction.debtor_address
             builder.PstlAdr do
-              builder.Ctry transaction.debtor_address.country_code
-              builder.AdrLine transaction.debtor_address.address_line1
-              builder.AdrLine transaction.debtor_address.address_line2
+              # Only set the fields that are actually provided.
+              # StrtNm, BldgNb, PstCd, TwnNm provide a structured address
+              # separated into its individual fields.
+              # AdrLine provides the address in free format text.
+              # Both are currently allowed and the actual preference depends on the bank.
+              # Also the fields that are required legally may vary depending on the country
+              # or change over time.
+              if transaction.debtor_address.street_name
+                builder.StrtNm transaction.debtor_address.street_name
+              end
+
+              if transaction.debtor_address.building_number
+                builder.BldgNb transaction.debtor_address.building_number
+              end
+
+              if transaction.debtor_address.post_code
+                builder.PstCd transaction.debtor_address.post_code
+              end
+
+              if transaction.debtor_address.town_name
+                builder.TwnNm transaction.debtor_address.town_name
+              end
+
+              if transaction.debtor_address.country_code
+                builder.Ctry transaction.debtor_address.country_code
+              end
+
+              if transaction.debtor_address.address_line1
+                builder.AdrLine transaction.debtor_address.address_line1
+              end
+
+              if transaction.debtor_address.address_line2
+                builder.AdrLine transaction.debtor_address.address_line2
+              end
             end
           end
         end

data/lib/sepa_king/message.rb

@@ -38,17 +38,20 @@ module SEPA
 
     # @return [String] xml
     def to_xml(schema_name=self.known_schemas.first)
-      raise RuntimeError.new(errors.full_messages.join("\n")) unless valid?
-      raise RuntimeError.new("Incompatible with schema #{schema_name}!") unless schema_compatible?(schema_name)
-
-      builder = Builder::XmlMarkup.new indent: 2
-      builder.instruct!
-      builder.Document(xml_schema(schema_name)) do
-        builder.__send__(xml_main_tag) do
-          build_group_header(builder)
-          build_payment_informations(builder)
+      raise SEPA::Error.new(errors.full_messages.join("\n")) unless valid?
+      raise SEPA::Error.new("Incompatible with schema #{schema_name}!") unless schema_compatible?(schema_name)
+
+      builder = Nokogiri::XML::Builder.new do |builder|
+        builder.Document(xml_schema(schema_name)) do
+          builder.__send__(xml_main_tag) do
+            build_group_header(builder)
+            build_payment_informations(builder)
+          end
         end
       end
+
+      validate_final_document!(builder.doc, schema_name)
+      builder.to_xml
     end
 
     def amount_total(selected_transactions=transactions)
@@ -68,10 +71,10 @@ module SEPA
 
     # Set unique identifer for the message
     def message_identification=(value)
-      raise ArgumentError.new('mesage_identification must be a string!') unless value.is_a?(String)
+      raise ArgumentError.new('message_identification must be a string!') unless value.is_a?(String)
 
       regex = /\A([A-Za-z0-9]|[\+|\?|\/|\-|\:|\(|\)|\.|\,|\'|\ ]){1,35}\z/
-      raise ArgumentError.new("mesage_identification does not match #{regex}!") unless value.match(regex)
+      raise ArgumentError.new("message_identification does not match #{regex}!") unless value.match(regex)
 
       @message_identification = value
     end
@@ -81,6 +84,22 @@ module SEPA
       @message_identification ||= "SEPA-KING/#{SecureRandom.hex(11)}"
     end
 
+    # Set creation date time for the message
+    # p.s. Rabobank in the Netherlands only accepts the more restricted format [0-9]{4}[-][0-9]{2,2}[-][0-9]{2,2}[T][0-9]{2,2}[:][0-9]{2,2}[:][0-9]{2,2}
+    def creation_date_time=(value)
+      raise ArgumentError.new('creation_date_time must be a string!') unless value.is_a?(String)
+
+      regex = /[0-9]{4}[-][0-9]{2,2}[-][0-9]{2,2}(?:\s|T)[0-9]{2,2}[:][0-9]{2,2}[:][0-9]{2,2}/
+      raise ArgumentError.new("creation_date_time does not match #{regex}!") unless value.match(regex)
+
+      @creation_date_time = value
+    end
+
+    # Get creation date time for the message (with fallback to Time.now.iso8601)
+    def creation_date_time
+      @creation_date_time ||= Time.now.iso8601
+    end
+
     # Returns the id of the batch to which the given transaction belongs
     # Identified based upon the reference of the transaction
     def batch_id(transaction_reference)
@@ -106,7 +125,7 @@ module SEPA
     def build_group_header(builder)
       builder.GrpHdr do
         builder.MsgId(message_identification)
-        builder.CreDtTm(Time.now.iso8601)
+        builder.CreDtTm(creation_date_time)
         builder.NbOfTxs(transactions.length)
         builder.CtrlSum('%.2f' % amount_total)
         builder.InitgPty do
@@ -131,5 +150,11 @@ module SEPA
     def transaction_group(transaction)
       transaction
     end
+
+    def validate_final_document!(document, schema_name)
+      xsd = Nokogiri::XML::Schema(File.read(File.expand_path("../../../lib/schema/#{schema_name}.xsd", __FILE__)))
+      errors = xsd.validate(document).map { |error| error.message }
+      raise SEPA::Error.new("Incompatible with schema #{schema_name}: #{errors.join(', ')}") if errors.any?
+    end
   end
 end

data/lib/sepa_king/transaction/credit_transfer_transaction.rb

@@ -1,21 +1,24 @@
 # encoding: utf-8
 module SEPA
   class CreditTransferTransaction < Transaction
-    attr_accessor :service_level
+    attr_accessor :service_level,
+                  :creditor_address,
+                  :category_purpose
 
-    validates_inclusion_of :service_level, :in => %w(SEPA URGP)
+    validates_inclusion_of :service_level, :in => %w(SEPA URGP), :allow_nil => true
+    validates_length_of :category_purpose, within: 1..4, allow_nil: true
 
     validate { |t| t.validate_requested_date_after(Date.today) }
 
     def initialize(attributes = {})
       super
-      self.service_level ||= 'SEPA'
+      self.service_level ||= 'SEPA' if self.currency == 'EUR'
     end
 
     def schema_compatible?(schema_name)
       case schema_name
       when PAIN_001_001_03
-        self.service_level == 'SEPA'
+        !self.service_level || (self.service_level == 'SEPA' && self.currency == 'EUR')
       when PAIN_001_002_03
         self.bic.present? && self.service_level == 'SEPA' && self.currency == 'EUR'
       when PAIN_001_003_03

data/lib/sepa_king/transaction/direct_debit_transaction.rb

@@ -4,7 +4,15 @@ module SEPA
     SEQUENCE_TYPES = %w(FRST OOFF RCUR FNAL)
     LOCAL_INSTRUMENTS = %w(CORE COR1 B2B)
 
-    attr_accessor :mandate_id, :mandate_date_of_signature, :local_instrument, :sequence_type, :creditor_account, :original_debtor_account, :same_mandate_new_debtor_agent, :original_creditor_account, :debtor_address
+    attr_accessor :mandate_id,
+                  :mandate_date_of_signature,
+                  :local_instrument,
+                  :sequence_type,
+                  :creditor_account,
+                  :original_debtor_account,
+                  :same_mandate_new_debtor_agent,
+                  :original_creditor_account,
+                  :debtor_address
 
     validates_with MandateIdentifierValidator, field_name: :mandate_id, message: "%{value} is invalid"
     validates_presence_of :mandate_date_of_signature

data/lib/sepa_king/transaction.rb

@@ -6,7 +6,18 @@ module SEPA
 
     DEFAULT_REQUESTED_DATE = Date.new(1999, 1, 1).freeze
 
-    attr_accessor :name, :iban, :bic, :amount, :instruction, :reference, :remittance_information, :requested_date, :batch_booking, :currency, :debtor_address
+    attr_accessor :name,
+                  :iban,
+                  :bic,
+                  :amount,
+                  :instruction,
+                  :reference,
+                  :remittance_information,
+                  :requested_date,
+                  :batch_booking,
+                  :currency,
+                  :debtor_address,
+                  :creditor_address
 
     convert :name, :instruction, :reference, :remittance_information, to: :text
     convert :amount, to: :decimal

data/lib/sepa_king/version.rb

@@ -1,3 +1,3 @@
 module SEPA
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/lib/sepa_king.rb

@@ -1,14 +1,16 @@
 require 'active_model'
 require 'bigdecimal'
-require 'builder'
+require 'nokogiri'
 require 'iban-tools'
 
+require 'sepa_king/error'
 require 'sepa_king/converter'
 require 'sepa_king/validator'
 require 'sepa_king/account'
 require 'sepa_king/account/debtor_account'
 require 'sepa_king/account/debtor_address'
 require 'sepa_king/account/creditor_account'
+require 'sepa_king/account/creditor_address'
 require 'sepa_king/transaction'
 require 'sepa_king/transaction/direct_debit_transaction'
 require 'sepa_king/transaction/credit_transfer_transaction'

data/sepa_king.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.2'
 
   s.add_runtime_dependency 'activemodel', '>= 3.1'
-  s.add_runtime_dependency 'builder'
+  s.add_runtime_dependency 'nokogiri'
   s.add_runtime_dependency 'iban-tools'
 
   s.add_development_dependency 'bundler'
@@ -29,5 +29,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'nokogiri'
 end

data/spec/credit_transfer_spec.rb

@@ -38,7 +38,60 @@ describe SEPA::CreditTransfer do
       it 'should fail' do
         expect {
           SEPA::CreditTransfer.new.to_xml
-        }.to raise_error(RuntimeError)
+        }.to raise_error(SEPA::Error)
+      end
+    end
+
+    context 'setting creditor address with adrline' do
+      subject do
+        sct = SEPA::CreditTransfer.new name: 'Schuldner GmbH',
+                                       iban: 'DE87200500001234567890'
+
+        sca = SEPA::CreditorAddress.new country_code:  'CH',
+                                        address_line1: 'Mustergasse 123',
+                                        address_line2: '1234 Musterstadt'
+
+        sct.add_transaction name:                   'Telekomiker AG',
+                            bic:                    'PBNKDEFF370',
+                            iban:                   'DE37112589611964645802',
+                            amount:                 102.50,
+                            reference:              'XYZ-1234/123',
+                            remittance_information: 'Rechnung vom 22.08.2013',
+                            creditor_address:       sca
+
+        sct
+      end
+
+      it 'should validate against pain.001.003.01' do
+        expect(subject.to_xml(SEPA::PAIN_001_003_03)).to validate_against('pain.001.003.03.xsd')
+      end
+    end
+
+    context 'setting creditor address with structured fields' do
+      subject do
+        sct = SEPA::CreditTransfer.new name: 'Schuldner GmbH',
+                                       iban: 'DE87200500001234567890',
+                                       bic:  'BANKDEFFXXX'
+
+        sca = SEPA::CreditorAddress.new country_code:    'CH',
+                                        street_name:     'Mustergasse',
+                                        building_number: '123',
+                                        post_code:       '1234',
+                                        town_name:       'Musterstadt'
+
+        sct.add_transaction name:                   'Telekomiker AG',
+                            bic:                    'PBNKDEFF370',
+                            iban:                   'DE37112589611964645802',
+                            amount:                 102.50,
+                            reference:              'XYZ-1234/123',
+                            remittance_information: 'Rechnung vom 22.08.2013',
+                            creditor_address:       sca
+
+        sct
+      end
+
+      it 'should validate against pain.001.001.01' do
+        expect(subject.to_xml(SEPA::PAIN_001_001_03)).to validate_against('pain.001.001.03.xsd')
       end
     end
 
@@ -65,13 +118,13 @@ describe SEPA::CreditTransfer do
         it 'should fail for pain.001.001.03' do
           expect {
             subject.to_xml(SEPA::PAIN_001_001_03)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
 
         it 'should fail for pain.001.002.03' do
           expect {
             subject.to_xml(SEPA::PAIN_001_002_03)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
       end
 
@@ -248,6 +301,7 @@ describe SEPA::CreditTransfer do
           sct.add_transaction(credit_transfer_transaction.merge requested_date: Date.today + 1, batch_booking: true,  amount: 2)
           sct.add_transaction(credit_transfer_transaction.merge requested_date: Date.today + 2, batch_booking: false, amount: 4)
           sct.add_transaction(credit_transfer_transaction.merge requested_date: Date.today + 2, batch_booking: true,  amount: 8)
+          sct.add_transaction(credit_transfer_transaction.merge requested_date: Date.today + 2, batch_booking: true, category_purpose: 'SALA',  amount: 6)
 
           sct.to_xml
         end
@@ -264,6 +318,9 @@ describe SEPA::CreditTransfer do
 
           expect(subject).to have_xml('//Document/CstmrCdtTrfInitn/PmtInf[4]/ReqdExctnDt', (Date.today + 2).iso8601)
           expect(subject).to have_xml('//Document/CstmrCdtTrfInitn/PmtInf[4]/BtchBookg', 'true')
+
+          expect(subject).to have_xml('//Document/CstmrCdtTrfInitn/PmtInf[5]/ReqdExctnDt', (Date.today + 2).iso8601)
+          expect(subject).to have_xml('//Document/CstmrCdtTrfInitn/PmtInf[5]/PmtTpInf/CtgyPurp/Cd', 'SALA')
         end
 
         it 'should have multiple control sums' do
@@ -324,13 +381,13 @@ describe SEPA::CreditTransfer do
         it 'should fail for pain.001.002.03' do
           expect {
             subject.to_xml(SEPA::PAIN_001_002_03)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
 
         it 'should fail for pain.001.003.03' do
           expect {
             subject.to_xml(SEPA::PAIN_001_003_03)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
       end
 
@@ -352,7 +409,7 @@ describe SEPA::CreditTransfer do
         it 'should fail for pain.001.002.03' do
           expect {
             subject.to_xml(SEPA::PAIN_001_002_03)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
 
         it 'should validate against pain.001.003.03' do

data/spec/credit_transfer_transaction_spec.rb

@@ -55,4 +55,14 @@ describe SEPA::CreditTransferTransaction do
       expect(SEPA::CreditTransferTransaction).not_to accept(Date.new(1995,12,21), Date.today - 1, for: :requested_date)
     end
   end
+
+  context 'Category Purpose' do
+    it 'should allow valid value' do
+      expect(SEPA::CreditTransferTransaction).to accept(nil, 'SALA', 'X' * 4, for: :category_purpose)
+    end
+
+    it 'should not allow invalid value' do
+      expect(SEPA::CreditTransferTransaction).not_to accept('', 'X' * 5, for: :category_purpose)
+    end
+  end
 end

data/spec/direct_debit_spec.rb

@@ -70,19 +70,19 @@ describe SEPA::DirectDebit do
       it 'should fail' do
         expect {
           SEPA::DirectDebit.new.to_xml
-        }.to raise_error(RuntimeError)
+        }.to raise_error(SEPA::Error)
       end
     end
 
-    context 'setting debtor address' do
+    context 'setting debtor address with adrline' do
       subject do
         sdd = SEPA::DirectDebit.new name:                'Gläubiger GmbH',
                                     iban:                'DE87200500001234567890',
                                     creditor_identifier: 'DE98ZZZ09999999999'
 
-        sda = SEPA::DebtorAddress.new country_code:           'CH',
-                                address_line1:                'Mustergasse 123',
-                                address_line2:                '1234 Musterstadt'
+        sda = SEPA::DebtorAddress.new country_code:  'CH',
+                                      address_line1: 'Mustergasse 123',
+                                      address_line2: '1234 Musterstadt'
 
         sdd.add_transaction name:                      'Zahlemann & Söhne GbR',
                             bic:                       'SPUEDE2UXXX',
@@ -102,6 +102,36 @@ describe SEPA::DirectDebit do
       end
     end
 
+    context 'setting debtor address with structured fields' do
+      subject do
+        sdd = SEPA::DirectDebit.new name:                'Gläubiger GmbH',
+                                    iban:                'DE87200500001234567890',
+                                    creditor_identifier: 'DE98ZZZ09999999999'
+
+        sda = SEPA::DebtorAddress.new country_code:    'CH',
+                                      street_name:     'Mustergasse',
+                                      building_number: '123',
+                                      post_code:       '1234',
+                                      town_name:       'Musterstadt'
+
+        sdd.add_transaction name:                      'Zahlemann & Söhne GbR',
+                            bic:                       'SPUEDE2UXXX',
+                            iban:                      'DE21500500009876543210',
+                            amount:                    39.99,
+                            reference:                 'XYZ/2013-08-ABO/12345',
+                            remittance_information:    'Unsere Rechnung vom 10.08.2013',
+                            mandate_id:                'K-02-2011-12345',
+                            debtor_address:            sda,
+                            mandate_date_of_signature: Date.new(2011,1,25)
+
+        sdd
+      end
+
+      it 'should validate against pain.008.001.02' do
+        expect(subject.to_xml(SEPA::PAIN_008_001_02)).to validate_against('pain.008.001.02.xsd')
+      end
+    end
+
     context 'for valid creditor' do
       context 'without BIC (IBAN-only)' do
         subject do
@@ -128,7 +158,7 @@ describe SEPA::DirectDebit do
         it 'should fail for pain.008.002.02' do
           expect {
             subject.to_xml(SEPA::PAIN_008_002_02)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
 
         it 'should validate against pain.008.001.02' do
@@ -229,10 +259,6 @@ describe SEPA::DirectDebit do
           expect(subject).to validate_against('pain.008.003.02.xsd')
         end
 
-        it 'should have message_identification' do
-          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/GrpHdr/MsgId', message_id_regex)
-        end
-
         it 'should have creditor identifier' do
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/GrpHdr/InitgPty/Id/OrgId/Othr/Id', direct_debit.account.creditor_identifier)
         end
@@ -359,7 +385,7 @@ describe SEPA::DirectDebit do
         it 'should raise error on XML generation' do
           expect {
             subject.to_xml
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
       end
 
@@ -498,6 +524,19 @@ describe SEPA::DirectDebit do
         end
       end
 
+      context 'with large message identification' do
+        subject do
+          sct = direct_debit
+          sct.message_identification = 'A' * 35
+          sct.add_transaction(direct_debt_transaction.merge(instruction: '1234/ABC'))
+          sct
+        end
+
+        it 'should fail as the payment identification becomes too large' do
+          expect { subject.to_xml }.to raise_error(SEPA::Error)
+        end
+      end
+
       context 'with a different currency given' do
         subject do
           sct = direct_debit
@@ -523,13 +562,13 @@ describe SEPA::DirectDebit do
         it 'should fail for pain.008.002.02' do
           expect {
             subject.to_xml(SEPA::PAIN_008_002_02)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
 
         it 'should fail for pain.008.003.02' do
           expect {
             subject.to_xml(SEPA::PAIN_008_003_02)
-          }.to raise_error(RuntimeError)
+          }.to raise_error(SEPA::Error)
         end
       end
     end

data/spec/message_spec.rb

@@ -85,4 +85,44 @@ describe SEPA::Message do
       end
     end
   end
+
+describe :creation_date_time do
+    subject { DummyMessage.new }
+
+    describe 'getter' do
+      it 'should return Time.now.iso8601' do
+        expect(subject.creation_date_time).to eq(Time.now.iso8601)
+      end
+    end
+
+    describe 'setter' do
+      it 'should accept date time strings' do
+        ['2017-01-05T12:28:52', '2017-01-05T12:28:52Z', '2017-01-05 12:28:52', '2017-01-05T12:28:52+01:00'].each do |valid_dt|
+          subject.creation_date_time = valid_dt
+          expect(subject.creation_date_time).to eq(valid_dt)
+        end
+      end
+
+      it 'should deny invalid string' do
+        [ 'an arbitrary string',
+          ''
+        ].each do |arg|
+          expect {
+            subject.creation_date_time = arg
+          }.to raise_error(ArgumentError)
+        end
+      end
+
+      it 'should deny argument other than String' do
+        [ 123,
+          nil,
+          :foo
+        ].each do |arg|
+          expect {
+            subject.creation_date_time = arg
+          }.to raise_error(ArgumentError)
+        end
+      end
+    end
+  end
 end

data/spec/transaction_spec.rb

@@ -27,18 +27,51 @@ describe SEPA::Transaction do
   end
 
   context 'Adress' do
-    it 'should accept valid value' do
-      expect(SEPA::Transaction).to accept(SEPA::DebtorAddress.new(
-        country_code: "CH",
-        address_line1: "Musterstrasse 123",
-        address_line2: "1234 Musterstadt"
-      ), for: :debtor_address)
+    context 'with address_line' do
+      it 'should accept valid value' do
+        expect(SEPA::Transaction).to accept(SEPA::DebtorAddress.new(
+          country_code: "CH",
+          address_line1: "Musterstrasse 123",
+          address_line2: "1234 Musterstadt"
+        ), for: :debtor_address)
+      end
+
+      it 'should accept valid value' do
+        expect(SEPA::Transaction).to accept(SEPA::CreditorAddress.new(
+          country_code: "CH",
+          address_line1: "Musterstrasse 123",
+          address_line2: "1234 Musterstadt"
+        ), for: :creditor_address)
+      end
+    end
+
+    context 'with individual address fields' do
+      it 'should accept valid value' do
+        expect(SEPA::Transaction).to accept(SEPA::DebtorAddress.new(
+          country_code: "CH",
+          street_name:     'Mustergasse',
+          building_number: '123',
+          post_code:       '1234',
+          town_name:       'Musterstadt'
+        ), for: :debtor_address)
+      end
+
+      it 'should accept valid value' do
+        expect(SEPA::Transaction).to accept(SEPA::CreditorAddress.new(
+          country_code: "CH",
+          street_name:     'Mustergasse',
+          building_number: '123',
+          post_code:       '1234',
+          town_name:       'Musterstadt'
+        ), for: :creditor_address)
+      end
     end
 
     it 'should not accept invalid value' do
       expect(SEPA::Transaction).not_to accept('', {} , for: :name)
     end
   end
+
   context 'IBAN' do
     it 'should accept valid value' do
       expect(SEPA::Transaction).to accept('DE21500500009876543210', 'PL61109010140000071219812874', for: :iban)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_king
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,25 +123,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Implemention of pain.001.002.03 and pain.008.002.02 (ISO 20022)
 email:
 - gl@salesking.eu
 - mail@georg-ledermann.de
-executables: []
+executables:
+- rake
 extensions: []
 extra_rdoc_files: []
 files:
@@ -153,6 +140,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/rake
 - gemfiles/Gemfile-activemodel-3.1.x
 - gemfiles/Gemfile-activemodel-3.2.x
 - gemfiles/Gemfile-activemodel-4.0.x
@@ -170,9 +158,11 @@ files:
 - lib/sepa_king.rb
 - lib/sepa_king/account.rb
 - lib/sepa_king/account/creditor_account.rb
+- lib/sepa_king/account/creditor_address.rb
 - lib/sepa_king/account/debtor_account.rb
 - lib/sepa_king/account/debtor_address.rb
 - lib/sepa_king/converter.rb
+- lib/sepa_king/error.rb
 - lib/sepa_king/message.rb
 - lib/sepa_king/message/credit_transfer.rb
 - lib/sepa_king/message/direct_debit.rb
@@ -225,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby gem for creating SEPA XML files