add detection support

History.txt

@@ -1,3 +1,6 @@
+V1.1 July 11th, 2009
+* Add Google AJAX Language Dection support
+
 v1.0 Dec 16th, 2008
 * using the Google AJAX Language API instead of scrape
 * add the batch translation support

Rakefile

@@ -1,12 +1,12 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('rtranslate', '1.0') do |p|
+Hoe.new('rtranslate', '1.1') do |p|
   p.rubyforge_name = 'rtranslate'
   p.author = 'Ye Dingding'
   p.email = 'yedingding@gmail.com'
-  p.url = 'http://sishen.lifegoo.com'
+  p.url = 'http://github.com/sishen/rtranslate'
   p.summary = 'Google translate ruby client api'
   p.description = 'A simple, unofficial, ruby client API for using Google Translate.'
-  p.extra_deps = [['hpricot', '>= 0.4'], ['json', '>= 1.1.3']]
+  p.extra_deps = [['json', '>= 1.1.3']]
 end

bin/rtranslate

@@ -10,6 +10,7 @@ opts = OptionParser.new do |opts|
   opts.banner = <<-EOF
   Usage:
     rtranslate -f lang -t lang text
+    rtranslate -d text
   EOF
 
   opts.on("-fLANG", "--from LANG", "From Language LANG") do |x|
@@ -20,6 +21,10 @@ opts = OptionParser.new do |opts|
     options[:to] = x
   end
 
+  opts.on("-d", "--detect", "Detect the text") do
+    options[:detect] = true
+  end
+
   opts.on("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -29,9 +34,13 @@ end
 opts.parse!(ARGV)
 text = ARGV.shift
 
-if options[:from].nil? || options[:to].nil? || text.empty?
+unless (options[:detect] || (options[:from] && options[:to]) ) && text
   puts opts
   exit
 end
 
-STDOUT.puts(Translate.t(text, options[:from], options[:to]))
+if options[:detect]
+  STDOUT.puts(Translate.d(text))
+else
+  STDOUT.puts(Translate.t(text, options[:from], options[:to]))
+end

lib/rtranslate.rb

@@ -1,23 +1,27 @@
 require File.join(File.dirname(__FILE__), 'rtranslate/language')
 require File.join(File.dirname(__FILE__), 'rtranslate/rtranslate')
+require File.join(File.dirname(__FILE__), 'rtranslate/detection')
 require 'uri'
 require 'open-uri'
 
 begin
-  require 'hpricot'
+  require 'json'
 rescue LoadError
   require 'rubygems'
-  require 'hpricot'
+  require 'json'
 end
 
 $KCODE = 'u'
 
 include Translate
 def Translate.t(text, from, to)
-  begin
-    RTranslate.translate(text, from, to)
-  rescue
-    "Error: " + $!
-  end
+  RTranslate.translate(text, from, to)
+rescue
+  "Error: " + $!
 end
 
+def Translate.d(text)
+  Detection.detect(text)
+rescue
+  "Error: " + $!
+end

lib/rtranslate/detection.rb

@@ -0,0 +1,70 @@
+# The program is a simple, unofficial, ruby client API
+# for using Google Translate.
+#
+# Author::    Dingding Ye  (mailto:yedingding@gmail.com)
+# Copyright:: Copyright (c) 2007 Dingding Ye
+# License::   Distributes under MIT License
+
+module Translate
+  class DetectionResponse
+    attr_reader :abbrev
+    attr_reader :language
+    attr_reader :reliability
+    attr_reader :confidence
+
+    def initialize(json)
+      @abbrev = json["language"]
+      @language = Google::Language::Languages[@abbrev]
+      @reliability = json["isReliable"]
+      @confidence = json["confidence"]
+    end
+
+    def to_s
+      abbrev
+    end
+  end
+
+  class Detection
+    # Google AJAX Language REST Service URL
+    GOOGLE_DETECTION_URL = "http://ajax.googleapis.com/ajax/services/language/detect"
+
+    # Default version of Google AJAX Language API
+    DEFAULT_VERSION = "1.0"
+
+    attr_reader :version, :key
+
+    class << self
+      def detect(text)
+        Detection.new.detect(text)
+      end
+      alias_method :d, :detect
+    end
+
+    def initialize(version = DEFAULT_VERSION, key = nil)
+      @version = version
+      @key = key
+    end
+
+    def detect(text, details = false)
+      url = "#{GOOGLE_DETECTION_URL}?q=#{text}&v=#{@version}"
+      if @key
+        url << "&key=#{@key}"
+      end
+      detection_response = do_detect(url)
+      details ? detection_response : detection_response.abbrev
+    end
+
+    private
+    def do_detect(url)
+      jsondoc = open(URI.escape(url)).read
+      response = JSON.parse(jsondoc)
+      if response["responseStatus"] == 200
+        DetectionResponse.new(response["responseData"])
+      else
+        raise StandardError, response["responseDetails"]
+      end
+    rescue Exception => e
+      raise StandardError, e.message
+    end
+  end
+end

lib/rtranslate/rtranslate.rb

@@ -5,13 +5,6 @@
 # Copyright:: Copyright (c) 2007 Dingding Ye
 # License::   Distributes under MIT License
 
-begin
-  require 'json'
-rescue LoadError
-  require 'rubygems'
-  require 'json'
-end
-
 module Translate
   class UnsupportedLanguagePair < StandardError
   end
@@ -30,6 +23,7 @@ class << self
       def translate(text, from, to)
         RTranslate.new.translate(text, { :from => from, :to => to })
       end
+      alias_method :t, :translate
 
       def translate_strings(text_array, from, to)
         RTranslate.new.translate_strings(text_array, {:from => from, :to => to})
@@ -42,8 +36,6 @@ def translate_string_to_languages(text, options)
       def batch_translate(translate_options)
         RTranslate.new.batch_translate(translate_options)
       end
-
-      alias_method :t, :translate
     end
 
     def initialize(version = DEFAULT_VERSION, key = nil, default_from = nil, default_to = nil)
@@ -121,17 +113,15 @@ def batch_translate(translate_options)
 
     private
     def do_translate(url) #:nodoc:
-      begin
-        jsondoc = open(URI.escape(url)).read
-        response = JSON.parse(jsondoc)
-        if response["responseStatus"] == 200
-          response["responseData"]["translatedText"]
-        else
-          raise StandardError, response["responseDetails"]
-        end
-      rescue Exception => e
-        raise StandardError, e.message
+      jsondoc = open(URI.escape(url)).read
+      response = JSON.parse(jsondoc)
+      if response["responseStatus"] == 200
+        response["responseData"]["translatedText"]
+      else
+        raise StandardError, response["responseDetails"]
       end
+    rescue Exception => e
+      raise StandardError, e.message
     end
   end
 end

rtranslate.gemspec

@@ -1,16 +1,17 @@
 Gem::Specification.new do |s|
   s.name = %q{rtranslate}
-  s.version = "1.0"
+  s.version = "1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ye Dingding"]
-  s.date = %q{2008-12-15}
+  s.date = %q{2009-07-11}
   s.description = %q{rtranslate is a simple, unofficial, ruby client API for using Google Translate.}
   s.email = %q{yedingding@gmail.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
   s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "rtranslate.gemspec", "bin/rtranslate",
              "lib/rtranslate.rb", "lib/rtranslate/language.rb", "lib/rtranslate/rtranslate.rb", "tests/ts_translate.rb", 
-             "bin/rtranslate", "lib/rtranslate.rb", "lib/rtranslate/language.rb", "lib/rtranslate/rtranslate.rb"]
+             "bin/rtranslate", "lib/rtranslate.rb", "lib/rtranslate/language.rb",
+             "lib/rtranslate/rtranslate.rb", "lib/rtranslate/detection.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://sishen.lifegoo.com}
   s.rdoc_options = ["--main", "README.txt"]

tests/ts_detection.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+$:.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
+
+require 'test/unit'
+require 'rtranslate'
+
+class Translate::DetectionTest < Test::Unit::TestCase
+  include Google::Language
+  def test_detection
+    d = Detection.new
+    assert_equal "es", d.detect("para poner este importante proyecto en práctica")
+    assert_equal "en", d.detect("this is a test of the Emergency text categorizing system.")
+    assert_equal "fr", d.detect("serait désigné peu après PDG d'Antenne 2 et de FR 3. Pas même lui ! Le")
+    assert_equal "it", d.detect("studio dell'uomo interiore? La scienza del cuore umano, che")
+    assert_equal "ro", d.detect("taiate pe din doua, in care vezi stralucind brun  sau violet cristalele interioare")
+    assert_equal "pl", d.detect("na porozumieniu, na ³±czeniu si³ i ¶rodków. Dlatego szukam ludzi, którzy")
+    assert_equal "de", d.detect("sagt Hühsam das war bei Über eine Annonce in einem Frankfurter der Töpfer ein. Anhand von gefundenen gut kennt, hatte ihm die wahren Tats
+achen Sechzehn Adorno-Schüler erinnern und daß ein Weiterdenken der Theorie für ihre Festlegung sind drei Jahre Erschütterung Einblick in die Abhängigkeit der Bauarbeiten
+ sei")
+    assert_equal "fi", d.detect("koulun arkistoihin pölyttymään, vaan nuoret saavat itse vaikuttaa ajatustensa eteenpäinviemiseen esimerkiksi")
+    assert_equal "sv", d.detect("enligt all sannolikhet för att få ro oavsiktligt intagit en för")
+    assert_equal "hu", d.detect("esôzéseket egy kissé túlméretezte, ebbôl kifolyólag a Földet egy hatalmas árvíz mosta el")
+    assert_equal "fi", d.detect("koulun arkistoihin pölyttymään, vaan nuoret saavat itse vaikuttaa ajatustensa eteenpäinviemiseen esimerkiksi")
+    assert_equal "nl", d.detect("tegen de kabinetsplannen. Een speciaal in het leven geroepen Landelijk")
+    assert_equal "da", d.detect("viksomhed, 58 pct. har et arbejde eller er under uddannelse, 76 pct. forsørges ikke længere af Kolding")
+    assert_equal "cs", d.detect("datují rokem 1862.  Naprosto zakázán byl v pocitech smutku, beznadìje èi jiné")
+    assert_equal "no", d.detect("hånd på den enda hvitere restaurant-duken med en bevegelse så forfinet")
+    assert_equal "pt", d.detect("popular. Segundo o seu biógrafo, a Maria Adelaide auxiliava muita gente")
+    assert_equal "en", d.detect("TaffyDB finders looking nice so far!")
+  end
+end