datev 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be98f6189b13517bf847be2bdddc9ce7f68eb65
-  data.tar.gz: 3e8ce045af515ed7d627a0e4ffca52b16b7e1059
+  metadata.gz: 38fbb6b78613770842a83df919e0652c421d8902
+  data.tar.gz: ec4669a8aed09afbbcb33dfff44bbad0ac3d1c98
 SHA512:
-  metadata.gz: 49a002ffda0f1be07af7bb3e17e188b61c449e571f638a097c4c7ac64bc67b977a45e629aa9cba19a5108e5fb0a594a2121d584cd43aa0d34d270a351da0f4cf
-  data.tar.gz: bbe6649cf4e9fa92e0e0ffb336b4617604939ab46467a2aa4fc2b3db4f0c77127b8b51226d72b757d7d8705838cdc4579fbe61713229d0e59875afaebfee4c3c
+  metadata.gz: 02f1d2fd376c43b074c9db571240e51dca041f4588b7b31c3c2e7807f91479e62a60a653f203b84f7fd5f9b256840d72a1b0f82d1d2f3bb141fa1e31cceeedc8
+  data.tar.gz: 471d96bdb4a0c00f7c4a151e80c2d3e8d7967b7304634605db6e3309fd3c0cbd63f7d5dd3297814a14da913ce0bd643ee48ab33e36631b4bd55ed75649545373

data/.rspec

@@ -1,2 +1,2 @@
---format documentation
+--format progress
 --color

data/lib/datev.rb

@@ -1,5 +1,21 @@
 require 'datev/version'
-require 'datev/account'
-require 'datev/booking'
-require 'datev/booking_export'
-require 'datev/account_export'
+
+require 'datev/field'
+require 'datev/field/string_field'
+require 'datev/field/integer_field'
+require 'datev/field/boolean_field'
+require 'datev/field/decimal_field'
+require 'datev/field/date_field'
+
+require 'datev/base'
+require 'datev/base/header'
+require 'datev/base/header/account_header'
+require 'datev/base/header/booking_header'
+require 'datev/base/account'
+require 'datev/base/booking'
+
+require 'datev/export'
+require 'datev/export/account_export'
+require 'datev/export/booking_export'
+
+require 'csv'

data/lib/datev/base.rb

@@ -1,5 +1,3 @@
-require 'datev/field'
-
 module Datev
   class Base
     class << self
@@ -19,20 +17,19 @@ module Datev
         raise ArgumentError.new("Field '#{name}' already exists")
       end
 
-      self.fields << Field.new(name, type, options, &block)
+      field_class = const_get("Datev::#{type.to_s.capitalize}Field")
+      self.fields << field_class.new(name, options, &block)
     end
 
     def self.field_by_name(name)
       self.fields.find { |f| f.name == name }
     end
 
-    attr_accessor :attributes
-
     def initialize(attributes)
-      self.attributes = self.class.default_attributes || {}
-
       raise ArgumentError.new('Hash required') unless attributes.is_a?(Hash)
 
+      @attributes = self.class.default_attributes || {}
+
       # Check existing names and set value (if valid)
       attributes.each_pair do |name,value|
         unless field = self.class.field_by_name(name)
@@ -40,12 +37,12 @@ module Datev
         end
 
         field.validate!(value)
-        self.attributes[name] = value
+        @attributes[name] = value
       end
 
       # Check for missing values
       self.class.fields.select(&:required?).each do |field|
-        if attributes[field.name].nil?
+        if @attributes[field.name].nil?
           raise ArgumentError.new("Value for field '#{field.name}' is required but missing")
         end
       end
@@ -55,12 +52,12 @@ module Datev
       field = self.class.field_by_name(name)
       raise ArgumentError.new("Field '#{name}' not found") unless field
 
-      attributes[field.name]
+      @attributes[field.name]
     end
 
     def output(context=nil)
       self.class.fields.map do |field|
-        value = attributes[field.name]
+        value = @attributes[field.name]
         field.output(value, context)
       end
     end

data/lib/datev/{account.rb → base/account.rb}

@@ -1,5 +1,3 @@
-require 'datev/base'
-
 module Datev
   class Account < Base
     # http://www.datev.de/dnlexom/client/app/index.html#/document/1036228/D103622800011

data/lib/datev/{booking.rb → base/booking.rb}

@@ -1,5 +1,3 @@
-require 'datev/base'
-
 module Datev
   class Booking < Base
     # http://www.datev.de/dnlexom/client/app/index.html#/document/1036228/D103622800010

data/lib/datev/{header.rb → base/header.rb}

@@ -1,5 +1,3 @@
-require 'datev/base'
-
 module Datev
   class Header < Base
     # 1

data/lib/datev/{account_header.rb → base/header/account_header.rb}

@@ -1,5 +1,3 @@
-require 'datev/base'
-
 module Datev
   class AccountHeader < Header
     self.default_attributes = {

data/lib/datev/{booking_header.rb → base/header/booking_header.rb}

@@ -1,5 +1,3 @@
-require 'datev/base'
-
 module Datev
   class BookingHeader < Header
     self.default_attributes = {

data/lib/datev/export.rb

@@ -1,6 +1,3 @@
-require 'csv'
-require 'datev/header'
-
 module Datev
   class Export
     CSV_OPTIONS = { :col_sep => ';', :encoding => 'windows-1252' }

data/lib/datev/{account_export.rb → export/account_export.rb}

@@ -1,7 +1,3 @@
-require 'datev/export'
-require 'datev/account_header'
-require 'datev/account'
-
 module Datev
   class AccountExport < Export
     self.header_class = AccountHeader

data/lib/datev/{booking_export.rb → export/booking_export.rb}

@@ -1,7 +1,3 @@
-require 'datev/export'
-require 'datev/booking_header'
-require 'datev/booking'
-
 module Datev
   class BookingExport < Export
     self.header_class = BookingHeader

data/lib/datev/field.rb

@@ -1,26 +1,17 @@
 module Datev
   class Field
-    attr_accessor :name, :type, :options, :block
+    attr_accessor :name, :options, :block
 
-    def initialize(name, type, options={}, &block)
+    def initialize(name, options={}, &block)
       unless name.is_a?(String)
-        raise ArgumentError.new('Name param has to be a String')
-      end
-
-      unless [:string, :decimal, :boolean, :date, :integer].include?(type)
-        raise ArgumentError.new('Type param not recognized')
+        raise ArgumentError.new("Argument 'name' has to be a String")
       end
 
       unless options.is_a?(Hash)
-        raise ArgumentError.new('Options param has to be a Hash')
-      end
-
-      unless (options.keys - [:limit, :required, :format, :precision, :scale]).empty?
-        raise ArgumentError.new('Options param includes unknown key')
+        raise ArgumentError.new("Argument 'options' has to be a Hash")
       end
 
       self.name = name
-      self.type = type
       self.options = options
 
       if block_given?
@@ -32,58 +23,9 @@ module Datev
       options[:required] == true
     end
 
-    def format
-      options[:format]
-    end
-
-    def limit
-      options[:limit]
-    end
-
-    def precision
-      options[:precision]
-    end
-
-    def scale
-      options[:scale]
-    end
-
     def validate!(value)
       if value.nil?
         raise ArgumentError.new("Value for field '#{name}' is required") if required?
-      else
-        case type
-        when :string
-          raise ArgumentError.new("Value given for field '#{name}' is not a String") unless value.is_a?(String)
-          raise ArgumentError.new("Value '#{value}' for field '#{name}' is too long") if limit && value.length > limit
-        when :integer
-          raise ArgumentError.new("Value given for field '#{name}' is not an Integer") unless value.is_a?(Integer)
-          raise ArgumentError.new("Value '#{value}' for field '#{name}' is too long") if limit && value.to_s.length > limit
-        when :decimal
-          raise ArgumentError.new("Value given for field '#{name}' is not a Decimal") unless value.is_a?(Numeric)
-          raise ArgumentError.new("Value '#{value}' for field '#{name}' is too long") if precision && value.to_s.length > precision+1
-        when :date
-          raise ArgumentError.new("Value given for field '#{name}' is not a Date or Time") unless value.is_a?(Time) || value.is_a?(Date)
-        when :boolean
-          raise ArgumentError.new("Value given for field '#{name}' is not a Boolean") unless [true, false].include?(value)
-        end
-      end
-    end
-
-    def output(value, context=nil)
-      return if value.nil?
-
-      case type
-      when :string
-        value.slice(0, limit || 255)
-      when :integer
-        value.to_s
-      when :decimal
-        ("%.#{scale}f" % value).sub('.',',')
-      when :boolean
-        value ? 1 : 0
-      when :date
-        value.strftime(format)
       end
     end
   end

data/lib/datev/field/boolean_field.rb

@@ -0,0 +1,15 @@
+module Datev
+  class BooleanField < Field
+    def validate!(value)
+      super
+
+      unless value.nil?
+        raise ArgumentError.new("Value given for field '#{name}' is not a Boolean") unless [true, false].include?(value)
+      end
+    end
+
+    def output(value, _context=nil)
+      value ? 1 : 0 unless value.nil?
+    end
+  end
+end

data/lib/datev/field/date_field.rb

@@ -0,0 +1,19 @@
+module Datev
+  class DateField < Field
+    def format
+      options[:format]
+    end
+
+    def validate!(value)
+      super
+
+      if value
+        raise ArgumentError.new("Value given for field '#{name}' is not a Date or Time") unless value.is_a?(Time) || value.is_a?(Date)
+      end
+    end
+
+    def output(value, _context=nil)
+      value.strftime(format) if value
+    end
+  end
+end

data/lib/datev/field/decimal_field.rb

@@ -0,0 +1,24 @@
+module Datev
+  class DecimalField < Field
+    def precision
+      options[:precision]
+    end
+
+    def scale
+      options[:scale]
+    end
+
+    def validate!(value)
+      super
+
+      if value
+        raise ArgumentError.new("Value given for field '#{name}' is not a Decimal") unless value.is_a?(Numeric)
+        raise ArgumentError.new("Value '#{value}' for field '#{name}' is too long") if precision && value.to_s.length > precision+1
+      end
+    end
+
+    def output(value, _context=nil)
+      ("%.#{scale}f" % value).sub('.',',') if value
+    end
+  end
+end

data/lib/datev/field/integer_field.rb

@@ -0,0 +1,20 @@
+module Datev
+  class IntegerField < Field
+    def limit
+      options[:limit]
+    end
+
+    def validate!(value)
+      super
+
+      if value
+        raise ArgumentError.new("Value given for field '#{name}' is not an Integer") unless value.is_a?(Integer)
+        raise ArgumentError.new("Value '#{value}' for field '#{name}' is too long") if limit && value.to_s.length > limit
+      end
+    end
+
+    def output(value, _context=nil)
+      value.to_s if value
+    end
+  end
+end

data/lib/datev/field/string_field.rb

@@ -0,0 +1,20 @@
+module Datev
+  class StringField < Field
+    def limit
+      options[:limit]
+    end
+
+    def validate!(value)
+      super
+
+      if value
+        raise ArgumentError.new("Value given for field '#{name}' is not a String") unless value.is_a?(String)
+        raise ArgumentError.new("Value '#{value}' for field '#{name}' is too long") if limit && value.length > limit
+      end
+    end
+
+    def output(value, _context=nil)
+      value.slice(0, limit || 255) if value
+    end
+  end
+end

data/lib/datev/version.rb

@@ -1,3 +1,3 @@
 module Datev
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datev
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Georg Ledermann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,16 +102,21 @@ files:
 - examples/EXTF_Buchungsstapel.csv
 - examples/EXTF_Kontenbeschriftungen.csv
 - lib/datev.rb
-- lib/datev/account.rb
-- lib/datev/account_export.rb
-- lib/datev/account_header.rb
 - lib/datev/base.rb
-- lib/datev/booking.rb
-- lib/datev/booking_export.rb
-- lib/datev/booking_header.rb
+- lib/datev/base/account.rb
+- lib/datev/base/booking.rb
+- lib/datev/base/header.rb
+- lib/datev/base/header/account_header.rb
+- lib/datev/base/header/booking_header.rb
 - lib/datev/export.rb
+- lib/datev/export/account_export.rb
+- lib/datev/export/booking_export.rb
 - lib/datev/field.rb
-- lib/datev/header.rb
+- lib/datev/field/boolean_field.rb
+- lib/datev/field/date_field.rb
+- lib/datev/field/decimal_field.rb
+- lib/datev/field/integer_field.rb
+- lib/datev/field/string_field.rb
 - lib/datev/version.rb
 homepage: https://github.com/ledermann/datev
 licenses: