sepa_king 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55e01a727d2ad4cb40cc2f284f1e77149781359
-  data.tar.gz: f8a2b539e05d97d6630a260b91362c7ecc7fb2b9
+  metadata.gz: dd633edaa40b7ed3cd1dfe6bbcdb5d676053b6a4
+  data.tar.gz: 8bdcfc3411785c55878a7a0039815ff046f9f428
 SHA512:
-  metadata.gz: 50a4b696964158725ee468d65a00839bb37d0e7d2939bccb17d0ccb25e24ad14b2160ec7acb22c1ba045e0047f6a5866bf96602e3b26406436b2120bb6c11639
-  data.tar.gz: c78387d1c6fd870f045b1ae37eb8b3d7a1aae21ec68604e00b00c75b0ad8cc584a55872534890e525d2d1e37183fc0d7bf27818def85ea7d8fc6f7fe0688eba4
+  metadata.gz: 8e9af124aa9adf73f3b49a4b20880b68ed9f04bbf49fa75bac9bb49140fb1e694efb243595864567bb7544c64a581008b8006afc04e7d404bda9f3d074c104f8
+  data.tar.gz: c71cb2fb8a9691c2c9d0e70a9a1d2bc63d96178594ca0f41d913670d0d58d9f188ad3b833e28d63d18a5ff4b4a8b61f05adb039cee23b3f0cbf8065c96fda688

data/.travis.yml

@@ -1,9 +1,8 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
 gemfile:
   - gemfiles/Gemfile-activemodel-3.0.x
   - gemfiles/Gemfile-activemodel-3.1.x
@@ -14,8 +13,6 @@ gemfile:
   - gemfiles/Gemfile-activemodel-5.0.x
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-activemodel-5.0.x
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile-activemodel-5.0.x
     - rvm: 2.1.10

data/README.md

@@ -23,7 +23,7 @@ BTW: **pain** is a shortcut for **Pa**yment **In**itiation.
 
 ## Requirements
 
-* Ruby 1.9.3 or newer
+* Ruby 2.0.0 or newer
 * ActiveModel 3.0 or newer
 
 
@@ -170,6 +170,10 @@ sct.add_transaction(
   # Number with two decimal digit
   amount:                 102.50,
 
+  # OPTIONAL: Instruction Identification, will not be submitted to the creditor
+  # String, max. 35 char
+  instruction:               '12345',
+
   # OPTIONAL: End-To-End-Identification, will be submitted to the creditor
   # String, max. 35 char
   reference:              'XYZ-1234/123',

data/lib/sepa_king/account/creditor_account.rb

@@ -3,6 +3,6 @@ module SEPA
   class CreditorAccount < Account
     attr_accessor :creditor_identifier
 
-    validates_with CreditorIdentifierValidator
+    validates_with CreditorIdentifierValidator, message: "%{value} is invalid"
   end
 end

data/lib/sepa_king/account.rb

@@ -8,7 +8,7 @@ module SEPA
     convert :name, to: :text
 
     validates_length_of :name, within: 1..70
-    validates_with BICValidator, IBANValidator
+    validates_with BICValidator, IBANValidator, message: "%{value} is invalid"
 
     def initialize(attributes = {})
       attributes.each do |name, value|

data/lib/sepa_king/message/direct_debit.rb

@@ -108,6 +108,9 @@ module SEPA
     def build_transaction(builder, transaction)
       builder.DrctDbtTxInf do
         builder.PmtId do
+          if transaction.instruction.present?
+            builder.InstrId(transaction.instruction)
+          end
           builder.EndToEndId(transaction.reference)
         end
         builder.InstdAmt('%.2f' % transaction.amount, Ccy: 'EUR')

data/lib/sepa_king/transaction/direct_debit_transaction.rb

@@ -6,7 +6,7 @@ module SEPA
 
     attr_accessor :mandate_id, :mandate_date_of_signature, :local_instrument, :sequence_type, :creditor_account, :original_debtor_account, :same_mandate_new_debtor_agent
 
-    validates_with MandateIdentifierValidator, field_name: :mandate_id
+    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

data/lib/sepa_king/transaction.rb

@@ -17,7 +17,7 @@ module SEPA
     validates_numericality_of :amount, greater_than: 0
     validates_presence_of :requested_date
     validates_inclusion_of :batch_booking, :in => [true, false]
-    validates_with BICValidator, IBANValidator
+    validates_with BICValidator, IBANValidator, message: "%{value} is invalid"
 
     def initialize(attributes = {})
       attributes.each do |name, value|

data/lib/sepa_king/validator.rb

@@ -9,7 +9,7 @@ module SEPA
       value = record.send(field_name).to_s
 
       unless IBANTools::IBAN.valid?(value) && value.match(REGEX)
-        record.errors.add(field_name, :invalid)
+        record.errors.add(field_name, :invalid, message: options[:message])
       end
     end
   end
@@ -24,7 +24,7 @@ module SEPA
 
       if value
         unless value.to_s.match(REGEX)
-          record.errors.add(field_name, :invalid)
+          record.errors.add(field_name, :invalid, message: options[:message])
         end
       end
     end
@@ -38,7 +38,7 @@ module SEPA
       value = record.send(field_name)
 
       unless valid?(value)
-        record.errors.add(field_name, :invalid)
+        record.errors.add(field_name, :invalid, message: options[:message])
       end
     end
 
@@ -61,7 +61,7 @@ module SEPA
       value = record.send(field_name)
 
       unless value.to_s.match(REGEX)
-        record.errors.add(field_name, :invalid)
+        record.errors.add(field_name, :invalid, message: options[:message])
       end
     end
   end

data/lib/sepa_king/version.rb

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

data/sepa_king.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.add_runtime_dependency 'activemodel', '>= 3.0.0'
   s.add_runtime_dependency 'builder'
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'simplecov', '~> 0.11.2'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'nokogiri'
 end

data/spec/credit_transfer_spec.rb

@@ -267,6 +267,27 @@ describe SEPA::CreditTransfer do
           expect(subject).to have_xml('//Document/CstmrCdtTrfInitn/PmtInf[4]/CtrlSum', '8.00')
         end
       end
+
+      context 'with instruction given' do
+        subject do
+          sct = credit_transfer
+
+          sct.add_transaction name:                   'Telekomiker AG',
+                              iban:                   'DE37112589611964645802',
+                              amount:                 102.50,
+                              instruction:            '1234/ABC'
+
+          sct.to_xml
+        end
+
+        it 'should create valid XML file' do
+          expect(subject).to validate_against('pain.001.003.03.xsd')
+        end
+
+        it 'should contain <InstrId>' do
+          expect(subject).to have_xml('//Document/CstmrCdtTrfInitn/PmtInf/CdtTrfTxInf[1]/PmtId/InstrId', '1234/ABC')
+        end
+      end
     end
   end
 end

data/spec/direct_debit_spec.rb

@@ -411,6 +411,24 @@ describe SEPA::DirectDebit do
           expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[2]/DrctDbtTx/MndtRltdInf/AmdmntInfDtls/OrgnlDbtrAgt/FinInstnId/Othr/Id', 'SMNDA')
         end
       end
+
+      context 'with instruction given' do
+        subject do
+          sct = direct_debit
+
+          sct.add_transaction(direct_debt_transaction.merge(instruction: '1234/ABC'))
+
+          sct.to_xml
+        end
+
+        it 'should create valid XML file' do
+          expect(subject).to validate_against('pain.008.003.02.xsd')
+        end
+
+        it 'should contain <InstrId>' do
+          expect(subject).to have_xml('//Document/CstmrDrctDbtInitn/PmtInf/DrctDbtTxInf[1]/PmtId/InstrId', '1234/ABC')
+        end
+      end
     end
   end
 end

data/spec/validator_spec.rb

@@ -5,7 +5,7 @@ describe SEPA::IBANValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :iban, :iban_the_terrible
-    validates_with SEPA::IBANValidator
+    validates_with SEPA::IBANValidator, message: "%{value} seems wrong"
     validates_with SEPA::IBANValidator, field_name: :iban_the_terrible
   end
 
@@ -21,13 +21,19 @@ describe SEPA::IBANValidator do
                                       'DE87 2005 0000 1234 5678 90', # spaces included
                                for: [:iban, :iban_the_terrible])
   end
+
+  it "should customize error message" do
+    v = Validatable.new(:iban => 'xxx')
+    v.valid?
+    expect(v.errors[:iban]).to eq(['xxx seems wrong'])
+  end
 end
 
 describe SEPA::BICValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :bic, :custom_bic
-    validates_with SEPA::BICValidator
+    validates_with SEPA::BICValidator, message: "%{value} seems wrong"
     validates_with SEPA::BICValidator, field_name: :custom_bic
   end
 
@@ -38,13 +44,19 @@ describe SEPA::BICValidator do
   it 'should not accept an invalid BIC' do
     expect(Validatable).not_to accept('', 'GENODE61HR', 'DEUTDEDBDUEDEUTDEDBDUE', for: [:bic, :custom_bic])
   end
+
+  it "should customize error message" do
+    v = Validatable.new(:bic => 'xxx')
+    v.valid?
+    expect(v.errors[:bic]).to eq(['xxx seems wrong'])
+  end
 end
 
 describe SEPA::CreditorIdentifierValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :creditor_identifier, :crid
-    validates_with SEPA::CreditorIdentifierValidator
+    validates_with SEPA::CreditorIdentifierValidator, message: "%{value} seems wrong"
     validates_with SEPA::CreditorIdentifierValidator, field_name: :crid
   end
 
@@ -55,13 +67,19 @@ describe SEPA::CreditorIdentifierValidator do
   it 'should not accept an invalid creditor_identifier' do
     expect(Validatable).not_to accept('', 'xxx', 'DE98ZZZ099999999990', for: [:creditor_identifier, :crid])
   end
+
+  it "should customize error message" do
+    v = Validatable.new(:creditor_identifier => 'xxx')
+    v.valid?
+    expect(v.errors[:creditor_identifier]).to eq(['xxx seems wrong'])
+  end
 end
 
 describe SEPA::MandateIdentifierValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :mandate_id, :mid
-    validates_with SEPA::MandateIdentifierValidator
+    validates_with SEPA::MandateIdentifierValidator, message: "%{value} seems wrong"
     validates_with SEPA::MandateIdentifierValidator, field_name: :mid
   end
 
@@ -72,4 +90,10 @@ describe SEPA::MandateIdentifierValidator do
   it 'should not accept an invalid mandate_identifier' do
     expect(Validatable).not_to accept(nil, '', 'X' * 36, 'ABC 123', '#/*', 'Ümläüt', for: [:mandate_id, :mid])
   end
+
+  it "should customize error message" do
+    v = Validatable.new(:mandate_id => 'ABC 123')
+    v.valid?
+    expect(v.errors[:mandate_id]).to eq(['ABC 123 seems wrong'])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_king
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -99,16 +99,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby gem for creating SEPA XML files