google-translate 0.6.6 → 0.6.7

data/CHANGES

@@ -29,6 +29,6 @@
 
 * Reflecting changes in how google returns supported languages list
 
-== Version 0.6.3
+== Version 0.6.7
 
 * Deploy on gemcutter

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/google-translate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google-translate}
-  s.version = "0.6.6"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Shvets"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-05-04}
   s.description = %q{Simple client for Google Translate API.}
   s.email = %q{alexander.shvets@gmail.com}
   s.executables = ["translate", "t"]

data/lib/google_translate.rb

@@ -98,8 +98,8 @@ module Google
       open(URI.escape(request)) do |stream|
         content = stream.read
 
-        from_languages = collect_languages content, 'sllangdropdown', 'sl', 'old_sl'
-        to_languages = collect_languages content, 'tllangdropdown', 'tl', 'old_tl'
+        from_languages = collect_languages content, 0, 'sllangdropdown', 'sl', 'old_sl'
+        to_languages = collect_languages content, 1, 'tllangdropdown', 'tl', 'old_tl'
 
         response[:from_languages] = from_languages
         response[:to_languages] = to_languages
@@ -108,7 +108,7 @@ module Google
       response
     end
 
-    def collect_languages buffer, class_name, tag_name, tag_id
+    def collect_languages buffer, index, class_name, tag_name, tag_id
       languages = []
 
       spaces = '\s?'
@@ -116,17 +116,23 @@ module Google
 
       class_part = "class#{spaces}=#{spaces}#{quote}#{class_name}#{quote}"
       name_part = "name#{spaces}=#{spaces}#{quote}#{tag_name}#{quote}"
-      id_part = "id#{spaces}=#{spaces}#{quote}old_sl#{quote}"
+      id_part = "id#{spaces}=#{spaces}#{quote}#{tag_id}#{quote}"
       tabindex_part = "tabindex#{spaces}=#{spaces}#{quote}0#{quote}"
-
       re1 = buffer.split(%r{<select#{spaces}#{class_part}#{spaces}#{name_part}#{spaces}#{id_part}#{spaces}#{tabindex_part}#{spaces}>(.*)?</select>}).select{|x| x =~ %r{<option} }
-      text = re1[0]
 
-      re2 = /<option(\s*)value="([a-z|A-Z]*)">([a-z|A-Z]*)<\/option>/
+      text = re1[index]
+      
+      if index == 0
+        pos = text.index('</select><span class=langselect')
+        text = text[0..pos]
+      end
+
+      re2 = /<option(\s*)value="([a-z|A-Z|-]*)">([a-z|A-Z|\(|\)|\s]*)<\/option>/
 
-      matches = text.scan(re2)
+      matches = text.gsub(/selected/i, '').squeeze.scan(re2)
 
       matches.each do |m|
+        p m[1]
         languages << Language.new(m[2], m[1])
       end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -04:00
+date: 2010-05-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency