chinese_pinyin 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b19a3fd8b5753309a20ca9606e36fb1d2c3b1e65256006f45875ef7a2113ec7
-  data.tar.gz: 1e6e4004e23954b6ce5be09cf348c2de60949fd8c17a6fbac20590fb29613f78
+  metadata.gz: 23e4d70b5131cb483c5a9a6a542b1310ad4cad4535e8d295ff58ba9338f2b930
+  data.tar.gz: 1224699549ee0d9d644e1f96d084a3c17c7754f9236d2a21311a152fafd73b52
 SHA512:
-  metadata.gz: 446b0eacb9b4de236b7cc7d514ae6f962c1167e4a55e886bd4226f5248a4f2be2282068dd0134077068324285bc1fe5c4ac4dbd83c63cb94e224c47c70bf01c8
-  data.tar.gz: 0c90d687de3815836e3d5f9f984eea53093b4a2cdde65a662bdf23e0988d4b4b4546023cc0f17e6e8db4ace3188cbf070da5269b44fc6270adcd7f26667db7ec
+  metadata.gz: 4d913acf6b8b162685957081afc5ccc6a47337e1a5481bb347a27ae8748c16f87f56c367c0a064fe1b09246d288c7680064bb1f4673dcebce669f64e3c9b458d
+  data.tar.gz: 5974408e11538bc96644ef3b8f7b41c9b5a381719bd495347217eb5165a8771dc34d7d94c810bb0543b66aaa6a79c2d64aa268845187dad167244836cf032950

data/.github/workflows/chinese_pinyin.yml

@@ -0,0 +1,26 @@
+name: Chinese Pinyin
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+  
+  push:
+    branches:
+      - 'ruby3-support'
+      - 'master'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.1', '2.5', '2.6', '2.7', '3.0']
+    steps:
+    - uses: actions/checkout@v1
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Build and test with Rake
+      run: |
+        rake test

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 1.1.0 (04/19/2021)
+
+* support ruby 3
+
 ## 1.0.2 (08/19/2019)
 
 * add 嗯 to pinyin-utf8.dat

data/README.md

@@ -1,6 +1,6 @@
 # ChinesePinyin
 
-[![Build Status](https://secure.travis-ci.org/flyerhzm/chinese_pinyin.png)](http://travis-ci.org/flyerhzm/chinese_pinyin)
+[![Chinese Pinyin](https://github.com/flyerhzm/chinese_pinyin/actions/workflows/chinese_pinyin.yml/badge.svg)](https://github.com/flyerhzm/chinese_pinyin/actions/workflows/chinese_pinyin.yml)
 
 Translate chinese hanzi to pinyin.
 

data/Rakefile

@@ -1,8 +1,6 @@
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "bundler"
-Bundler.setup
 
-require "rake"
+require 'bundler/setup'
 require 'rake/testtask'
 require "rdoc/task"
 

data/lib/chinese_pinyin.rb

@@ -16,17 +16,18 @@ class Pinyin
 
   class <<self
     attr_accessor :table
-    attr_accessor :ruby2
+    attr_accessor :ruby1
 
     def init_table
       return if @table
 
       # Ruby 2.0以后默认即为UTF-8编码，使用新的码表以提升效率
-      @ruby2  = !!(RUBY_VERSION =~ /^2/)
-      datfile = @ruby2 ? 'pinyin-utf8.dat' : 'Mandarin.dat'
+      @ruby1  = !!(RUBY_VERSION =~ /^1/)
+      datfile = @ruby1 ? 'Mandarin.dat' : 'pinyin-utf8.dat'
       @table  = {}
 
-      File.open(File.dirname(__FILE__) + "/../data/#{datfile}", "r:UTF-8",) do |file|
+      file = File.join(File.dirname(__FILE__), "../data/#{datfile}")
+      File.open(file, "r:UTF-8",) do |file|
         while line = file.gets
           key, value  = line.split(' ', 2)
           @table[key] = value
@@ -50,7 +51,7 @@ class Pinyin
     end
 
     def translate(chars, options={})
-      chars     = chars.force_encoding("UTF-8")
+      chars     = chars.encode("UTF-8")
       splitter  = options.fetch(:splitter, ' ')
       tonemarks = options.fetch(:tonemarks, false)
       tone      = options.fetch(:tone, false || tonemarks)
@@ -72,7 +73,7 @@ class Pinyin
       is_english = false
 
       chars.scan(/./).each do |char|
-        key = @ruby2 ? char : sprintf("%X", char.unpack("U").first)
+        key = @ruby1 ? sprintf("%X", char.unpack("U").first) : char
 
         if @table[key]
           results << splitter if is_english
@@ -80,7 +81,7 @@ class Pinyin
           is_english = false
           pinyin     = @table[key].chomp.split(' ', 2)[0]
 
-          pinyin.downcase! unless @ruby2
+          pinyin.downcase! if @ruby1
           pinyin.chop! unless tone
           pinyin.capitalize! if camel
           if tonemarks

data/lib/chinese_pinyin/version.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module ChinesePinyin
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/test/chinese_pinyin_test.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
 ENV["WORDS_FILE"] = File.dirname(__FILE__) + '/Words.dat'
@@ -10,6 +11,11 @@ class PinyinTest < Test::Unit::TestCase
     assert_equal("shang hai very good o ye", Pinyin.t('上海very good哦耶'))
   end
 
+  def test_t_with_frozen_string
+    assert_equal("zhong guo", Pinyin.t('中国'.freeze))
+    assert_equal("shen zhen", Pinyin.t('深圳'.freeze))
+  end
+
   def test_t_with_splitter
     assert_equal("zhong-guo", Pinyin.t('中国', splitter: '-'))
     assert_equal("huangzhimin", Pinyin.t('黄志敏', splitter: ''))

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: chinese_pinyin
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Richard Huang
 - Hong, Liang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies: []
 description: translate chinese hanzi to pinyin.
 email:
@@ -20,8 +20,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/chinese_pinyin.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -40,7 +40,7 @@ homepage: http://github.com/flyerhzm/chinese_pinyin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -55,8 +55,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: translate chinese hanzi to pinyin.
 test_files:

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.0