sishen-rtranslate 1.1 → 1.2

data/History.txt

@@ -1,3 +1,6 @@
+V1.2 Sep 17th, 2009
+* Enable the auto-detect source features of google translate api
+
 V1.1 July 11th, 2009
 * Add Google AJAX Language Dection support
 

data/bin/rtranslate

@@ -34,7 +34,7 @@ end
 opts.parse!(ARGV)
 text = ARGV.shift
 
-unless (options[:detect] || (options[:from] && options[:to]) ) && text
+unless (options[:detect] || options[:to] ) && text
   puts opts
   exit
 end

data/lib/rtranslate/rtranslate.rb

@@ -61,8 +61,8 @@ module Translate
     def translate(text, options = { })
       from = options[:from] || @default_from
       to = options[:to] || @default_to
-      if Google::Language.supported?(from) && Google::Language.supported?(to)
-        from = Google::Language.abbrev(from)
+      if (from.nil? || Google::Language.supported?(from)) && Google::Language.supported?(to)
+        from = from ? Google::Language.abbrev(from) : nil
         to = Google::Language.abbrev(to)
         langpair = "#{from}|#{to}"
         url = "#{GOOGLE_TRANSLATE_URL}?q=#{text}&langpair=#{langpair}&v=#{@version}"

data/rtranslate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rtranslate}
-  s.version = "1.1"
+  s.version = "1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ye Dingding"]

data/tests/ts_translate.rb

@@ -9,14 +9,27 @@ class Translate::TranslateTest < Test::Unit::TestCase
   def test_english_translate
     assert_equal("مرحبا العالم", Translate.t("Hello world", "ENGLISH", "ARABIC"));
     assert_equal("世界您好", Translate.t("Hello world", "ENGLISH", "CHINESE_SIMPLIFIED"));
-    assert_equal("Bonjour le monde", Translate.t("Hello world", "ENGLISH", "FRENCH"));
+    assert_equal("Bonjour tout le monde", Translate.t("Hello world", "ENGLISH", "FRENCH"));
     assert_equal("Hallo Welt", Translate.t("Hello world", "ENGLISH", "GERMAN"));
-    assert_equal("Ciao mondo", Translate.t("Hello world", "ENGLISH", "ITALIAN"));
-    assert_equal("こんにちは世界", Translate.t("Hello world", "ENGLISH", "JAPANESE"));
-    assert_equal("여보세요 세계", Translate.t("Hello world", "ENGLISH", "KOREAN"));
+    assert_equal("Ciao a tutti", Translate.t("Hello world", "ENGLISH", "ITALIAN"));
+    assert_equal("こんにちは、世界", Translate.t("Hello world", "ENGLISH", "JAPANESE"));
+    assert_equal("안녕하세요 세상", Translate.t("Hello world", "ENGLISH", "KOREAN"));
     assert_equal("Olá mundo", Translate.t("Hello world", "ENGLISH", "PORTUGUESE"));
     assert_equal("Привет мир", Translate.t("Hello world", "ENGLISH", "RUSSIAN"));
-    assert_equal("Hola mundo", Translate.t("Hello world", "ENGLISH", "SPANISH"));
+    assert_equal("¡Hola, mundo", Translate.t("Hello world", "ENGLISH", "SPANISH"));
+  end
+
+  def test_auto_detect_translate
+    assert_equal("مرحبا العالم", Translate.t("Hello world", nil, "ARABIC"));
+    assert_equal("世界您好", Translate.t("Hello world", nil, "CHINESE_SIMPLIFIED"));
+    assert_equal("Bonjour tout le monde", Translate.t("Hello world", nil, "FRENCH"));
+    assert_equal("Hallo Welt", Translate.t("Hello world", nil, "GERMAN"));
+    assert_equal("Ciao a tutti", Translate.t("Hello world", nil, "ITALIAN"));
+    assert_equal("こんにちは、世界", Translate.t("Hello world", nil, "JAPANESE"));
+    assert_equal("안녕하세요 세상", Translate.t("Hello world", nil, "KOREAN"));
+    assert_equal("Olá mundo", Translate.t("Hello world", nil, "PORTUGUESE"));
+    assert_equal("Привет мир", Translate.t("Hello world", nil, "RUSSIAN"));
+    assert_equal("¡Hola, mundo", Translate.t("Hello world", nil, "SPANISH"));
   end
 
   def test_chinese_translate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sishen-rtranslate
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - Ye Dingding
@@ -68,6 +68,7 @@ files:
 - tests/ts_detection.rb
 has_rdoc: true
 homepage: http://sishen.lifegoo.com
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: a simple, unofficial, ruby client API for using Google Translate