pinyin 0.0.1 → 0.1.4

data/lib/pinyin/tones.rb

@@ -0,0 +1,47 @@
+module Pinyin
+  #
+  # Base class for Tone classes
+  #
+  class Tone
+    VALID_TONES  = 1..5
+    MAX_TONE = NEUTRAL_TONE = 5
+
+    class <<self
+    def add_tone(s,t)
+      s
+    end
+
+    def peek_tone(s)
+      NEUTRAL_TONE
+    end
+
+    def pop_tone(s)
+      [NEUTRAL_TONE, s]
+    end
+
+    private
+      def normalize(t)
+        if VALID_TONES === t
+          t
+        else
+          t %= MAX_TONE
+          t = NEUTRAL_TONE if t == 0
+        end
+      end
+
+    end
+  end
+end
+
+require "pinyin/tones/marks"
+require "pinyin/tones/numbers"
+require "pinyin/tones/accents"
+require "pinyin/tones/no_tones"
+
+module Pinyin
+  module Tones
+    All = [Numbers, Marks, Accents, NoTones]
+    MAX_TONE = NEUTRAL_TONE = 5
+    VALID_TONES  = 1..5
+  end
+end

data/lib/{tones → pinyin/tones}/accents.rb

@@ -1,7 +1,8 @@
 module Pinyin
   module Tones
-    class Accents
-      
+    class Accents < Tone
+      class <<self
+
       UNICODE_TONE_GLYPHS={ 
         :a=>[97, 257, 225, 462, 224],
         :e=>[101, 275, 233, 283, 232],
@@ -11,49 +12,51 @@ module Pinyin
         :v=>[252, 470, 472, 474, 476]
       }
 
-      def self.tone_glyph(letter,tone)
+      def tone_glyph(letter,tone)
         if (u=UNICODE_TONE_GLYPHS[letter.to_sym][tone%MAX_TONE])
           [u].pack('U')
         end
       end
 
-      def self.add_tone(syll, tone)
+      def add_tone(syll, tone)
+        syll.gsub!('ü','v')
         tone %= MAX_TONE
         case syll
         when /a/ : syll.sub(/a/, tone_glyph(:a,tone))
         when /e/ : syll.sub(/e/, tone_glyph(:e,tone))
         when /o/ : syll.sub(/o/, tone_glyph(:o,tone))
-        when /(i|o|u|v)\Z/ : syll.sub(Regexp.new($1),tone_glyph($1,tone))
+        when /(i|u|v)/ : syll.sub($1, tone_glyph($1,tone))
         else syll
         end  
       end
 
-      def self.peek_tone(syll)
+      def peek_tone(syll)
         unpacked = syll.unpack('U*')
         each_tone_glyph do |vowel, tones|
           tone_glyph=unpacked.find {|t| tones.include?(t)}
-          Tones.normalize( tones.index(tone_glyph) ) if tone_glyph
+          normalize( tones.index(tone_glyph) ) if tone_glyph
         end
       end
 
-      def self.pop_tone(syll)
+      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[0]
-            break [Tones.normalize(tones.index(tone_glyph)), unpacked.pack('U*')]
+            break [normalize(tones.index(tone_glyph)), unpacked.pack('U*')]
           end
         end
       end
 
       private
-        def self.each_tone_glyph
-          [:a,:e,:i,:o,:u].each do |v|  #Order is significant
+        def each_tone_glyph
+          [:a,:e,:i,:o,:u,:v].each do |v|  #Order is significant
             vowel, tones = v, UNICODE_TONE_GLYPHS[v]
             yield vowel,tones
           end
         end
 
     end
+    end
   end
 end

data/lib/{tones → pinyin/tones}/marks.rb

@@ -1,12 +1,15 @@
 module Pinyin
   module Tones
-    class Marks
+    class Marks < Tone
+      class <<self
+
       GLYPHS=['˙', '', 'ˊ', 'ˇ', 'ˋ']
-      def self.add_tone(syll,tone)
-        syll + GLYPHS[Tones.normalize(tone) % 5]
+
+      def add_tone(syll,tone)
+        syll + GLYPHS[normalize(tone) % 5]
       end
 
-      def self.peek_tone(syll)
+      def peek_tone(syll)
         case syll
         when /ˊ/ : 2
         when /ˇ/ : 3
@@ -17,9 +20,11 @@ module Pinyin
         end
       end
 
-      def self.pop_tone(syll)
+      def pop_tone(syll)
         [ peek_tone(syll), syll[/\A[^#{GLYPHS.join}]+/] ]
       end
+
+      end
     end
   end
 end

data/lib/pinyin/tones/no_tones.rb

@@ -0,0 +1,6 @@
+module Pinyin
+  module Tones
+    NoTones = Pinyin::Tone
+  end
+end
+      

data/lib/pinyin/tones/numbers.rb

@@ -0,0 +1,25 @@
+module Pinyin
+  module Tones
+    class Numbers < Tone
+      class <<self
+
+      def add_tone(syll, tone)
+        syll + normalize(tone).to_s
+      end
+
+      def peek_tone(syll)
+        if syll =~ /(\d)\Z/
+          normalize Integer($1)
+        else
+          NEUTRAL_TONE
+        end
+      end      
+
+      def pop_tone(syll)
+        [ peek_tone(syll), syll[/\A\D+/] ]
+      end
+
+      end
+    end
+  end
+end

data/rakefile

@@ -1,39 +1,22 @@
-require 'rake'
-require 'rake/testtask'
 require 'rubygems'
-Gem::manage_gems
-require 'rake/gempackagetask'
+require 'hoe'
 
+$:.unshift './lib'
 
-task :default => [:test_units]
+require 'pinyin'
 
-namespace "test" do
-  Rake::TestTask.new("pinyin") do |t|
-    $: << File.dirname(__FILE__) + '/lib'
-    t.pattern = 'test/*.rb'
-    t.verbose = true
-    t.warning = true
-  end
-end
-
-spec = Gem::Specification.new do |s|
-    s.name       = "pinyin"
-    s.version    = "0.0.1"
-    s.author     = "Arne Brasseur"
-    s.email      = "pinyin at menolikespam arnebrasseur dot net"
-    s.homepage   = "http://svn.arnebrasseur.net/pinyin"
-    s.platform   = Gem::Platform::RUBY
-    s.summary    = "A conversion library for Chinese transcription methods in Ruby"
-    s.files      = FileList["**/*"]
-#FileList["{bin,docs,lib,test}/**/*"].exclude("rdoc").to_a
-    s.require_path      = "lib/"
-# not sure yet what these are
-#    s.autorequire       = "pinyin"
-#    s.test_file         = "test/runtest.rb"
-#    s.has_rdoc          = true
-#    s.extra_rdoc_files  = ['README']
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.need_tar = true
+Hoe.new('pinyin', Pinyin::VERSION) do |p|
+  p.rubyforge_name = 'pinyin'
+  p.summary = 'A conversion library for Chinese transcription methods like Hanyu Pinyin, Bopomofo and Wade-Giles.'
+  p.description = p.paragraphs_of('README.txt', 2).join
+  p.url = 'http://rubyforge.org/projects/pinyin'
+  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.email = 'pinyin@arnebrasseur.net'
+  p.author = 'Arne Brasseur'
+  p.extra_deps << ['facets', '>= 2.4.0']
+  p.spec_extras = {
+    :extra_rdoc_files => ['README.txt', 'History.txt'],
+    :rdoc_options => ['--main', 'README.txt'],
+    :platform => Gem::Platform::RUBY
+  }
 end

data/script/update

@@ -0,0 +1,4 @@
+sudo gem uninstall pinyin 
+rake clean
+rake package
+sudo gem install pkg/pinyin -y

data/test/{comparison_test.rb → test_comparison.rb}

@@ -7,7 +7,7 @@ require 'csv'
 # Since I can't find another reference of the hanyu pinyin 'lo', I have removed it from the table
 
 class TestCompare < Test::Unit::TestCase
-  CHART=CSV.parse(IO.read(File.dirname(__FILE__)+'/../lib/data/comparison.csv'))
+  CHART=CSV.parse(IO.read(File.dirname(__FILE__)+'/../lib/pinyin/data/comparison.csv'))
   COMPARE=[:hanyu, :wadegiles, :zhuyin, :tongyong]
 
 

data/test/{hanyu_coverage.rb → test_hanyu_coverage.rb}

@@ -1,9 +1,11 @@
 require 'test/unit'
 require 'pinyin.rb'
 require 'yaml'
+
 $KCODE='u'
+
 module HanyuCoverage 
-  grid=YAML.load(IO.read(File.dirname(__FILE__)+'/../lib/data/valid_pinyin.yaml'))
+  grid=YAML.load(IO.read(File.dirname(__FILE__)+'/../lib/pinyin/data/valid_pinyin.yaml'))
   grid.each do |fname, row|
     row.each do |iname, hanyu|
       eval %[

metadata

@@ -1,74 +1,105 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: pinyin
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-07-26 00:00:00 +02:00
-summary: A conversion library for Chinese transcription methods in Ruby
-require_paths: 
-- lib/
-email: pinyin at menolikespam arnebrasseur dot net
-homepage: http://svn.arnebrasseur.net/pinyin
-rubyforge_project: 
-description: 
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.4
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Arne Brasseur
-files: 
-- examples
-- lib
-- rakefile
-- test
-- TODO
-- examples/cgiform
-- examples/hello.rb
-- examples/cgiform/cgiform.rb
-- examples/cgiform/template.rhtml
-- lib/conversions.rb
-- lib/data
-- lib/exception.rb
-- lib/groundwork.rb
-- lib/pinyin.rb
-- lib/support.rb
-- lib/tones
-- lib/tones.rb
-- lib/data/comparison.csv
-- lib/data/final.csv
-- lib/data/initial.csv
-- lib/data/paladiy.txt
-- lib/data/rules.yaml
-- lib/data/valid_pinyin.yaml
-- lib/tones/accents.rb
-- lib/tones/marks.rb
-- lib/tones/no_tones.rb
-- lib/tones/numbers.rb
-- test/comparison_test.rb
-- test/hanyu_coverage.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-07-18 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: facets
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.4.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
+description: Pinyin can convert between various systems for phonetically writing 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: pinyin@arnebrasseur.net
 executables: []
 
 extensions: []
 
+extra_rdoc_files: 
+- README.txt
+- History.txt
+files: 
+- History.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- TODO
+- examples/cgiform/cgiform.rb
+- examples/cgiform/template.rhtml
+- examples/hello.rb
+- lib/pinyin.rb
+- lib/pinyin/conversion.rb
+- lib/pinyin/conversions.rb
+- lib/pinyin/conversions/hanyu.rb
+- lib/pinyin/data/comparison.csv
+- lib/pinyin/data/final.csv
+- lib/pinyin/data/initial.csv
+- lib/pinyin/data/paladiy.txt
+- lib/pinyin/data/rules.yaml
+- lib/pinyin/data/valid_pinyin.yaml
+- lib/pinyin/exception.rb
+- lib/pinyin/groundwork.rb
+- lib/pinyin/string.rb
+- lib/pinyin/support.rb
+- lib/pinyin/tones.rb
+- lib/pinyin/tones/accents.rb
+- lib/pinyin/tones/marks.rb
+- lib/pinyin/tones/no_tones.rb
+- lib/pinyin/tones/numbers.rb
+- rakefile
+- script/update
+- test/test_comparison.rb
+- test/test_hanyu_coverage.rb
+has_rdoc: true
+homepage: http://rubyforge.org/projects/pinyin
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: pinyin
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: A conversion library for Chinese transcription methods like Hanyu Pinyin, Bopomofo and Wade-Giles.
+test_files: 
+- test/test_comparison.rb
+- test/test_hanyu_coverage.rb

data/lib/tones.rb

@@ -1,19 +0,0 @@
-
-module Pinyin
-  module Tones
-    All=Dir[File.join(File.dirname(__FILE__),'tones','*.rb')].map{|s| s[/tones\/(.*)\.rb/,1]}
-    MAX_TONE = NEUTRAL_TONE = 5
-    VALID_TONES  = 1..5
-    CONVERSIONS  = {0 => NEUTRAL_TONE}
-
-    def self.normalize(t)
-      if VALID_TONES === t
-        t
-      else
-        t %= MAX_TONE
-        CONVERSIONS[t] || t
-      end
-    end
-  end
-end
-