law_number_switch 0.0.18 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0e43127b0a2d5b9252145ab651b8acc71cae0ac
-  data.tar.gz: 3247190ec7e7d55c4010de2c607715a5f75f2754
+  metadata.gz: 28c0b6b97eda0982e91db732e9a7b0ac93ed5c9e
+  data.tar.gz: 1682a3e9b1fe46d0d5f614631b2a25e50280c90e
 SHA512:
-  metadata.gz: 6abb6327c13e175b899f4a5822ea41c331e87367856fc2896813c8d094a81241552eff85312f511eaeddc896f0a849a563f24278c208575aa1804543d317e0c0
-  data.tar.gz: 1c29d6db81d517cd0b1c26e98b9304c1e64cb7e625b658d23b3fe41da33c1efbf1f0465a03b52f2073d9e67aedcf0abdb90e12157bfcded930b246e90a843a6a
+  metadata.gz: d39fde132c266766e78800886b9e52d6f297b33fe1c0cc1b8e3036e481e72377163bbf9b115cc231683cac771ed99db196e017ae955593f74332d4709a9dcd1d
+  data.tar.gz: af3a9ddc290e279dcf2884a6af26449b612b30d3d92de34d03d17a01c96d0e0c0dc1b4628a595d25bc0825d19ffb2305503a313eb2d48128c6c6ea07c31e2bd4

data/lib/law_number_switch.rb

@@ -4,109 +4,133 @@ module LawNumberSwitch
   CN_UNIT_BIG = ["", "萬", "億", "兆" ]
 
   def to_cn_number
-    string = self.to_cn_number_oneten
-    if string =~ /一十/
-      string.gsub(/一十/, '十')
-    else
-      string
+    self.to_cn_number_oneten.gsub(/一十/, '十')
+  end
+
+  def to_cn_number_capital
+    self.to_cn_number.tr('一二三四五六七八九十百千', '壹貳參肆伍陸柒捌玖拾佰仟')
+  end
+
+  def to_cn_number_only
+    output = ''
+    self.split('').each do |num|
+      output += num.to_cn_number_oneten
     end
+    output
   end
 
   def to_cn_number_oneten
-    if self =~ /-/
-      dash_words
-    else
-      int_words
+    output = ''
+    string = ''
+    self.scan(/./).each do |char|
+      if char =~ /\d/ || char == '-'
+        string += char
+      else
+        char = string.to_cn_number_judge + char unless string.empty?
+        output += char
+        string = ''
+      end
     end
+    output += string.to_cn_number_judge unless string.empty?
+    output
   end
 
-  def int_words
-    n_s = self.to_i.abs
-    return "零" if n_s == 0
-
-    num_arr = n_s.to_s.split('').reverse
-    rst_arr = []
+  def to_cn_number_judge
+    self =~ /-/ ? dash_words : int_words
+  end
 
-    writable = -1 
+  def int_words
+    return '零' if self == '0'
+    return self if self.length > 16
+    num_arr = self.split('').reverse
+    cn_num_arr = []
+    write = -1 
     #1： 都需要寫；
     #0： 寫一個零，後面的千不用寫； 
     #-1：不需要寫千，也不需要寫零；
-
     num_arr.each_with_index do |value, index|
-      writable = -1 if index%4 == 0
-      unit_big = (index%4 == 0) ? CN_UNIT_BIG[index/4] : ""
+      write = -1 if index % 4 == 0
+      unit_big = (index % 4 == 0) ? CN_UNIT_BIG[index / 4] : ""
       number = CN_NUMBER[value.to_i]
-
       if value.to_i == 0
-        unit = (writable == 1) ? "零" : ""
-        writable = (writable == 1) ? 0 : -1
+        unit = (write == 1) ? "零" : ""
+        write = (write == 1) ? 0 : -1
       else
-        unit = CN_UNIT[index%4]
-        writable = 1
+        unit = CN_UNIT[index % 4]
+        write = 1
       end
+      cn_num_arr << number + unit + unit_big
+    end
+    string = cn_num_arr.reverse.join
 
-        rst_arr << number + unit + unit_big
+    CN_UNIT_BIG.each_with_index do |char, index|
+      position = string.index(char)
+      if index > 0 && position != nil && string[position - 1] == CN_UNIT_BIG[index + 1]
+        string[position] = ''
+        # case: successive units
+      end
     end
-    rst_arr.reverse.join
+    string
   end
 
   def dash_words
-    n_arr = []
-    front = self.scan(/\d*-/)
-    behind = self.scan(/-\d*$/)[0]
-    
-    front.each do |f|
-      f_n = f.int_words + "之"
-      n_arr << f_n
+    return '負' if self == '-'
+    output = ''
+    self.split('-').each do |part|
+      output += part.to_cn_number_oneten + '之'
     end
-
-    b_n = behind.int_words
-    n_arr << b_n
-
-    n_arr.join
+    self[0] == '-' ? output = output.sub(/之/, '負') : output
+    self[-1] == '-' ? output : output.chop
   end
 
   CN_NUMS = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九"]
   CN_DECS = ["十", "百", "千", "萬", "億", "兆", "拾", "佰", '仟']
-  CN_NUMS_MAP = {'〇' => 0, '一' => 1, '二' => 2, '兩' => 2, '三' => 3, '四' => 4, '五' => 5, 
-    '六' => 6, '七' => 7, '八' => 8, '九' => 9, '零' => 0, '壹' => 1, '貳' => 2, 
-    '參' => 3, '肆' => 4, '伍' => 5, '陸' => 6, '柒' => 7, '捌' => 8, '玖' => 9, '○' => 0}
+  CN_NUMS_MAP = {'〇' => 0,  '○' => 0, '一' => 1, '二' => 2, '兩' => 2, '三' => 3, '四' => 4,
+    '五' => 5, '六' => 6, '七' => 7, '八' => 8, '九' => 9, '零' => 0, '壹' => 1, '貳' => 2, 
+    '參' => 3, '肆' => 4, '伍' => 5, '陸' => 6, '柒' => 7, '捌' => 8, '玖' => 9}
   CN_DECS_MAP = {'個' => 1, '十' => 10, '百' => 100, '千' => 1000, '萬' => 10000, 
     '億' => 100000000, '兆' => 100000000000, '拾' => 10, '佰' => 100, '仟' => 1000}
 
   def to_number
     output = ''
     string = ''
-    self.scan(/./) do |c|
-      if CN_NUMS_MAP[c] || CN_DECS_MAP[c] || c == '之'
-        string += c
+    self.scan(/./) do |char|
+      if CN_NUMS_MAP[char] || CN_DECS_MAP[char] || char == '之'
+        string += char
       else
-        c = string.to_number_case + c unless string.empty?
-        output += c
+        char = string.to_number_judge + char unless string.empty?
+        output += char
         string = ''
       end
     end
-    output += string.to_number_case unless string.empty?
+    output += string.to_number_judge unless string.empty?
     output
   end
 
-  def to_number_case
-    string = self
+  def to_number_only
+    number_only = ''
+    self.scan(/./) do |char|
+      if char == '之'
+        number_only += "-"
+      else
+        number_only += CN_NUMS_MAP[char].to_s
+      end
+    end
+    number_only
+  end
+
+  def to_number_judge
     return '之' if self == '之'
-    no_unit = 0
-    string = string.gsub(/(?:○|〇)/, "零").gsub(/(?:零|○|〇)(?:十|拾)/, "一十")
+    non_unit = 0
+    string = self.gsub(/(?:○|〇)/, "零").gsub(/(?:零|○|〇)(?:十|拾)/, "一十")
       .gsub(/廿/, "二十").gsub(/卅/, "三十") 
-    CN_DECS.each do |d|
-      no_ten = d + '十'
-      one_ten = d + '一' + '十'
-      if string =~ Regexp.new(no_ten)
-        string = self.gsub(Regexp.new(no_ten), one_ten)
-      end
-      if string !~ Regexp.new(d)
-        no_unit += 1
-      end
+    CN_DECS.each do |dec|
+      no_ten = dec + '十'
+      one_ten = dec + '一' + '十'
+      string = string.gsub(Regexp.new(no_ten), one_ten)
+      non_unit += 1 if string !~ Regexp.new(dec)
     end
-    if no_unit == CN_DECS.length
+    if non_unit == CN_DECS.length
       string.to_number_only
     elsif string =~ /之/
       string.dash_number
@@ -115,24 +139,10 @@ module LawNumberSwitch
     end
   end
 
-  def to_number_only
-    number_only = ''
-    self.scan(/./) do |c|
-      if c == '之'
-        number_only += "-"
-      else
-        number_only += CN_NUMS_MAP[c].to_s
-      end
-    end
-    number_only
-  end
-
   def int_number
     num_str = ''
-    last = nil
-    self.scan(/./) do |c|
-      num_str += c if c != '零'
-      last = c
+    self.scan(/./) do |char|
+      num_str += char if char != '零'
     end
     if num_str =~ /^十/
       num_str = '一' + num_str
@@ -141,16 +151,15 @@ module LawNumberSwitch
     sums = []
     temp_sum = 0
     last_num = 0
-    num_str.scan(/./) do |ch|
-      if num = CN_NUMS_MAP[ch]
+    num_str.scan(/./) do |char|
+      if num = CN_NUMS_MAP[char]
         last_num = num
-      elsif dec = CN_DECS_MAP[ch]
+      elsif dec = CN_DECS_MAP[char]
         if dec < 10000
           temp_sum += last_num * dec
         else
-        #find back for the one that exceeds current dec
           sums.each_with_index do |x, i|
-            if x < dec * 10 #10 is here for situation like 兩億億
+            if x < dec * 10 # case: double units
               sums[i] = x * dec
             else
               break
@@ -168,26 +177,18 @@ module LawNumberSwitch
     sums << temp_sum + last_num
 
     sum = 0
-    sums.each do |x|
-      sum += x
+    sums.each do |num|
+      sum += num
     end
     sum.to_s
   end
 
   def dash_number
-    w_arr = []
-    front = self.scan(/[^之]*之/)
-    behind = self.scan(/[^之]*.$/)[0]
-    
-    front.each do |f|
-      f = f.chop
-      f_w = f.int_number + '-'
-      w_arr << f_w
+    output = ''
+    self.split('之').each do |part|
+      output += part.to_number + '-'
     end
-
-    b_w = behind.int_number
-    w_arr << b_w
-    w_arr.join
+    self[-1] == '之' ? output : output.chop
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: law_number_switch
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.1.0
 platform: ruby
 authors:
 - GaussJay