sepa_king 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e3b76466f9a0fa80b6b9580abbf8cfdc8c1e530914d833848f16962bf49f1c0
-  data.tar.gz: '08059bad5cd7a74208fad02c15769de2cb5e84b3ae7cb622165af5081bc8a4df'
+  metadata.gz: bbdd7991d9da595e8a78eef4ede917a4bf96f425305da1ea0f908e9c04c23750
+  data.tar.gz: 5ac2d38ed83dec60f68ea9f70b8be7bd16e01385457c41f58f15dc00990e07a9
 SHA512:
-  metadata.gz: 1c7f07f705f9afb8c6bcd0e91c3371b4f496e0649dd93b3dab85b5167223393d428d652cbf90147aa415ec63af3d9a01ac6f416a13c4190d28276b49d4a79b30
-  data.tar.gz: 20670910d9fe37671c90dc4189756757ed109b3110429631726b3b479e9ed625927db391002b6f9a01af4ba2e87ea921cd28c5c6e628daa3ec73483f7aa34904
+  metadata.gz: 10dd0ce9bae0413cc3ed0d65b470fc8f0911bd4035cc19a3a4505a88d6076ee552b1c0d4cd8e8d0d0ab9542a9d42eb717418d43a7e5c6ad5212fab2d4d042123
+  data.tar.gz: a27678581e7f3d371d47fe58ad77b9245bade4d05adaa69dd1ec0425efb253fb4db8f624f77e5ce2cbf18b9000e429614b4068b61fa466e46a9d347a03ccd75b

data/lib/sepa_king/message/credit_transfer.rb

@@ -17,7 +17,7 @@ module SEPA
       }
     end
 
-    def build_payment_informations(builder)
+    def build_payment_informations(builder, schema_name)
       # Build a PmtInf block for every group of transactions
       grouped_transactions.each do |group, transactions|
         # All transactions with the same requested_date are placed into the same PmtInf block
@@ -52,7 +52,7 @@ module SEPA
             builder.FinInstnId do
               if account.bic
                 builder.BIC(account.bic)
-              else
+              elsif schema_name != PAIN_001_001_03_CH_02
                 builder.Othr do
                   builder.Id('NOTPROVIDED')
                 end

data/lib/sepa_king/message/direct_debit.rb

@@ -24,7 +24,7 @@ module SEPA
       }
     end
 
-    def build_payment_informations(builder)
+    def build_payment_informations(builder, schema_name)
       # Build a PmtInf block for every group of transactions
       grouped_transactions.each do |group, transactions|
         builder.PmtInf do

data/lib/sepa_king/message.rb

@@ -46,7 +46,7 @@ module SEPA
         builder.Document(xml_schema(schema_name)) do
           builder.__send__(xml_main_tag) do
             build_group_header(builder)
-            build_payment_informations(builder)
+            build_payment_informations(builder, schema_name)
           end
         end
       end
@@ -63,9 +63,9 @@ module SEPA
       raise ArgumentError.new("Schema #{schema_name} is unknown!") unless self.known_schemas.include?(schema_name)
 
       case schema_name
-        when PAIN_001_002_03, PAIN_008_002_02, PAIN_001_001_03, PAIN_001_001_03_CH_02
+        when PAIN_001_002_03, PAIN_008_002_02
           account.bic.present? && transactions.all? { |t| t.schema_compatible?(schema_name) }
-        when PAIN_001_003_03, PAIN_008_003_02, PAIN_008_001_02
+        when PAIN_001_001_03, PAIN_001_001_03_CH_02, PAIN_001_003_03, PAIN_008_003_02, PAIN_008_001_02
           transactions.all? { |t| t.schema_compatible?(schema_name) }
       end
     end
@@ -161,7 +161,7 @@ module SEPA
     end
 
     def validate_final_document!(document, schema_name)
-      xsd = Nokogiri::XML::Schema(File.read(File.expand_path("../../../lib/schema/#{schema_name}.xsd", __FILE__)))
+      xsd = Nokogiri::XML::Schema(File.read(File.expand_path("../../lib/schema/#{schema_name}.xsd", __dir__)))
       errors = xsd.validate(document).map { |error| error.message }
       raise SEPA::Error.new("Incompatible with schema #{schema_name}: #{errors.join(', ')}") if errors.any?
     end

data/lib/sepa_king/validator.rb

@@ -23,7 +23,7 @@ module SEPA
       value = record.send(field_name)
 
       if value
-        unless value.to_s.match(REGEX)
+        unless value.to_s.match?(REGEX)
           record.errors.add(field_name, :invalid, message: options[:message])
         end
       end

data/lib/sepa_king/version.rb

@@ -1,3 +1,3 @@
 module SEPA
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/sepa_king.gemspec

@@ -1,5 +1,5 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sepa_king/version'
 

data/spec/account_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::Account do
+RSpec.describe SEPA::Account do
   describe :new do
     it 'should not accept unknown keys' do
       expect {

data/spec/converter_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::Converter do
+RSpec.describe SEPA::Converter do
   include SEPA::Converter::InstanceMethods
 
   describe :convert_text do

data/spec/credit_transfer_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::CreditTransfer do
+RSpec.describe SEPA::CreditTransfer do
   let(:message_id_regex) { /SEPA-KING\/[0-9a-z_]{22}/ }
   let(:credit_transfer) {
     SEPA::CreditTransfer.new name:       'Schuldner GmbH',
@@ -105,20 +105,29 @@ describe SEPA::CreditTransfer do
                               bic:                    'PBNKDEFF370',
                               iban:                   'DE37112589611964645802',
                               amount:                 102.50,
+                              currency:               currency,
                               reference:              'XYZ-1234/123',
                               remittance_information: 'Rechnung vom 22.08.2013'
 
           sct
         end
 
-        it 'should create valid XML file' do
+        let(:currency) { nil }
+
+        it 'should validate against pain.001.003.03' do
           expect(subject.to_xml(SEPA::PAIN_001_003_03)).to validate_against('pain.001.003.03.xsd')
         end
 
-        it 'should fail for pain.001.001.03' do
-          expect {
-            subject.to_xml(SEPA::PAIN_001_001_03)
-          }.to raise_error(SEPA::Error, /Incompatible with schema/)
+        it 'should validate against pain.001.001.03' do
+          expect(subject.to_xml(SEPA::PAIN_001_001_03)).to validate_against('pain.001.001.03.xsd')
+        end
+
+        context 'with CHF as currency' do
+          let(:currency) { 'CHF' }
+
+          it 'should validate against pain.001.001.03.ch.02' do
+            expect(subject.to_xml(SEPA::PAIN_001_001_03_CH_02)).to validate_against('pain.001.001.03.ch.02.xsd')
+          end
         end
 
         it 'should fail for pain.001.002.03' do

data/spec/credit_transfer_transaction_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::CreditTransferTransaction do
+RSpec.describe SEPA::CreditTransferTransaction do
   describe :initialize do
     it 'should initialize a valid transaction' do
       expect(

data/spec/creditor_account_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::CreditorAccount do
+RSpec.describe SEPA::CreditorAccount do
   it 'should initialize a new account' do
     expect(
       SEPA::CreditorAccount.new name:                'Gläubiger GmbH',

data/spec/debtor_account_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::DebtorAccount do
+RSpec.describe SEPA::DebtorAccount do
   it 'should initialize a new account' do
     expect(
       SEPA::DebtorAccount.new name:       'Gläubiger GmbH',

data/spec/debtor_address_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::DebtorAddress do
+RSpec.describe SEPA::DebtorAddress do
   it 'should initialize a new address' do
     expect(
       SEPA::DebtorAddress.new country_code:       'CH',

data/spec/direct_debit_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::DirectDebit do
+RSpec.describe SEPA::DirectDebit do
   let(:message_id_regex) { /SEPA-KING\/[0-9a-z_]{22}/ }
 
   let(:direct_debit) {

data/spec/direct_debit_transaction_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::DirectDebitTransaction do
+RSpec.describe SEPA::DirectDebitTransaction do
   describe :initialize do
     it 'should create a valid transaction' do
       expect(

data/spec/message_spec.rb

@@ -10,7 +10,7 @@ class DummyMessage < SEPA::Message
   self.transaction_class = DummyTransaction
 end
 
-describe SEPA::Message do
+RSpec.describe SEPA::Message do
   describe :amount_total do
     subject do
       message = DummyMessage.new
@@ -86,7 +86,7 @@ describe SEPA::Message do
     end
   end
 
-describe :creation_date_time do
+  describe :creation_date_time do
     subject { DummyMessage.new }
 
     describe 'getter' do

data/spec/spec_helper.rb

@@ -18,12 +18,13 @@ require 'sepa_king'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+Dir[File.expand_path(File.join(__dir__, 'support', '**', '*.rb'))].each {|f| require f}
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+  config.disable_monkey_patching!
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

data/spec/transaction_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::Transaction do
+RSpec.describe SEPA::Transaction do
   describe :new do
     it 'should have default for reference' do
       expect(SEPA::Transaction.new.reference).to eq('NOTPROVIDED')
@@ -26,7 +26,7 @@ describe SEPA::Transaction do
     end
   end
 
-  context 'Adress' do
+  context 'Address' do
     context 'with address_line' do
       it 'should accept valid value' do
         expect(SEPA::Transaction).to accept(SEPA::DebtorAddress.new(

data/spec/validation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Credit Transfer Initiation' do
+RSpec.describe 'Credit Transfer Initiation' do
   it "should validate example file" do
     expect(File.read('spec/examples/pain.001.002.03.xml')).to validate_against('pain.001.002.03.xsd')
     expect(File.read('spec/examples/pain.001.003.03.xml')).to validate_against('pain.001.003.03.xsd')
@@ -12,7 +12,7 @@ describe 'Credit Transfer Initiation' do
   end
 end
 
-describe 'Direct Debit Initiation' do
+RSpec.describe 'Direct Debit Initiation' do
   it 'should validate example file' do
     expect(File.read('spec/examples/pain.008.002.02.xml')).to validate_against('pain.008.002.02.xsd')
     expect(File.read('spec/examples/pain.008.003.02.xml')).to validate_against('pain.008.003.02.xsd')

data/spec/validator_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe SEPA::IBANValidator do
+RSpec.describe SEPA::IBANValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :iban, :iban_the_terrible
@@ -29,7 +29,7 @@ describe SEPA::IBANValidator do
   end
 end
 
-describe SEPA::BICValidator do
+RSpec.describe SEPA::BICValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :bic, :custom_bic
@@ -52,7 +52,7 @@ describe SEPA::BICValidator do
   end
 end
 
-describe SEPA::CreditorIdentifierValidator do
+RSpec.describe SEPA::CreditorIdentifierValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :creditor_identifier, :crid
@@ -93,7 +93,7 @@ describe SEPA::CreditorIdentifierValidator do
   end
 end
 
-describe SEPA::MandateIdentifierValidator do
+RSpec.describe SEPA::MandateIdentifierValidator do
   class Validatable
     include ActiveModel::Model
     attr_accessor :mandate_id, :mid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sepa_king
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Georg Leciejewski
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-15 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -187,7 +187,6 @@ files:
 - spec/examples/pain.008.003.02.xml
 - spec/message_spec.rb
 - spec/spec_helper.rb
-- spec/support/active_model.rb
 - spec/support/custom_matcher.rb
 - spec/support/factories.rb
 - spec/support/validations.rb
@@ -213,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: Ruby gem for creating SEPA XML files

data/spec/support/active_model.rb

@@ -1,30 +0,0 @@
-unless defined?(ActiveModel::Model)
-  # ActiveModel::Model is available since ActiveModel 4.0 only.
-  #
-  # If it's missing, add the code from
-  # https://github.com/rails/rails/blob/master/activemodel/lib/active_model/model.rb
-  module ActiveModel
-    module Model
-      def self.included(base)
-        base.class_eval do
-          extend  ActiveModel::Naming
-          extend  ActiveModel::Translation
-          include ActiveModel::Validations
-          include ActiveModel::Conversion
-        end
-      end
-
-      def initialize(params={})
-        params.each do |attr, value|
-          self.public_send("#{attr}=", value)
-        end if params
-
-        super()
-      end
-
-      def persisted?
-        false
-      end
-    end
-  end
-end