Skip to content

Commit

Permalink
Use Ruby 1.9 hash syntax. Closes #9
Browse files Browse the repository at this point in the history
  • Loading branch information
@ledermann
ledermann committed Aug 27, 2013
1 parent a5adecb commit b6464a8
Show file tree
Hide file tree
Showing 19 changed files with 139 additions and 139 deletions.
42 changes: 21 additions & 21 deletions README.md
View file
Expand Up @@ -28,20 +28,20 @@ How to create a SEPA file for direct debit ("Lastschrift")

```ruby
# First: Create the main object
dd = SEPA::DirectDebit.new :name => 'Gläubiger GmbH',
:bic => 'BANKDEFFXXX',
:iban => 'DE87200500001234567890',
:identifier => 'DE98ZZZ09999999999'
dd = SEPA::DirectDebit.new name: 'Gläubiger GmbH',
bic: 'BANKDEFFXXX',
iban: 'DE87200500001234567890',
identifier: 'DE98ZZZ09999999999'

# Second: Add transactions
dd.add_transaction :name => 'Zahlemann & Söhne GbR',
:bic => 'SPUEDE2UXXX',
:iban => 'DE21500500009876543210',
:amount => 39.99,
:reference => 'XYZ/2013-08-ABO/6789',
:remittance_information => 'Vielen Dank für Ihren Einkauf!',
:mandate_id => 'K-02-2011-12345',
:mandate_date_of_signature => Date.new(2011,1,25)
dd.add_transaction name: 'Zahlemann & Söhne GbR',
bic: 'SPUEDE2UXXX',
iban: 'DE21500500009876543210',
amount: 39.99,
reference: 'XYZ/2013-08-ABO/6789',
remittance_information: 'Vielen Dank für Ihren Einkauf!',
mandate_id: 'K-02-2011-12345',
mandate_date_of_signature: Date.new(2011,1,25)
dd.add_transaction ...

# Last: create XML string
Expand All @@ -53,17 +53,17 @@ How to create a SEPA file for credit transfer ("Überweisung")

```ruby
# First: Create the main object
ct = SEPA::CreditTransfer.new :name => 'Schuldner GmbH',
:bic => 'BANKDEFFXXX',
:iban => 'DE87200500001234567890'
ct = SEPA::CreditTransfer.new name: 'Schuldner GmbH',
bic: 'BANKDEFFXXX',
iban: 'DE87200500001234567890'

# Second: Add transactions
ct.add_transaction :name => 'Telekomiker AG',
:bic => 'PBNKDEFF370',
:iban => 'DE37112589611964645802',
:amount => 102.50,
:reference => 'XYZ-1234/123',
:remittance_information => 'Rechnung vom 22.08.2013'
ct.add_transaction name: 'Telekomiker AG',
bic: 'PBNKDEFF370',
iban: 'DE37112589611964645802',
amount: 102.50,
reference: 'XYZ-1234/123',
remittance_information: 'Rechnung vom 22.08.2013'
ct.add_transaction ...

# Last: create XML string
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Expand Up @@ -3,4 +3,4 @@ require 'rspec/core/rake_task'

RSpec::Core::RakeTask.new(:spec)

task :default => :spec
task default: :spec
6 changes: 3 additions & 3 deletions lib/sepa_king/account.rb
View file
Expand Up @@ -5,11 +5,11 @@ class Account
extend Converter

attr_accessor :name, :iban, :bic
convert :name, :to => :text
convert :name, to: :text

validates_presence_of :name, :iban, :bic
validates_length_of :name, :maximum => 70
validates_length_of :bic, :within => 8..11
validates_length_of :name, maximum: 70
validates_length_of :bic, within: 8..11

validate do |t|
errors.add(:iban, 'is invalid') unless IBANTools::IBAN.valid?(t.iban.to_s)
Expand Down
2 changes: 1 addition & 1 deletion lib/sepa_king/account/creditor_account.rb
View file
Expand Up @@ -3,6 +3,6 @@ module SEPA
class CreditorAccount < Account
attr_accessor :identifier

validates_length_of :identifier, :is => 18
validates_length_of :identifier, is: 18
end
end
2 changes: 1 addition & 1 deletion lib/sepa_king/message.rb
View file
Expand Up @@ -24,7 +24,7 @@ def amount_total
def build_xml(&block)
raise RuntimeError.new(account.errors.full_messages.join("\n")) unless account.valid?

builder = Builder::XmlMarkup.new :indent => 2
builder = Builder::XmlMarkup.new indent: 2
builder.instruct!
yield(builder)
end
Expand Down
2 changes: 1 addition & 1 deletion lib/sepa_king/message/credit_transfer.rb
View file
Expand Up @@ -63,7 +63,7 @@ def build_transactions(builder)
builder.EndToEndId(transaction.reference || 'NOTPROVIDED')
end
builder.Amt do
builder.InstdAmt('%.2f' % transaction.amount, :Ccy => 'EUR')
builder.InstdAmt('%.2f' % transaction.amount, Ccy: 'EUR')
end
builder.CdtrAgt do
builder.FinInstnId do
Expand Down
2 changes: 1 addition & 1 deletion lib/sepa_king/message/direct_debit.rb
View file
Expand Up @@ -76,7 +76,7 @@ def build_transactions(builder)
builder.PmtId do
builder.EndToEndId(transaction.reference || 'NOTPROVIDED')
end
builder.InstdAmt('%.2f' % transaction.amount, :Ccy => 'EUR')
builder.InstdAmt('%.2f' % transaction.amount, Ccy: 'EUR')
builder.DrctDbtTx do
builder.MndtRltdInf do
builder.MndtId(transaction.mandate_id)
Expand Down
14 changes: 7 additions & 7 deletions lib/sepa_king/transaction.rb
View file
Expand Up @@ -5,15 +5,15 @@ class Transaction
extend Converter

attr_accessor :name, :iban, :bic, :amount, :reference, :remittance_information
convert :name, :reference, :remittance_information, :to => :text
convert :amount, :to => :decimal
convert :name, :reference, :remittance_information, to: :text
convert :amount, to: :decimal

validates_presence_of :name, :iban, :bic, :amount
validates_length_of :name, :maximum => 70
validates_length_of :bic, :within => 8..11
validates_length_of :reference, :maximum => 35, :minimum => 1, :allow_nil => true
validates_length_of :remittance_information, :minimum => 1, :maximum => 140, :allow_nil => true
validates_numericality_of :amount, :greater_than => 0
validates_length_of :name, maximum: 70
validates_length_of :bic, within: 8..11
validates_length_of :reference, maximum: 35, minimum: 1, allow_nil: true
validates_length_of :remittance_information, minimum: 1, maximum: 140, allow_nil: true
validates_numericality_of :amount, greater_than: 0

validate do |t|
errors.add(:iban, 'is invalid') unless IBANTools::IBAN.valid?(t.iban.to_s)
Expand Down
2 changes: 1 addition & 1 deletion lib/sepa_king/transaction/direct_debit_transaction.rb
View file
Expand Up @@ -3,7 +3,7 @@ module SEPA
class DirectDebitTransaction < Transaction
attr_accessor :mandate_id, :mandate_date_of_signature

validates_length_of :mandate_id, :within => 1..35
validates_length_of :mandate_id, within: 1..35
validates_presence_of :mandate_date_of_signature

validate do |t|
Expand Down
14 changes: 7 additions & 7 deletions spec/account_spec.rb
View file
Expand Up @@ -5,7 +5,7 @@
describe 'Initialization' do
it 'should not accept unknown keys' do
expect {
SEPA::Account.new :foo => 'bar'
SEPA::Account.new foo: 'bar'
}.to raise_error(NoMethodError)
end
end
Expand All @@ -14,15 +14,15 @@
it 'should accept valid value' do
[ 'Gläubiger GmbH', 'Zahlemann & Söhne GbR', 'X' * 70 ].each do |value_value|
expect(
SEPA::Account.new :name => value_value
SEPA::Account.new name: value_value
).to have(:no).errors_on(:name)
end
end

it 'should not accept invalid value' do
[ nil, '', 'X' * 71 ].each do |invalue_value|
expect(
SEPA::Account.new :name => invalue_value
SEPA::Account.new name: invalue_value
).to have_at_least(1).errors_on(:name)
end
end
Expand All @@ -32,15 +32,15 @@
it 'should accept valid value' do
[ 'DE21500500009876543210', 'PL61109010140000071219812874' ].each do |value_value|
expect(
SEPA::Account.new :iban => value_value
SEPA::Account.new iban: value_value
).to have(:no).errors_on(:iban)
end
end

it 'should not accept invalid value' do
[ nil, '', 'invalid' ].each do |invalue_value|
expect(
SEPA::Account.new :iban => invalue_value
SEPA::Account.new iban: invalue_value
).to have_at_least(1).errors_on(:iban)
end
end
Expand All @@ -50,15 +50,15 @@
it 'should accept valid value' do
[ 'DEUTDEFF', 'DEUTDEFF500', 'SPUEDE2UXXX' ].each do |value_value|
expect(
SEPA::Account.new :bic => value_value
SEPA::Account.new bic: value_value
).to have(:no).errors_on(:bic)
end
end

it 'should not accept invalid value' do
[ nil, '', 'invalid' ].each do |invalue_value|
expect(
SEPA::Account.new :bic => invalue_value
SEPA::Account.new bic: invalue_value
).to have_at_least(1).errors_on(:bic)
end
end
Expand Down
46 changes: 23 additions & 23 deletions spec/credit_transfer_spec.rb
View file
Expand Up @@ -3,9 +3,9 @@

describe SEPA::CreditTransfer do
let(:credit_transfer) {
SEPA::CreditTransfer.new :name => 'Schuldner GmbH',
:bic => 'BANKDEFFXXX',
:iban => 'DE87200500001234567890'
SEPA::CreditTransfer.new name: 'Schuldner GmbH',
bic: 'BANKDEFFXXX',
iban: 'DE87200500001234567890'
}

describe :new do
Expand All @@ -19,20 +19,20 @@
describe :add_transaction do
it 'should add valid transactions' do
3.times {
credit_transfer.add_transaction :name => 'Telekomiker AG',
:bic => 'PBNKDEFF370',
:iban => 'DE37112589611964645802',
:amount => 102.50,
:reference => 'XYZ-1234/123',
:remittance_information => 'Rechnung vom 22.08.2013'
credit_transfer.add_transaction name: 'Telekomiker AG',
bic: 'PBNKDEFF370',
iban: 'DE37112589611964645802',
amount: 102.50,
reference: 'XYZ-1234/123',
remittance_information: 'Rechnung vom 22.08.2013'
}

expect(credit_transfer).to have(3).transactions
end

it 'should fail for invalid transaction' do
expect {
credit_transfer.add_transaction :name => ''
credit_transfer.add_transaction name: ''
}.to raise_error(ArgumentError)
end
end
Expand All @@ -50,19 +50,19 @@
before :each do
@ct = credit_transfer

@ct.add_transaction :name => 'Telekomiker AG',
:bic => 'PBNKDEFF370',
:iban => 'DE37112589611964645802',
:amount => 102.50,
:reference => 'XYZ-1234/123',
:remittance_information => 'Rechnung vom 22.08.2013'

@ct.add_transaction :name => 'Amazonas GmbH',
:bic => 'TUBDDEDDXXX',
:iban => 'DE27793589132923472195',
:amount => 59.00,
:reference => 'XYZ-5678/456',
:remittance_information => 'Rechnung vom 21.08.2013'
@ct.add_transaction name: 'Telekomiker AG',
bic: 'PBNKDEFF370',
iban: 'DE37112589611964645802',
amount: 102.50,
reference: 'XYZ-1234/123',
remittance_information: 'Rechnung vom 22.08.2013'

@ct.add_transaction name: 'Amazonas GmbH',
bic: 'TUBDDEDDXXX',
iban: 'DE27793589132923472195',
amount: 59.00,
reference: 'XYZ-5678/456',
remittance_information: 'Rechnung vom 21.08.2013'
end

it 'should create valid XML file' do
Expand Down
12 changes: 6 additions & 6 deletions spec/credit_transfer_transaction_spec.rb
View file
Expand Up @@ -4,12 +4,12 @@
describe SEPA::CreditTransferTransaction do
it 'should initialize a new transaction' do
expect(
SEPA::CreditTransferTransaction.new :name => 'Telekomiker AG',
:iban => 'DE37112589611964645802',
:bic => 'PBNKDEFF370',
:amount => 102.50,
:reference => 'XYZ-1234/123',
:remittance_information => 'Rechnung 123 vom 22.08.2013'
SEPA::CreditTransferTransaction.new name: 'Telekomiker AG',
iban: 'DE37112589611964645802',
bic: 'PBNKDEFF370',
amount: 102.50,
reference: 'XYZ-1234/123',
remittance_information: 'Rechnung 123 vom 22.08.2013'
).to be_valid
end
end
12 changes: 6 additions & 6 deletions spec/creditor_account_spec.rb
View file
Expand Up @@ -4,26 +4,26 @@
describe SEPA::CreditorAccount do
it 'should initialize a new account' do
expect(
SEPA::CreditorAccount.new :name => 'Gläubiger GmbH',
:bic => 'BANKDEFFXXX',
:iban => 'DE87200500001234567890',
:identifier => 'DE98ZZZ09999999999'
SEPA::CreditorAccount.new name: 'Gläubiger GmbH',
bic: 'BANKDEFFXXX',
iban: 'DE87200500001234567890',
identifier: 'DE98ZZZ09999999999'
).to be_valid
end

describe :identifier do
it 'should accept valid value' do
[ 'DE98ZZZ09999999999' ].each do |value_value|
expect(
SEPA::CreditorAccount.new :identifier => value_value
SEPA::CreditorAccount.new identifier: value_value
).to have(:no).errors_on(:identifier)
end
end

it 'should not accept invalid value' do
[ '', 'invalid' ].each do |invalue_value|
expect(
SEPA::CreditorAccount.new :identifier => invalue_value
SEPA::CreditorAccount.new identifier: invalue_value
).to have_at_least(1).errors_on(:identifier)
end
end
Expand Down
6 changes: 3 additions & 3 deletions spec/debtor_account_spec.rb
View file
Expand Up @@ -4,9 +4,9 @@
describe SEPA::DebtorAccount do
it 'should initialize a new account' do
expect(
SEPA::DebtorAccount.new :name => 'Gläubiger GmbH',
:bic => 'BANKDEFFXXX',
:iban => 'DE87200500001234567890'
SEPA::DebtorAccount.new name: 'Gläubiger GmbH',
bic: 'BANKDEFFXXX',
iban: 'DE87200500001234567890'
).to be_valid
end
end

0 comments on commit b6464a8

Please sign in to comment.