sepa_king 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2314875acf744a2dad9a545b56d75a27672e29e9
-  data.tar.gz: dc3f98095e43274d6eeafab00a46f68abc9f8728
+  metadata.gz: ecce149363029e74d571ff27d16743316d126460
+  data.tar.gz: ea57de58cac8041d8f618512586b11018ae2abb0
 SHA512:
-  metadata.gz: 2f1f366521a4884bea53d0e0b9989039af4d94e54936df4889460f4aa3926dc9520e82d4018dcdd88e88c8b76abedf4963880f01320971d818561d89b06206b6
-  data.tar.gz: 720f897af281d19848ef4396cda5b2e1faf9aa17b823226972f9f3d2e5276aeb7bbde2c71c674bd679aeaa36422d9174cbb6177b0d5f45b673e989805c2bbd4a
+  metadata.gz: ee0bdeeade055d746b07247482288163e03762ba6b66bae32be2a06530908e4ab70fb69608a41f040831907862fc984ebe938fc9b68778d66620c63276cf2fbb
+  data.tar.gz: b29f17363268119f3c7f3d324aaace1ffadcc7ba58ae5f7f7940528cf2e808109aa8ffe46c33e2f7be9c6cb9b6541c97a9179b09f17d9bafb752ce0fd036daa5

data/README.md

@@ -108,6 +108,15 @@ sdd.add_transaction(
   # OPTIONAL: Enables or disables batch booking, in German "Sammelbuchung / Einzelbuchung"
   # True or False
   batch_booking: true
+
+  # Optional: Use a different creditor account
+  # CreditorAccount
+  creditor_account: SEPA::CreditorAccount.new(
+    name:                'Creditor Inc.',
+    bic:                 'RABONL2U',
+    iban:                'NL08RABO0135742099',
+    creditor_identifier: 'NL53ZZZ091734220000'
+  )
 )
 sdd.add_transaction ...
 
@@ -180,6 +189,11 @@ xml_string = sct.to_xml
 https://github.com/salesking/sepa_king/releases
 
 
+## Contributors
+
+https://github.com/salesking/sepa_king/graphs/contributors
+
+
 ## Resources
 
 * http://www.ebics.de/index.php?id=77

data/lib/sepa_king/message/direct_debit.rb

@@ -26,7 +26,8 @@ module SEPA
         { requested_date:   transaction.requested_date,
           local_instrument: transaction.local_instrument,
           sequence_type:    transaction.sequence_type,
-          batch_booking:    transaction.batch_booking
+          batch_booking:    transaction.batch_booking,
+          account:          transaction.creditor_account || account
         }
       end
     end
@@ -51,16 +52,16 @@ module SEPA
           end
           builder.ReqdColltnDt(group[:requested_date].iso8601)
           builder.Cdtr do
-            builder.Nm(account.name)
+            builder.Nm(group[:account].name)
           end
           builder.CdtrAcct do
             builder.Id do
-              builder.IBAN(account.iban)
+              builder.IBAN(group[:account].iban)
             end
           end
           builder.CdtrAgt do
             builder.FinInstnId do
-              builder.BIC(account.bic)
+              builder.BIC(group[:account].bic)
             end
           end
           builder.ChrgBr('SLEV')
@@ -68,7 +69,7 @@ module SEPA
             builder.Id do
               builder.PrvtId do
                 builder.Othr do
-                  builder.Id(account.creditor_identifier)
+                  builder.Id(group[:account].creditor_identifier)
                   builder.SchmeNm do
                     builder.Prtry('SEPA')
                   end

data/lib/sepa_king/message.rb

@@ -5,7 +5,11 @@ module SEPA
     include ActiveModel::Validations
 
     attr_reader :account, :transactions
+
     validates_presence_of :transactions
+    validate do |record|
+      record.errors.add(:account, 'is invalid') unless record.account.valid?
+    end
 
     class_attribute :account_class, :transaction_class, :xml_main_tag
 
@@ -22,7 +26,6 @@ module SEPA
 
     # @return [String] xml
     def to_xml
-      raise RuntimeError.new(account.errors.full_messages.join("\n")) unless account.valid?
       raise RuntimeError.new(errors.full_messages.join("\n")) unless valid?
 
       builder = Builder::XmlMarkup.new indent: 2

data/lib/sepa_king/transaction/direct_debit_transaction.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module SEPA
   class DirectDebitTransaction < Transaction
-    attr_accessor :mandate_id, :mandate_date_of_signature, :local_instrument, :sequence_type
+    attr_accessor :mandate_id, :mandate_date_of_signature, :local_instrument, :sequence_type, :creditor_account
 
     validates_length_of :mandate_id, within: 1..35
     validates_presence_of :mandate_date_of_signature
@@ -9,6 +9,10 @@ module SEPA
     validates_inclusion_of :sequence_type, :in => %w(FRST OOFF RCUR FNAL)
 
     validate do |t|
+      if creditor_account
+        errors.add(:creditor_account, 'is not correct') unless creditor_account.valid?
+      end
+
       if t.mandate_date_of_signature.is_a?(Date)
         errors.add(:mandate_date_of_signature, 'is in the future') if t.mandate_date_of_signature > Date.today
       else

data/lib/sepa_king/version.rb

@@ -1,3 +1,3 @@
 module SEPA
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/direct_debit_spec.rb

@@ -273,6 +273,27 @@ describe SEPA::DirectDebit do
           subject.should have_xml('//Document/CstmrDrctDbtInitn/PmtInf[4]/CtrlSum', '8.00')
         end
       end
+
+      context 'with transactions containing different creditor_account' do
+        subject do
+          sdd = direct_debit
+
+          sdd.add_transaction(direct_debt_transaction)
+          sdd.add_transaction(direct_debt_transaction.merge(creditor_account: SEPA::CreditorAccount.new(
+                                                                                name:                'Creditor Inc.',
+                                                                                bic:                 'RABONL2U',
+                                                                                iban:                'NL08RABO0135742099',
+                                                                                creditor_identifier: 'NL53ZZZ091734220000'))
+          )
+
+          sdd.to_xml
+        end
+
+        it 'should contain two payment_informations with <Cdtr>' do
+          subject.should have_xml('//Document/CstmrDrctDbtInitn/PmtInf[1]/Cdtr/Nm', 'Glaeubiger GmbH')
+          subject.should have_xml('//Document/CstmrDrctDbtInitn/PmtInf[2]/Cdtr/Nm', 'Creditor Inc.')
+        end
+      end
     end
   end
 end

data/spec/message_spec.rb

@@ -6,32 +6,39 @@ class DummyTransaction < SEPA::Transaction
 end
 
 class DummyMessage < SEPA::Message
-  self.account_class = Hash
+  self.account_class = SEPA::Account
   self.transaction_class = DummyTransaction
 end
 
 describe SEPA::Message do
   describe :amount_total do
-    it 'should sum up all transactions' do
+    subject do
       message = DummyMessage.new
       message.add_transaction amount: 1.1
       message.add_transaction amount: 2.2
-      message.amount_total.should == 3.3
+      message
+    end
+
+    it 'should sum up all transactions' do
+      subject.amount_total.should == 3.3
     end
 
     it 'should sum up selected transactions' do
-      message = DummyMessage.new
-      message.add_transaction amount: 1.1
-      message.add_transaction amount: 2.2
-      message.amount_total([message.transactions[0]]).should == 1.1
+      subject.amount_total([subject.transactions[0]]).should == 1.1
     end
   end
 
   describe 'validation' do
+    subject { DummyMessage.new }
+
+    it 'should fail with invalid account' do
+      subject.should_not be_valid
+      subject.should have(1).error_on(:account)
+    end
+
     it 'should fail without transactions' do
-      message = DummyMessage.new
-      message.should_not be_valid
-      message.should have(1).error_on(:transactions)
+      subject.should_not be_valid
+      subject.should have(1).error_on(:transactions)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_king
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -9,146 +9,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: iban-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !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)
@@ -159,9 +159,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -210,17 +210,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby gem for creating SEPA XML files