chinese_pinyin 0.6.1.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b715ff1242e797d9c74fa97c6f171c399f011fe5
-  data.tar.gz: 3ede774cf53500643729e4437d1dbdc27bf133f7
+  metadata.gz: 536820144ef1284e973430e684d7511a5f4a21b5
+  data.tar.gz: 235adb7c959a9c0a01e3d2234ac1abf75fefc79a
 SHA512:
-  metadata.gz: 952ef367abdd377365510ef7e9f7d80d0fddd475cf32c0311e06ab5177507a5e5e0d6852da3ac4d9ec0e301882b33c8aeb82c6f2a503a04c1c4a2e51010fc2d3
-  data.tar.gz: e5c52df59b7ca6650696ae98f02e459ede81e9edc79d80f3974e0240490445d82a9278e7529ad35f6fa181c6ebd4faaf04f5f3561ca0d793a82d26d4117c0e01
+  metadata.gz: fcf06b8a4f831aac76d9ecd772b972f05b855e70fab14fca2d40aa5f6504fdd4045a56bc5a84dc22e1bb0cf857d72b6e6f0ce8133f37d95dae78f2f05e360330
+  data.tar.gz: 526585ebbd8b4ecc987f31d5c591cbc8352708df9af9601f1a01c8ae8bb22f06da2da73e6017f2fbbd6f8b71e747009e16f2a6c88b0c0d215fe61c4222268b95

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.2.0

data/Gemfile

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
+gem 'test-unit' # ruby 2.1.5以后版本的标准库中不包含'test-unit'

data/README.md

@@ -21,6 +21,7 @@ Usage
     Pinyin.t('中国', splitter: '-') => "zhong-guo"
     Pinyin.t('中国', splitter: '') => "zhongguo"
     Pinyin.t('中国', tone: true) => "zhong1 guo2"
+    Pinyin.t('中国', tonemarks: true) => "zhōng guó"
 
 Polyphone Issue
 ---------------

data/lib/chinese_pinyin.rb

@@ -4,6 +4,16 @@ $KCODE = 'u' if RUBY_VERSION =~ /1\.8/
 require 'chinese_pinyin/version'
 
 class Pinyin
+
+  TONE_MARK = {
+    a: %w(a ā á ǎ à),
+    o: %w(o ō ó ǒ ò),
+    e: %w(e ē é ě è),
+    i: %w(i ī í ǐ ì),
+    u: %w(u ū ú ǔ ù),
+    v: %w(ü ǖ ǘ ǚ ǜ)
+  }
+
   class <<self
     attr_accessor :table
     attr_accessor :ruby2
@@ -40,9 +50,10 @@ class Pinyin
     end
 
     def translate(chars, options={})
-      splitter = options.fetch(:splitter, ' ')
-      tone     = options.fetch(:tone, false)
-      camel    = options.fetch(:camelcase, false)
+      splitter  = options.fetch(:splitter, ' ')
+      tonemarks = options.fetch(:tonemarks, false)
+      tone      = options.fetch(:tone, false || tonemarks)
+      camel     = options.fetch(:camelcase, false)
 
       init_word_table
       results = @words_table[chars]
@@ -71,6 +82,13 @@ class Pinyin
           pinyin.downcase! unless @ruby2
           pinyin.chop! unless tone
           pinyin.capitalize! if camel
+          if tonemarks
+            tone_index = pinyin[-1].to_i
+            pinyin = pinyin[0...-1]
+            %w(a o e i u v).each { |v|
+              break if pinyin.tr! v, TONE_MARK[v.to_sym][tone_index]
+            }
+          end
 
           results << pinyin
           results << splitter

data/lib/chinese_pinyin/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ChinesePinyin
-  VERSION = "0.6.1.1"
+  VERSION = "0.7.0"
 end

data/test/chinese_pinyin_test.rb

@@ -38,4 +38,9 @@ class PinyinTest < Test::Unit::TestCase
   def test_t_with_chinese_punctuation
     assert_equal("ce-shi-yi-xia-Think-diff", Pinyin.t('测试一下，Think diff', splitter: '-'))
   end
+
+  def test_t_with_tonemarks
+    assert_equal('zhōng guó', Pinyin.t('中国', tonemarks: true))
+    assert_equal('běi jīng', Pinyin.t('北京', tonemarks: true))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chinese_pinyin
 version: !ruby/object:Gem::Version
-  version: 0.6.1.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Richard Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies: []
 description: translate chinese hanzi to pinyin.
 email:
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: translate chinese hanzi to pinyin.