datev 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18133a3c19a1a0115fbe982e1119b096575b9994
-  data.tar.gz: 6868011995c1910c215a21088fe6cf180831a671
+  metadata.gz: 5f9e40ec72d19dbed69b6822ea7620bd8492d777
+  data.tar.gz: b7918aecf4f2f6f663cf6f6e1e253665a8ecd61e
 SHA512:
-  metadata.gz: 4d152732cd3b595ccd55bb158e08ea0ecc36a205fd55548b3fd15bd2a407fa7ef85513d79fb6db9823776b22f6a0d50a56a5ed4913a746e6885c8743b508e149
-  data.tar.gz: ef25922dd607ba3546583b60ba289dc5907cc1b6f411cc181f22b981504c434676bfecb7245289d59d0d3d0fdfe6c6d34b90b0e3a2e2d0bc49ffff2246b922cc
+  metadata.gz: 2946308d40559ff1797aa4e6cc0577cabdd01db663aa1c01092432c58b5a2cbc53335b4917ef4cc1ab1b617ab379d747e8e0aa27582ee09c878c39cc585e32c5
+  data.tar.gz: d6f547b2106860631de50cb5612c94e999b6e6eafc52234713de68938ceaf05c1080e120a19481c1821a210a7fd3da8dce0905374837a4a6cbe8fbbffa595d3a

data/lib/datev/base.rb

@@ -8,15 +8,19 @@ module Datev
 
     attr_accessor :attributes
 
-    def self.field(name, type, options={})
+    def self.field(name, type, options={}, &block)
       self.fields ||= []
 
       # Check if there is already a field with the same name
-      if self.fields.find { |f| f.name == name }
+      if field_by_name(name)
         raise ArgumentError.new("Field '#{name}' already exists")
       end
 
-      self.fields << Field.new(name, type, options)
+      self.fields << Field.new(name, type, options, &block)
+    end
+
+    def self.field_by_name(name)
+      self.fields.find { |f| f.name == name }
     end
 
     def initialize(attributes)
@@ -26,7 +30,7 @@ module Datev
 
       # Check existing names and set value (if valid)
       attributes.each_pair do |name,value|
-        unless field = self.class.fields.find { |f| f.name == name }
+        unless field = self.class.field_by_name(name)
           raise ArgumentError.new("Field '#{name}' not found")
         end
 
@@ -42,10 +46,17 @@ module Datev
       end
     end
 
-    def to_a
+    def [](name)
+      field = self.class.field_by_name(name)
+      raise ArgumentError.new("Field '#{name}' not found") unless field
+
+      attributes[field.name]
+    end
+
+    def output(context=nil)
       self.class.fields.map do |field|
         value = attributes[field.name]
-        field.output(value)
+        field.output(value, context)
       end
     end
   end

data/lib/datev/booking.rb

@@ -37,17 +37,29 @@ module Datev
     # ISO-Code beachten (siehe Dok.-Nr.1080170)
 
     # 7
-    field 'Konto', :integer, :limit => 9, :required => true
+    field 'Konto', :integer, :limit => 9, :required => true do
     # Sach- oder Personen-Kontonummer
     # Darf max. 8- bzw. max. 9-stellig sein (abhängig von der Information im Header)
     # Die Personenkontenlänge darf nur 1 Stelle länger sein als die definierte Sachkontennummernlänge.
 
+      def output(value, context)
+        length = context['Sachkontenlänge']
+        value.to_s.rjust(length, '0')
+      end
+    end
+
     # 8
-    field 'Gegenkonto (ohne BU-Schlüssel)', :integer, :limit => 9, :required => true
+    field 'Gegenkonto (ohne BU-Schlüssel)', :integer, :limit => 9, :required => true do
     # Sach- oder Personen-Kontonummer
     # Darf max. 8- bzw. max. 9-stellig sein (abhängig von der Information im Header)
     # Die Personenkontenlänge darf nur 1 Stelle länger sein als die definierte Sachkontennummernlänge.
 
+      def output(value, context)
+        length = context['Sachkontenlänge']
+        value.to_s.rjust(length, '0')
+      end
+    end
+
     # 9
     field 'BU-Schlüssel', :string, :limit => 2
     # Steuerschlüssel und/oder Berichtigungsschlüssel

data/lib/datev/export.rb

@@ -6,23 +6,8 @@ module Datev
   class Export
     CSV_OPTIONS = { :col_sep => ';', :encoding => 'windows-1252' }
 
-    DEFAULT_HEADER_ATTRIBUTES = {
-      'DATEV-Format-KZ' => 'EXTF',
-      'Versionsnummer'  => 510,
-      'Datenkategorie'  => 21,
-      'Formatname'      => 'Buchungsstapel',
-      'Formatversion'   => 7,
-      'Erzeugt am'      => Time.now.utc,
-      'Sachkontenlänge' => 4,
-      'Bezeichnung'     => 'Buchungen',
-      'Buchungstyp'     => 1,
-      'WKZ'             => 'EUR'
-    }
-
     def initialize(header_attributes)
-      raise ArgumentError.new('Hash required') unless header_attributes.is_a?(Hash)
-
-      @header = Header.new DEFAULT_HEADER_ATTRIBUTES.merge(header_attributes)
+      @header = Header.new header_attributes
       @rows = []
     end
 
@@ -45,11 +30,11 @@ module Datev
   private
 
     def write(csv)
-      csv << @header.to_a
+      csv << @header.output
       csv << Booking.fields.map(&:name)
 
       @rows.each do |row|
-        csv << row.to_a
+        csv << row.output(@header)
       end
     end
   end

data/lib/datev/field.rb

@@ -1,8 +1,8 @@
 module Datev
   class Field
-    attr_accessor :name, :type, :options
+    attr_accessor :name, :type, :options, :block
 
-    def initialize(name, type, options={})
+    def initialize(name, type, options={}, &block)
       unless name.is_a?(String)
         raise ArgumentError.new('Name param has to be a String')
       end
@@ -22,6 +22,10 @@ module Datev
       self.name = name
       self.type = type
       self.options = options
+
+      if block_given?
+        self.instance_eval(&block)
+      end
     end
 
     def required?
@@ -66,7 +70,7 @@ module Datev
       end
     end
 
-    def output(value)
+    def output(value, context=nil)
       return if value.nil?
 
       case type

data/lib/datev/header.rb

@@ -2,6 +2,24 @@ require 'datev/base'
 
 module Datev
   class Header < Base
+    DEFAULT_ATTRIBUTES = {
+      'DATEV-Format-KZ' => 'EXTF',
+      'Versionsnummer'  => 510,
+      'Datenkategorie'  => 21,
+      'Formatname'      => 'Buchungsstapel',
+      'Formatversion'   => 7,
+      'Erzeugt am'      => Time.now.utc,
+      'Sachkontenlänge' => 4,
+      'Bezeichnung'     => 'Buchungen',
+      'Buchungstyp'     => 1,
+      'WKZ'             => 'EUR'
+    }
+
+    def initialize(attributes={})
+      raise ArgumentError.new('Hash required') unless attributes.is_a?(Hash)
+      super DEFAULT_ATTRIBUTES.merge(attributes)
+    end
+
     # 1
     field 'DATEV-Format-KZ', :string, :limit => 4
     # vom Datev angegeben

data/lib/datev/version.rb

@@ -1,3 +1,3 @@
 module Datev
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datev
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler