zhongwen_tools 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87292bf853bdd642cf95b4f28d163ba79ca92ffd
-  data.tar.gz: 4ecc9dce49d0eba08b910f0dceea0da7001a3fde
+  metadata.gz: 464e5f5a0938c25d49147ebaa5369b91adf85fed
+  data.tar.gz: 762419b20b0087c2793b853f0aa4bd844fea0030
 SHA512:
-  metadata.gz: b39dfe2644f3f10776635d601fccb2d383ba356769556f8338135b7b9b46ada44753bd9d554816b8277b21f0b236fc9d0cc031abc05e16e81787e4764c1280d1
-  data.tar.gz: 56f86364a7b9a882353287a85648af8b110b09205493f7d918fca5d69a950367e33f9c71a0d3a3871724df9395ac4c3b6f1ae8b592d5c845db4d3344389fa87c
+  metadata.gz: 6a17e3d5ca63934f469d9952132897df26068df1aa536db913b447efdcfc8c5c0fab07902893d963216f0e416d3ec1267c3a5e346ceb88c0a0aa7d7f0903fd9d
+  data.tar.gz: d212a8764d2f5ab96e6cd23c819efcfd49f986f601b50bbea75dcfec9b54f73a9fa57a20884a59007a5d0d6bf7621b0ee8e6fb7d911117fc6e8800f1bb5de1ff

data/.travis.yml

@@ -1,7 +1,14 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.5
+  - 2.1
   - 2.2.0
+  - ruby-head
+  - jruby-19mode
+  - rbx-2
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+    - rvm: rbx-2

data/lib/zhongwen_tools/romanization/pinyin.rb

@@ -255,7 +255,7 @@ module ZhongwenTools
         #       It's like magic.
         str.gsub(regex) do
           ($3.nil? ? "#{ PYN_PY[$1] }" : ($2 == '' && %w(a e o).include?($3[0, 1])) ? "'#{ PYN_PY["#{ $3 }#{ $6 }"]}#{ $4 }#{ $5 }" : "#{ $2 }#{ PYN_PY["#{ $3 }#{ $6 }"] }#{ $4 }#{ $5 }") + (($7.to_s.length > 1) ? '-' : '')
-        end.gsub("-'", '-').sub(/^'/, '')
+        end.gsub("-'", '-').sub(/^'/, '').gsub(" '", ' ')
       end
     end
   end

data/lib/zhongwen_tools/version.rb

@@ -1,3 +1,3 @@
 module ZhongwenTools
-  VERSION = '0.19.0'
+  VERSION = '0.19.1'
 end

data/test/test_pinyin.rb

@@ -76,6 +76,10 @@ class TestPinyin < Minitest::Test
       assert_equal word[:py], ZhongwenTools::Romanization::Pinyin.to_pinyin(word[:pyn])
       assert_equal word[:py], ZhongwenTools::Romanization::Pinyin.to_py(word[:pyn])
     end
+
+    sentences.each do |s|
+      assert_equal ZhongwenTools::Romanization::Pinyin.to_py(s[:pyn]), s[:py]
+    end
   end
 
   def test_pinyin_to_pyn
@@ -101,25 +105,34 @@ class TestPinyin < Minitest::Test
     ]
 
     @split_words = [
-      { pyn: 'A1-la1-bo2',  py: 'Ālābó', split: %w(A1 la1 bo2), split_py: %w(Ā lā bó) },
-      { pyn: 'Mao2 Ze2-dong1',  py: 'Máo Zédōng', split: %w(Mao2 Ze2 dong1), split_py:  %w(Máo Zé dōng) }
+      { pyn: 'A1-la1-bo2', py: 'Ālābó', split: %w(A1 la1 bo2), split_py: %w(Ā lā bó) },
+      { pyn: 'Mao2 Ze2-dong1', py: 'Máo Zédōng', split: %w(Mao2 Ze2 dong1), split_py: %w(Máo Zé dōng) }
     ]
 
     @syllabic_nasals = [
-      { pyn: 'ng3', py: 'ňg'},
-      { pyn: 'm3', py: 'm̌'},
-      { pyn: 'n3', py: 'ň'},
-      { pyn: 'Ng3', py: 'Ňg'}
+      { pyn: 'ng3', py: 'ňg' },
+      { pyn: 'm3', py: 'm̌' },
+      { pyn: 'n3', py: 'ň' },
+      { pyn: 'Ng3', py: 'Ňg' }
     ]
 
     @words = [
       { pyn: 'A1la1bo2', py: 'Ālābó'},
       { pyn: 'ni3 hao3', py: 'nǐ hǎo' },
       { pyn: 'Zhong1guo2', py: 'Zhōngguó' },
-      { pyn: 'chui1 niu3', py: "chuī niǔ" },
+      { pyn: 'chui1 niu3', py: 'chuī niǔ' },
       { pyn: 'Mao2 Ze2dong1', py: 'Máo Zédōng' }
     ]
 
     @r =  { pyn: 'r5', py: 'r' }
   end
+
+  def sentences
+    [
+      {
+        py: "Yóuyú èxìng tōnghuòpéngzhàng, gāi guó huòbì dàdà biǎnzhí le.",
+        pyn: 'You2yu2 e4xing4 tong1huo4peng2zhang4, gai1 guo2 huo4bi4 da4da4 bian3zhi2 le5.'
+      }
+    ]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zhongwen_tools
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Steven Daniels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake