google-translate 0.7.2 → 0.8.0

data/CHANGES

@@ -39,4 +39,8 @@
 
 == Version 0.7.1
 
-* Ruby 1.9.2 ready
+* Ruby 1.9.2 ready
+
+== Version 0.8.0
+
+* Stop using translate API, start using scraping google translate

data/Rakefile

@@ -1,9 +1,10 @@
 # Rakefile for google-translate
 
-require 'rubygems'
+require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
+
 require 'rake/gempackagetask'
 require 'rake/testtask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'rake/rdoctask'
 require 'rcov/rcovtask'
 
@@ -67,8 +68,13 @@ task :"run:gem" do
   puts ruby("#{command}")
 end
 
-Spec::Rake::SpecTask.new do |task|
-  task.libs << 'lib'
+#Spec::Rake::SpecTask.new do |task|
+#  task.libs << 'lib'
+#  task.pattern = 'spec/**/*_spec.rb'
+#  task.verbose = false
+#end
+
+RSpec::Core::RakeTask.new do |task|
   task.pattern = 'spec/**/*_spec.rb'
   task.verbose = false
 end

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/google-translate.gemspec

@@ -1,60 +1,67 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{google-translate}
-  s.version = "0.7.2"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexander Shvets"]
-  s.date = %q{2010-09-16}
+  s.authors = [%q{Alexander Shvets}]
+  s.date = %q{2011-10-12}
   s.description = %q{Simple client for Google Translate API.}
   s.email = %q{alexander.shvets@gmail.com}
-  s.executables = ["translate", "t"]
+  s.executables = [%q{translate}, %q{t}]
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
     "CHANGES",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "bin/t",
-     "bin/t.bat",
-     "bin/translate",
-     "bin/translate.bat",
-     "google-translate.gemspec",
-     "lib/google_translate.rb"
+    "README",
+    "Rakefile",
+    "VERSION",
+    "bin/t",
+    "bin/t.bat",
+    "bin/translate",
+    "bin/translate.bat",
+    "google-translate.gemspec",
+    "lib/google_translate.rb"
   ]
   s.homepage = %q{http://github.com/shvets/google-translate}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.requirements = ["none"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.requirements = [%q{none}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Simple client for Google Translate API (Summary).}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/translate_spec.rb"
+    "spec/translate_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<gemcutter>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.1.4"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<gemcutter>, [">= 0"])
     else
+      s.add_dependency(%q<json_pure>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<gemcutter>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 1.1.4"])
       s.add_dependency(%q<json_pure>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<gemcutter>, [">= 0"])
     end
   else
+    s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<gemcutter>, [">= 0"])
     s.add_dependency(%q<json_pure>, [">= 1.1.4"])
     s.add_dependency(%q<json_pure>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/google_translate.rb

@@ -5,6 +5,7 @@ require 'cgi'
 require 'json'
 
 module Google
+
   Language = Struct.new(:name, :code) do
     def to_s
       "(" + code + ": " + name + ")"
@@ -12,6 +13,8 @@ module Google
   end
 
   class Translator
+    GOOGLE_TRANSLATE_SERVICE_URL = "http://translate.google.com"
+
     def self.Exception(*names)
       cl = Module === self ? self : Object
       names.each {|n| cl.const_set(n, Class.new(Exception))}
@@ -20,79 +23,57 @@ module Google
     Exception :MissingFromLanguage, :MissingToLanguage, :MissingTextLanguage,
               :TranslateServerIsDown, :InvalidResponse, :MissingText, :MissingTestText
 
-    URL_STRING = "http://ajax.googleapis.com/ajax/services/language/"
-    URL2_STRING = "http://translate.google.com"
-
     def translate(from, to, from_text, options={})
       raise(MissingFromLanguage) if from.nil?
       raise(MissingToLanguage) if to.nil?
       raise(MissingTextLanguage) if from_text.nil?
 
-      request = URL_STRING + "translate?v=1.0&langpair=#{from}%7C#{to}&q=" + CGI.escape(from_text) 
-      
       begin
-        response = call_service(request, [:response_status, :response_details, :response_data])
+        url = GOOGLE_TRANSLATE_SERVICE_URL + "/translate_a/t?client=t&text=#{from_text}&hl=#{from}&tl=#{to}"
+        # &sl=auto&multires=1&prev=btn&ssel=0&tsel=4&uptl=ru&alttl=en&sc=1
 
-        raise(TranslateServerIsDown) if response.empty?
+        open(URI.escape(url)) do |stream|
+          content = stream.read
 
-        raise(InvalidResponse, response[:response_details]) if response[:response_status] != 200 # success
+          s = content.split(',').collect {|s| s == '' ? "\"\"" : s}.join(",")
 
-        to_text = response[:response_data]['translatedText']
+          result = JSON.parse(s)
 
-        (options[:html]) ? CGI.unescapeHTML(to_text) : to_text
-      rescue OpenURI::HTTPError
-        raise(TranslateServerIsDown)
-      end
-    end
+          raise(TranslateServerIsDown) if (!result || result.empty?)
 
-    def detect_language(test_text)
-      raise(MissingTestText) if test_text.nil?
+  #        raise(InvalidResponse, result["responseDetails"]) if response.code.to_i != 200 # success
 
-      request = URL_STRING + "detect?v=1.0&q=" + CGI.escape(test_text) 
-
-      begin
-        response = call_service(request, [:response_data]) 
-        response_data = response[:response_data]
-
-        raise(TranslateServerIsDown) if response.empty?
-
-        response_data
-      rescue OpenURI::HTTPError
-        raise(TranslateServerIsDown)
+          to_text = result[0][0][0]
+          translit = result[0][0][2]
+          (options[:html]) ? CGI.unescapeHTML(translit) : translit
+        end
+      rescue Exception => e
+         raise(TranslateServerIsDown)
       end
     end
+
+#    def detect_language(test_text)
+  
+      # raise(MissingTestText) if test_text.nil?
+
+      # begin
+      #   response = self.class.get("/detect", :query => {:q => test_text})
+      #   response = (response && response.parsed_response) ? response.parsed_response : nil
+      #   raise(TranslateServerIsDown) if (!response || response.empty?)
+      #   response_data = response["responseData"]
+      #   return response_data
+      # rescue HTTParty::ResponseError
+      #   raise(TranslateServerIsDown)
+      # end
+    #end
   
     def supported_languages
-      call_service2(URL2_STRING , [])
+      fetch_languages(GOOGLE_TRANSLATE_SERVICE_URL , [])
     end
 
     private
 
-    def camelize(str)
-      words = str.split('_')
-
-      words[0] + words[1..-1].map {|w| w.capitalize}.join
-    end
-
-    def call_service(request, keys)
-      response = {}
-
-      open(request) do |stream|
-        content = stream.read
-
-        unless content.nil?
-          json = JSON.parse(content)
-
-          keys.each do |key|
-            response[key] = json[camelize(key.to_s)]
-          end
-        end
-      end
-
-      response
-    end
-
-    def call_service2(request, keys)
+    def fetch_languages(request, keys)
       response = {}
 
       open(URI.escape(request)) do |stream|
@@ -132,9 +113,13 @@ module Google
       end
 
       re2 = /<option(\s*)value="([a-z|A-Z|-]*)">([a-z|A-Z|\(|\)|\s]*)<\/option>/
-
       matches = text.gsub(/selected/i, '').squeeze.scan(re2)
 
+      if matches.size == 0
+        re2 = /<option(\s*)value=([a-z|A-Z|-]*)>([a-z|A-Z|\(|\)|\s]*)<\/option>/
+        matches = text.gsub(/selected/i, '').squeeze.scan(re2)
+      end
+
       matches.each do |m|
          languages << Language.new(m[2], m[1])
       end

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 # spec_helper.rb
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 
 # add lib directory
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end

data/spec/translate_spec.rb

@@ -27,15 +27,13 @@ module Google
     
     it "should translate test string from one language to another" do
       r = @translator.translate(:en, :ru, "hello world!")
-
       puts r
-
       r.size.should be > 0
     end
 
-    it "should detect the language of a string" do
-      @translator.detect_language("bonjour tout le monde")['language'].should be == "fr"
-    end
+    #it "should detect the language of a string" do
+    #  @translator.detect_language("bonjour tout le monde")['language'].should be == "fr"
+    #end
      
     it "should raise an error if no string" do
       lambda {
@@ -43,9 +41,9 @@ module Google
       }.should raise_error
     end
     
-    it "should return unreliable flag if language is not recognized" do
-      @translator.detect_language("azafretmkldt")['isReliable'].should be_false
-    end
+    #it "should return unreliable flag if language is not recognized" do
+    #  @translator.detect_language("azafretmkldt")['isReliable'].should be_false
+    #end
 
     it "should return list of supported languages" do
       languages = @translator.supported_languages

metadata

@@ -1,91 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google-translate
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+version: !ruby/object:Gem::Version
+  version: 0.8.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alexander Shvets
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-16 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &2156925300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: *2156925300
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2156924080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156924080
+- !ruby/object:Gem::Dependency
+  name: gemcutter
+  requirement: &2156922920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156922920
+- !ruby/object:Gem::Dependency
   name: json_pure
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156921920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.4
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
+  version_requirements: *2156921920
+- !ruby/object:Gem::Dependency
   name: json_pure
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156921080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *2156921080
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156919920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: *2156919920
+- !ruby/object:Gem::Dependency
   name: gemcutter
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156918840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156918840
 description: Simple client for Google Translate API.
 email: alexander.shvets@gmail.com
-executables: 
+executables:
 - translate
 - t
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - CHANGES
 - README
 - Rakefile
@@ -98,40 +109,31 @@ files:
 - lib/google_translate.rb
 - spec/spec_helper.rb
 - spec/translate_spec.rb
-has_rdoc: true
 homepage: http://github.com/shvets/google-translate
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Simple client for Google Translate API (Summary).
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/translate_spec.rb