sepa_king 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06ba65debe0037b33312ef3e37e26ee1961f455e
-  data.tar.gz: 2a18cefa0543ff2e0f4d3ca80fe85188e97615a2
+SHA256:
+  metadata.gz: 770829019aef0e261d784bff74bba479c2bc629d5b5cd29fd8ed5987dd3f2a36
+  data.tar.gz: 2929b12cc5c35646e0991f1747e8d329b1d88293bad2ed0d1ddc0f4c0c90522c
 SHA512:
-  metadata.gz: dad5f9e7304d1cba1cc7e241cfd3a5a394d7ca5214a0e64194dd774fb72b10d749d44bba655152e7e92339a3496bd6b51da26da529b6012e5517165d2800cae0
-  data.tar.gz: aea41790a245876bf8659a85118034c80f5ed09f7e9d9d7080af65a0de96679f58648e2945ed309abc0d0437aa5e4545ba711e061b697f3b5c3ab4420664ea75
+  metadata.gz: f78107df5faad7d6cd0f71ceeefcc8ed385aba409aab707c6d7552530d425cdad7d33fd5f4e9087236ea68d57c1b35888a29f9ffc176802c36e7c459afa2a6b0
+  data.tar.gz: 2d42905a7c00c9d5daa8fd64a4eaa6018c3210b542d935a962beab83e035b6ec227501c5bfa847645382381dbca5c953eea68c7df547dab53454af92083cb4f6

data/.travis.yml

@@ -1,11 +1,9 @@
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 gemfile:
-  - gemfiles/Gemfile-activemodel-3.0.x
   - gemfiles/Gemfile-activemodel-3.1.x
   - gemfiles/Gemfile-activemodel-3.2.x
   - gemfiles/Gemfile-activemodel-4.0.x
@@ -13,18 +11,15 @@ gemfile:
   - gemfiles/Gemfile-activemodel-4.2.x
   - gemfiles/Gemfile-activemodel-5.0.x
   - gemfiles/Gemfile-activemodel-5.1.x
+  - gemfiles/Gemfile-activemodel-5.2.x
 matrix:
   exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-activemodel-5.1.x
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile-activemodel-5.1.x
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-activemodel-5.0.x
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile-activemodel-5.0.x
-    - rvm: 2.4.2
+    - rvm: 2.4.4
       gemfile: gemfiles/Gemfile-activemodel-4.1.x
-    - rvm: 2.4.2
+    - rvm: 2.4.4
+      gemfile: gemfiles/Gemfile-activemodel-4.2.x
+    - rvm: 2.5.1
+      gemfile: gemfiles/Gemfile-activemodel-4.1.x
+    - rvm: 2.5.1
       gemfile: gemfiles/Gemfile-activemodel-4.2.x
 sudo: false

data/README.md

@@ -23,8 +23,8 @@ BTW: **pain** is a shortcut for **Pa**yment **In**itiation.
 
 ## Requirements
 
-* Ruby 2.0.0 or newer
-* ActiveModel 3.0 or newer
+* Ruby 2.2 or newer
+* ActiveModel 3.1 or newer
 
 
 ## Installation
@@ -101,7 +101,7 @@ sdd.add_transaction(
   # Local instrument, in German "Lastschriftart"
   # One of these strings:
   #   'CORE' ("Basis-Lastschrift")
-  #   'COR1' ("Basis-Lastschrift mit verkürzter Vorlagefrist")
+  #   'COR1' ("Basis-Lastschrift mit verkürzter Vorlagefrist")
   #   'B2B' ("Firmen-Lastschrift")
   local_instrument: 'CORE',
 
@@ -129,6 +129,13 @@ sdd.add_transaction(
     iban:                'NL08RABO0135742099',
     creditor_identifier: 'NL53ZZZ091734220000'
   )
+
+  # OPTIONAL: Specify the country & address of the debtor (REQUIRED for SEPA debits outside of EU)
+  debtor_address: SEPA::DebtorAddress.new(
+    country_code:        'CH',
+    address_line1:       'Mustergasse 123a',
+    address_line2:       '1234 Musterstadt'
+  )
 )
 sdd.add_transaction ...
 

data/gemfiles/{Gemfile-activemodel-3.0.x → Gemfile-activemodel-5.2.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activemodel', '~>3.0.20'
+gem 'activemodel', '~> 5.2.0'

data/lib/sepa_king.rb

@@ -7,6 +7,7 @@ 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/transaction'
 require 'sepa_king/transaction/direct_debit_transaction'

data/lib/sepa_king/account/debtor_address.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module SEPA
+  class DebtorAddress
+    include ActiveModel::Validations
+    extend Converter
+
+    attr_accessor :country_code, :address_line1, :address_line2
+
+    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
+
+    def initialize(attributes = {})
+      attributes.each do |name, value|
+        public_send("#{name}=", value)
+      end
+    end
+  end
+end

data/lib/sepa_king/message/direct_debit.rb

@@ -84,7 +84,6 @@ module SEPA
     end
 
     def build_amendment_informations(builder, transaction)
-      return unless transaction.original_debtor_account || transaction.same_mandate_new_debtor_agent
       builder.AmdmntInd(true)
       builder.AmdmntInfDtls do
         if transaction.original_debtor_account
@@ -93,7 +92,7 @@ module SEPA
               builder.IBAN(transaction.original_debtor_account)
             end
           end
-        else
+        elsif transaction.same_mandate_new_debtor_agent
           builder.OrgnlDbtrAgt do
             builder.FinInstnId do
               builder.Othr do
@@ -102,6 +101,22 @@ module SEPA
             end
           end
         end
+        if transaction.original_creditor_account
+          builder.OrgnlCdtrSchmeId do
+            if transaction.original_creditor_account.name
+              builder.Nm(transaction.original_creditor_account.name)
+            end
+            if transaction.original_creditor_account.creditor_identifier
+              builder.Id do
+                builder.PrvtId do
+                  builder.Othr do
+                    builder.Id(transaction.original_creditor_account.creditor_identifier)
+                  end
+                end
+              end
+            end
+          end
+        end
       end
     end
 
@@ -118,7 +133,7 @@ module SEPA
           builder.MndtRltdInf do
             builder.MndtId(transaction.mandate_id)
             builder.DtOfSgntr(transaction.mandate_date_of_signature.iso8601)
-            build_amendment_informations(builder, transaction)
+            build_amendment_informations(builder, transaction) if transaction.amendment_informations?
           end
         end
         builder.DbtrAgt do
@@ -134,6 +149,13 @@ module SEPA
         end
         builder.Dbtr do
           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
+            end
+          end
         end
         builder.DbtrAcct do
           builder.Id do

data/lib/sepa_king/transaction.rb

@@ -6,7 +6,8 @@ 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
+    attr_accessor :name, :iban, :bic, :amount, :instruction, :reference, :remittance_information, :requested_date, :batch_booking, :currency, :debtor_address
+
     convert :name, :instruction, :reference, :remittance_information, to: :text
     convert :amount, to: :decimal
 

data/lib/sepa_king/transaction/direct_debit_transaction.rb

@@ -4,13 +4,12 @@ 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
+    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
     validates_inclusion_of :local_instrument, in: LOCAL_INSTRUMENTS
     validates_inclusion_of :sequence_type, in: SEQUENCE_TYPES
-
     validate { |t| t.validate_requested_date_after(Date.today.next) }
 
     validate do |t|
@@ -31,6 +30,10 @@ module SEPA
       self.sequence_type ||= 'OOFF'
     end
 
+    def amendment_informations?
+      original_debtor_account || same_mandate_new_debtor_agent || original_creditor_account
+    end
+
     def schema_compatible?(schema_name)
       case schema_name
       when PAIN_008_002_02

data/lib/sepa_king/version.rb

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

data/sepa_king.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.2'
 
-  s.add_runtime_dependency 'activemodel', '>= 3.0.0'
+  s.add_runtime_dependency 'activemodel', '>= 3.1'
   s.add_runtime_dependency 'builder'
   s.add_runtime_dependency 'iban-tools'
 
@@ -29,5 +29,5 @@ 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', RUBY_VERSION < '2.1.0' ? '~> 1.6.0' : '~> 1'
+  s.add_development_dependency 'nokogiri'
 end

data/spec/debtor_address_spec.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe SEPA::DebtorAddress do
+  it 'should initialize a new address' do
+    expect(
+      SEPA::DebtorAddress.new country_code:       'CH',
+                              address_line1:       'Mustergasse 123',
+                              address_line2:       '12345 Musterstadt'
+    ).to be_valid
+  end
+end

data/spec/direct_debit_spec.rb

@@ -74,6 +74,34 @@ describe SEPA::DirectDebit do
       end
     end
 
+    context 'setting debtor address' 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'
+
+        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.003.02' do
+        expect(subject.to_xml(SEPA::PAIN_008_003_02)).to validate_against('pain.008.003.02.xsd')
+      end
+    end
+
     context 'for valid creditor' do
       context 'without BIC (IBAN-only)' do
         subject do
@@ -137,6 +165,42 @@ describe SEPA::DirectDebit do
         end
       end
 
+      context 'with BIC and debtor address ' do
+        subject do
+          sdd = direct_debit
+
+          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',
+                              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
+
+        it 'should validate against pain.008.002.02' do
+          expect(subject.to_xml(SEPA::PAIN_008_002_02)).to validate_against('pain.008.002.02.xsd')
+        end
+
+        it 'should validate against pain.008.003.02' do
+          expect(subject.to_xml(SEPA::PAIN_008_003_02)).to validate_against('pain.008.003.02.xsd')
+        end
+      end
+
       context 'without requested_date given' do
         subject do
           sdd = direct_debit
@@ -398,17 +462,21 @@ describe SEPA::DirectDebit do
 
           sdd.add_transaction(direct_debt_transaction.merge(original_debtor_account: 'NL08RABO0135742099'))
           sdd.add_transaction(direct_debt_transaction.merge(same_mandate_new_debtor_agent: true))
+          sdd.add_transaction(direct_debt_transaction.merge(original_creditor_account: SEPA::CreditorAccount.new(creditor_identifier: 'NL53ZZZ091734220000', name: 'Creditor Inc.')))
           sdd.to_xml
         end
 
         it 'should include amendment indicator' do
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[1]/DrctDbtTx/MndtRltdInf/AmdmntInd', 'true')
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[2]/DrctDbtTx/MndtRltdInf/AmdmntInd', 'true')
+          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[3]/DrctDbtTx/MndtRltdInf/AmdmntInd', 'true')
         end
 
         it 'should include amendment information details' do
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[1]/DrctDbtTx/MndtRltdInf/AmdmntInfDtls/OrgnlDbtrAcct/Id/IBAN', 'NL08RABO0135742099')
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[2]/DrctDbtTx/MndtRltdInf/AmdmntInfDtls/OrgnlDbtrAgt/FinInstnId/Othr/Id', 'SMNDA')
+          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[3]/DrctDbtTx/MndtRltdInf/AmdmntInfDtls/OrgnlCdtrSchmeId/Nm', 'Creditor Inc.')
+          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[3]/DrctDbtTx/MndtRltdInf/AmdmntInfDtls/OrgnlCdtrSchmeId/Id/PrvtId/Othr/Id', 'NL53ZZZ091734220000')
         end
       end
 

data/spec/transaction_spec.rb

@@ -26,6 +26,19 @@ describe SEPA::Transaction do
     end
   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)
+    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.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 description: Implemention of pain.001.002.03 and pain.008.002.02 (ISO 20022)
 email:
 - gl@salesking.eu
@@ -153,7 +153,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/Gemfile-activemodel-3.0.x
 - gemfiles/Gemfile-activemodel-3.1.x
 - gemfiles/Gemfile-activemodel-3.2.x
 - gemfiles/Gemfile-activemodel-4.0.x
@@ -161,6 +160,7 @@ files:
 - gemfiles/Gemfile-activemodel-4.2.x
 - gemfiles/Gemfile-activemodel-5.0.x
 - gemfiles/Gemfile-activemodel-5.1.x
+- gemfiles/Gemfile-activemodel-5.2.x
 - lib/schema/pain.001.001.03.xsd
 - lib/schema/pain.001.002.03.xsd
 - lib/schema/pain.001.003.03.xsd
@@ -171,6 +171,7 @@ files:
 - lib/sepa_king/account.rb
 - lib/sepa_king/account/creditor_account.rb
 - lib/sepa_king/account/debtor_account.rb
+- lib/sepa_king/account/debtor_address.rb
 - lib/sepa_king/converter.rb
 - lib/sepa_king/message.rb
 - lib/sepa_king/message/credit_transfer.rb
@@ -187,6 +188,7 @@ files:
 - spec/credit_transfer_transaction_spec.rb
 - spec/creditor_account_spec.rb
 - spec/debtor_account_spec.rb
+- spec/debtor_address_spec.rb
 - spec/direct_debit_spec.rb
 - spec/direct_debit_transaction_spec.rb
 - spec/examples/pain.001.001.03.xml
@@ -215,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -223,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby gem for creating SEPA XML files
@@ -234,6 +236,7 @@ test_files:
 - spec/credit_transfer_transaction_spec.rb
 - spec/creditor_account_spec.rb
 - spec/debtor_account_spec.rb
+- spec/debtor_address_spec.rb
 - spec/direct_debit_spec.rb
 - spec/direct_debit_transaction_spec.rb
 - spec/examples/pain.001.001.03.xml