codecal 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e32f1544c510923cea8b7246837c64df210c6807
-  data.tar.gz: 78547689fc699e5bbe6db36cb312296d54ea763f
+  metadata.gz: f77a2ce8d8ecfdb5a14b4dd26aef81339c7ad2ae
+  data.tar.gz: d63bf9f0d3326cfa83093771f2c0e3052b049921
 SHA512:
-  metadata.gz: cb6d8219dbe9f58e283e3e56283d24b96df31bf1ca21e7e5baad32dd26fbbccc19c690bf2ea37617605a02b63081c3211354e2ed03217d215ff87dcc4cf11702
-  data.tar.gz: 93548ea3c0816d99ca6fd234e3c9179e3270b9d7ee2044c5f1f6eed4a5ac23c5e06870cd3d52c07dcf8e2f7df12ff3c375872a1056ee2760411340339df2bdf8
+  metadata.gz: 4ca0cce49b239c578aa215d1fa5bbc43c886a8c94889da9fc53dd8c1c9b2004c3a0fdd8c9a1ab1d8cf5bb5bbeef802fb550d01fbcd891323ab6646518688e548
+  data.tar.gz: 77102c8cc6b5e69237b649e108aa7006ce8b1513463f28384559b4096f53609d8100941f98a20270749981ca674b0ef1c3a764fa21c2653afbbd7c0aa38313e0

data/README.md

@@ -70,6 +70,14 @@ Codecal.validate_simple_code(String)
 #   valid : boolean
 Codecal.validate_masked_code(String)
 
+# Get unmasked code
+# Parameters:
+#   mask        : String(>=6)   -- mask of letter or number
+#   masked_code : String(>=6)
+# Return:
+#   code  : String(>=6) ||  false : boolean
+Codecal.get_unmasked_code(String)
+
 # Get currency name
 # Parameters:
 #   currency_code : String(4)

data/lib/codecal/version.rb

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

data/lib/codecal.rb

@@ -30,7 +30,7 @@ module Codecal
         errormsg += "parameter is nil. "
         return {success:false, error: errormsg}
       end
-      errormsg += "the type of the code to be encrypted should be Integer. " unless account_id.to_i > 0
+      errormsg += "the type of the code to be encrypted should be Integer. " unless all_digits?(account_id.to_s)
       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) }
@@ -40,7 +40,7 @@ module Codecal
     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) 
+      errormsg = "mark should be string of letter or number and length should >= 5" unless is_legal_mask?(mask)
       return {success:false, error: errormsg} if errormsg
       result = simple_code_generate(account_id)
       return result unless result[:success]
@@ -61,14 +61,22 @@ module Codecal
     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) 
+      return false unless is_legal_masked_code?(masked_code)
+      return false unless is_legal_mask?(mask) 
       offset = get_mask_offset(mask)
-      result = simple_code_generate(unmask_code(offset, masked_code))
+      result = simple_code_generate(unmask_code(offset, masked_code)[1..-1].to_i)
       return false unless result[:success]
       return masked_code == mask_code(offset, result[:customer_code])
     end
 
+    def get_unmasked_code(mask, masked_code)
+      return false unless is_legal_masked_code?(masked_code)
+      return false unless is_legal_mask?(mask) 
+      offset = get_mask_offset(mask)
+      code = unmask_code(offset, masked_code)
+      all_digits?(code) ? code : false
+    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)
@@ -95,10 +103,11 @@ module Codecal
     end
 
     def unmask_code(offset, masked_code)
-      code = masked_code[1..-1].split("").each_with_index.inject([]) do |code, (c, i)|
+      start_code = masked_code[0]
+      code = masked_code[1..-1].downcase.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
+      code.unshift(start_code).join
     end
 
     def get_mask_offset(mask)
@@ -113,8 +122,23 @@ module Codecal
       end
     end
 
-    def all_letters_or_digits(str)
+    def all_letters_or_digits?(str)
       str[/[a-zA-Z0-9]+/]  == str
     end
+
+    def all_digits?(str)
+      str[/[0-9]+/]  == str
+    end
+
+    def is_legal_mask?(mask)
+      return false if !mask.is_a?(String) || mask.size < 6 || !all_letters_or_digits?(mask) 
+      return true
+    end
+
+    def is_legal_masked_code?(masked_code)
+      return false unless masked_code.is_a?(String) && masked_code.size > 5
+      return true
+    end
+
   end
 end

metadata

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