codecal 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8aee3f860b9401cdc8235eeb24c488a62d4167
-  data.tar.gz: ddec58a2ebd8be0a0aa177d87b7f8d21ba8371a3
+  metadata.gz: 9a9497c1ebd3be3858b93cf5b998d449556a2db4
+  data.tar.gz: 8746807358f6365760509bf8f7d43c99d75a25f2
 SHA512:
-  metadata.gz: 8c28a2118e4c048668677cadd108add060fd4f313356ae0d17d48872ff0a396951faa1c0d62e2772afd1b79e8fd697be6510f20d1d7236d4aa0df1f47ab1fb8a
-  data.tar.gz: 38fc88524672f4f97448baeeab5750da414ed8f538e5b184d0d4412082da5019e42e975994ee7f80e417f56b3954530d077f04a8cfacc57fc9681a0b7df740fc
+  metadata.gz: 1e574f8ec7fab16a439e042a1035aa294e4159ca9b64db0558698fbf75e2e6352aa7f0802727aa5c08be275800f7db599feef5a246b800fc551a8c926a90ceb0
+  data.tar.gz: 751d4f1609d91a2d0d7443b264ee2b91f210da0e29ef1617464faa6c9195ccf3822092a7006f08a4ce043d4b00849924eb41f9e9d5e3254496d992508745bb6a

data/README.md

@@ -19,6 +19,12 @@ Or install it yourself as:
 ```
 require 'codecal'
 
+codecal = Codecal::Calc.new()
+
+# or initialize with mask_alphabet string which should only contain unique letter and number and length over 26
+
+codecal = Codecal::Calc.new('fdsa32jkh89704lncmxzvrueopwytq')
+
 # Generate customer code for user account
 # Parameters:
 #   number     : Integer(<=9) -- code to be calculated and masked
@@ -27,7 +33,7 @@ require 'codecal'
 #   success       : boolean -- generate customer code success
 #   customer code : String  -- 16 numbers string when success == true
 #   error         : String  -- error message of parameters when success == false
-Codecal.bank_customer_code_generate(number, currency)
+codecal.bank_customer_code_generate(number, currency)
 
 # Generate simple code for account
 # Parameters:
@@ -36,7 +42,7 @@ Codecal.bank_customer_code_generate(number, currency)
 #   success       : boolean -- generate customer code success
 #   customer code : String  -- numbers(number.length + 1) string when success == true
 #   error         : String  -- error message of parameters when success == false
-Codecal.simple_code_generate(number)
+codecal.simple_code_generate(number)
 
 # Generate masked code for account
 # Parameters:
@@ -46,21 +52,21 @@ Codecal.simple_code_generate(number)
 #   success       : boolean -- generate customer code success
 #   customer code : String  -- combination of letter and number(number.length + 1) string when success == true
 #   error         : String  -- error message of parameters when success == false
-Codecal.code_generate_with_mask(mask, number)
+codecal.code_generate_with_mask(mask, number)
 
 # Validate customer code
 # Parameters:
 #   customer_code : String
 # Return:
 #   valid : boolean
-Codecal.validate_bank_customer_code(String)
+codecal.validate_bank_customer_code(String)
 
 # Validate simple code
 # Parameters:
 #   simple_code : String
 # Return:
 #   valid : boolean
-Codecal.validate_simple_code(String)
+codecal.validate_simple_code(String)
 
 # Validate masked code
 # Parameters:
@@ -68,7 +74,7 @@ Codecal.validate_simple_code(String)
 #   masked_code : String(>=6)
 # Return:
 #   valid : boolean
-Codecal.validate_masked_code(String)
+codecal.validate_masked_code(String)
 
 # Get unmasked code
 # Parameters:
@@ -76,11 +82,11 @@ Codecal.validate_masked_code(String)
 #   masked_code : String(>=6)
 # Return:
 #   code  : String(>=6) ||  false : boolean
-Codecal.get_unmasked_code(String)
+codecal.get_unmasked_code(String)
 
 # Get currency name
 # Parameters:
 #   currency_code : String(4)
 # Return:
 #   currency name : String -- nil if not found
-Codecal.get_currency_name(String)
+codecal.get_currency_name(String)

data/lib/codecal/version.rb

@@ -1,3 +1,3 @@
 module Codecal
-  VERSION = "0.3.10"
+  VERSION = "0.4.0"
 end

data/lib/codecal.rb

@@ -2,11 +2,23 @@ require "codecal/version"
 require_relative "./code"
 
 module Codecal
-  @@BASE_ALPHABET = ['o','a','3','p','9','h','b','2','q','i','1','c','4','r','7','j','s','5','d','t','8','k','u','e','v','l','w','f','x','6','m','y','0','g','z','n']
-  @@MASK_ALPHABET = ['a','4','p','9','h','r','7','q','c','3','b','2','j','s','6','d','t','8','k','u','e','l','v','f','w','x','5','m','y','g','z','n', 'i']
-  @@generate_seed = [2,7,5,3,8,9,5,9,1,6,7,3,5]
-  @@simple_seed = [5,4,6,2,3,1,5,4,6,2,3,1]
-  class<<self
+
+  class Calc
+    @@MASK_ALPHABET = ['a','4','p','9','h','r','7','q','c','3','b','2','j','s','6','d','t','8','k','u','e','v','f','w','x','5','m','y','g','z','n']
+    @@generate_seed = [2,7,5,3,8,9,5,9,1,6,7,3,5]
+    @@simple_seed = [5,4,6,2,3,1,5,4,6,2,3,1]
+
+    def initialize(mask_alphabet = nil)
+      if mask_alphabet.is_a?(String) && 
+          mask_alphabet.size > 26 &&
+          all_letters_or_digits?(mask_alphabet) &&
+          mask_alphabet.size == mask_alphabet.split('').uniq.size
+        @mask_alphabet = mask_alphabet.split('')
+      else
+        @mask_alphabet = @@MASK_ALPHABET      
+      end
+    end
+
     def bank_customer_code_generate(account_id, currency)
       errormsg = ""
       if account_id == nil || currency == nil
@@ -84,7 +96,7 @@ module Codecal
 
       offset = get_mask_offset(mask)
       code = unmask_code(offset, masked_code)
-      all_digits?(code) ? code : false
+      masked_code.size == code.size ? code : false
     end
 
     def get_currency_name(currency_code)
@@ -106,7 +118,7 @@ module Codecal
     def mask_code(offset, code)
       code_arr = code.size > 5 ? code.split("") : ("%06d" % code).split("")
       masked_code = code_arr.each_with_index.inject([]) do |code, (c, i)|
-        code.push(@@MASK_ALPHABET[(@@BASE_ALPHABET.find_index(c) + offset[ i % offset.size ]) % @@MASK_ALPHABET.size])
+        code.push(mask_char(c, offset[ i % offset.size ]))
       end
       start_code = masked_code.pop
       masked_code.unshift(start_code).join
@@ -115,14 +127,14 @@ module Codecal
     def unmask_code(offset, masked_code)
       masked_code = masked_code[1..-1] + masked_code[0]
       code = masked_code.downcase.split("").each_with_index.inject([]) do |code, (c, i)|
-        code.push(@@BASE_ALPHABET[(@@MASK_ALPHABET.find_index(c) - offset[ i % offset.size ]) % @@MASK_ALPHABET.size])
+        code.push(un_mask_char(c, offset[ i % offset.size ]))
       end
       code.join
     end
 
     def get_mask_offset(mask)
       mask.split("").inject([]) do |offset,c|
-        [[*'a'..'z', *'0'..'9'], [*'A'..'Z', *'0'..'9']].each do |m|
+        [[*'a'..'z'], [*'A'..'Z'], [*'0'..'9']].each do |m|
           if m.include?(c)
             offset.push(m.find_index(c))
             break
@@ -147,9 +159,27 @@ module Codecal
 
     def is_legal_masked_code?(masked_code)
       return false unless masked_code.is_a?(String) && masked_code.size > 5
-      return false unless masked_code[/[a-np-zA-NP-Z1-9]+/] == masked_code
+      return false unless mask_alphabet_include?(masked_code)
       return true
     end
 
+    def mask_alphabet_include?(code)
+      code.split('').each do |c|
+        return false unless @mask_alphabet.include?(c)
+      end
+      true
+    end
+
+    def mask_char(char, offset)
+      if all_digits?(char) && char.size == 1
+        @mask_alphabet[(@mask_alphabet.find_index(@mask_alphabet[char.to_i]) + offset) % @mask_alphabet.size]
+      end
+    end
+
+    def un_mask_char(char, offset)
+      if mask_alphabet_include?(char)
+        (@mask_alphabet.find_index(char) - offset) % @mask_alphabet.size
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecal
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Roger Fang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler