codecal 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 219b4b4f7674fefcea2b9d1fc485cf5dfd983e42
-  data.tar.gz: 99080cf9c671959042ab6c7b9eba25d183d79de0
+  metadata.gz: e32f1544c510923cea8b7246837c64df210c6807
+  data.tar.gz: 78547689fc699e5bbe6db36cb312296d54ea763f
 SHA512:
-  metadata.gz: 24c7389520d4517d7f88a4ddd0e48548f7babb7c44d71030f4ef9f0e04c6e08a9ff37f79b9cf300efd087f8b58ae5dcd9e6096be6662816b17d6ed98006bb2cb
-  data.tar.gz: a6c2d78e065e99eddabae2e0b9234b08c54274ab7d8b670463b2764ed5e5369c0074bc9792e8d882f9cbc77258a36bba04584803c30ce72f165ec858dc83eca4
+  metadata.gz: cb6d8219dbe9f58e283e3e56283d24b96df31bf1ca21e7e5baad32dd26fbbccc19c690bf2ea37617605a02b63081c3211354e2ed03217d215ff87dcc4cf11702
+  data.tar.gz: 93548ea3c0816d99ca6fd234e3c9179e3270b9d7ee2044c5f1f6eed4a5ac23c5e06870cd3d52c07dcf8e2f7df12ff3c375872a1056ee2760411340339df2bdf8

data/README.md

@@ -21,22 +21,32 @@ require 'codecal'
 
 # Generate customer code for user account
 # Parameters:
-#   account_id : Integer(<=9) --user account_id in acx
-#   currency   : String  --currency name
+#   number     : Integer(<=9) -- code to be calculated and masked
+#   currency   : String       --currency name
 # Return: Hash
 #   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(account_id, currency)
+Codecal.bank_customer_code_generate(number, currency)
 
 # Generate simple code for account
 # Parameters:
-#   account_id : Integer(<=9) --user account_id in acx
+#   number  : Integer(<=9)  -- code to be calculated and masked
 # Return: Hash
 #   success       : boolean -- generate customer code success
-#   customer code : String  -- numbers(account_id.length + 1) string when success == true
+#   customer code : String  -- numbers(number.length + 1) string when success == true
 #   error         : String  -- error message of parameters when success == false
-Codecal.simple_code_generate(account_id)
+Codecal.simple_code_generate(number)
+
+# Generate masked code for account
+# Parameters:
+#   mask    : String(>=6)   -- mask of letter or number
+#   number  : Integer(<=9)  -- code to be calculated and masked
+# Return: Hash
+#   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)
 
 # Validate customer code
 # Parameters:
@@ -52,6 +62,14 @@ Codecal.validate_bank_customer_code(String)
 #   valid : boolean
 Codecal.validate_simple_code(String)
 
+# Validate masked code
+# Parameters:
+#   mask        : String(>=6)   -- mask of letter or number
+#   masked_code : String(>=6)
+# Return:
+#   valid : boolean
+Codecal.validate_masked_code(String)
+
 # Get currency name
 # Parameters:
 #   currency_code : String(4)

data/lib/codecal/version.rb

@@ -1,3 +1,3 @@
 module Codecal
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/codecal.rb

@@ -2,6 +2,7 @@ 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']
   @@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
@@ -29,7 +30,7 @@ module Codecal
         errormsg += "parameter is nil. "
         return {success:false, error: errormsg}
       end
-      errormsg += "parameter 1 type should be Integer. " unless account_id.to_i > 0
+      errormsg += "the type of the code to be encrypted should be Integer. " unless account_id.to_i > 0
       if errormsg.size == 0
         cal_array = (account_id.to_i.to_s).split("").map! {|i| i.to_i}
         {success:true,customer_code: simple_code_calculate(cal_array, @@simple_seed) }
@@ -38,6 +39,15 @@ module Codecal
       end
     end
 
+    def code_generate_with_mask(mask, account_id)
+      errormsg = "mark should be string of letter or number and length should >= 5" if !mask.is_a?(String) || mask.size < 6 || !all_letters_or_digits(mask) 
+      return {success:false, error: errormsg} if errormsg
+      result = simple_code_generate(account_id)
+      return result unless result[:success]
+      offset = get_mask_offset(mask)
+      {success:true, customer_code: mask_code(offset, result[:customer_code])}
+    end
+
     def validate_bank_customer_code(customer_code)
       return false unless customer_code && customer_code.is_a?(String) && customer_code.size == 16
       calcode = code_calculate(customer_code[0..12].split("").map! {|i| i.to_i}, @@generate_seed)
@@ -50,6 +60,15 @@ module Codecal
       return simple_code == calcode
     end
 
+    def validate_masked_code(mask, masked_code)
+      return false unless masked_code.is_a?(String) && masked_code.size > 5
+      return false if !mask.is_a?(String) || mask.size < 6 || !all_letters_or_digits(mask) 
+      offset = get_mask_offset(mask)
+      result = simple_code_generate(unmask_code(offset, masked_code))
+      return false unless result[:success]
+      return masked_code == mask_code(offset, result[:customer_code])
+    end
+
     def get_currency_name(currency_code)
       return nil if !currency_code || currency_code.size !=4 || !currency_code.is_a?(String)
       return Code.new.get_name(currency_code)
@@ -65,5 +84,37 @@ module Codecal
       code = array.reverse.each_with_index.inject(0){|count, (i, index)| count += i*( index < 11 ? seed.reverse[index + 1] : (index+1).times.inject(1) {|c| c *= 3} % 7 ) }
       return (array.join + ( code % 7 ).to_s).to_i.to_s
     end
+
+    def mask_code(offset, code)
+      code_arr = code.size > 5 ? code.split("") : ("%06d" % code).split("")
+      start_code = code_arr.pop
+      masked_code = code_arr.each_with_index.inject([]) do |code, (c, i)|
+        code.push(@@BASE_ALPHABET[(@@BASE_ALPHABET.find_index(c) + offset[ i % offset.size ]) % @@BASE_ALPHABET.size])
+      end
+      masked_code.unshift(start_code).join
+    end
+
+    def unmask_code(offset, masked_code)
+      code = masked_code[1..-1].split("").each_with_index.inject([]) do |code, (c, i)|
+        code.push(@@BASE_ALPHABET[(@@BASE_ALPHABET.find_index(c) - offset[ i % offset.size ]) % @@BASE_ALPHABET.size])
+      end
+      code.join.to_i
+    end
+
+    def get_mask_offset(mask)
+      mask.split("").inject([]) do |offset,c|
+        [[*'a'..'z', *'0'..'9'], [*'A'..'Z', *'0'..'9']].each do |m|
+          if m.include?(c)
+            offset.push(m.find_index(c))
+            break
+          end
+        end
+        offset
+      end
+    end
+
+    def all_letters_or_digits(str)
+      str[/[a-zA-Z0-9]+/]  == str
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecal
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Roger Fang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler