sepa_king 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31135b499c4feea2fb23f4b0378637220e2e36ef
-  data.tar.gz: 5e073a7c3dd05cfba2ebb4dc88aa6bcdf803faab
+  metadata.gz: f0171ca52d3b9667fa2aab79ce037fc9d82b94f1
+  data.tar.gz: 108d5e3dfab121f5bb8f154ca8a786fdd0fcc02f
 SHA512:
-  metadata.gz: 9b7ee7b9cf4962fa4caa9d807e09bbb5b111cf307aa5dcd58d366110132e15eab841364dc30cb2e6aab3ebd1eb3373bc04eae8a8595d9c76548c0512ec3f1b86
-  data.tar.gz: f656ff1bba65a9e711fa1f58c169ce637c24ad2af6069c099bb16b7a61a2a10e1bd2822af841b06c1b2138e58a52cb01080c33acdda67d07721a9560e7187a6b
+  metadata.gz: 8d270da4b9707bf2e58daa7d58313f90be7578e3cb7b87e4b4da451479b75710c159513ef86f49aab30e4feff4162290eddf9422ac21690e3bd93905042bb6c2
+  data.tar.gz: ced4136ed50cb16d4256b081d7ef651b6969a7c11593f6490d9fbfe6d492105455d339a63efc8c39965c365bca85b6b4cde99c3f6a70fe48b4b866000c8e12f4

data/.travis.yml

@@ -10,3 +10,4 @@ gemfile:
   - gemfiles/Gemfile-activemodel-4.0.x
   - gemfiles/Gemfile-activemodel-4.1.x
   - gemfiles/Gemfile-activemodel-4.2.x
+sudo: false

data/lib/core_ext/string.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+# Extend String class to use I18n.transliterate as an instance method
+#
+# To have a better ASCII approximation for some languages, it's strongly
+# recommended to add custom rules in your I18n dictionary like this
+# example for Germany:
+#
+# de:
+#   i18n:
+#     transliterate:
+#       rule:
+#         Ä: 'Ae'
+#         Ö: 'Oe'
+#         Ü: 'Ue'
+#         ä: 'ae'
+#         ö: 'oe'
+#         ü: 'ue'
+#         ß: 'ss'
+#
+# Because this stuff is out of scope of this gem, we don't include the rules here
+
+String.class_eval do
+  def i18n_transliterate(replacement='?')
+    I18n.transliterate(self, replacement)
+  end
+end

data/lib/sepa_king/converter.rb

@@ -18,11 +18,23 @@ module SEPA
       def convert_text(value)
         return unless value
 
-        I18n.transliterate(value.to_s).
-          # Change linebreaks to whitespaces
+        value.to_s.
+          # Replace some special characters described as "Best practices" in Chapter 6.2 of this document:
+          # http://www.europeanpaymentscouncil.eu/index.cfm/knowledge-bank/epc-documents/sepa-requirements-for-an-extended-character-set-unicode-subset-best-practices/epc217-08-best-practices-sepa-requirements-for-character-set-ssgpdf/
+          gsub('€','E').
+          gsub('@','(at)').
+          gsub('&', '+').
+          gsub('_','-').
+
+          # Replace non-ASCII characters with an ASCII approximation
+          i18n_transliterate.
+
+          # Replace linebreaks by spaces
           gsub(/\n+/,' ').
+
           # Remove all invalid characters
           gsub(/[^a-zA-Z0-9\ \'\:\?\,\-\(\+\.\)\/]/, '').
+
           # Remove leading and trailing spaces
           strip
       end

data/lib/sepa_king/message.rb

@@ -103,6 +103,13 @@ module SEPA
         builder.CtrlSum('%.2f' % amount_total)
         builder.InitgPty do
           builder.Nm(account.name)
+          builder.Id do
+            builder.OrgId do
+              builder.Othr do
+                builder.Id(account.creditor_identifier)
+              end
+            end
+          end if account.respond_to? :creditor_identifier
         end
       end
     end

data/lib/sepa_king/version.rb

@@ -1,3 +1,3 @@
 module SEPA
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/sepa_king.rb

@@ -4,6 +4,8 @@ require 'bigdecimal'
 require 'builder'
 require 'iban-tools'
 
+require 'core_ext/string'
+
 require 'sepa_king/converter'
 require 'sepa_king/validator'
 require 'sepa_king/account'

data/spec/converter_spec.rb

@@ -5,12 +5,11 @@ describe SEPA::Converter do
   include SEPA::Converter::InstanceMethods
 
   describe :convert_text do
-    it 'should remove invalid chars' do
-      expect(convert_text('&@"=<>!')).to eq('')
-    end
-
-    it 'should not touch valid chars' do
-      expect(convert_text("abc-ABC-0123- ':?,-(+.)/")).to eq("abc-ABC-0123- ':?,-(+.)/")
+    it 'should convert special chars' do
+      expect(convert_text('GmbH & Co. KG')).to eq('GmbH + Co. KG')
+      expect(convert_text('10€')).to eq('10E')
+      expect(convert_text('info@bundesbank.de')).to eq('info(at)bundesbank.de')
+      expect(convert_text('abc_def')).to eq('abc-def')
     end
 
     it 'should convert umlaute' do
@@ -28,6 +27,14 @@ describe SEPA::Converter do
       expect(convert_text(1234)).to eq('1234')
     end
 
+    it 'should remove invalid chars' do
+      expect(convert_text('"=<>!')).to eq('')
+    end
+
+    it 'should not touch valid chars' do
+      expect(convert_text("abc-ABC-0123- ':?,-(+.)/")).to eq("abc-ABC-0123- ':?,-(+.)/")
+    end
+
     it 'should not touch nil' do
       expect(convert_text(nil)).to eq(nil)
     end

data/spec/core_ext/string_spec.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe String do
+  describe :i18n_transliterate do
+    it 'should use I18n.transliterate' do
+      expect('Ærøskøbing'.i18n_transliterate).to eq('AEroskobing')
+      expect('Jürgen'.i18n_transliterate).to eq('Jurgen')
+    end
+  end
+end

data/spec/direct_debit_spec.rb

@@ -167,6 +167,10 @@ describe SEPA::DirectDebit do
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/GrpHdr/MsgId', /SEPA-KING\/[0-9]+/)
         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
+
         it 'should contain <PmtInfId>' do
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/PmtInfId', /SEPA-KING\/[0-9]+\/1/)
         end
@@ -233,8 +237,8 @@ describe SEPA::DirectDebit do
         end
 
         it 'should contain <Dbtr>' do
-          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[1]/Dbtr/Nm', 'Zahlemann  Sohne GbR')
-          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[2]/Dbtr/Nm', 'Meier  Schulze oHG')
+          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[1]/Dbtr/Nm', 'Zahlemann + Sohne GbR')
+          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[2]/Dbtr/Nm', 'Meier + Schulze oHG')
         end
 
         it 'should contain <DbtrAcct>' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_king
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -173,6 +173,7 @@ files:
 - gemfiles/Gemfile-activemodel-4.0.x
 - gemfiles/Gemfile-activemodel-4.1.x
 - gemfiles/Gemfile-activemodel-4.2.x
+- lib/core_ext/string.rb
 - lib/schema/pain.001.001.03.xsd
 - lib/schema/pain.001.002.03.xsd
 - lib/schema/pain.001.003.03.xsd
@@ -195,6 +196,7 @@ files:
 - sepa_king.gemspec
 - spec/account_spec.rb
 - spec/converter_spec.rb
+- spec/core_ext/string_spec.rb
 - spec/credit_transfer_spec.rb
 - spec/credit_transfer_transaction_spec.rb
 - spec/creditor_account_spec.rb
@@ -242,6 +244,7 @@ summary: Ruby gem for creating SEPA XML files
 test_files:
 - spec/account_spec.rb
 - spec/converter_spec.rb
+- spec/core_ext/string_spec.rb
 - spec/credit_transfer_spec.rb
 - spec/credit_transfer_transaction_spec.rb
 - spec/creditor_account_spec.rb