banktools-se 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b633dbca824e82f87a2231925c8d70eceefba6a
-  data.tar.gz: 52d741928c20bdd104ef5485d63e98c2fc6a95a6
+  metadata.gz: 56a0412c8e17d142b99162549712b831e282fdd8
+  data.tar.gz: bc6dae711b9df4a89094eae81abf6f148a6092e1
 SHA512:
-  metadata.gz: c5bb3d5baccd5d08d4c8a6151014d9790b507d87043061abc81f98036c932b84109cbdc8da1ee3d6fe30bb7a6f55ed9ef40fdea5673b3b4dd41ad43421551489
-  data.tar.gz: 47f8212e2a74a177af8c4306a4369a54c677e1aaa9ae7a9dae13fa0aab63fe1292a1c5bdbe4c0d3270cec87a87b868519dfcfbae64c8b2fcfc72a47ed42520a3
+  metadata.gz: 08a10797c97ab40fae64930595cac729b92dea89762fec47fe90914f7d84735acad17e920322c09a783cafc89847c255ba462b222f24aebcc9aef8f33a5a5cd5
+  data.tar.gz: 27fa5ab9c2585e3a410333ac9722ab3bb1a2f235d285af2863d8495fc1b47710231c611972961572d178d5bafa69cae86d44682ec47669cd14e31ce8dff12289

data/README.markdown

@@ -44,6 +44,13 @@ to install it.
     fundraising_account = BankTools::SE::Bankgiro.new("902-0033")
     fundraising_account.fundraising?  # => true
 
+    # OCR
+    BankTools::SE::Bankgiro.number_to_ocr("123")  # => "1230"
+    BankTools::SE::Bankgiro.number_to_ocr("123", length_digit: true)  # => "12351"
+    BankTools::SE::Bankgiro.number_to_ocr("123", length_digit: true, pad: "0")  # => "123067"
+    BankTools::SE::Bankgiro.number_from_ocr("1230")  # => "123"
+    BankTools::SE::Bankgiro.number_from_ocr("123067", length_digit: true, pad: "0")  # => "123"
+
 
     # Plusgiro
 

data/lib/banktools-se/bankgiro.rb

@@ -1,11 +1,46 @@
+# http://sv.wikipedia.org/wiki/Bankgirot#Bankgironummer
+
 module BankTools
   module SE
     class Bankgiro
-
-      # http://sv.wikipedia.org/wiki/Bankgirot#Bankgironummer
+      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
+      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
+      end
+
       def initialize(number)
         @number = number
       end

data/lib/banktools-se/utils.rb

@@ -13,6 +13,16 @@ module BankTools
         sum % 10 == 0
       end
 
+      def self.luhn_checksum(number)
+        digits = number.to_s.scan(/\d/).reverse.map { |x| x.to_i }
+        digits = digits.each_with_index.map { |d, i|
+          d *= 2 if i.even?
+          d > 9 ? d - 9 : d
+        }
+        sum = digits.inject(0) { |m, x| m + x }
+        mod = 10 - sum % 10
+        mod == 10 ? 0 : mod
+      end
     end
   end
 end

data/lib/banktools-se/version.rb

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

data/spec/bankgiro_spec.rb

@@ -83,4 +83,41 @@ describe BankTools::SE::Bankgiro do
       BankTools::SE::Bankgiro.new("5402-9681").should_not be_fundraising
     end
   end
+
+  # http://www.bgc.se/upload/Gemensamt/Trycksaker/Manualer/BG6070.pdf section 5.2
+  describe ".number_to_ocr" do
+    it "adds a mod-10 check digit" do
+      BankTools::SE::Bankgiro.number_to_ocr("123").should eq "1230"
+    end
+
+    it "can add an optional length digit" do
+      BankTools::SE::Bankgiro.number_to_ocr("1234567890", length_digit: true).should eq "123456789023"
+    end
+
+    it "can pad the number" do
+      BankTools::SE::Bankgiro.number_to_ocr("1234567890", length_digit: true, pad: "0").should eq "1234567890037"
+    end
+
+    it "raises if resulting number is > 25 digits" do
+      expect { BankTools::SE::Bankgiro.number_to_ocr("1234567890123456789012345") }.to raise_error(BankTools::SE::Bankgiro::OverlongOCR)
+    end
+  end
+
+  describe ".number_from_ocr" do
+    it "strips the mod-10 check digit" do
+      BankTools::SE::Bankgiro.number_from_ocr("1230").should eq "123"
+    end
+
+    it "can strip an optional length digit" do
+      BankTools::SE::Bankgiro.number_from_ocr("123456789023", length_digit: true).should eq "1234567890"
+    end
+
+    it "can pad the number" 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)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: banktools-se
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Henrik Nyh
@@ -76,7 +76,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Guardfile
 - README.markdown
 - Rakefile
 - banktools-se.gemspec

data/Guardfile

@@ -1,6 +0,0 @@
-guard 'rspec', :version => 2, :cli => "--color" do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/banktools-se/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end