sishen-rtranslate 1.4 → 1.5

data/History.txt

@@ -1,3 +1,6 @@
+V1.5 Oct 31th, 2010
+* Compatible with ActiveSupport 3.0
+
 V1.3 Dec 18th, 2009
 * Enable the translation for the long string which is supposed to be more than 500 characters. The lib will split the text into several groups 500 by 500 and then join the response translated text together. 
 

data/Rakefile

@@ -10,7 +10,7 @@ begin
     p.email = 'yedingding@gmail.com'
     p.homepage = '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.description = 'A simple, unofficial, ruby client API for using Google Translate.'    
     p.add_dependency 'json', '>= 1.1.3'
     p.add_dependency 'activesupport', '>= 2.2.0'
   end

data/lib/rtranslate.rb

@@ -14,10 +14,11 @@ rescue LoadError
   require 'json'
 end
 
-$KCODE = 'u'
-
+$KCODE = 'u' unless RUBY_VERSION >= "1.9"
+ 
 unless defined?(ActiveSupport)
   require 'active_support'
+  require 'active_support/core_ext'
 end
 
 include Translate

data/lib/rtranslate/rtranslate.rb

@@ -67,12 +67,12 @@ module Translate
         to = Google::Language.abbrev(to)
         langpair = "#{from}|#{to}"
 
-        text.mb_chars.scan(/(.{1,300})/).inject("") do |result, st|
+        text.mb_chars.scan(/(.{1,300})/).flatten.inject("") do |result, st|
           url = "#{GOOGLE_TRANSLATE_URL}?q=#{CGI.escape(st.to_s)}&langpair=#{CGI.escape(langpair)}&v=#{@version}"
           url << "&key=#{@key}" if @key          
           url << "&userip=#{options[:userip]}" if options[:userip]
           
-          result += do_translate(url)
+          result += CGI.unescapeHTML(do_translate(url))
         end
       else
         raise UnsupportedLanguagePair, "Translation from '#{from}' to '#{to}' isn't supported yet!"

data/tests/ts_translate.rb

@@ -8,12 +8,12 @@ class Translate::TranslateTest < Test::Unit::TestCase
   include Google::Language
   def test_english_translate
     assert_equal("مرحبا العالم", Translate.t("Hello world", "ENGLISH", "ARABIC"));
-    assert_equal("世界您好", Translate.t("Hello world", "ENGLISH", "CHINESE_SIMPLIFIED"));
+    assert_equal("你好世界", Translate.t("Hello world", "ENGLISH", "CHINESE_SIMPLIFIED"));
     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 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("안녕하세요", 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"));
@@ -21,12 +21,12 @@ class Translate::TranslateTest < Test::Unit::TestCase
 
   def test_auto_detect_translate
     assert_equal("مرحبا العالم", Translate.t("Hello world", nil, "ARABIC"));
-    assert_equal("世界您好", Translate.t("Hello world", nil, "CHINESE_SIMPLIFIED"));
+    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("안녕하세요", 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"));
@@ -44,15 +44,15 @@ class Translate::TranslateTest < Test::Unit::TestCase
   end
 
   def test_translate_strings
-    assert_equal(["喂", "世界"], Translate::RTranslate.translate_strings(["Hello", "World"],  "en", "zh-CN"))
+    assert_equal(["你好", "世界"], Translate::RTranslate.translate_strings(["Hello", "World"],  "en", "zh-CN"))
   end
 
   def test_translate_string_to_languages
-    assert_equal(["世界您好", "ハローワールド"], Translate::RTranslate.translate_string_to_languages("Hello World", {:from => "en", :to => ["zh-CN", "ja"]}))
+    assert_equal(["你好世界", "ハローワールド"], Translate::RTranslate.translate_string_to_languages("Hello World", {:from => "en", :to => ["zh-CN", "ja"]}))
   end
 
   def test_batch_translate
-    assert_equal(["世界您好", "ハローワールド"],
+    assert_equal(["你好世界", "ハローワールド"],
                  Translate::RTranslate.batch_translate([["Hello World", {:from => "en", :to => "zh-CN"}], ["Hello World", {:from => "en", :to => "ja"}]]))
   end
 end

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: sishen-rtranslate
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 4
-  version: "1.4"
+  - 5
+  version: "1.5"
 platform: ruby
 authors: 
 - Ye Dingding
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +08:00
+date: 2010-10-31 00:00:00 +08:00
 default_executable: rtranslate
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +24,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 1
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 2
@@ -86,7 +83,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -95,7 +91,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"