vesr 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae7e408a671168464173f8f975352930137d89ef
-  data.tar.gz: b558c3cc6bdd0373587246fb5a6dfe656c707895
+  metadata.gz: 812a29300c484ae22567b16acaf0e884a809322f
+  data.tar.gz: 34525baa67b7e26c21f3eeb7fd360728411ffcb4
 SHA512:
-  metadata.gz: ee0ce7d1edb35a4ec9662dcfc52bf79ba5231190dfbc96650ba1020623132cad60bdacf437e6f85f68999322937c833e0ffe77ff7a35147eafb76fe72410ae08
-  data.tar.gz: 73f57511a7651bb6d3fbb05ed9d643d22af65aff458ed570534681fe6f3b27235d54528c6361a39109eade3eea301ca0178d110eb14dfc5f948230826ed95979
+  metadata.gz: 1ee3bb90f0c601107ecdfc33ce2fe5e0850264c0d81d9ef6e23f796c25eed7a6d333f1e68eee3cf34558627680a1e6f4dfafa19f6685e2608c9276e969aead79
+  data.tar.gz: 39fc74d1826fde0be3159762104d97ee7537682bfb4f6655dc5058fd583b167e7344262d4bd2c679dcf9dd2f295e1923d1aaf9c08f32a47899c81413500c0262

data/lib/vesr/prawn/esr_recipe.rb

@@ -1,6 +1,9 @@
 require 'action_view/helpers/translation_helper'
 require 'action_view/helpers'
 
+require 'vesr/reference_builder'
+require 'vesr/validation_digit_calculator'
+
 module Prawn
   module EsrRecipe
 
@@ -110,31 +113,17 @@ module Prawn
     end
 
     def esr9_reference(invoice, esr_account)
-      esr9_format(esr9_add_validation_digit(esr_number(esr_account.esr_id, invoice.customer.id, invoice.id)))
+      esr_number = VESR::ReferenceBuilder.call(invoice.customer.id, invoice.id, esr_account.esr_id)
+      esr9_format VESR::ValidationDigitCalculator.call(esr_number)
     end
 
     def esr9_build(esr_amount, invoice, biller_id, esr_id)
       # 01 is type 'Einzahlung in CHF'
       amount_string = "01#{sprintf('%011.2f', esr_amount).delete('.')}"
-      id_string = esr_number(esr_id, invoice.customer.id, invoice.id)
+      id_string = VESR::ReferenceBuilder.call(invoice.customer.id, invoice.id, esr_id)
       biller_string = esr9_format_account_id(biller_id)
 
-      "#{esr9_add_validation_digit(amount_string)}>#{esr9_add_validation_digit(id_string)}+ #{biller_string}>"
-    end
-
-    def esr_number(esr_id, customer_id, invoice_id)
-      customer_id_length = 19 - esr_id.to_s.length
-      esr_id.to_s + sprintf("%0#{customer_id_length}i", customer_id).delete(' ') + sprintf('%07i', invoice_id).delete(' ')
-    end
-
-    def esr9_add_validation_digit(value)
-      # Defined at http://www.pruefziffernberechnung.de/E/Einzahlungsschein-CH.shtml
-      esr9_table = [0, 9, 4, 6, 8, 2, 7, 1, 3, 5]
-      digit = 0
-      value.split('').map{|c| digit = esr9_table[(digit + c.to_i) % 10]}
-      digit = (10 - digit) % 10
-
-      "#{value}#{digit}"
+      "#{VESR::ValidationDigitCalculator.call(amount_string)}>#{VESR::ValidationDigitCalculator.call(id_string)}+ #{biller_string}>"
     end
 
     def esr9_format(reference_code)

data/lib/vesr/reference_builder.rb

@@ -0,0 +1,35 @@
+require 'vesr/validation_digit_calculator'
+
+module VESR
+  class ReferenceBuilder
+    def self.call(customer_id, invoice_id, esr_id)
+      new(customer_id, invoice_id, esr_id).call
+    end
+
+    attr_reader :customer_id, :invoice_id, :esr_id
+
+    def initialize(customer_id, invoice_id, esr_id)
+      @customer_id = customer_id
+      @invoice_id = invoice_id
+      @esr_id = esr_id
+    end
+
+    def call
+      "#{esr_id}#{formatted_customer_id}#{formatted_invoice_id}"
+    end
+
+    private
+
+    def formatted_customer_id
+      format "%0#{customer_id_length}i", customer_id
+    end
+
+    def customer_id_length
+      19 - esr_id.to_s.length
+    end
+
+    def formatted_invoice_id
+      format '%07i', invoice_id
+    end
+  end
+end

data/lib/vesr/validation_digit_calculator.rb

@@ -0,0 +1,20 @@
+module VESR
+  class ValidationDigitCalculator
+    # Defined at http://www.pruefziffernberechnung.de/E/Einzahlungsschein-CH.shtml
+
+    ESR9_TABLE = [0, 9, 4, 6, 8, 2, 7, 1, 3, 5]
+
+    def self.call(value)
+      value = value.to_s
+
+      digit = 0
+      value.split('').each do |char|
+        current_digit = digit + char.to_i
+        digit = ESR9_TABLE[current_digit % 10]
+      end
+      digit = (10 - digit) % 10
+
+      "#{value}#{digit}"
+    end
+  end
+end

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vesr
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Roman Simecek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -81,6 +81,8 @@ files:
 - lib/vesr/prawn.rb
 - lib/vesr/prawn/esr_recipe.rb
 - lib/vesr/railtie.rb
+- lib/vesr/reference_builder.rb
+- lib/vesr/validation_digit_calculator.rb
 - lib/vesr/version.rb
 homepage: https://github.com/raskhadafi/vesr
 licenses: