viitenumero 0.0.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7ce3fcf81240d447d86381763b7443af1c537c
-  data.tar.gz: 3fd6dd902c18e886f1402072ad257e776c170f2a
+  metadata.gz: dbddfa4ece091a8353870235c9667943118770d0
+  data.tar.gz: aaefedb9210111517e2b4d776f08c51dc568298b
 SHA512:
-  metadata.gz: be8645d775a8d373a8eb1b33aeb504272fb618561442025b2bef61f8049a810b514f2aaa86dcba92670d4700beabe3fd9c747dd5eff76703f71c45dca6247705
-  data.tar.gz: df353b5856290b84c25d13fab4e6f14af831ed33a9e252c2903803a57febcec635a772c3ba45e56122516cb9916fd9ed8ceefbecf9ba1710314975f1faa5d4e3
+  metadata.gz: 238cfc61b92a611e7876ec948dfde03aa672ace9843d092231cc4f2b64986569a48ec580e19ae4b24070f0b07ea31c6a9baaab5e7b67429fc2733259642bb824
+  data.tar.gz: adefdab209ae3cbe00e6d53af82c2a8631dfbf80af4fbf092c43c16eb9282295455d30c962d78c681eb79a755803f2341fd42d058fef570fa0e89cd581dd14ae

data/README.md

@@ -27,15 +27,20 @@ viite = Viite.new('75310116600498132890')
 viite.valid?
  => true
 
+viite.fi.to_s
+ => "75310116600498132890"
+
 viite.paper_format
  => "75310 11660 04981 32890"
 
-Viite.random(length: 10)
+FIViite.random(length: 10).to_s
  => "3084950403"
 
 laskun_numero = 1000
-Viite.generate(laskun_numero)
+FIViite.generate(laskun_numero).to_s
  => "10003"
+RFViite.generate(laskun_numero).to_s
+ => "RF6810003"
 
 class Bill < ActiveRecord
   validates :reference_number, viite: true

data/lib/viitenumero.rb

@@ -1,4 +1,6 @@
 require "viitenumero/version"
+require "viitenumero/fi_viite"
+require "viitenumero/rf_viite"
 require "viitenumero/viite"
 
 module Viitenumero

data/lib/viitenumero/fi_viite.rb

@@ -0,0 +1,84 @@
+require 'active_model'
+
+module Viitenumero
+  class FIViite
+    include ActiveModel::Validations
+
+    attr_reader :number
+
+    def initialize(s)
+      @number = format(s)
+    end
+
+    def paper_format
+      number.gsub(/.{5}(?=.)/, '\0 ')
+    end
+
+    def machine_format
+      number
+    end
+
+    def valid?
+      valid_format? and valid_length? and valid_checksum?
+    end
+
+    def self.generate(base)
+      base = (base || '').to_s.gsub(/\s+/, '')
+      raise ArgumentError.new('must be a number') if base.match(/\A\d+\z/).nil?
+      raise ArgumentError.new('must be between 3-19 chars long') if base.length < 3 || base.length > 19
+
+      FIViite.new(base + checksum(base))
+    end
+
+    def self.random(length: 4)
+      raise ArgumentError if length < 4 || length > 20
+      base = ''
+      base_length = length - 1
+      base = rand(10**base_length).to_s while base.length != base_length
+      generate(base.to_s)
+    end
+
+    def self.valid?(s)
+      FIViite.new(s).valid?
+    end
+
+    def to_s
+      machine_format
+    end
+
+    def to_rf
+      RFViite.generate(machine_format, add_fi_checksum: false)
+    end
+
+    private
+
+    def format(s)
+      r = (s || '').to_s.gsub(/\s+/, '')
+      r.slice!(0) while r[0] == '0'
+      r
+    end
+
+    def valid_format?
+      !number.match(/\A\d+\z/).nil?
+    end
+
+    def valid_length?
+      number.length >= 4 && number.length <= 20
+    end
+
+    def valid_checksum?
+      last_digit = number[-1, 1]
+      last_digit == self.class.checksum(number[0..-2])
+    end
+
+    def self.checksum(base)
+      weights = [7, 3, 1]
+      checksum, current_weight = 0, 0
+      base.split('').reverse.each do |digit|
+        checksum += digit.to_i * weights[current_weight % 3]
+        current_weight += 1
+      end
+      ((10 - checksum % 10) % 10).to_s
+    end
+  end
+end

data/lib/viitenumero/rf_viite.rb

@@ -0,0 +1,86 @@
+require 'active_model'
+
+module Viitenumero
+  # Note: Supports only ISO 11649 creditor references that are based on
+  # Finnish national reference numbers (see fi_viite). Does *not* support
+  # other SEPA countries.
+  class RFViite
+    include ActiveModel::Validations
+
+    attr_reader :number
+
+    def initialize(s)
+      @number = format(s)
+    end
+
+    def paper_format
+      number.gsub(/.{4}(?=.)/, '\0 ')
+    end
+
+    def machine_format
+      number
+    end
+
+    def valid?
+      valid_format? and valid_length? and valid_checksum? and valid_national_checksum?
+    end
+
+    def self.generate(base, add_fi_checksum: true)
+      base = (base || '').to_s.gsub(/\s+/, '')
+      raise ArgumentError.new('must be a number') if base.match(/\A\d+\z/).nil?
+      raise ArgumentError.new('must be between 3-19 chars long') if base.length < 3 || base.length > 19
+
+      base = base + FIViite.checksum(base) if add_fi_checksum
+      RFViite.new('RF' + checksum(base) + base)
+    end
+
+    def self.random(length: 8)
+      raise ArgumentError if length < 8 || length > 24
+      base_length = length - 4
+      FIViite.random(length: base_length).to_rf
+    end
+
+    def self.valid?(s)
+      RFViite.new(s).valid?
+    end
+
+    def to_s
+      machine_format
+    end
+
+    def to_fi
+      FIViite.new(national_part)
+    end
+
+    def national_part
+      number[4..-1]
+    end
+
+    private
+
+    def format(s)
+      (s || '').to_s.gsub(/\s+/, '').upcase
+    end
+
+    def valid_format?
+      !number.match(/\ARF\d+\z/).nil?
+    end
+
+    def valid_length?
+      number.length >= 8 && number.length <= 24
+    end
+
+    def valid_checksum?
+      check_digits = number[2..3]
+      check_digits == self.class.checksum(national_part)
+    end
+
+    def valid_national_checksum?
+      FIViite.valid?(national_part)
+    end
+
+    def self.checksum(base)
+      (98 - (base + '271500').to_i % 97).to_s.rjust(2, '0')
+    end
+  end
+end

data/lib/viitenumero/version.rb

@@ -1,3 +1,3 @@
 module Viitenumero
-  VERSION = "0.0.2"
+  VERSION = "1.0.2"
 end

data/lib/viitenumero/viite.rb

@@ -7,37 +7,33 @@ module Viitenumero
     attr_reader :number
 
     def initialize(s)
-      @number = format(s)
+      if FIViite.valid?(s)
+        @number = FIViite.new(s)
+      elsif RFViite.valid?(s)
+        @number = RFViite.new(s)
+      else
+        @number = FIViite.new(s)
+      end
     end
 
-    def paper_format
-      number.gsub(/.{5}(?=.)/, '\0 ')
+    def rf
+      number.is_a?(RFViite) ? number : number.to_rf
     end
 
-    def machine_format
-      number
+    def fi
+      number.is_a?(FIViite) ? number : number.to_fi
     end
 
-    def valid?
-      valid_format? and valid_length? and valid_checksum?
+    def paper_format
+      number.paper_format
     end
 
-    def self.generate(base)
-      base = (base || '').to_s.gsub(/\s+/, '')
-      raise ArgumentError.new('must be a number') if base.match(/\A\d+\z/).nil?
-      raise ArgumentError.new('must be between 3-19 chars long') if base.length < 3 || base.length > 19
-
-      Viite.new(base + checksum(base))
+    def machine_format
+      number.machine_format
     end
 
-    def self.random(opts={})
-      opts.symbolize_keys!
-      length = opts.fetch(:length, 4)
-      raise ArgumentError if length < 4 || length > 20
-      base = ''
-      base_length = length - 1
-      base = rand(10**base_length).to_s while base.length != base_length
-      generate(base.to_s)
+    def valid?
+      number.valid?
     end
 
     def self.valid?(s)
@@ -47,36 +43,5 @@ module Viitenumero
     def to_s
       machine_format
     end
-
-    private
-
-    def format(s)
-      r = (s || '').to_s.gsub(/\s+/, '')
-      r.slice!(0) while r[0] == '0'
-      r
-    end
-
-    def valid_format?
-      !number.match(/\A\d+\z/).nil?
-    end
-
-    def valid_length?
-      number.length >= 4 && number.length <= 20
-    end
-
-    def valid_checksum?
-      last_digit = number[-1, 1]
-      last_digit == self.class.checksum(number[0..-2])
-    end
-
-    def self.checksum(base)
-      weights = [7, 3, 1]
-      checksum, current_weight = 0, 0
-      base.split('').reverse.each do |digit|
-        checksum += digit.to_i * weights[current_weight % 3]
-        current_weight += 1
-      end
-      ((10 - checksum % 10) % 10).to_s
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viitenumero
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexander Hanhikoski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,8 @@ files:
 - bin/console
 - bin/setup
 - lib/viitenumero.rb
+- lib/viitenumero/fi_viite.rb
+- lib/viitenumero/rf_viite.rb
 - lib/viitenumero/version.rb
 - lib/viitenumero/viite.rb
 - lib/viitenumero/viite_validator.rb