ting 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9bbc658786c91fe67ed87314813fb4a77cbb9b
-  data.tar.gz: 2e0e80574d869de65ec96ac9e46c1251b8a5cfff
+  metadata.gz: 6d7dbea414f62b23124a52f7eb9be4fed2997b92
+  data.tar.gz: 1e179823cb2b4c37c17642d1afe165993ccb0489
 SHA512:
-  metadata.gz: 526bb29a7f33492f00ef637a532c2152eb619859be7e9a2a94f079fb3fbc77791f9df24daccc2b09924377ea49037a0342e2ab7223ae89a18749111b5b98ecd0
-  data.tar.gz: 0905ae0bd0ebd3f1f683d09fc9b702fdcc29c81c87af9d9660d430fa99f245c8f4210bd7ee5bdc4a564ff1e12702fda40c52d0a0e66e19fd1d35a5ea6a40e241
+  metadata.gz: 5aad8f773d7731e222ea7c4c6324af8742954480b9258673a2a6e442b689bbed5b4e8bedbbbcfe058672a6d66782d37ea14be7457cff3a5581cce42e693f16ea
+  data.tar.gz: 35ead7e81254b5294d7bce9c8dcaca965d661780e02702762060e5ab3dd6f15b863909f698627afa8cc6366de8d5941a118507fc59fb8306509d2a461f0927fd

data/.travis.yml

@@ -1,13 +1,14 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - jruby-19mode
-  - rbx
+  - 2.1.1
+  - 2.2.5
+  - 2.3.4
+  - 2.4.2
+  - jruby
   - ruby-head
   - jruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: jruby-head

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    ting (0.9.0)
+    ting (0.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
     ffi2-generators (0.1.1)
+    power_assert (0.4.1)
     psych (2.0.4)
     racc (1.4.11)
     rake (10.1.1)
@@ -221,6 +222,8 @@ GEM
     rubysl-xmlrpc (2.0.0)
     rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
+    test-unit (3.2.3)
+      power_assert
 
 PLATFORMS
   java
@@ -232,4 +235,8 @@ DEPENDENCIES
   rake (~> 10.1)
   rspec (~> 2.14)
   rubysl (~> 2.0)
+  test-unit
   ting!
+
+BUNDLED WITH
+   1.15.4

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/arnebrasseur/ting.png)](https://travis-ci.org/arnebrasseur/ting) [![Code Climate](https://codeclimate.com/github/arnebrasseur/ting.png)](https://codeclimate.com/github/arnebrasseur/ting)
+[![Build Status](https://travis-ci.org/arnebrasseur/ting.png)](https://travis-ci.org/plexus/ting) [![Code Climate](https://codeclimate.com/github/arnebrasseur/ting.png)](https://codeclimate.com/github/plexus/ting)
 
 # Ting
 

data/Rakefile

@@ -24,5 +24,5 @@ desc "Push gem to rubygems.org"
 task :push => :gem do
   sh "git tag v#{Ting::VERSION}"
   sh "git push --tags"
-  sh "gem push pkg/hexp-#{Ting::VERSION}.gem"
+  sh "gem push pkg/ting-#{Ting::VERSION}.gem"
 end

data/code_of_conduct.md

@@ -0,0 +1,32 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect
+all people who contribute through reporting issues, posting feature
+requests, updating documentation, submitting pull requests or patches,
+and other activities.
+
+We are committed to making participation in this project a
+harassment-free experience for everyone, regardless of level of
+experience, gender, gender identity and expression, sexual
+orientation, disability, personal appearance, body size, race, age, or
+religion.
+
+Examples of unacceptable behavior by participants include the use of
+sexual language or imagery, derogatory comments or personal attacks,
+trolling, public or private harassment, insults, or other
+unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct. Project
+maintainers who do not follow the Code of Conduct may be removed from
+the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by opening an issue or contacting one or more of the
+project maintainers.
+
+This Code of Conduct is adapted from the
+[Contributor Covenant](http:contributor-covenant.org), version 1.0.0,
+available at
+[http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/examples/hello.rb

@@ -1,11 +1,11 @@
 $: << File.join(File.dirname(__FILE__), '../lib')
 
-require 'pinyin'
+require 'ting'
 
-conv1 = Pinyin::Converter.new(:hanyu, :numbers, :wadegiles, :accents)
-conv2 = Pinyin::Converter.new(:wadegiles, :accents, :zhuyin, :marks)
+conv1 = Ting::Converter.new(:hanyu, :numbers, :wadegiles, :accents)
+conv2 = Ting::Converter.new(:wadegiles, :accents, :zhuyin, :marks)
 
-pinyin    = 'wo3 de2 peng2 you3 shi4 dai4 fu'
+pinyin    = 'wo3 de peng2 you3 shi4 dai4 fu'
 wadegiles = conv1 << pinyin
 zhuyin    = conv2 << wadegiles
 

data/lib/ting.rb

@@ -19,6 +19,8 @@ require 'ting/procable'
 require 'ting/reader'
 require 'ting/writer'
 require 'ting/converter'
+require 'ting/hanyu_pinyin_parser'
+require 'ting/memoize_call'
 
 module Ting
   class << self

data/lib/ting/data/final.csv

@@ -6,7 +6,7 @@
 "tongyong","ih","a","o","e",,"ai","ei","ao","ou","an","en","ang","eng","ong",,"i","ia",,"ie",,"iao","iou","ian","in","iang","ing","u","ua","uo","uai","uei","uan","un","uang",,"yu","yue","yuan","yun","yong"
 "tongyong_standalone",,"a","o","e","ê","ai","ei","ao","ou","an","en","ang","eng",,"er","yi","ya","yo","ye","yai","yao","you","yan","yin","yang","ying","wu","wa","wo","wai","wei","wan","wun","wang","wong","yu","yue","yuan","yun","yong"
 "wadegiles","ih","a","o","e",,"ai","ei","ao","ou","an","en","ang","eng","ung","erh","i","ia",,"ieh",,"iao","iu","ien","in","iang","ing","u","ua","uo","uai","ui","uan","un","uang",,"ü","üeh","üan","ün","iung"
-"wadegiles_standalone",,,,,,,,,,,,,,,,,"ya",,"yeh",,"yao","yu","yan","yin","yang","ying","wu","wa","wo","wai","wei","wan","wen","wang","weng","yü","yüeh","yüan","yün","yung"
-"zhuyin",,"ㄚ","ㄛ","ㄜ","ㄝ","ㄞ","ㄟ","ㄠ","ㄡ","ㄢ","ㄣ","ㄤ","ㄥ","ㄨㄥ","ㄦ","ㄧ","ㄧㄚ",,"ㄧㄝ",,"ㄧㄠ","ㄧㄡ","ㄧㄢ","ㄧㄣ","ㄧㄤ","ㄧㄥ","ㄨ","ㄨㄚ","ㄨㄛ","ㄨㄞ","ㄨㄟ","ㄨㄢ","ㄨㄣ","ㄨㄤ","ㄨㄥ","ㄩ","ㄩㄝ","ㄩㄢ","ㄩㄣ","ㄩㄥ"
+"wadegiles_standalone",,,,,,,,,,,,,,,,,"ya","yo","yeh","yai","yao","yu","yan","yin","yang","ying","wu","wa","wo","wai","wei","wan","wen","wang","weng","yü","yüeh","yüan","yün","yung"
+"zhuyin",,"ㄚ","ㄛ","ㄜ","ㄝ","ㄞ","ㄟ","ㄠ","ㄡ","ㄢ","ㄣ","ㄤ","ㄥ","ㄨㄥ","ㄦ","ㄧ","ㄧㄚ","ㄧㄛ","ㄧㄝ","ㄧㄞ","ㄧㄠ","ㄧㄡ","ㄧㄢ","ㄧㄣ","ㄧㄤ","ㄧㄥ","ㄨ","ㄨㄚ","ㄨㄛ","ㄨㄞ","ㄨㄟ","ㄨㄢ","ㄨㄣ","ㄨㄤ","ㄨㄥ","ㄩ","ㄩㄝ","ㄩㄢ","ㄩㄣ","ㄩㄥ"
 "palladin","и","а","о","э",,"ай","эй","ао","оу","ань","энь","ан","эн","ун","эр","и","я","ё","е","яй","яо","ю","янь","инь","ян","ин","у","уа","уо","уай","уй","уaнь","унь","уaн","вэн","юй","юэ","юaнь","юнь","юн"
 "palladin_standalone",,,,,,,,,,,,,,"вэн",,,,,,,,,,,,,,"ва","во","вай","вэй","вaнь","вэнь","вaн",,,,,

data/lib/ting/groundwork.rb

@@ -157,7 +157,7 @@ module Ting
     #
 
     def valid_combinations( &blk )
-      return to_enum(__message__) unless block_given?
+      return to_enum(__method__) unless block_given?
       inp = YAML::load(IO.read(File.join(File.dirname(__FILE__), 'data', 'valid_pinyin.yaml')))
       inp.each do |final, initials|
         final = Final.const_get(final)
@@ -169,7 +169,7 @@ module Ting
     end
 
     def all_syllables( &blk )
-      return to_enum(__message__) unless block_given?
+      return to_enum(__method__) unless block_given?
       valid_combinations.map do |i,f|
         1.upto(5) do |t|
           yield Syllable.new(i,f,t,false)

data/lib/ting/hanyu_pinyin_parser.rb

@@ -0,0 +1,41 @@
+module Ting
+  class HanyuPinyinParser
+    include Procable
+
+    def hanyu_writer
+      @hanyu_writer ||= Ting.writer(:hanyu, :accents)
+    end
+
+    def hanyu_reader
+      @hanyu_reader ||= Ting.reader(:hanyu, :accents)
+    end
+
+    def all_syllables
+      @all_syllables ||= Ting.all_syllables.map(&hanyu_writer).sort_by(&:length).reverse
+    end
+
+    def sylls_with_erhua
+      @with_erhua ||= all_syllables.map{|p| p + 'r'}
+    end
+
+    def pinyin_regexp
+      @pinyin_regexp ||= Regexp.union(*sylls_with_erhua, *all_syllables)
+    end
+
+    def split_pinyin(pinyin)
+      pinyin.scan(pinyin_regexp).flat_map do |syll|
+        if sylls_with_erhua.include?(syll) && ! all_syllables.include?(syll)
+          [ syll[0..-2], 'er']
+        else
+          [ syll ]
+        end
+      end
+    end
+
+    def parse(pinyin)
+      split_pinyin(pinyin).map(&hanyu_reader)
+    end
+    alias call parse
+
+  end
+end

data/lib/ting/memoize_call.rb

@@ -0,0 +1,14 @@
+module Ting
+  class MemoizeCall
+    include Procable
+
+    def initialize(target)
+      @target = target
+      @map = {}
+    end
+
+    def call(*args)
+      @map[args] ||= @target.call(*args)
+    end
+  end
+end

data/lib/ting/procable.rb

@@ -3,5 +3,9 @@ module Ting
     def to_proc
       method(:call).to_proc
     end
+
+    def memoize
+      MemoizeCall.new(self)
+    end
   end
 end

data/lib/ting/tones/accents.rb

@@ -22,7 +22,7 @@ module Ting
 
       def add_tone(syll, tone)
         syll = syll.sub('ü','v')
-        tone %= MAX_TONE
+        tone = tone % MAX_TONE
         case syll
         when /a/
           syll.sub(/a/, tone_glyph(:a,tone))
@@ -40,29 +40,30 @@ module Ting
       end
 
       def peek_tone(syll)
-        unpacked = syll.unpack('U*')
-        each_tone_glyph do |vowel, tones|
-          tone_glyph=unpacked.find {|t| tones.include?(t)}
+        candidates = each_tone_glyph.map do |vowel, tones|
+          tone_glyph = syll.codepoints.find {|t| tones.include?(t)}
           normalize( tones.index(tone_glyph) ) if tone_glyph
-        end
+        end.compact
+        candidates.reject {|tone| tone == 5}.first || candidates.first
       end
 
       # returns [ tone number, syllable without tone ]
       # e.g. ni3 => [ 3, 'ni' ]
       def pop_tone(syll)
-        unpacked = syll.unpack('U*')
-        each_tone_glyph do |vowel, tones|
-
-          if tone_glyph = unpacked.find {|t| tones.include?(t)}
-            unpacked[unpacked.index(tone_glyph)] = vowel.to_s.unpack('U').first
-            break [normalize(tones.index(tone_glyph)), unpacked.pack('U*').sub('v', 'ü')]
+        tone = peek_tone(syll)
+        unpacked = syll.codepoints.to_a
+        each_tone_glyph do |vowel, tone_glyph_codepoints|
+          tone_glyph_cp = tone_glyph_codepoints[tone % MAX_TONE]
+          if unpacked.include? tone_glyph_cp
+            unpacked[unpacked.index(tone_glyph_cp)] = vowel.to_s.unpack('U').first
+            return [normalize(tone_glyph_codepoints.index(tone_glyph_cp)), unpacked.pack('U*').sub('v', 'ü')]
           end
-
         end
       end
 
       private
         def each_tone_glyph
+          return to_enum(__method__) unless block_given?
           [:a,:e,:i,:o,:u,:v].each do |v|  #Order is significant
             vowel, tones = v, UNICODE_TONE_GLYPHS[v]
             yield vowel,tones

data/lib/ting/version.rb

@@ -1,3 +1,3 @@
 module Ting
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/spec/jruby_csv_spec.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-
+require 'spec_helper'
 require 'csv'
-require 'rspec/autorun'
 
 # Describes a problem with CSV parsing on JRuby, see output at the bottom.
 #

data/spec/ting_spec.rb

@@ -6,14 +6,14 @@ describe Ting do
   let(:bopomofo) { 'ㄉㄠˋ ㄎㄜˇ ㄉㄠˋ ㄈㄟ ㄔㄤˊ ㄉㄠˋ'.force_encoding('UTF-8') }
 
   it 'should convert from Hany Pinyin to Bopomofo' do
-    Ting.from(:hanyu, :numbers).to(:zhuyin, :marks).convert(pinyin).should == bopomofo
+    expect(Ting.from(:hanyu, :numbers).to(:zhuyin, :marks).convert(pinyin)).to eq(bopomofo)
   end
 
-  it "should parse" do
-    Ting::Reader.new(:hanyu, :numbers).parse('Bei3').first.should == Ting::Syllable.new( Ting::Initial::Bo, Ting::Final::Ei, 3, true )
+  it 'should parse' do
+    expect(Ting::Reader.new(:hanyu, :numbers).parse('Bei3').first).to eq(Ting::Syllable.new( Ting::Initial::Bo, Ting::Final::Ei, 3, true ))
   end
 
   it 'should respect capitalization' do
-    Ting.from(:hanyu, :numbers).to(:hanyu, :accents).convert('Bei3 jing1').should == 'Běi jīng'
+    expect(Ting.from(:hanyu, :numbers).to(:hanyu, :accents).convert('Bei3 jing1')).to eq('Běi jīng')
   end
 end

data/test/test_comparison.rb

@@ -1,7 +1,7 @@
 require 'ting'
 require 'test/unit'
 
-# This test uses the chart from piyin.info to compare all implemented conversion types
+# This test uses the chart from pinyin.info to compare all implemented conversion types
 # Since I can't find another reference of the hanyu pinyin 'lo', I have removed it from the table
 
 class TestCompare < Test::Unit::TestCase

data/test/test_odd_syllables.rb

@@ -0,0 +1,28 @@
+require 'ting'
+require 'test/unit'
+
+class TestOddSyllables < Test::Unit::TestCase
+  def test_zhuyin_conversion
+    pinyin_to_zhuyin = Ting::Converter.new(:hanyu, :numbers, :zhuyin, :marks)
+    zhuyin_to_pinyin = Ting::Converter.new(:zhuyin, :marks, :hanyu, :numbers)
+    
+    # These syllable could not be converted to Zhuyin in Ting 0.9.
+    %w(yo1 yai2).each do |pinyin|
+      zhuyin = pinyin_to_zhuyin.convert(pinyin)
+      pinyin2 = zhuyin_to_pinyin.convert(zhuyin)
+      assert_equal pinyin, pinyin2
+    end
+  end
+
+  def test_wg_conversion
+    pinyin_to_wg = Ting::Converter.new(:hanyu, :numbers, :wadegiles, :numbers)
+    wg_to_pinyin = Ting::Converter.new(:wadegiles, :numbers, :hanyu, :numbers)
+    
+    # These syllable could not be converted to Wade-Giles in Ting 0.9.
+    %w(yo1 yai2).each do |pinyin|
+      wg = pinyin_to_wg.convert(pinyin)
+      pinyin2 = wg_to_pinyin.convert(wg)
+      assert_equal pinyin, pinyin2
+    end
+  end
+end

data/ting.gemspec

@@ -1,4 +1,3 @@
-
 require File.expand_path('../lib/ting/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -6,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.version  = Ting::VERSION
   gem.authors  = [ 'Arne Brasseur' ]
   gem.email    = [ 'arne@arnebrasseur.net' ]
-  gem.homepage = 'http://github.com/github/ting'
+  gem.homepage = 'https://github.com/plexus/ting'
   gem.license  = 'GPL-3.0'
   gem.platform = Gem::Platform::RUBY
 
@@ -20,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake', '~> 10.1'
   gem.add_development_dependency 'rspec', '~> 2.14'
+  gem.add_development_dependency 'test-unit'
 end

metadata

@@ -1,46 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: ting
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Arne Brasseur
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-description: Ting can convert between various phonetic representations of Mandarin
-  Chinese. It can also handle various representation of tones, so it can be used to
-  convert pinyin with numbers to pinyin with tones.
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: test-unit
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ting can convert between various phonetic representations of Mandarin Chinese. It can also handle various representation of tones, so it can be used to convert pinyin with numbers to pinyin with tones.
 email:
 - arne@arnebrasseur.net
 executables: []
@@ -59,6 +71,7 @@ files:
 - README.md
 - Rakefile
 - TODO
+- code_of_conduct.md
 - examples/hello.rb
 - lib/ting.rb
 - lib/ting/conversion.rb
@@ -73,9 +86,10 @@ files:
 - lib/ting/data/valid_pinyin.yaml
 - lib/ting/exception.rb
 - lib/ting/groundwork.rb
+- lib/ting/hanyu_pinyin_parser.rb
+- lib/ting/memoize_call.rb
 - lib/ting/procable.rb
 - lib/ting/reader.rb
-- lib/ting/string.rb
 - lib/ting/tones.rb
 - lib/ting/tones/accents.rb
 - lib/ting/tones/ipa.rb
@@ -90,12 +104,13 @@ files:
 - spec/ting_spec.rb
 - test/test_comparison.rb
 - test/test_hanyu_coverage.rb
+- test/test_odd_syllables.rb
 - ting.gemspec
-homepage: http://github.com/github/ting
+homepage: https://github.com/plexus/ting
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,15 +125,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
-summary: A conversion library for Chinese transcription methods like Hanyu Pinyin,
-  Bopomofo and Wade-Giles.
+summary: A conversion library for Chinese transcription methods like Hanyu Pinyin, Bopomofo and Wade-Giles.
 test_files:
 - spec/jruby_csv_spec.rb
 - spec/spec_helper.rb
 - spec/ting_spec.rb
 - test/test_comparison.rb
 - test/test_hanyu_coverage.rb
+- test/test_odd_syllables.rb

data/lib/ting/string.rb

@@ -1,4 +0,0 @@
-# coding: utf-8
-
-class String
-end