chinese_number 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbb6c1256556e75af180c6b8f789d95c9b8355e
-  data.tar.gz: feaf72289d42c70f875f9d0009f12dc2273b940f
+  metadata.gz: a2c5087a769a7e00ba5a52c4d750c84824c2ad9a
+  data.tar.gz: b7251a093f675f3f07612f2bed763670d31b799d
 SHA512:
-  metadata.gz: 329760a6425c24d4c0b07cf94086ca7f02c052bb82dd485b9ff09018978191e5770b0ea76ffcee8ff1e8a194a303acc096a4f50270ec5c08d4f1a75928be1dc1
-  data.tar.gz: 6dcb28b20fb09ca5137fe3166a95eebfde904df89af152579ef816e293eb4f45aec80b10fd8a011603bafd97be1af9b7475ec55eae86611c86d7c0805f6ff363
+  metadata.gz: 9943d3aa18ce4d17aa9b1ac471d41df4fa6d136efc01c27086b2715b7ab2fbea658750ce684c86f285c8101698a178f1d5f5d7a28a97b33e209c1dec3259f3fb
+  data.tar.gz: cb6c27b0f0cf5aceacc53534b4d1114e114bf125cea106018f35bdbd13109323b56b4da0aef232f658b238fe24c51c2b2ad37ff4f799cb991907ac06a8780e9a

data/README.md

@@ -3,8 +3,8 @@
 这个 ruby gem 可以用来解析汉语描述的数字，转换成阿拉伯数字。例如：
 
 ~~~ruby
-require 'chinse_number'
-ChinseNumber.trans "一年有三百六十五天"
+require 'chinese_number'
+ChineseNumber.trans "一年有三百六十五天"
 #=> "1年有365天"
 ~~~
 
@@ -29,10 +29,10 @@ ChinseNumber.trans "一年有三百六十五天"
 ~~~ruby
 require 'chinese_number'
 
-ChinseNumber.trans "我有十块钱"
+ChineseNumber.trans "我有十块钱"
 #=> "我有10块钱"
 
-ChinseNumber.trans "二〇一四年"
+ChineseNumber.trans "二〇一四年"
 #=> "2014年"
 
 ChineseNumber.find "每分钟六十秒的速度前进二十四小时"
@@ -45,7 +45,7 @@ ChineseNumber.extract "每分钟六十秒的速度前进二十四小时"
 或者独立的 Parser 类:
 
 ~~~ruby
-parser = ChinseNumber::Parser.new
+parser = ChineseNumber::Parser.new
 parser.parse "一万二"
 #=> 12000
 

data/lib/chinese_number/parser.rb

@@ -7,10 +7,10 @@ module ChineseNumber
     attr_reader :parts
     
     def self.generate_base_map
-      chinse_numbers = "一两二三四五六七八九〇零".chars
-      digits         = "122345678900".chars.map(&:to_i)
+      chinese_numbers = "一两二三四五六七八九〇零".chars
+      digits          = "122345678900".chars.map(&:to_i)
       Hash.new.tap do |map|
-        chinse_numbers.each_with_index do |w, i|
+        chinese_numbers.each_with_index do |w, i|
           d      = digits[i]
           map[w] = map[d.to_s] = d
         end
@@ -18,7 +18,7 @@ module ChineseNumber
     end
 
     def self.generate_multipers_map
-      chinse_multipers = {
+      {
         '十' => 10,
         '百' => 100,
         '千' => 1000,
@@ -40,6 +40,7 @@ module ChineseNumber
 
     DIGIT_MAP      = generate_base_map.freeze
     MULTIPERS      = generate_multipers_map
+    ARABIC_NUMBER  = /\d/
     DIGIT_TOKEN    = Regexp.new( "[#{DIGIT_MAP.keys.join}]" )
     MULTIPER_TOKEN = Regexp.new( "[#{MULTIPERS.keys.join}]" )
     TOKEN          = Regexp.new( "[#{(DIGIT_MAP.keys + MULTIPERS.keys).join}]+" )
@@ -58,6 +59,13 @@ module ChineseNumber
 
       while w = @scanner.scan( /\S/ )
         case w
+        when ARABIC_NUMBER
+          if @scanner.check(ARABIC_NUMBER)
+            w << @scanner.scan( /\d+/ )
+            handle_digit w.to_i
+          else
+            handle_digit DIGIT_MAP[w]
+          end
         when DIGIT_TOKEN
           handle_digit DIGIT_MAP[w]
         when MULTIPER_TOKEN

data/lib/chinese_number/version.rb

@@ -1,3 +1,3 @@
 module ChineseNumber
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/chinese_number_spec.rb

@@ -3,16 +3,23 @@ require_relative 'spec_helper'
 describe ChineseNumber do
 
   it '可以转换普通字符串' do
-    ChineseNumber.trans('我口袋里没有一千块钱').should == '我口袋里没有1000块钱'
-    ChineseNumber.trans('一年有三百六十五天').should == '1年有365天'
+    expect(ChineseNumber.trans('我口袋里没有一千块钱')).to eql '我口袋里没有1000块钱'
+    expect(ChineseNumber.trans('一年有三百六十五天')).to eql '1年有365天'
+  end
+
+  it '可以转换"数字+倍数"的混合' do
+    expect(ChineseNumber.trans('250万')).to eql '2500000'
+    expect(ChineseNumber.trans('20万')).to eql '200000'
+    expect(ChineseNumber.trans('20万五千')).to eql '205000'
+    expect(ChineseNumber.trans('20万零五千')).to eql '205000'
   end
 
   it '可以抽出数字' do
-    ChineseNumber.extract('每分钟六十秒的速度前进二十四小时').should == [60, 24]
+    expect(ChineseNumber.extract('每分钟六十秒的速度前进二十四小时')).to eql [60, 24]
   end
 
   it '可以寻找字符串内的中文数字' do
-    ChineseNumber.find('每分钟六十秒的速度前进二十四小时').should == [
+    expect(ChineseNumber.find('每分钟六十秒的速度前进二十四小时')).to eql [
       { '六十' => 60 },
       { '二十四' => 24 }
     ]

data/spec/parser_spec.rb

@@ -88,7 +88,7 @@ describe ChineseNumber::Parser do
 
   it '对于不合法的文字抛出错误' do
     expect {
-      @parser.parse('没有数字').should
+      @parser.parse('没有数字')
     }.to raise_error( ChineseNumber::Parser::InvalidWord )
   end
 
@@ -101,7 +101,7 @@ describe ChineseNumber::Parser do
   end
 
   def test word, expect_digit
-    @parser.parse( word ).should == expect_digit
+    expect(@parser.parse( word )).to eql expect_digit
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chinese_number
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - qhwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Translate Chinese numbers into Arabic numbers