payment_dta 0.0.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e203d13d27d3c009b4a4272e5f29081448834171
+  data.tar.gz: a9f68912e4ac9a66c48d332a9c18fd731f102235
+SHA512:
+  metadata.gz: fdbeb4b0f138f16542a0f3a07597944890208c3c21a393561d21d459e0b1cc39a0da505a173b2656a58d3c885b9bd45e1e3ebfa485d1b84f56093392869d6b0c
+  data.tar.gz: 8ab81bac6b497554505da76df997f7aca3016d0797808e9846cd159db73c4040a6e621b2f973fd2911f28e9101cc486a96579cd392f611537ef941cab3a1958a

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,9 @@
+.DS_Store
+.rvmrc
+coverage
+rdoc
+pkg
+*.tmproj
+tmp/*.dta
+.bundle
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 1.9.2
+  - 1.9.3
+  - jruby-19mode

data/CHANGELOG

@@ -0,0 +1,20 @@
+# Changelog
+
+## 1.0.0
+
+* Discontinue support for Ruby 1.8
+* Support for Ruby 1.9.x and Ruby 2.0
+* Move to bundler
+* Run tests on travis.ci
+* fix issue #2 (calculate entry_sequence_number) (gewo)
+* use swift convention for amount formatting (gewo)
+* use BigDecimal for calculating the TotalRecord sum to prevent rounding
+errors (gewo)
+* truncate long input for beneficiary_address_line[1-4] (gewo)
+* convert characters in the @data-hash getter, before building the final
+record to get the correct record-lengths (gewo)
+
+### Contributors
+
+ * [gewo](https://github.com/gewo)
+ * [senny](https://github.com/senny)

data/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in payment_dta.gemspec
+gemspec

data/Rakefile

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'bundler/gem_tasks'
+require 'rake'
+require 'rdoc/task'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+end
+
+task :default => :spec
+
+
+RDoc::Task.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "payment_dta #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/payment_dta.rb

@@ -1,4 +1,5 @@
+require 'payment_dta/version'
 require 'payment_dta/dta_file'
 %w(esr_payment domestic_chf_payment financial_institution_payment bank_cheque_payment iban_payment special_financial_institution_payment total_record).each do |payment_type|
   require "payment_dta/payments/#{payment_type}"
-end
+end

data/lib/payment_dta/character_conversion.rb

@@ -1,4 +1,3 @@
-require 'iconv'
 module DTA
   module CharacterConversion
     CONVERSION_MAP_UTF8 = {
@@ -230,7 +229,7 @@ module DTA
     def map_characters(string)
       new_string = ""
       string.each_char do |character|
-        code = character.size == 1 ? character[0] : "#{character[0]}#{character[1]}".to_i
+        code = character.bytes.to_a.join('').to_i
         if CONVERSION_MAP_UTF8.has_key?(code)
           new_string << CONVERSION_MAP_UTF8[code][:convert_to]
         else
@@ -241,11 +240,11 @@ module DTA
     end
     
     def encode_characters(string)
-      Iconv.conv("ISO-8859-1", "UTF8",string)
+      string.encode('iso-8859-1')
     end
     
     def dta_string(string)
       encode_characters(map_characters(string))
     end
   end
-end
+end

data/lib/payment_dta/character_conversion_hash.rb

@@ -0,0 +1,15 @@
+require 'payment_dta/character_conversion'
+
+module DTA
+  class CharacterConversionHash < Hash
+    include CharacterConversion
+
+    # Character conversion must be done _before_ building the final record to
+    # prevent changing the length.
+    #
+    # @return [String] The original value with character conversion applied.
+    def [](key)
+      (value = super(key)).respond_to?(:each_char) ? dta_string(value) : value
+    end
+  end
+end

data/lib/payment_dta/dta_file.rb

@@ -1,31 +1,37 @@
 require 'set'
+require 'bigdecimal'
+require 'payment_dta/character_conversion_hash'
 require 'payment_dta/payments/total_record'
 class DTAFile
   attr_reader :records
-  
+
   def initialize(path, transaction_number = rand(100000000000).to_s)
     @transaction_number = transaction_number.to_s
     @path = path
     @records = SortedSet.new
   end
-  
+
   def write_file
     File.open(@path,"w") do |file|
       @records.each{|record| file.puts record.to_dta}
       file.puts build_total_record.to_dta
     end
   end
-  
+
   def total
     @records.inject(0) do |sum, record|
-      sum + record.amount.to_f
+      sum + BigDecimal.new(record.amount.to_s, 16)
     end
   end
-  
+
   def <<(record)
     record.transaction_number = @transaction_number
     @records << record
-    recalculate_output_sequence_numbers
+    recalculate_entry_sequence_numbers
+  end
+
+  def dta_string
+    (@records.map(&:to_dta) << build_total_record.to_dta) * "\n" << "\n"
   end
 
   def self.create(path)
@@ -34,22 +40,23 @@ class DTAFile
     dta_file.write_file
     dta_file
   end
-  
+
   private
-  
-  def recalculate_output_sequence_numbers
+
+  def recalculate_entry_sequence_numbers
     start = 1
     @records.each do |record|
-      record.output_sequence_number = start
+      record.entry_sequence_number = start
       start += 1
     end
   end
-  
+
   def build_total_record
     TotalRecord.new(
       :total_amount => total,
+      :entry_sequence_number => @records.count + 1,
       :data_file_sender_identification => @records.first.data_file_sender_identification
     )
   end
 
-end
+end

data/lib/payment_dta/payments/bank_cheque_payment.rb

@@ -21,7 +21,7 @@ class BankChequePayment < DTA::Payments::Base
   end
   
   def payment_amount_value
-   @data[:payment_amount].to_s.ljust(15)
+    super(15)
   end
   
   def payment_amount_value_date

data/lib/payment_dta/payments/base.rb

@@ -5,17 +5,17 @@ module DTA
   module Payments
     class Base
       include DTA::CharacterConversion
-      
+
       def initialize(data = {})
-        @data = data
+        @data = CharacterConversionHash[data]
       end
-      
+
       def to_dta
         dta_string(record)
       end
 
       def segment1
-        @segment1 ||= build_segment1 
+        @segment1 ||= build_segment1
       end
 
       def segment2
@@ -25,7 +25,7 @@ module DTA
       def segment3
         @segment3 ||= build_segment3
       end
-      
+
       def segment4
         @segment4 ||= build_segment4
       end
@@ -37,7 +37,7 @@ module DTA
       def segment6
         @segment6 ||= build_segment6
       end
-      
+
       def record
         @record ||= segment1 + segment2 + segment3 + segment4 + segment5 + segment6
       end
@@ -45,7 +45,7 @@ module DTA
       def header
         @header ||= build_header
       end
-      
+
       def requested_processing_date
         @data[:requested_processing_date].to_s
       end
@@ -55,11 +55,7 @@ module DTA
       end
 
       def output_sequence_number
-        @output_sequence_number.to_s.rjust(5,'0')
-      end
-      
-      def output_sequence_number=(output_sequence_number)
-        @output_sequence_number = output_sequence_number
+        '00000'
       end
 
       def creation_date
@@ -67,7 +63,7 @@ module DTA
       end
 
       def ordering_party_bank_clearing_number
-        @data[:ordering_party_bank_clearing_number].to_s.ljust(7,'0')
+        @data[:ordering_party_bank_clearing_number].to_s.ljust(7,' ')
       end
 
       def data_file_sender_identification
@@ -82,6 +78,10 @@ module DTA
         @data[:entry_sequence_number].to_s.rjust(5,'0')
       end
 
+      def entry_sequence_number=(entry_sequence_number)
+        @data[:entry_sequence_number] = entry_sequence_number
+      end
+
       def payment_type
         '1'
       end
@@ -105,11 +105,11 @@ module DTA
       def reference_number
         issuer_identification + transaction_number
       end
-      
+
       def account_to_be_debited
         @data[:account_to_be_debited].to_s.ljust(24)
       end
-      
+
       def payment_amount
         payment_amount_value_date + payment_amount_currency + payment_amount_value
       end
@@ -126,8 +126,8 @@ module DTA
         @data[:payment_amount]
       end
 
-      def payment_amount_value
-        @data[:payment_amount].to_s.ljust(12)
+      def payment_amount_value(size=12)
+        @data[:payment_amount].to_s.ljust(size).gsub('.', ',')
       end
 
       def ordering_partys_address(line_size=24)
@@ -155,19 +155,19 @@ module DTA
       end
 
       def beneficiary_address_line1(line_size=24)
-        @data[:beneficiary_address_line1].to_s.ljust(line_size)
+        @data[:beneficiary_address_line1].to_s.ljust(line_size)[0, line_size]
       end
 
       def beneficiary_address_line2(line_size=24)
-        @data[:beneficiary_address_line2].to_s.ljust(line_size)
+        @data[:beneficiary_address_line2].to_s.ljust(line_size)[0, line_size]
       end
 
       def beneficiary_address_line3(line_size=24)
-        @data[:beneficiary_address_line3].to_s.ljust(line_size)
+        @data[:beneficiary_address_line3].to_s.ljust(line_size)[0, line_size]
       end
 
       def beneficiary_address_line4(line_size=24)
-        @data[:beneficiary_address_line4].to_s.ljust(line_size)
+        @data[:beneficiary_address_line4].to_s.ljust(line_size)[0, line_size]
       end
 
       def reason_for_payment_message(line_size=24)
@@ -189,11 +189,11 @@ module DTA
       def reason_for_payment_message_line4(line_size=24)
         @data[:reason_for_payment_message_line4].to_s.ljust(line_size)
       end
-      
+
       def bank_payment_instructions
         @data[:bank_payment_instructions].to_s.ljust(120)
       end
-      
+
       def identification_bank_address
         @data[:identification_bank_address].to_s
       end
@@ -229,11 +229,11 @@ module DTA
       def beneficiary_institution_address_line4
        @data[:beneficiary_institution_address_line4].to_s.ljust(24)
       end
-      
+
       def beneficiary_iban_number
         @data[:beneficiary_iban_number].to_s.ljust(34)
       end
-      
+
       def identification_purpose
         @data[:identification_purpose].to_s[0,1]
       end
@@ -249,7 +249,7 @@ module DTA
       def rule_of_charge
         @data[:rule_of_charge].to_s[0,1]
       end
-     
+
       protected
 
       def build_segment1
@@ -263,7 +263,7 @@ module DTA
       def build_segment3
         '03'
       end
-      
+
       def build_segment4
         '04'
       end
@@ -271,18 +271,18 @@ module DTA
       def build_segment5
         '05'
       end
-      
+
       def build_segment6
         '06'
       end
-      
+
       def build_header
-        requested_processing_date + beneficiary_bank_clearing_number + output_sequence_number + creation_date + ordering_party_bank_clearing_number + data_file_sender_identification + entry_sequence_number + transaction_type + payment_type + processing_flag    
+        requested_processing_date + beneficiary_bank_clearing_number + output_sequence_number + creation_date + ordering_party_bank_clearing_number + data_file_sender_identification + entry_sequence_number + transaction_type + payment_type + processing_flag
       end
-      
+
       def reserve_field(length = 14)
        ''.ljust(length)
       end
-    end 
+    end
   end
-end
+end

data/lib/payment_dta/payments/financial_institution_payment.rb

@@ -17,7 +17,7 @@ class FinancialInstitutionPayment < DTA::Payments::Base
   end
   
   def payment_amount_value
-   @data[:payment_amount].to_s.ljust(15)
+    super(15)
   end
   
   def payment_amount_value_date

data/lib/payment_dta/payments/iban_payment.rb

@@ -25,7 +25,7 @@ class IBANPayment < DTA::Payments::Base
   end
   
   def payment_amount_value
-  @data[:payment_amount].to_s.ljust(15)
+    super(15)
   end
   
   def convertion_rate

data/lib/payment_dta/payments/special_financial_institution_payment.rb

@@ -25,7 +25,7 @@ class SpecialFinancialInstitutionPayment < DTA::Payments::Base
   end
   
   def payment_amount_value
-   @data[:payment_amount].to_s.ljust(15)
+    super(15)
   end
   
   def payment_amount_value_date

data/lib/payment_dta/payments/total_record.rb

@@ -4,28 +4,29 @@ class TotalRecord < DTA::Payments::Base
   def segment1
     super + total_amount + reserve_field(59)
   end
-  
+
   def record
     segment1
   end
-  
+
   def total_amount
-    @data[:total_amount].to_s.gsub(/\./,',').ljust(16)
+    number = BigDecimal.new(@data[:total_amount].to_s, 16).round(3)
+    number.to_s('F').gsub(/\./,',').ljust(16)
   end
-  
+
   def ordering_party_bank_clearing_number
     ''.ljust(7)
   end
-  
+
   def transaction_type
     '890'
   end
-  
+
   def payment_type
     '0'
   end
-  
+
   def requested_processing_date
     '000000'
   end
-end
+end