lib/ting/conversions/hanyu.rb in ting-0.3.0 vs lib/ting/conversions/hanyu.rb in ting-0.9.0

@@ -4,37 +4,37 @@
   module Conversions
     class Hanyu
       def initialize(tone = :numbers, options = {})
         @options = options
         @options[:preprocess] ||= lambda {|s| s.gsub(/u:|Ü/, 'ü').downcase }
-        
+
         if Class === tone
           @tone = tone
         else
-          @tone = Ting::Tones.const_get(tone.to_s.camelcase)
+          @tone = Ting::Tones.const_get(Ting.camelize(tone.to_s))
         end
       end
 
       def valid_character_regexp
         @valid_character_regexp ||= valid_character_regexp!
       end
-      
+
       def valid_character_regexp!
         valid_chars = []
         Ting.valid_combinations do |i,f|
           1.upto(5) do |tone|
-            valid_chars += @tone.add_tone(Conversions.unparse(:hanyu,TonelessSyllable.new(i,f)), tone).uchars
+            valid_chars += @tone.add_tone(Conversions.unparse(:hanyu,Syllable.new(i,f)), tone).chars.to_a
           end
         end
         valid_chars.sort!.uniq!
         Regexp.new(valid_chars.map{|ch| Regexp.escape(ch)}.join('|'))
       end
 
       def parse(string)
         result = []
         looking_at = []
-        string.uchars.each do |ch|
+        string.chars.each do |ch|
           head, syll = parse_tail(looking_at)
           looking_at << ch
           if syll && !parse_tail(looking_at)
             puts "-> #{syll.inspect}"
             result << head.to_s unless head.empty?
@@ -56,11 +56,10 @@
       end
 
       def parse_syllable(tone_syll)
         tone_syll = tone_syll.to_s
         tone_syll = @options[:preprocess].call(tone_syll) if @options[:preprocess]
-#        p tone_syll
         tone, syll = @tone.pop_tone(tone_syll)
         if tone && syll
           ini_fini = Conversions.parse(:hanyu,syll)
           if ini_fini
             p tone, syll, ini_fini
@@ -69,11 +68,8 @@
 
           return Syllable.new(ini, fini, tone) if tone && ini && fini
         end
       end
 
-       #     self.gsub('u:','ü').gsub(/[A-Za-züÜ]{1,5}\d/) do |m|
-       #Ting.HanyuWriter(:accents) << Ting.HanyuReader(:numbers).parse(m.downcase)
-       #end
     end
   end
 end