hanzi_to_pinyin 0.7.0 → 0.8.0

data/README.rdoc

@@ -1,16 +1,16 @@
 = hanzi_to_pinyin
 
-translate chinese to pinyin , fetch first letter OR full pinyin
+translate chinese to pinyin, fetch first letter OR full pinyin
 
 == Install
 
 rails3
 
-  $ gem 'hanzi_to_pinyin' , '0.6.1' , require: 'hanzi_to_pinyin'
+  $ gem 'hanzi_to_pinyin', '0.8.0', require: 'hanzi_to_pinyin'
 or latest develop version
-  $ gem 'hanzi_to_pinyin' , git: 'git://github.com/wxianfeng/hanzi_to_pinyin.git'
+  $ gem 'hanzi_to_pinyin', git: 'git://github.com/wxianfeng/hanzi_to_pinyin.git'
 or freeze ref version
-  $ gem 'hanzi_to_pinyin' , git: 'git://github.com/wxianfeng/hanzi_to_pinyin.git' , ref: 5fa43b0
+  $ gem 'hanzi_to_pinyin', git: 'git://github.com/wxianfeng/hanzi_to_pinyin.git', ref: 5fa43b0
 
 == Usage
 
@@ -22,7 +22,7 @@ or freeze ref version
   $ HanziToPinyin.is_hanzi?("你") => true
   $ HanziToPinyin.is_hanzi?("a") => false
 
-  # 只处理汉字和数字 多音字,分隔 字字之间;分隔
+  # 多音字,分隔 字字之间;分隔,字母丢弃
   $ HanziToPinyin.hanzi_2_py("我们") => "wo;men"
   $ HanziToPinyin.hanzi_2_py("查理Smith") => "cha,zha;li"
   $ HanziToPinyin.hanzi_2_py("测试1") => "ce;shi;1"

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/hanzi_to_pinyin.rb

@@ -11,6 +11,12 @@ class HanziToPinyin
   # Unicode中汉字的结束点
   @@hanzi_unicode_end = 40869
   
+  # 字母(10进制)
+  @@letter_upcase_start = 65
+  @@letter_upcase_end = 90
+  @@letter_downcase_start = 97
+  @@letter_downcase_end = 122
+  
   # 数字(10进制)
   @@number_unicode_start = 48
   @@number_unicode_end = 57
@@ -48,55 +54,49 @@ class HanziToPinyin
   end
   
   ##
-  # 只处理汉字和数字和_,- 多音字,分隔 字字之间;分隔
-  #   查理Smith => "cha,zha;li"
-  #   郭轶 => "guo;yi,die"
-  #   我们 => "wo;men"
-  #   宗志强 => "zong;zhi;qiang,jiang"
+  # 多音字,分隔 字字之间;分隔,字母丢弃
+  #  查理Smith => "cha,zha;li"
+  #  郭轶 => "guo;yi,die"
+  #  我们 => "wo;men"
+  #  宗志强 => "zong;zhi;qiang,jiang"
   def self.hanzi_2_py(hanzi)
     hanzi = hanzi.force_encoding("utf-8")
-    str = ''
+    @str = ''
     hanzi.each_char do |hz|
-      if is_number?(hz.ord) or is_underline?(hz.ord) or is_dash?(hz.ord)
-        if str.length == 0
-          str << hz.chr
-        else
-          if str[-1] == ";"
-            str << hz.chr
-          else
-            str << ";#{hz.chr}"
-          end
-        end
-      elsif is_hanzi?(hz.ord)
+      if is_hanzi?(hz.ord)
         values = @@py[hz]
-        if values.size > 1
-          if str.length == 0
-            str << "#{values.join(',')}"
-          else
-            if str[-1] == ";"
-              str << "#{values.join(',')}"
-            else
-              str << ";#{values.join(',')}"
-            end
-          end
+        append(values)
+      elsif is_letter?(hz.ord)
+        next
+      else
+        if @str.length == 0
+          @str << hz.chr
         else
-          if str.length == 0
-            str << "#{values.join};"
+          if @str[-1] == ";"
+            @str << hz.chr
           else
-            if str[-1] == ";"
-              str << "#{values.join}"
-            else
-              str << ";#{values.join}"
-            end
+            @str << ";#{hz.chr}"
           end
         end
       end
     end
-    str
+    @str
   end
   class << self
     alias_method :hanzi_to_py , :hanzi_2_py
   end
+  
+  def self.append(values)
+    if @str.length == 0
+      @str << "#{values.join(',')}"
+    else
+      if @str[-1] == ";"
+        @str << "#{values.join(',')}"
+      else
+        @str << ";#{values.join(',')}"
+      end
+    end
+  end
 
   def self.is_hanzi?(hanzi_codepoint)
     hanzi_codepoint >= @@hanzi_unicode_start && hanzi_codepoint <= @@hanzi_unicode_end
@@ -113,5 +113,9 @@ class HanziToPinyin
   def self.is_dash?(codepoint)
     codepoint == @@dash
   end
+  
+  def self.is_letter?(codepoint)
+    codepoint >= @@letter_upcase_start && codepoint <= @@letter_upcase_end  or codepoint >= @@letter_downcase_start && codepoint <= @@letter_downcase_end
+  end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanzi_to_pinyin
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 +08:00
-default_executable: 
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &87605570 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *87605570
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yamler
-  requirement: &87604140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *87604140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &87603270 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87603270
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: chinese hanzi to pinyin , fetch first letter OR full pinyin, written
   in Ruby.
 email:
@@ -57,10 +71,9 @@ files:
 - VERSION
 - LICENSE.txt
 - Rakefile
+- lib/hanzi_to_pinyin.rb
 - lib/data/unicode_to_pinyin.yml
 - lib/data/hz2py.json
-- lib/hanzi_to_pinyin.rb
-has_rdoc: true
 homepage: http://github.com/wxianfeng/hanzi_to_pinyin
 licenses: []
 post_install_message: ! "  hanzi_to_pinyin is a tool for chinese hanzi to pinyin ,fetch
@@ -77,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -743416909
+      hash: 292557973814545694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: chinese hanzi to pinyin , fetch first letter OR full pinyin