chinese_number 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b07a194edcdae7fbaba6135311a7b15cdd0efe9
-  data.tar.gz: 03295ee4692e9cb11ce144fec33c5e2b848bc305
+  metadata.gz: 46ea1d2202268f055e90c1217fc86eff132622bf
+  data.tar.gz: 973db4e1a05ddc47a36c9cc68f6b03c8ca8a5286
 SHA512:
-  metadata.gz: a4a43fefd36e4bd970ce9918bff882aefe873e96f22b5717b95c0f8eeb7a6bf3f59777e948c6c478f2dd0979d2924edf96cdfb303c269dacaf982efdd8102a9b
-  data.tar.gz: 5efbf0030515e2e1401311686c4053404f6c65cd2c09a9ecee7da4eb6a1ec5c83593be2dc2b49f2cddd3008d9b9062c5fa01fcaa3b547bfa38ded2b14598e1cc
+  metadata.gz: 72f416e8c01b10036d4a83ea5f844072a718c68cf8afc328ecdbc31c4d79f43dc7f2dd7f6d01e438c8665b3b6fc77e65fcc771b53e2e305c9a4331d866eb7389
+  data.tar.gz: 680469fda7cf8ed8441c63f8e7cb02944ba9802e9cdce441d100e06db90a3d6489adf36a2ee066bb8b061e4c233f52daeb64816bc965deece9573a87e4f3986b

data/README.md

@@ -1,6 +1,6 @@
 # ChineseNumber
 
-This ruby gem helps you convert Chinse numbers into Arab numbers. For example:
+这个 ruby gem 可以用来解析汉语描述的数字，转换成阿拉伯数字。例如：
 
 ~~~ruby
 require 'chinse_number'
@@ -8,41 +8,58 @@ ChinseNumber.trans "一年有三百六十五天"
 #=> "1年有365天"
 ~~~
 
-## Installation
+## 安装
 
-Add this line to your application's Gemfile:
+在 Gemfile 中添加
 
     gem 'chinese_number'
 
-And then execute:
+然后运行:
 
     $ bundle
 
-Or install it yourself as:
+或者直接用 gem 安装
 
     $ gem install chinese_number
 
-## Usage
+## 使用方法
+
+可以用封装后的高级 api:
 
-You can use the top-level api:
 ~~~ruby
 ChinseNumber.trans "我有十块钱"
 #=> "我有10块钱"
 
 ChinseNumber.trans "二〇一四年"
 #=> "2014年"
+
+ChineseNumber.extract '每分钟六十秒的速度前进二十四小时'
+#=> [60, 24]
 ~~~
 
-or use the standalone parser:
+或者独立的 Parser 类:
+
 ~~~ruby
-ChinseNumber::Parser.new.parse "一万二"
+parser = ChinseNumber::Parser.new
+parser.parse "一万二"
 #=> 12000
+
+parser.parse "3千1百零5"
+#=> 3105
 ~~~
 
-## Contributing
+## TODO
+
+小数解析
+
+## 协议
+
+the MIT license
+
+## 贡献
 
-1. Fork it ( http://github.com/<my-github-username>/chinese_number/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+1. Fork ( http://github.com/qhwa/chinese_number/fork )
+2. 创建一个分支 (`git checkout -b my-new-feature`)
+3. 提交你的修改 (`git commit -am 'Add some feature'`)
+4. push 到你的 github 仓库(`git push origin my-new-feature`)
+5. 创建一个 Pull Request

data/lib/chinese_number/parser.rb

@@ -3,15 +3,16 @@ require 'strscan'
 module ChineseNumber
 
   class Parser
+
+    attr_reader :parts
     
     def self.generate_base_map
-      chinse_numbers = "一二三四五六七八九〇零".chars
-      digits         = "12345678900".chars.map(&:to_i)
+      chinse_numbers = "一两二三四五六七八九〇零".chars
+      digits         = "122345678900".chars.map(&:to_i)
       Hash.new.tap do |map|
         chinse_numbers.each_with_index do |w, i|
-          digit      = digits[i]
-          map[w]     = digit
-          map[digit] = w
+          d      = digits[i]
+          map[w] = map[d.to_s] = d
         end
       end
     end
@@ -53,38 +54,14 @@ module ChineseNumber
       end
 
       @scanner = StringScanner.new( word )
-      parts    = []
+      @parts   = []
 
       while w = @scanner.scan( /\S/ )
         case w
         when DIGIT_TOKEN
-          num = DIGIT_MAP[w]
-
-          # 此处处理省略倍数的情况，例如
-          # "一万五"、"八万八"
-          if @scanner.eos? && parts.last && parts.last.factor >= 10
-            parts << MultipedNum.new( num, parts.last.factor / 10 )
-          else
-            parts << MultipedNum.new( num, 1 )
-          end
-
+          handle_digit DIGIT_MAP[w]
         when MULTIPER_TOKEN
-          if parts.empty?
-            parts << MultipedNum.new( 1, 1 )
-          end
-
-          multiper = MULTIPERS[w]
-
-          if parts.last.factor <= multiper
-            parts.each do |part|
-              if part.factor <= multiper
-                part.factor *= multiper
-              end
-            end
-          else
-            parts << MultipedNum.new( 1, multiper )
-          end
-
+          handle_multiper MULTIPERS[w]
         else
           raise UnexpectToken.new(w)
         end
@@ -95,6 +72,34 @@ module ChineseNumber
       end
     end
 
+    private
+
+      def handle_digit num
+        # 此处处理省略倍数的情况，例如
+        # "一万五"、"八万八"
+        if @scanner.eos? && parts.last && parts.last.factor >= 10
+          parts << MultipedNum.new( num, parts.last.factor / 10 )
+        else
+          parts << MultipedNum.new( num, 1 )
+        end
+      end
+
+      def handle_multiper multiper
+        if parts.empty?
+          parts << MultipedNum.new( 1, 1 )
+        end
+
+        if parts.last.factor <= multiper
+          parts.each do |part|
+            if part.factor <= multiper
+              part.factor *= multiper
+            end
+          end
+        else
+          parts << MultipedNum.new( 1, multiper )
+        end
+      end
+
     class MultipedNum < Struct.new(:base, :factor)
       def to_i
         base * factor       

data/lib/chinese_number/version.rb

@@ -1,3 +1,3 @@
 module ChineseNumber
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/chinese_number.rb

@@ -3,10 +3,17 @@ require "chinese_number/parser"
 
 module ChineseNumber
   
-  def self.trans( text )
-    text.gsub( Parser::TOKEN ) do |word|
-      Parser.new.parse( word ).to_s
+  class << self
+    def trans text
+      text.gsub( Parser::TOKEN ) do |word|
+        Parser.new.parse( word ).to_s
+      end
     end
-  end
 
+    def extract text
+      text.scan( Parser::TOKEN ).map do |word|
+        Parser.new.parse( word )
+      end
+    end
+  end
 end

data/spec/chinese_number_spec.rb

@@ -6,5 +6,10 @@ describe ChineseNumber do
     ChineseNumber.trans('我口袋里没有一千块钱').should == '我口袋里没有1000块钱'
     ChineseNumber.trans('一年有三百六十五天').should == '1年有365天'
   end
+
+  it '可以抽出数字' do
+    ChineseNumber.extract('每分钟六十秒的速度前进二十四小时').should == [60, 24]
+  end
+
 end
 

data/spec/parser_spec.rb

@@ -15,6 +15,7 @@ describe ChineseNumber::Parser do
   it '可以解析个位数字' do
     test '零', 0
     test '〇', 0
+    test '两', 2
   
     '一二三四五六七八九'.each_char.to_a.each_with_index do |w, i|
       test w, i + 1
@@ -91,6 +92,14 @@ describe ChineseNumber::Parser do
     }.to raise_error( ChineseNumber::Parser::InvalidWord )
   end
 
+  it '可以解析汉字和数字混用的情形' do
+    test '3千万', 3000_0000
+  end
+
+  it '支持纯阿拉伯数字' do
+    test '3134', 3134
+  end
+
   def test word, expect_digit
     @parser.parse( word ).should == expect_digit
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chinese_number
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - qhwa