king_dtaus 2.0.4.pre → 2.0.4

data/.gitignore

@@ -0,0 +1,9 @@
+nbproject/*
+.rvmrc
+coverage/*
+rdoc/*
+pkg/*
+.DS_Store
+DTAUS0.TXT
+dta.txt
+Gemfile.lock

data/Gemfile

@@ -1,7 +1,2 @@
 source :rubygems
-
-gemspec
-
-group :test do
-  gem "rcov"
-end
+gemspec

data/README.markdown

@@ -18,38 +18,35 @@ We love building payment applications.
 
 ## Features
 
-* Create DTAUS debit advice (Lastschrift)
-* Create DTAUS credit advice (Gutschrift)
-* Create DTAZV debit advice
-* High test coverage to ensure software quality
+* Create DTAUS debit transfer (Lastschrift)
+* Create DTAUS credit transfer (Gutschrift)
+* Create DTAZV debit transfer
+* 100% test coverage to ensure software quality
+* works with ruby 1.8 & 1.9.2
 
-## Beta Version Info
+## Version Info
 
-We are working on version 2 of the gem with some breaking changes!
+Version 2 has breaking changes!
 
 * account attributes now passed in as hash
-* renamed of account attributes client_xy => owner_xy
-* renamed account.account_number to bank_account_number
+* renamed account.client_xy => owner_xy
+* renamed account.account_number => bank_account_number
 * added iban/bic to account
 * DTAZV added
 
-Go for it:
-
-    gem install king_dtaus --pre
-    # or add a pre version to your Gemfile
-    gem 'king_dtaus', '2.0.3.pre'
+If you want to stay with v1 just pin it in your Gemfile:
+    
+    gem "king_dtaus", "<2"
 
 ## TODOs
 
-* first gem with no todo's - never seen it, huh? - just kidding
-* some more edge-case tests needed
+* some more edge-case tests needed, we need your feedback here!
 
 ## Resources
 
 * SalesKing: http://salesking.eu
 * DTAZV-Viewer: http://www.meta-evolutions.de/pages/artikel-20070630-dtazv-datei-betrachter.html
 * DTA/DTAZV PHP Pear: http://pear.php.net/package/Payment_DTA
-* Ruby Kernel Module: http://www.ruby-doc.org/core/classes/Kernel.html
 * Windata ZV-Tools: http://www.windata.de/Site/2Produkte2/ZVTools.aspx
 * The Swift Codes: http://www.theswiftcodes.com/
 * StarMoney: http://www.starmoney.de/index.php?id=starmoneybusiness_testen
@@ -60,63 +57,68 @@ Here are some examples how to create a DTA- or DTAZV-File. Also check out the sp
 
 ### DTA
 
-    # create a new dtaus object
-    dta = KingDta::Dtaus.new('LK')
+```ruby
+# create a new dtaus object
+dta = KingDta::Dtaus.new('LK')
   
-    # set sender account
-    dta.account = KingDta::Account.new(
+# set sender account
+dta.account = KingDta::Account.new(
                     :bank_account_number => "123456789",
                     :bank_number => "69069096",
                     :owner_name => "Return to Sender",
                     :bank_name => "Money Burner Bank")
   
-    # following should be done in a loop to add multiple bookings
-    # create receiving account
-    receiver = KingDta::Account.new(
+# following should be done in a loop to add multiple bookings
+# create receiving account
+receiver = KingDta::Account.new(
                     :bank_account_number => "987456123",
                     :bank_number => "99099096",
                     :owner_name => "Gimme More Lt.",
                     :bank_name => "Banking Bandits")
-    # create booking
-    booking = KingDta::Booking.new(receiver, 100.00 )
+# create booking
+booking = KingDta::Booking.new(receiver, 100.00 )
   
-    # set booking text if you want to
-    booking.text = "Thanks for your purchase"
+# set booking text if you want to
+booking.text = "Thanks for your purchase"
  
-    # add booking
-    dta.add( booking )
-    # end loop
+# add booking
+dta.add( booking )
+# end loop
 
-    # create datausstring and do with it whatever fits your workflow
-    my_str = dta.create
+# create datausstring and do with it whatever fits your workflow
+my_str = dta.create
 
+```
 ### DTAZV
 
-    @dtazv = KingDta::Dtazv.new(Date.today)
+```ruby 
+@dtazv = KingDta::Dtazv.new()
 
-    # sender account
-    @dtazv.account = KingDta::Account.new(
+# sender account
+@dtazv.account = KingDta::Account.new(
       :bank_account_number => "123456789",
       :bank_number => "40050100",
       :bank_name => "Greedy Fuckers Bank",
       :owner_name => "Sender name"
-    )
+)
 
-    # receiver account
-    receiver = KingDta::Account.new(
+# receiver account
+receiver = KingDta::Account.new(
       :bank_account_number => "987654321",
       :bank_iban => "PLsome-long-Iban",
       :bank_bic => "BicCode",
       :owner_name => "receivers name"
-    )
-    # add bookings, probably in a loop
-    booking = KingDta::Booking.new(receiver, 220.25)
-    @dtazv.add(booking)
+)
+
+# add bookings, probably in a loop
+booking = KingDta::Booking.new(receiver, 220.25)
+@dtazv.add(booking)
 
-    # get output as string
-    @dtazv.create
+# get output as string
+@dtazv.create
+```
 
-also make sure to read the specs
+also make sure to read the code and the specs
 
 ## Credits
 
@@ -126,9 +128,6 @@ Bugfixes and enhancements by
 * Kim Rudolph - https://github.com/krudolph
 * Thorsten Böttger - https://github.com/alto
 * Jan Kus - https://github.com/koos
+* used https://rubygems.org/gems/DTAUS as a starting point
 
-This gem used https://rubygems.org/gems/DTAUS as a starting point.
-It was disected, turned into a real class structure, bugs were fixed and
-of course a full test suite ensures its functionality.
-
-Copyright (c) 2009-2011 Georg Leciejewski (SalesKing), Jan Kus (Railslove), released under the MIT license
+Copyright (c) 2009-2011 Georg Leciejewski (SalesKing), Jan Kus (Railslove), released under the MIT license

data/Rakefile

@@ -1,31 +1,18 @@
 require 'rake'
+require 'rspec'
 require 'rspec/core/rake_task'
-
+require 'rdoc/task'
+require 'bundler/gem_helper'
+Bundler::GemHelper.install_tasks
 desc "Run specs"
 RSpec::Core::RakeTask.new
-
 task :default => :spec
 
-RSpec::Core::RakeTask.new(:coverage) do |t|
-  t.rcov = true
-  t.rcov_opts =  %q[--exclude "spec"]
-  t.verbose = true
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "king_dtaus"
-    gem.summary = %Q{Generate DTAUS strings and files}
-    gem.description = %Q{DTAUS is a text-based format, to create bank transfers for german banks. This gem helps with the creation of those transfer files.}
-    gem.email = "gl@salesking.eu"
-    gem.homepage = "http://github.com/salesking/king_dtaus"
-    gem.authors = ["Georg Leciejewski", "Georg Ledermann", "Jan Kus"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+desc 'Generate documentation'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'docs/rdoc'
+  rdoc.title    = 'KingPdf'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/king_dtaus.gemspec

@@ -1,76 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'king_dta/version'
 
 Gem::Specification.new do |s|
   s.name = %q{king_dtaus}
-  s.version = "2.0.4.pre"
+  s.version = KingDta::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Georg Leciejewski", "Georg Ledermann", "Jan Kus"]
-  s.date = %q{2011-09-19}
-  s.description = %q{DTAUS is a text-based format, to create bank transfers for german banks. This gem helps with the creation of those transfer files.}
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
+  s.authors = ['Georg Leciejewski', 'Georg Ledermann', 'Jan Kus']
+  s.date = %q{2011-11-15}
+  s.summary = %q{Generate DTA/DTAUS and DTAZV bank transfer files .. the easy way}
+  s.description = %q{DTA/DTAUS and DTAZV are text-based formats to create bank transfers for german banks.
+This gem creates DTA/DATAUS files for inner german credit and debit(Gutschrift/Lastschrift) transfers.
+It is also capable of creating DTAZV credit-files for transfers from Germany to European SEPA region.}
   s.email = %q{gl@salesking.eu}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".travis.yml",
-    "Gemfile",
-    "MIT-LICENSE",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "docs/dtazv.pdf",
-    "docs/dtazv_bank_bbk.pdf",
-    "docs/example.output",
-    "king_dtaus.gemspec",
-    "lib/king_dta/account.rb",
-    "lib/king_dta/booking.rb",
-    "lib/king_dta/dta.rb",
-    "lib/king_dta/dtaus.rb",
-    "lib/king_dta/dtazv.rb",
-    "lib/king_dta/exception.rb",
-    "lib/king_dta/helper.rb",
-    "lib/king_dtaus.rb",
-    "spec/account_spec.rb",
-    "spec/booking_spec.rb",
-    "spec/dtaus_spec.rb",
-    "spec/dtazv_spec.rb",
-    "spec/helper_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.extra_rdoc_files = ['README.markdown']
+  s.executables   = nil
+  s.files         = `git ls-files`.split("\n").reject{|i| i[/^docs\//] }
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+
   s.homepage = %q{http://github.com/salesking/king_dtaus}
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
   s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Generate DTAUS strings and files}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_runtime_dependency 'i18n'
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'rake', '>= 0.9.2'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<king_dtaus>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<i18n>, [">= 0"])
-    else
-      s.add_dependency(%q<king_dtaus>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<king_dtaus>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-  end
 end
 

data/lib/king_dta/account.rb

@@ -1,18 +1,18 @@
 # encoding: utf-8
 module KingDta
-  # A bank account with name of the account owner,
-  # Kontodaten verwalten mit Name des Inhabers und Bank, Bankleitzahl und Kontonummer.
+  # Bank account and owner information
   class Account
     include KingDta::Helper
-    
-    attr_accessor :bank_account_number, :bank_number, :bank_street, :bank_city,
+
+    attr_accessor :bank_street, :bank_city,
                   :bank_zip, :bank_name, :bank_country_code, :bank_iban,
                   :bank_bic,
                   :owner_name, :owner_number, :owner_street, :owner_city,
                   :owner_zip_code, :owner_country_code
+    attr_reader :bank_account_number, :bank_number
 
-    # TODO test
     def initialize(args={})
+      args = args.dup
 
       @bank_street = convert_text(args.delete(:bank_street))
       @bank_city = convert_text(args.delete(:bank_city))
@@ -26,23 +26,44 @@ module KingDta
       end
 
       raise ArgumentError.new('Owner number too long, max 10 allowed') if @owner_number && "#{@owner_number}".length > 10
-      raise ArgumentError.new("Owner street too long, max 35 allowed") if @owner_street && @owner_street.length > 35
-      raise ArgumentError.new("Owner city too long, max 35 allowed") if @owner_city && @owner_city.length > 35
-      raise ArgumentError.new("Owner country code too long, max 2 allowed") if @owner_country_code && @owner_country_code.length > 2
+      raise ArgumentError.new('Owner street too long, max 35 allowed') if @owner_street && @owner_street.length > 35
+      raise ArgumentError.new('Owner city too long, max 35 allowed') if @owner_city && @owner_city.length > 35
+      raise ArgumentError.new('Owner country code too long, max 2 allowed') if @owner_country_code && @owner_country_code.length > 2
+
 
-      raise ArgumentError.new('Bank account number too long, max 35 allowed') if @bank_account_number && "#{@bank_account_number}".length > 35
-      raise ArgumentError.new("Bank account number cannot be 0")  if @bank_account_number && @bank_account_number == 0
       raise ArgumentError.new("Bank iban wrong length: #{@bank_iban.length}, must be between 15-34") if @bank_iban && !@bank_iban.length.between?(15,34)
       raise ArgumentError.new("Bank bic wrong length: #{@bank_bic.length} must be between 8-11") if @bank_bic && !@bank_bic.length.between?(8,11)
-      raise ArgumentError.new('Bank number too long, max 11 allowed') if @bank_number && "#{@bank_number}".length > 11
-      raise ArgumentError.new("Bank number cannot be 0")   if @bank_number && @bank_number == 0
-      raise ArgumentError.new("Bank street too long, max 35 allowed") if @bank_street && @bank_street.length > 35
-      raise ArgumentError.new("Bank city too long, max 35 allowed") if @bank_city && @bank_city.length > 35
-      raise ArgumentError.new("Bank name too long, max 35 allowed") if @bank_name && @bank_name.length > 35
-      raise ArgumentError.new("Bank country code too long, max 2 allowed") if @bank_country_code && @bank_country_code.length > 2
+
+      raise ArgumentError.new('Bank street too long, max 35 allowed') if @bank_street && @bank_street.length > 35
+      raise ArgumentError.new('Bank city too long, max 35 allowed') if @bank_city && @bank_city.length > 35
+      raise ArgumentError.new('Bank name too long, max 35 allowed') if @bank_name && @bank_name.length > 35
+      raise ArgumentError.new('Bank country code too long, max 2 allowed') if @bank_country_code && @bank_country_code.length > 2
 
       @owner_country_code = @bank_iban[0..1 ] if @bank_iban && !@owner_country_code
+    end
+
+    # Cast given account number to integer. Strips spaces and leading zeros
+    # from the bank account number.
+    # DTA relies on integers for checksums and field values.
+    # @param [String|Integer] number
+    def bank_account_number=(number)
+      nr_str = "#{number}".gsub(/\s/,'')
+      raise ArgumentError.new('Bank account number too long, max 10 allowed') if nr_str.length > 10
+      raise ArgumentError.new('Bank account number cannot be 0') if nr_str == '0'
+
+      @bank_account_number = nr_str.to_i
+    end
+
+    # Cast given bank number to integer. Strips spaces and leading zeros
+    # from the bank account number.
+    # DTA relies on integers for checksums and field values.
+    # @param [String|Integer] number
+    def bank_number=(number)
+      nr_str = "#{number}".gsub(/\s/,'')
+      raise ArgumentError.new('Bank number too long, max 8 allowed') if nr_str.length > 8
+      raise ArgumentError.new('Bank number cannot be 0') if nr_str == '0'
 
+      @bank_number = nr_str.to_i
     end
 
     def bank_zip_city

data/lib/king_dta/booking.rb

@@ -8,17 +8,21 @@ module KingDta
     LASTSCHRIFT_EINZUGSERMAECHTIGUNG = '05000'
     UEBERWEISUNG_GUTSCHRIFT          = '51000'
 
-    attr_accessor :value, :account, :text, :account_key
+    attr_accessor :value, :account, :text, :account_key, :currency, :charge_bearer_code
     #Eine Buchung ist definiert durch:
     #- Konto (siehe Klasse Konto
     #- Betrag
     #  Der Betrag kann , oder . als Dezimaltrenner enthalten.
     #- optional Buchungstext
-    def initialize( account, value, text=nil, account_key=nil )
+    def initialize( account, value, text=nil, account_key=nil, currency="EUR" )
       raise Exception.new("Hey, a booking should have an Account") unless account.kind_of?( Account )
       @account = account
       @text = text ? convert_text( text ) : text
       @account_key = account_key
+      if currency.size != 3
+        raise Exception.new("currency code needs to be 3 chars. You gave me: #{currency.inspect}")
+      end
+      @currency = currency
       if value.is_a?(String)
         value = BigDecimal.new value.sub(',', '.')
       elsif value.is_a?(Numeric)
@@ -28,7 +32,7 @@ module KingDta
       end
       value = ( value * 100 ).to_i  #€-Cent
       if value == 0
-        raise Exception.new("A booking of 0.00 € makes no sence")
+        raise Exception.new("A booking of 0.00 #{@currency} makes no sense")
       elsif value > 0
         @value = value
         @pos   = true

data/lib/king_dta/dtaus.rb

@@ -36,8 +36,8 @@ module KingDta
     def set_checksums
       @sum_bank_account_numbers, @sum_bank_numbers, @sum_values  = 0,0,0
       bookings.each do |b|
-        @sum_bank_account_numbers  += b.account.bank_account_number.to_i
-        @sum_bank_numbers += b.account.bank_number.to_i
+        @sum_bank_account_numbers  += b.account.bank_account_number
+        @sum_bank_numbers += b.account.bank_number
         @sum_values += b.value
       end
     end
@@ -63,7 +63,7 @@ module KingDta
     # 11b 95    8      Ausführungsdatum Format DDMMJJJJ. max A7 + 15 Tage. Default Blanks.
     # 11c 103   24     Reserviert, 24 Blanks
     # 12  127   1      Währungskennzeichen  "1" = Euro
-    #                  
+    #
     #    Insgesamt 128 Zeichen
     def add_a
       data = '0128'
@@ -74,7 +74,7 @@ module KingDta
       data += '%-27.27s' % @account.owner_name
       data += @date.strftime("%d%m%y")              # creation date - today
       data += ' ' * 4
-      data += '%010i' % @account.bank_account_number.to_i
+      data += '%010i' % @account.bank_account_number
       data += '%010i' % 0
       data += ' '  * 15
       data += '%8s' % @date.strftime("%d%m%Y")     #Ausführungsdatum - ja hier 8 Stellen
@@ -153,13 +153,13 @@ module KingDta
       data1 = 'C'
       data1 +=  '%08i' % 0
       data1 +=  '%-08i' % booking.account.bank_number
-      data1 +=  '%010i' % booking.account.bank_account_number.to_i
+      data1 +=  '%010i' % booking.account.bank_account_number
       data1 +=  '0%011i0' % (booking.account.owner_number || 0)   #interne Kundennummer
       data1 +=  zahlungsart
       data1 +=  ' '
       data1 +=  '0' * 11
       data1 +=  '%08i' % @account.bank_number
-      data1 +=  '%010i' % @account.bank_account_number.to_i
+      data1 +=  '%010i' % @account.bank_account_number
       data1 +=  '%011i' % booking.value #Betrag in Euro einschl. Nachkomma
       data1 +=  ' ' * 3
       data1 +=  '%-27.27s' % booking.account.owner_name
@@ -172,7 +172,7 @@ module KingDta
       booking_txt = booking.text || default_text
       #Erste 27 Zeichen
       #if text < 26  fill with spaces
-      data2 +=  booking_txt[0..26].ljust(27)
+      data2 += booking_txt[0..26].ljust(27)
       booking_txt = booking_txt[27..999]
       # cut text into 27 long pieces
       while booking_txt && booking_txt.size > 0 && exts.size < 13
@@ -184,7 +184,7 @@ module KingDta
       data2 +=  '1' #EUR
       data2 +=  ' ' * 2
       # Gesamte Satzlänge ermitteln ( data1(+4) + data2 + Erweiterungen )
-      data1 = "%04i#{data1}" % ( data1.size + 4 + data2.size+ 2 + exts.size * 29 )
+      data1 = "%04i#{data1}" % ( data1.size + 4 + data2.size + 2 + exts.size * 29 )
       raise "DTAUS: Längenfehler C/1 #{data1.size} nicht 128, #{booking.account.owner_name}" unless data1.size == 128
       dta_string << data1
       #Anzahl Erweiterungen anfügen

data/lib/king_dta/dtazv.rb

@@ -35,9 +35,8 @@ module KingDta
     # Datensatz Q - kurze Variante
     # Die Bundesbank nimmt Q-Sätze in 2 Varianten entgegen. Die lange Variante ist identisch mit
     # den von den Auftraggebern gelieferten Q-Sätzen. In der kurzen Variante sind nur die Felder
-    # enthalten, die von der Bundesbank bei der Bearbeitung der Meldungen benötigt werden; das in der
-    # kurzen Variante nicht enthaltene Feld ist in der folgenden Tabelle durch Schattierung und Kursivschrift
-    # kenntlich gemacht. Beide Varianten dürfen in einer Datei vorkommen.
+    # enthalten, die von der Bundesbank bei der Bearbeitung der Meldungen benötigt werden.
+    # Beide Varianten dürfen in einer Datei vorkommen.
     # [ Anmerk.: Bei der Kurzen Variante entfällt die Kundennummer ]
     #
     # === Fields
@@ -45,7 +44,7 @@ module KingDta
     # 1   1     4      Satzlänge numerisch bei Disketten und DFÜ
     # 2   5     1      Satzart Konstante "Q"
     # 3   6     8      BLZ  Erstbeauftragtes Kreditinstitut
-    # 4   14    10     Kundennummer Entfällt bei der kurzen Variante
+    # 4   14    10     Kontonummer Auftraggeber Entfällt bei der kurzen Variante
     # 5   24    4x35   Auftraggeberdaten Zeile 1 und 2: Name;
     #                    Zeile 3: Straße/Postfach; Zeile 4: Ort
     # 6   164   6      Erstellungsdatum Format: JJMMTT
@@ -67,7 +66,7 @@ module KingDta
       data1 += @date.strftime("%y%m%d")                # Erstellungsdatum
       data1 += '01'
       data1 += @date.strftime("%y%m%d")                # Ausführungstermin
-      data1 += "N"                                     
+      data1 += "N"
       data1 += "%02i" % 0
       data1 += '%08i' % 0
       data1 += '%068s' % ''
@@ -112,13 +111,11 @@ module KingDta
     #                Pflicht, wenn T8 nicht belegt; nicht zu belegen bei Scheckziehungen,
     # 9b  68   4x35  Anschrift Bank des Zahlungsempfängers. Pflicht wenn T8 nicht belegt
     #                Wenn Anschrift nicht bekannt„UNBEKANNT"
-    #                Zeile 1 und 2: Name Zeile 3: Straße Zeile 4: Ort 
+    #                Zeile 1 und 2: Name Zeile 3: Straße Zeile 4: Ort
     #                Nicht zu belegen bei Scheckziehungen
     #
-    #  10a   3               208               alpha           Ländercode für Land des           2-stelliger ISO-alpha-Ländercode gemäß              P               P                 -                                         P
-    #                                                         Zahlungsempfängers bzw.           Länderverzeichnis für die Zahlungsbilanzstatistik;
-    #                                                         Scheckempfängers                  linksbündig zu belegen; 3. Stelle Leerzeichen
-    # 10b   4x35            211               alpha           Zahlungsempfänger bzw.            Bei Zahlungsauftrag: Zahlungsempfänger Bei          P               P                 Angabe eines Scheckempfängers nicht       P               Angabe eines Scheck­ empfängers nicht möglich
+    # 10a 208  3  2-stelliger ISO-alpha-Ländercode des Zahlungsempfänger gemäß Länderverzeichnis für die Zahlungsbilanzstatistik; linksbündig zu belegen; 3. Stelle Leerzeichen
+    # 10b 211  4x35                           alpha           Zahlungsempfänger bzw.            Bei Zahlungsauftrag: Zahlungsempfänger Bei          P               P                 Angabe eines Scheckempfängers nicht       P               Angabe eines Scheck­ empfängers nicht möglich
     #                                                         Scheckempfänger                   Scheckziehung:	Scheckempfänger Zeile 1 und 2:                                        möglich
     #                                                                                           Name Zeile 3	: Straße Zeile 4	: Ort/Land.
     # Entfällt bei der kurzen Variante NUR FUER DIE BEARBEITUNG DER MELDUNGEN--------------------------------------------------------------------------------------------------------
@@ -207,7 +204,7 @@ module KingDta
       data2 += '%08i'  % 0                                          # KANN/PFLICHT 6 BLZ
       data2 += '%03s' % ''                                          # KANN/PFLICHT 7a ISO-Währungscode
       data2 += '%010i' % 0                                          # KANN/PFLICHT 7b BLZ
-      data2 += '%-011s' % booking.account.bank_bic                   
+      data2 += '%-011s' % booking.account.bank_bic
       data2 += '%-03s'  % booking.account.bank_country_code         # Pflichtfelder wenn T8 leer
       data2 += '%-070s' % booking.account.bank_name
       data2 += '%-035.35s' % booking.account.bank_street
@@ -219,7 +216,7 @@ module KingDta
       data2 += '%-035.35s' % booking.account.owner_zip_city
       data2 += '%070s' % ''                                         # KANN/PFLICHT 11 Ordervermerk
       data2 += '/%-034s' % booking.account.bank_iban                # PFLICHT 12 35 IBAN bzw. Kontonummer des
-      data2 += 'EUR'                                                # KANN/PFLICHT 13 3 Auftragswährung "EUR"
+      data2 += booking.currency                                     # KANN/PFLICHT 13 3 Auftragswährung (z.B. "EUR")
       data2 += '%014i' % booking.value.divmod(100)[0]               # PFLICHT 14a 14 Betrag (Vorkommastellen) Rechtsbündig
       data2 += '%02i0' % booking.value.divmod(100)[1]               # PFLICHT 14b 3 Betrag (Nachkommastellen) Linksbündig
       data2 += '%-0140s' % (booking.text || default_text)
@@ -228,7 +225,7 @@ module KingDta
       data2 += "%02i" % 0                                           # N 18 Weisungsschlüssel 3 (gem. Anhang 2)
       data2 += "%02i" % 0                                           # N 19 Weisungsschlüssel 4 (gem. Anhang 2 und 2a)
       data2 += '%025s' % ''                                         # N 20 Zusatzinformationen zum Weisungsschlüssel
-      data2 += "%02i" % 0                                           # PFLICHT 21 Entgeltregelung
+      data2 += "%02i" % (booking.charge_bearer_code || 0)           # PFLICHT 21 Entgeltregelung
       data2 += "%02i" % 13                                          # PFLICHT 22 Kennzeichnung der Zahlungsart     Gemäß Anhang 1; Zahlungen, die weder '11' noch '13' als Zahlungsartschlüssel enthalten
       data2 += '%027s' % ''                                         # KANN 23 Variabler Text nur für Auftraggeberabrechnung
       # i dont know what to do.
@@ -429,4 +426,4 @@ module KingDta
       # data += '%075s' # 11 Reserve
     end
   end
-end
+end

data/lib/king_dta/version.rb

@@ -0,0 +1,3 @@
+module KingDta
+  VERSION='2.0.4'
+end

data/spec/account_spec.rb

@@ -8,45 +8,79 @@ describe KingDta::Account do
   end
 
   it "should initialize a new account" do
-    lambda{ 
+    lambda{
       KingDta::Account.new(:bank_account_number => @ba.bank_account_number,
                            :bank_number => @ba.bank_number,
                            :owner_name => @ba.owner_name)
     }.should_not raise_error
   end
 
+  # KingDta::Acount.new tends to remove keys from supplied hashes, which breaks
+  # things when I create multiple DTAUS files at once.
+  it "should not remove data from hashes" do
+    sender = {:owner_street => "123 Random Street",
+              :bank_account_number => @ba.bank_account_number,
+              :bank_number => @ba.bank_number,
+              :owner_name => @ba.owner_name}
+
+    sender.keys.should include(:owner_street) # => true
+    KingDta::Account.new(sender)
+    sender.keys.should include(:owner_street) # => boom!
+  end
+
   it "should initialize a new dtazv account" do
-    lambda{ 
+    lambda{
       KingDta::Account.new(sender_opts)
     }.should_not raise_error
   end
 
+  it "should convert bank_account_number to integer" do
+    opts = {:bank_account_number => '0123456',
+             :bank_number => @ba.bank_number,
+             :owner_name => @ba.owner_name}
+    anct = KingDta::Account.new(opts)
+    anct.bank_account_number.should == 123456
+
+    anct2 = KingDta::Account.new(opts.merge(:bank_account_number=>'012 345 6'))
+    anct2.bank_account_number.should == 123456
+  end
+
+  it "should convert bank_number to integer" do
+    opts = {:bank_account_number => @ba.bank_account_number,
+             :bank_number => '0123',
+             :owner_name => @ba.owner_name}
+    anct = KingDta::Account.new(opts)
+    anct.bank_number.should == 123
+
+    anct2 = KingDta::Account.new(opts.merge(:bank_number=>'012 34 5'))
+    anct2.bank_number.should == 12345
+  end
+
   it "should fail if bank account number is invalid" do
-    # lambda{ KingDta::Account.new(0, @ba.bank_number, @ba.owner_name) }.should raise_error(ArgumentError)
-    lambda{ 
+    lambda{
       KingDta::Account.new(:bank_account_number => 123456789011123456789011123456789011,
                            :bank_number => @ba.bank_number,
                            :owner_name => @ba.owner_name)
 
-    }.should raise_error(ArgumentError, 'Bank account number too long, max 35 allowed')
+    }.should raise_error(ArgumentError, 'Bank account number too long, max 10 allowed')
   end
 
   it "should fail if bank number is invalid" do
-    lambda{ 
+    lambda{
       KingDta::Account.new( :bank_account_number => @ba.bank_account_number,
                             :bank_number => 0,
                             :owner_name => @ba.owner_name)
     }.should raise_error(ArgumentError)
 
-    lambda{ 
+    lambda{
       KingDta::Account.new( :bank_account_number => @ba.bank_account_number,
                             :bank_number => 123456789101112,
                             :owner_name => @ba.owner_name)
-    }.should raise_error(ArgumentError, 'Bank number too long, max 11 allowed')
+    }.should raise_error(ArgumentError, 'Bank number too long, max 8 allowed')
   end
 
   it "should fail if owner number is too long" do
-    lambda{ 
+    lambda{
       KingDta::Account.new( :bank_account_number => @ba.bank_account_number,
                             :bank_number => @ba.bank_number,
                             :owner_name => @ba.owner_name,
@@ -54,7 +88,7 @@ describe KingDta::Account do
     }.should raise_error(ArgumentError, 'Owner number too long, max 10 allowed')
   end
 
-  it "should fail if street and/or Zip Code is too long" do    
+  it "should fail if street and/or Zip Code is too long" do
     opts = sender_opts.merge( :bank_street => "Lorem ipsum dolor sit amet, consectetur")
     lambda{
       KingDta::Account.new(opts)
@@ -63,7 +97,7 @@ describe KingDta::Account do
 
   it "should fail if city is too long" do
     opts = sender_opts.merge( :bank_city => "Lorem ipsum dolor sit amet, consecte")
-    lambda{ 
+    lambda{
       KingDta::Account.new opts
     }.should raise_error(ArgumentError, 'Bank city too long, max 35 allowed')
   end
@@ -105,4 +139,4 @@ describe KingDta::Account do
     acnt = KingDta::Account.new( opts )
     acnt.owner_country_code.should == "PL"
   end
-end
+end

data/spec/dtaus_spec.rb

@@ -90,6 +90,20 @@ describe KingDta::Dtaus do
     str.should == out
   end
 
+  it "should create c-sektion with long account owner name in extension" do
+    @dtaus.account = KingDta::Account.new(:bank_account_number => @kto1.bank_account_number, :bank_number => @kto1.bank_number, 
+                                          :owner_name =>  'A very long name exeeding 27 characters even longer 54 chars', :bank_name => @kto1.bank_name)
+
+    @dtaus.add(@booking)
+    @dtaus.bookings.first.text = 'SalesKing Monatsbeitrag 08/10 Freelancer Version'
+    @dtaus.add_c(@booking)
+    str = @dtaus.dta_string
+    str.length.should == 256
+    str.should include(@kto2.owner_name.upcase)
+    out = "0245C00000000370400440002787777000000000000005000 0000000000037040044782897003700000022025   PETER & MAY GMBH                   A VERY LONG NAME EXEEDING 2SALESKING MONATSBEITRAG 08/1  020210 FREELANCER VERSION      037 CHARACTERS EVEN LONGER 54           "
+    str.should == out
+  end
+
   it "should create c-sektion with default booking text" do
     @dtaus.default_text = 'Default verwendungszweck'
     @dtaus.add_c(@booking)
@@ -114,6 +128,15 @@ describe KingDta::Dtaus do
     str.should == out
   end
 
+  it "should create whole dta string with long texts exeeding extension" do
+    @dtaus.account = KingDta::Account.new(:bank_account_number => @kto1.bank_account_number, :bank_number => @kto1.bank_number,
+                                          :owner_name =>  'A very long name exeeding 27 characters even longer 54 chars', :bank_name => @kto1.bank_name)
+    @dtaus.add(@booking)
+    @dtaus.bookings.first.text = 'Rgn R-3456-0102220 Monatsbeitrag 08/10 Freelancer Version Vielen Dank Ihre SalesKing GmbH' * 20
+    @dtaus.bookings.first.account.owner_name =  'A very long name exeeding 27 characters even longer 54 chars'
+    str = @dtaus.create ## should not raise error
+  end
+
   it "should create whole dta string with long booking text in extension" do
     @dtaus.add(@booking)
     @dtaus.bookings.first.text = 'Rgn R-3456-0102220 Monatsbeitrag 08/10 Freelancer Version Vielen Dank Ihre SalesKing GmbH'

data/spec/dtazv_spec.rb

@@ -4,6 +4,19 @@ require 'spec_helper'
 # All Test DTAZV output strings are validated with sFirm => lokal Sparkassen Software
 
 describe KingDta::Dtazv do
+  context "support for non-EUR currency" do
+    before do
+      @dtazv = KingDta::Dtazv.new(Date.parse('2011-08-28'))
+      @dtazv.account = KingDta::Account.new sender_opts
+      @booking = KingDta::Booking.new(KingDta::Account.new(swiss_receiver), 235.42, nil, nil, "CHF")
+    end
+
+    # FIXME: Write better tests later
+    it "should at least not raise an error" do
+      @dtazv.add(@booking)
+      @dtazv.create
+    end
+  end
 
   before :each do
     @dtazv = KingDta::Dtazv.new(Date.parse('2011-08-28'))

data/spec/spec_helper.rb

@@ -4,10 +4,10 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'simplecov'
 SimpleCov.start 'rails'
-SimpleCov.coverage_dir 'coverage/rspec'
+SimpleCov.coverage_dir 'coverage'
 
 require 'rubygems'
-require "king_dtaus"
+require 'king_dtaus'
 require 'rspec'
 require 'ostruct'
 require 'date'
@@ -21,16 +21,16 @@ def sender_opts
     :bank_account_number => '1326049634',
     :bank_number => '37050299',
     :bank_name => 'Kreissparkasse Köln',
-    :bank_street => "Bank Eine Straße 2",
-    :bank_city => "Bank Köln",
-    :bank_zip => "51063",
-    :bank_country_code => "DE",
-    :owner_number => "",
+    :bank_street => 'Bank Eine Straße 2',
+    :bank_city => 'Bank Köln',
+    :bank_zip => '51063',
+    :bank_country_code => 'DE',
+    :owner_number => '',
     :owner_name =>'Jan Kus',
-    :owner_street => "Meine Eine Straße 2",
-    :owner_city => "Meine Köln",
-    :owner_zip_code => "51063",
-    :owner_country_code => "DE"
+    :owner_street => 'Meine Eine Straße 2',
+    :owner_city => 'Meine Köln',
+    :owner_zip_code => '51063',
+    :owner_country_code => 'DE'
   }
 end
 
@@ -39,10 +39,10 @@ def receiver_opts
     :bank_iban => 'PL10105013151000002308622378',
     :bank_bic => 'COBADEFF366',
     :owner_name =>'Dalai Lama',
-    :owner_street => "Bush-Avenue 55",
-    :owner_city => "India",
-    :owner_zip_code => "445555",
-    :owner_country_code => "DE" # actually wrong since iban is in poland
+    :owner_street => 'Bush-Avenue 55',
+    :owner_city => 'India',
+    :owner_zip_code => '445555',
+    :owner_country_code => 'DE' # actually wrong since iban is in poland
 #    only needed if no bic present
 #    :bank_name => 'Dalai Lamas Bank',
 #    :bank_street => "5th avenue",
@@ -53,6 +53,19 @@ def receiver_opts
   }
 end
 
+def swiss_receiver
+  # Random data
+  {
+    :bank_iban => "CH6331142389293969079",
+    :bank_bic => "BPPBCHGGXXX",
+    :owner_name => "Muammar al-Gaddafi",
+    :owner_street => "Bitziusstrasse 40",
+    :owner_city => "Bern",
+    :owner_zip_code => "3000",
+    :owner_country_code => "CH"
+  }
+end
+
 def test_kto1
   opts = {
             :bank_account_number => '7828970037',

metadata

@@ -1,128 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: king_dtaus
-version: !ruby/object:Gem::Version 
-  hash: 961916020
-  prerelease: 6
-  segments: 
-  - 2
-  - 0
-  - 4
-  - pre
-  version: 2.0.4.pre
+version: !ruby/object:Gem::Version
+  version: 2.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Georg Leciejewski
 - Georg Ledermann
 - Jan Kus
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-11-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: king_dtaus
-  version_requirements: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: jeweler
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: i18n
-  version_requirements: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
   prerelease: false
-description: DTAUS is a text-based format, to create bank transfers for german banks. This gem helps with the creation of those transfer files.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+description: ! 'DTA/DTAUS and DTAZV are text-based formats to create bank transfers
+  for german banks.
+
+  This gem creates DTA/DATAUS files for inner german credit and debit(Gutschrift/Lastschrift)
+  transfers.
+
+  It is also capable of creating DTAZV credit-files for transfers from Germany to
+  European SEPA region.'
 email: gl@salesking.eu
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
+- .gitignore
 - .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- VERSION
-- docs/dtazv.pdf
-- docs/dtazv_bank_bbk.pdf
-- docs/example.output
 - king_dtaus.gemspec
 - lib/king_dta/account.rb
 - lib/king_dta/booking.rb
@@ -131,6 +137,7 @@ files:
 - lib/king_dta/dtazv.rb
 - lib/king_dta/exception.rb
 - lib/king_dta/helper.rb
+- lib/king_dta/version.rb
 - lib/king_dtaus.rb
 - spec/account_spec.rb
 - spec/booking_spec.rb
@@ -138,41 +145,31 @@ files:
 - spec/dtazv_spec.rb
 - spec/helper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/salesking/king_dtaus
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2948502894254657810
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Generate DTAUS strings and files
+summary: Generate DTA/DTAUS and DTAZV bank transfer files .. the easy way
 test_files: []
-

data/VERSION

@@ -1 +0,0 @@
-2.0.4.pre

data/docs/example.output

@@ -1,7 +0,0 @@
-0256P37040044                                                     Commerzbank Köln                   5th avenue 55323                        los angeles1106080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
-
-0256Q370400447828970037                                                   GIMME YOUR MONEY AG                  6th avenue 445555                        los angeles11060801110608N000000000000000000000000000000000000000000000000000000000000000000000000000000
-
-0572T37040044EUR782897003711060837040044EUR0037040044  MARKF1100                                                                                                                                                                                                            FIDEL CASTRO                                                                                                                                           0        GR1601101250000000012300695EUR00000000000220025                                                                                                                                             0 0 0 0                        00013                          0                                  00000000000000000000000000000000000000000000000000000 00
-
-256Y000000000000000000000000000000000000000000000000000000000000000000000001                                                                                                                                                                                  0