sepa_king 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd633edaa40b7ed3cd1dfe6bbcdb5d676053b6a4
-  data.tar.gz: 8bdcfc3411785c55878a7a0039815ff046f9f428
+  metadata.gz: 26e9894eb7ccc0a61f5f5eaba7f787c9c0e19095
+  data.tar.gz: effbc319d83f8b8967ef06f3055ea1af5a686de5
 SHA512:
-  metadata.gz: 8e9af124aa9adf73f3b49a4b20880b68ed9f04bbf49fa75bac9bb49140fb1e694efb243595864567bb7544c64a581008b8006afc04e7d404bda9f3d074c104f8
-  data.tar.gz: c71cb2fb8a9691c2c9d0e70a9a1d2bc63d96178594ca0f41d913670d0d58d9f188ad3b833e28d63d18a5ff4b4a8b61f05adb039cee23b3f0cbf8065c96fda688
+  metadata.gz: 7d228d0db0b1fdba496ddf820a9ce9ecb0ee3c9e7b685705353eb9e2022975c103577324e37b8091709cd581d317c01b3d452cebafc0e559a2b8736d024ccf9c
+  data.tar.gz: a4f437e100aecbe85d63ab94075176cbd348756a1640ed09566aaf855008dfdf2cc4ff0e7eec5caa3ebcd3147bf01a1289ac590dca439b72d16fc89c26be1aca

data/.travis.yml

@@ -1,8 +1,9 @@
 rvm:
   - 2.0.0
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 gemfile:
   - gemfiles/Gemfile-activemodel-3.0.x
   - gemfiles/Gemfile-activemodel-3.1.x
@@ -11,10 +12,19 @@ gemfile:
   - gemfiles/Gemfile-activemodel-4.1.x
   - gemfiles/Gemfile-activemodel-4.2.x
   - gemfiles/Gemfile-activemodel-5.0.x
+  - gemfiles/Gemfile-activemodel-5.1.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.1
+      gemfile: gemfiles/Gemfile-activemodel-4.1.x
+    - rvm: 2.4.1
+      gemfile: gemfiles/Gemfile-activemodel-4.2.x
 sudo: false

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Georg Leciejewski (Sales King GmbH) & Georg Ledermann
+Copyright (c) 2013-2017 Georg Leciejewski (Sales King GmbH) & Georg Ledermann
 
 MIT License
 

data/README.md

@@ -70,10 +70,14 @@ sdd.add_transaction(
   # String, max. 34 chars
   iban:                      'DE21500500009876543210',
 
-  # Amount in EUR
+  # Amount
   # Number with two decimal digit
   amount:                    39.99,
 
+  # OPTIONAL: Currency, EUR by default (ISO 4217 standard)
+  # String, 3 char
+  currency:                  'EUR',
+
   # OPTIONAL: Instruction Identification, will not be submitted to the debtor
   # String, max. 35 char
   instruction:               '12345',
@@ -166,10 +170,14 @@ sct.add_transaction(
   # String, max. 34 chars
   iban:                   'DE37112589611964645802',
 
-  # Amount in EUR
+  # Amount
   # Number with two decimal digit
   amount:                 102.50,
 
+  # OPTIONAL: Currency, EUR by default (ISO 4217 standard)
+  # String, 3 char
+  currency:               'EUR',
+
   # OPTIONAL: Instruction Identification, will not be submitted to the creditor
   # String, max. 35 char
   instruction:               '12345',
@@ -256,4 +264,4 @@ https://github.com/salesking/sepa_king/graphs/contributors
 
 Released under the MIT license
 
-Copyright (c) 2013-2016 Georg Leciejewski (SalesKing), Georg Ledermann (https://github.com/ledermann)
+Copyright (c) 2013-2017 Georg Leciejewski (SalesKing), Georg Ledermann (https://github.com/ledermann)

data/gemfiles/Gemfile-activemodel-5.1.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activemodel', '~> 5.1.0'

data/lib/sepa_king/converter.rb

@@ -37,7 +37,14 @@ module SEPA
 
       def convert_decimal(value)
         return unless value
-        BigDecimal(value.to_s).round(2)
+        value = begin
+          BigDecimal(value.to_s)
+        rescue ArgumentError
+        end
+
+        if value && value.finite? && value > 0
+          value.round(2)
+        end
       end
     end
   end

data/lib/sepa_king/message/credit_transfer.rb

@@ -69,7 +69,7 @@ module SEPA
           builder.EndToEndId(transaction.reference)
         end
         builder.Amt do
-          builder.InstdAmt('%.2f' % transaction.amount, Ccy: 'EUR')
+          builder.InstdAmt('%.2f' % transaction.amount, Ccy: transaction.currency)
         end
         if transaction.bic
           builder.CdtrAgt do

data/lib/sepa_king/message/direct_debit.rb

@@ -113,7 +113,7 @@ module SEPA
           end
           builder.EndToEndId(transaction.reference)
         end
-        builder.InstdAmt('%.2f' % transaction.amount, Ccy: 'EUR')
+        builder.InstdAmt('%.2f' % transaction.amount, Ccy: transaction.currency)
         builder.DrctDbtTx do
           builder.MndtRltdInf do
             builder.MndtId(transaction.mandate_id)

data/lib/sepa_king/transaction/credit_transfer_transaction.rb

@@ -14,10 +14,12 @@ module SEPA
 
     def schema_compatible?(schema_name)
       case schema_name
-      when PAIN_001_001_03, PAIN_001_002_03
+      when PAIN_001_001_03
         self.bic.present? && self.service_level == 'SEPA'
+      when PAIN_001_002_03
+        self.bic.present? && self.service_level == 'SEPA' && self.currency == 'EUR'
       when PAIN_001_003_03
-        true
+        self.currency == 'EUR'
       end
     end
   end

data/lib/sepa_king/transaction/direct_debit_transaction.rb

@@ -34,8 +34,10 @@ module SEPA
     def schema_compatible?(schema_name)
       case schema_name
       when PAIN_008_002_02
-        self.bic.present? && %w(CORE B2B).include?(self.local_instrument)
-      when PAIN_008_003_02, PAIN_008_001_02
+        self.bic.present? && %w(CORE B2B).include?(self.local_instrument) && self.currency == 'EUR'
+      when PAIN_008_003_02
+        self.currency == 'EUR'
+      when PAIN_008_001_02
         true
       end
     end

data/lib/sepa_king/transaction.rb

@@ -6,11 +6,12 @@ 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
+    attr_accessor :name, :iban, :bic, :amount, :instruction, :reference, :remittance_information, :requested_date, :batch_booking, :currency
     convert :name, :instruction, :reference, :remittance_information, to: :text
     convert :amount, to: :decimal
 
     validates_length_of :name, within: 1..70
+    validates_length_of :currency, is: 3
     validates_length_of :instruction, within: 1..35, allow_nil: true
     validates_length_of :reference, within: 1..35, allow_nil: true
     validates_length_of :remittance_information, within: 1..140, allow_nil: true
@@ -27,6 +28,7 @@ module SEPA
       self.requested_date ||= DEFAULT_REQUESTED_DATE
       self.reference ||= 'NOTPROVIDED'
       self.batch_booking = true if self.batch_booking.nil?
+      self.currency ||= 'EUR'
     end
 
     protected

data/lib/sepa_king/version.rb

@@ -1,3 +1,3 @@
 module SEPA
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/sepa_king.gemspec

@@ -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'
+  s.add_development_dependency 'nokogiri', RUBY_VERSION < '2.1.0' ? '~> 1.6.0' : '~> 1'
 end

data/spec/converter_spec.rb

@@ -56,5 +56,19 @@ describe SEPA::Converter do
     it 'should not touch nil' do
       expect(convert_decimal(nil)).to eq(nil)
     end
+
+    it 'should not convert zero value' do
+      expect(convert_decimal(0)).to eq(nil)
+    end
+
+    it 'should not convert negative value' do
+      expect(convert_decimal(-3)).to eq(nil)
+    end
+
+    it 'should not convert invalid value' do
+      expect(convert_decimal('xyz')).to eq(nil)
+      expect(convert_decimal('NaN')).to eq(nil)
+      expect(convert_decimal('Infinity')).to eq(nil)
+    end
   end
 end

data/spec/credit_transfer_spec.rb

@@ -288,6 +288,45 @@ describe SEPA::CreditTransfer do
           expect(subject).to have_xml('//Document/CstmrCdtTrfInitn/PmtInf/CdtTrfTxInf[1]/PmtId/InstrId', '1234/ABC')
         end
       end
+
+      context 'with a different currency given' do
+        subject do
+          sct = credit_transfer
+
+          sct.add_transaction name:                   'Telekomiker AG',
+                              iban:                   'DE37112589611964645802',
+                              bic:                    'PBNKDEFF370',
+                              amount:                 102.50,
+                              currency:               'CHF'
+
+          sct
+        end
+
+        it 'should validate against pain.001.001.03' do
+          expect(subject.to_xml('pain.001.001.03')).to validate_against('pain.001.001.03.xsd')
+        end
+
+        it 'should have a CHF Ccy' do
+          doc = Nokogiri::XML(subject.to_xml('pain.001.001.03'))
+          doc.remove_namespaces!
+
+          nodes = doc.xpath('//Document/CstmrCdtTrfInitn/PmtInf/CdtTrfTxInf[1]/Amt/InstdAmt')
+          expect(nodes.length).to eql(1)
+          expect(nodes.first.attribute('Ccy').value).to eql('CHF')
+        end
+
+        it 'should fail for pain.001.002.03' do
+          expect {
+            subject.to_xml(SEPA::PAIN_001_002_03)
+          }.to raise_error(RuntimeError)
+        end
+
+        it 'should fail for pain.001.003.03' do
+          expect {
+            subject.to_xml(SEPA::PAIN_001_003_03)
+          }.to raise_error(RuntimeError)
+        end
+      end
     end
   end
 end

data/spec/credit_transfer_transaction_spec.rb

@@ -17,19 +17,30 @@ describe SEPA::CreditTransferTransaction do
 
   describe :schema_compatible? do
     context 'for pain.001.003.03' do
-      it 'should success' do
+      it 'should succeed' do
         expect(SEPA::CreditTransferTransaction.new({})).to be_schema_compatible('pain.001.003.03')
       end
+
+      it 'should fail for invalid attributes' do
+        expect(SEPA::CreditTransferTransaction.new(:currency => 'CHF')).not_to be_schema_compatible('pain.001.003.03')
+      end
     end
 
     context 'pain.001.002.03' do
-      it 'should success for valid attributes' do
+      it 'should succeed for valid attributes' do
         expect(SEPA::CreditTransferTransaction.new(:bic => 'SPUEDE2UXXX', :service_level => 'SEPA')).to be_schema_compatible('pain.001.002.03')
       end
 
       it 'should fail for invalid attributes' do
         expect(SEPA::CreditTransferTransaction.new(:bic => nil)).not_to be_schema_compatible('pain.001.002.03')
         expect(SEPA::CreditTransferTransaction.new(:bic => 'SPUEDE2UXXX', :service_level => 'URGP')).not_to be_schema_compatible('pain.001.002.03')
+        expect(SEPA::CreditTransferTransaction.new(:bic => 'SPUEDE2UXXX', :currency => 'CHF')).not_to be_schema_compatible('pain.001.002.03')
+      end
+    end
+
+    context 'for pain.001.001.03' do
+      it 'should succeed for valid attributes' do
+        expect(SEPA::CreditTransferTransaction.new(:bic => 'SPUEDE2UXXX', :currency => 'CHF')).to be_schema_compatible('pain.001.001.03')
       end
     end
   end

data/spec/direct_debit_spec.rb

@@ -429,6 +429,41 @@ describe SEPA::DirectDebit do
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[1]/PmtId/InstrId', '1234/ABC')
         end
       end
+
+      context 'with a different currency given' do
+        subject do
+          sct = direct_debit
+
+          sct.add_transaction(direct_debt_transaction.merge(instruction: '1234/ABC', currency: 'SEK'))
+
+          sct
+        end
+
+        it 'should validate against pain.001.001.03' do
+          expect(subject.to_xml(SEPA::PAIN_008_001_02)).to validate_against('pain.008.001.02.xsd')
+        end
+
+        it 'should have a CHF Ccy' do
+          doc = Nokogiri::XML(subject.to_xml('pain.008.001.02'))
+          doc.remove_namespaces!
+
+          nodes = doc.xpath('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[1]/InstdAmt')
+          expect(nodes.length).to eql(1)
+          expect(nodes.first.attribute('Ccy').value).to eql('SEK')
+        end
+
+        it 'should fail for pain.008.002.02' do
+          expect {
+            subject.to_xml(SEPA::PAIN_008_002_02)
+          }.to raise_error(RuntimeError)
+        end
+
+        it 'should fail for pain.008.003.02' do
+          expect {
+            subject.to_xml(SEPA::PAIN_008_003_02)
+          }.to raise_error(RuntimeError)
+        end
+      end
     end
   end
 end

data/spec/direct_debit_transaction_spec.rb

@@ -19,19 +19,30 @@ describe SEPA::DirectDebitTransaction do
 
   describe :schema_compatible? do
     context 'for pain.008.003.02' do
-      it 'should success' do
+      it 'should succeed' do
         expect(SEPA::DirectDebitTransaction.new({})).to be_schema_compatible('pain.008.003.02')
       end
+
+      it 'should fail for invalid attributes' do
+        expect(SEPA::DirectDebitTransaction.new(:currency => 'CHF')).not_to be_schema_compatible('pain.001.003.03')
+      end
     end
 
     context 'for pain.008.002.02' do
-      it 'should success for valid attributes' do
+      it 'should succeed for valid attributes' do
         expect(SEPA::DirectDebitTransaction.new(:bic => 'SPUEDE2UXXX', :local_instrument => 'CORE')).to be_schema_compatible('pain.008.002.02')
       end
 
       it 'should fail for invalid attributes' do
         expect(SEPA::DirectDebitTransaction.new(:bic => nil)).not_to be_schema_compatible('pain.008.002.02')
         expect(SEPA::DirectDebitTransaction.new(:bic => 'SPUEDE2UXXX', :local_instrument => 'COR1')).not_to be_schema_compatible('pain.008.002.02')
+        expect(SEPA::DirectDebitTransaction.new(:bic => 'SPUEDE2UXXX', :currency => 'CHF')).not_to be_schema_compatible('pain.008.002.02')
+      end
+    end
+
+    context 'for pain.008.001.02' do
+      it 'should succeed for valid attributes' do
+        expect(SEPA::DirectDebitTransaction.new(:bic => 'SPUEDE2UXXX', :currency => 'CHF')).to be_schema_compatible('pain.008.001.02')
       end
     end
   end

data/spec/transaction_spec.rb

@@ -75,4 +75,14 @@ describe SEPA::Transaction do
       expect(SEPA::Transaction).not_to accept('', 'X' * 141, for: :remittance_information)
     end
   end
+
+  context 'Currency' do
+    it 'should allow valid values' do
+      expect(SEPA::Transaction).to accept('EUR', 'CHF', 'SEK', for: :currency)
+    end
+
+    it 'should not allow invalid values' do
+      expect(SEPA::Transaction).not_to accept('', 'EURO', 'ABCDEF', for: :currency)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_king
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -127,16 +127,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: Implemention of pain.001.002.03 and pain.008.002.02 (ISO 20022)
 email:
 - gl@salesking.eu
@@ -160,6 +160,7 @@ files:
 - gemfiles/Gemfile-activemodel-4.1.x
 - gemfiles/Gemfile-activemodel-4.2.x
 - gemfiles/Gemfile-activemodel-5.0.x
+- gemfiles/Gemfile-activemodel-5.1.x
 - lib/schema/pain.001.001.03.xsd
 - lib/schema/pain.001.002.03.xsd
 - lib/schema/pain.001.003.03.xsd
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby gem for creating SEPA XML files