banktools-se 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a0412c8e17d142b99162549712b831e282fdd8
-  data.tar.gz: bc6dae711b9df4a89094eae81abf6f148a6092e1
+  metadata.gz: 2adb32315551258f25fd25045f10ddba1be9ed38
+  data.tar.gz: 07a40e43257c6cac10625e79332210aa5c6d1c56
 SHA512:
-  metadata.gz: 08a10797c97ab40fae64930595cac729b92dea89762fec47fe90914f7d84735acad17e920322c09a783cafc89847c255ba462b222f24aebcc9aef8f33a5a5cd5
-  data.tar.gz: 27fa5ab9c2585e3a410333ac9722ab3bb1a2f235d285af2863d8495fc1b47710231c611972961572d178d5bafa69cae86d44682ec47669cd14e31ce8dff12289
+  metadata.gz: 59341b4c01549b9ed8bb597886f93f77149126284d2c2e902e0dec17eac56d735d2153e0d9fd173a0cdc38450806bc43d62f92fc2b15a8a80abbcca7ae7e44fe
+  data.tar.gz: 26529338077b1e088fd19e78b60232af82944e59e04b14f733a94b91b5b59c62232877dfd4474c7db316de290e22a1b6793e76fac5bdeaacb342b5038ecfe5e6

data/lib/banktools-se/bankgiro/ocr.rb

@@ -0,0 +1,46 @@
+# http://www.bgc.se/upload/Gemensamt/Trycksaker/Manualer/BG6070.pdf section 5.2
+
+module BankTools
+  module SE
+    class Bankgiro
+      class OverlongOCR < StandardError; end
+      class BadChecksum < StandardError; end
+
+      class OCR
+        def self.number_to_ocr(number, opts = {})
+          add_length_digit = opts.fetch(:length_digit, false)
+          pad = opts.fetch(:pad, nil)
+
+          number = number.to_s
+
+          number += pad if pad
+
+          # Adding 2: 1 length digit, 1 check digit.
+          number += ((number.length + 2) % 10).to_s if add_length_digit
+
+          number_with_ocr = number + Utils.luhn_checksum(number).to_s
+
+          length = number_with_ocr.length
+          if length > 25
+            raise OverlongOCR, "Bankgiro OCR must be 2-25 characters (this one would be #{length} characters)"
+          end
+
+          number_with_ocr
+        end
+
+        def self.number_from_ocr(number, opts = {})
+          strip_length_digit = opts.fetch(:length_digit, false)
+          strip_padding = opts.fetch(:pad, "")
+
+          raise BadChecksum unless Utils.valid_luhn?(number)
+
+          digits_to_chop  = 1  # Checksum.
+          digits_to_chop += 1 if strip_length_digit
+          digits_to_chop += strip_padding.length
+
+          number[0...-digits_to_chop]
+        end
+      end
+    end
+  end
+end

data/lib/banktools-se/bankgiro.rb

@@ -1,44 +1,18 @@
 # http://sv.wikipedia.org/wiki/Bankgirot#Bankgironummer
 
+require "banktools-se/bankgiro/ocr"
+
 module BankTools
   module SE
     class Bankgiro
-      class OverlongOCR < StandardError; end
-      class BadCheckDigit < StandardError; end
-
       attr_reader :number
 
-      # http://www.bgc.se/upload/Gemensamt/Trycksaker/Manualer/BG6070.pdf section 5.2
       def self.number_to_ocr(number, opts = {})
-        add_length_digit = opts.fetch(:length_digit, false)
-        pad = opts.fetch(:pad, nil)
-
-        number = number.to_s
-
-        if pad
-          number += pad
-        end
-
-        if add_length_digit
-          # Adding 2: 1 length digit, 1 check digit
-          number += ((number.length + 2) % 10).to_s
-        end
-
-        number_with_ocr = number.to_s + Utils.luhn_checksum(number).to_s
-        raise OverlongOCR, "Bankgiro OCR must be 2-25 characters" if number_with_ocr.length > 25
-        number_with_ocr
+        OCR.number_to_ocr(number, opts)
       end
 
       def self.number_from_ocr(number, opts = {})
-        strip_length_digit = opts.fetch(:length_digit, false)
-        strip_padding = opts.fetch(:pad, false)
-
-        raise BadCheckDigit unless Utils.valid_luhn?(number)
-
-        number = number.to_s
-        number.slice!(-2) if strip_length_digit
-        number.slice!(-strip_padding.length.succ..-2) if strip_padding
-        number.chop
+        OCR.number_from_ocr(number, opts)
       end
 
       def initialize(number)

data/lib/banktools-se/version.rb

@@ -1,5 +1,5 @@
 module BankTools
   module SE
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/spec/bankgiro_spec.rb

@@ -116,8 +116,8 @@ describe BankTools::SE::Bankgiro do
       BankTools::SE::Bankgiro.number_from_ocr("1234567890037", length_digit: true, pad: "0").should eq "1234567890"
     end
 
-    it "raises if check digit is wrong" do
-      expect { BankTools::SE::Bankgiro.number_from_ocr("1231") }.to raise_error(BankTools::SE::Bankgiro::BadCheckDigit)
+    it "raises if checksum is wrong" do
+      expect { BankTools::SE::Bankgiro.number_from_ocr("1231") }.to raise_error(BankTools::SE::Bankgiro::BadChecksum)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banktools-se
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Henrik Nyh
@@ -82,6 +82,7 @@ files:
 - lib/banktools-se.rb
 - lib/banktools-se/account.rb
 - lib/banktools-se/bankgiro.rb
+- lib/banktools-se/bankgiro/ocr.rb
 - lib/banktools-se/errors.rb
 - lib/banktools-se/plusgiro.rb
 - lib/banktools-se/utils.rb