law_number_switch 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52b1bcd4fba1aae4d9a4788120a77c124931a024
-  data.tar.gz: 252f54bb6031623be09b59b8e4cb34b474cdf91f
+  metadata.gz: dd1e84ac20704a5a62c43dc2881055a5cb1725ec
+  data.tar.gz: 7370f86b8adfdd952bd2ab7da4cfb3117155a324
 SHA512:
-  metadata.gz: aca8e77258472d38209f68d411ad2151ebb3f5471503658ad4d67dc9ddb9f9fbf9a50b22d7fde540d3e9bd11ce39330b988b3ccf224211dcdbe79e8ca293c677
-  data.tar.gz: 477de0f8ab4261bf80aa551153a6f6e724c6eeec8e391c1b9c7a2bae324b9634e648bc8231c84d01eb26f75a6e5349ce04d06c4ec4fc901152a7e060af463af7
+  metadata.gz: fa35045b82933263c9b37c5928b35e25a25d28017d3c6830043b3974b17d5c4e2fe38b3b335a53fb7b7fc43d823d727595131dd6fa5d0bd0967230e8a1bab3c3
+  data.tar.gz: 96216c2b988dcdf918ca9fc67bf6eeb8fa607f6acdca8b860cfd4c8fb7057c237dafa848a2618288cf49c9623ac4c849c192b36335bfb49562623b87e3aa4006

data/lib/law_number_switch.rb

@@ -1,7 +1,7 @@
 module LawNumberSwitch
   CN_NUMBER = ["", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十" ]
   CN_UNIT = ["", "十", "百", "千" ]
-  CN_UNIT_BIG = ["", "萬", "億" ]
+  CN_UNIT_BIG = ["", "萬", "億", "兆" ]
 
   def to_cn_number
     string = self.to_cn_number_oneten
@@ -47,7 +47,6 @@ module LawNumberSwitch
 
         rst_arr << number + unit + unit_big
     end
-
     rst_arr.reverse.join
   end
 
@@ -68,12 +67,30 @@ module LawNumberSwitch
   end
 
   CN_NUMS = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九"]
-  CN_DECS = ["十", "百", "千", "萬", "億"]
-  CN_NUMS_MAP = {'〇' => 0, '一' => 1, '二' => 2, '三' => 3, '四' => 4, '五' => 5, 
-    '六' => 6, '七' => 7, '八' => 8, '九' => 9, '零' => 0}
-  CN_DECS_MAP = {'個' => 1, '十' => 10, '百' => 100, '千' => 1000, '萬' => 10000, '億' => 100000000}
+  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_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]
+        string += c
+      else
+        c = string.to_number_case + c unless string.empty?
+        output += c
+        string = ''
+      end
+    end
+    output += string.to_number_case unless string.empty?
+    output
+  end
+
+  def to_number_case
     string = self
     CN_DECS.each do |d|
       no_ten = d + '十'
@@ -82,17 +99,12 @@ module LawNumberSwitch
         string = self.gsub(Regexp.new(no_ten), one_ten)
       end
     end
-    if string =~ /零十/
-      string = string.gsub(/零十/, "一十")
-    end
-    string.to_number_oneten
-  end
-
-  def to_number_oneten
-    if self =~ /之/
-      dash_number
+    string = string.gsub(/(?:○|〇)/, "零").gsub(/(?:零|○|〇)(?:十|拾)/, "一十")
+      .gsub(/廿/, "二十").gsub(/卅/, "三十")
+    if string =~ /之/
+      string.dash_number
     else
-      int_number
+      string.int_number
     end
   end
 
@@ -158,7 +170,6 @@ module LawNumberSwitch
     w_arr << b_w
     w_arr.join
   end
-
 end
 
 String.include LawNumberSwitch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: law_number_switch
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.10
 platform: ruby
 authors:
 - GaussJay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies: []
 description: Swith chinese law number string and arabic numerals string to each other.
 email: