zhongwen_tools 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17555fc2b7ad68dc9185b7f0ae0eea1226a799eb
-  data.tar.gz: 4b53940c086bf4b839fd5cf22e5a6bb380692b26
+  metadata.gz: 466a2ff98a772d2209ee19dc8e9247f5d583a634
+  data.tar.gz: 70b02d066dd3d5fe4f77d9a44c3f7d128fd8e0e1
 SHA512:
-  metadata.gz: 7ac4b646e848da7548a3b9f8915b3202099186c913acd78a6130826bef2bda1bcd3ae18b8ab5d19409d30c59722fd6dd708b863d57b197e4336fb81ae4e20785
-  data.tar.gz: adc22130db84d0320b5763484435d94913d5359c1983a9631202cfe6f3181173e1185b0a1962a99521bc2d142a6df1930d504c1ef2159fecbd8509b59ce17856
+  metadata.gz: ed785ce19696c432b19cb0f638f1ba600457b4ffe78712f3a0d877709003fc31752978c53bbb007709615e04bb49b4109d08169bf5709a567fec058435fe123a
+  data.tar.gz: 4c54eba7f80ab986b01eaf746d76e08730387bc16d088a55a9881fa9c1d595577a11b1a4de294564da14b6d6534884b9ca687e66a5b887f344d073b798c0da5f

data/lib/zhongwen_tools/romanization/detect.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'zhongwen_tools/regex'
+require 'zhongwen_tools/romanization/string'
 
 module ZhongwenTools
   module Romanization
@@ -35,7 +36,11 @@ module ZhongwenTools
     def pyn?(str = nil)
       str ||= self
 
-      str.gsub(Regex.punc,'').gsub(Regex.pyn, '').gsub(/[\s\-]/,'').strip == ''
+      normalized_str = str.gsub(Regex.punc,'').gsub(/[\s\-]/,'').downcase
+      parts = split_pyn(normalized_str).map{ |p| p }
+      pyns = ROMANIZATIONS_TABLE.map{ |r| r[:pyn] }
+
+      parts.join('') == normalized_str && parts.size == parts.select{ |p| pyns.include? p.gsub(/[1-5]/,'') }.size
     end
 
     # Public: Checks if a String is Zhuyin Fuhao (a.k.a. bopomofo).
@@ -104,7 +109,7 @@ module ZhongwenTools
       str ||= self
 
       [:pyn, :py, :zyfh, :wg, :typy, :yale, :mps2].find do |type|
-        self.send("#{type}?", str)
+        send("#{type}?", str)
       end
     end
 

data/lib/zhongwen_tools/romanization/string.rb

@@ -15,7 +15,6 @@ module ZhongwenTools
     # Returns an Array of Strings.
     def split_pyn(str = nil)
       str ||= self
-      puts "WARNING: string is not valid pinyin-num format. #{str}" unless str.pyn?
       # FIXME: ignore punctuation
       str.scan(/(#{Regex.pyn})/).map{ |arr| arr[0].strip.gsub('-','') }.flatten
     end

data/lib/zhongwen_tools/version.rb

@@ -1,3 +1,3 @@
 module ZhongwenTools
-  VERSION = '0.12.2'
+  VERSION = '0.12.4'
 end

data/test/test_romanization.rb

@@ -121,12 +121,14 @@ class TestRomanization < Minitest::Test
   def test_romanization?
     assert_equal :pyn, @alabo[:pyn].romanization?
     assert_equal :py, @alabo[:py].romanization?
+    assert_equal :zyfh, 'ㄋㄧ3 ㄏㄠ3'.romanization?
     assert_equal :wg, @mzd.to_wg(:pyn).romanization?
   end
 
   def test_detect
     assert @str.pyn?
     assert " #{@str}".pyn?
+    refute 'Ardanz'.pyn?
     refute @py.pyn?
 
     assert 'chung1 kuo2'.wg?

data/zhongwen_tools.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency('simplecov', '~> 0.7', '>= 0.7.0')
     s.add_development_dependency('simplecov-gem-adapter', '~> 1.0', '>= 1.0.1')
     s.add_development_dependency('coveralls', '~> 0.7', '>= 0.7.0')
-    s.add_development_dependency('minitest', '~> 5')
+    s.add_development_dependency('minitest', '~> 5.3', '>= 5.3.0')
     s.add_development_dependency('pry', '~> 0.9', '>= 0.9.12')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zhongwen_tools
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.4
 platform: ruby
 authors:
 - Steven Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,14 +90,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement