google-translate 0.6.4 → 0.6.5

data/google_translate.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{google-translate}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
  
   s.authors = ["Alexander Shvets"]
-  s.date = %q{2009-01-21}
+  s.date = %q{2010-04-28}
   s.description = %q{Simple client for Google Translate API.}
   s.email = %q{alexander.shvets@gmail.com}
 
@@ -15,10 +15,10 @@ Gem::Specification.new do |s|
              "bin/translate", "bin/translate.bat", "spec/spec_helper.rb" , "spec/translate_spec.rb"]
 
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/shvets/google_translate}
+  s.homepage = %q{http://github.com/shvets/google-translate}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{google_translate}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Simple client for Google Translate API.}
 
   if s.respond_to? :specification_version then

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, 'sl', 'old_sl'
-        to_languages = collect_languages content, 'tl', 'old_tl'
+        from_languages = collect_languages content, 'sllangdropdown', 'sl', 'old_sl'
+        to_languages = collect_languages content, 'tllangdropdown', 'tl', 'old_tl'
 
         response[:from_languages] = from_languages
         response[:to_languages] = to_languages
@@ -108,15 +108,19 @@ module Google
       response
     end
 
-    def collect_languages buffer, tag_name, tag_id
+    def collect_languages buffer, class_name, tag_name, tag_id
       languages = []
 
       spaces = '\s?'
       quote = '(\s|\'|")?'
-      text = '(.*)'
 
-      re1 = /<select#{spaces}name=#{quote}#{tag_name}#{quote}#{spaces}id=#{quote}#{tag_id}#{quote}#{spaces}tabindex=#{spaces}#{quote}0#{quote}#{spaces}>(.*)<\/select>/
-      text = re1.match(buffer)[7]
+      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}"
+      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>/
 

data/spec/translate_spec.rb

@@ -47,7 +47,7 @@ module Google
       @translator.detect_language("azafretmkldt")['isReliable'].should be_false
     end
 
-    it "should return list of supportd languages" do
+    it "should return list of supported languages" do
       languages = @translator.supported_languages
 
       languages[:from_languages].size.should > 0

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: google-translate
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-21 00:00:00 -05:00
+date: 2010-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 4
         version: 1.1.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Simple client for Google Translate API.
 email: alexander.shvets@gmail.com
 executables: 
@@ -42,7 +51,7 @@ files:
 - spec/spec_helper.rb
 - spec/translate_spec.rb
 has_rdoc: true
-homepage: http://github.com/shvets/google_translate
+homepage: http://github.com/shvets/google-translate
 licenses: []
 
 post_install_message: 
@@ -54,18 +63,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - none
 rubyforge_project: google_translate
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Simple client for Google Translate API.