sishen-rtranslate 1.3 → 1.4

data/.gitignore

@@ -0,0 +1,4 @@
+.svn
+**/.svn
+**/**/.svn
+pkg

data/README.txt

@@ -1,4 +1,4 @@
-= google-api-transalte-ruby
+= google-api-translate-ruby
 A simple, unofficial, ruby client API for using Google Translate.
 
 == Install

data/Rakefile

@@ -1,12 +1,19 @@
 require 'rubygems'
-require 'hoe'
 
-Hoe.new('sishen-rtranslate', '1.3') do |p|
-  p.rubyforge_name = 'sishen-rtranslate'
-  p.author = 'Ye Dingding'
-  p.email = 'yedingding@gmail.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 = [['json', '>= 1.1.3']]
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |p|
+    p.name = 'sishen-rtranslate'
+    p.version = '1.4'
+    p.date = "2010-08-31"
+    p.authors = ['Ye Dingding']
+    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.add_dependency 'json', '>= 1.1.3'
+    p.add_dependency 'activesupport', '>= 2.2.0'
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -0,0 +1 @@
+1.4

data/lib/rtranslate/detection.rb

@@ -45,18 +45,18 @@ module Translate
       @key = key
     end
 
-    def detect(text, details = false)
-      url = "#{GOOGLE_DETECTION_URL}?q=#{text}&v=#{@version}"
-      if @key
-        url << "&key=#{@key}"
-      end
+    def detect(text, options = {:details => false})
+      url = "#{GOOGLE_DETECTION_URL}?q=#{CGI.escape(text)}&v=#{@version}"
+      url << "&key=#{@key}" if @key
+      url << "&userip=#{options[:userip]}" if options[:userip]
+      
       detection_response = do_detect(url)
-      details ? detection_response : detection_response.abbrev
+      options[:details] ? detection_response : detection_response.abbrev
     end
 
     private
     def do_detect(url)
-      jsondoc = open(URI.escape(url)).read
+      jsondoc = Net::HTTP.get(URI.parse(url))
       response = JSON.parse(jsondoc)
       if response["responseStatus"] == 200
         DetectionResponse.new(response["responseData"])

data/lib/rtranslate/rtranslate.rb

@@ -58,6 +58,7 @@ module Translate
     # Configuration options:
     # * <tt>:from</tt> - The source language
     # * <tt>:to</tt> - The target language
+    # * <tt>:userip</tt> - The IP address of the end-user on whose behalf the request is being made
     def translate(text, options = { })
       from = options[:from] || @default_from
       to = options[:to] || @default_to
@@ -66,11 +67,11 @@ module Translate
         to = Google::Language.abbrev(to)
         langpair = "#{from}|#{to}"
 
-        text.mb_chars.scan(/(.{1,500})/).inject("") do |result, st|
-          url = "#{GOOGLE_TRANSLATE_URL}?q=#{st}&langpair=#{langpair}&v=#{@version}"
-          if @key
-            url << "&key=#{@key}"
-          end
+        text.mb_chars.scan(/(.{1,300})/).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)
         end
       else
@@ -116,7 +117,7 @@ module Translate
 
     private
     def do_translate(url) #:nodoc:
-      jsondoc = open(URI.escape(url)).read
+      jsondoc = Net::HTTP.get(URI.parse(url))
       response = JSON.parse(jsondoc)
       if response["responseStatus"] == 200
         response["responseData"]["translatedText"]

data/lib/rtranslate.rb

@@ -1,8 +1,11 @@
+# encoding: utf-8
+
 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'
+require 'cgi'
+require 'net/http'
 
 begin
   require 'json'
@@ -11,21 +14,21 @@ rescue LoadError
   require 'json'
 end
 
+$KCODE = 'u'
+
 unless defined?(ActiveSupport)
-  require 'activesupport'
+  require 'active_support'
 end
 
-$KCODE = 'u'
-
 include Translate
 def Translate.t(text, from, to)
   RTranslate.translate(text, from, to)
 rescue
-  "Error: " + $!
+  "Error: #{$!}"
 end
 
 def Translate.d(text)
   Detection.detect(text)
 rescue
-  "Error: " + $!
+  "Error: #{$!}"
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sishen-rtranslate
 version: !ruby/object:Gem::Version 
-  version: "1.3"
+  hash: 7
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - Ye Dingding
@@ -9,29 +14,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +08:00
-default_executable: 
+date: 2010-08-31 00:00:00 +08:00
+default_executable: rtranslate
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 1
+        - 3
         version: 1.1.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
+  type: :runtime
+  version_requirements: *id002
 description: A simple, unofficial, ruby client API for using Google Translate.
 email: yedingding@gmail.com
 executables: 
@@ -39,49 +56,53 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
 - README.txt
 files: 
+- .gitignore
 - History.txt
 - MIT-LICENSE
 - Manifest.txt
 - README.txt
 - Rakefile
+- VERSION
 - bin/rtranslate
 - lib/rtranslate.rb
+- lib/rtranslate/detection.rb
 - lib/rtranslate/language.rb
 - lib/rtranslate/rtranslate.rb
-- lib/rtranslate/detection.rb
-- rtranslate.gemspec
-- tests/ts_translate.rb
 - tests/ts_detection.rb
+- tests/ts_translate.rb
 has_rdoc: true
 homepage: http://github.com/sishen/rtranslate
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: sishen-rtranslate
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Google translate ruby client api

data/rtranslate.gemspec

@@ -1,43 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{rtranslate}
-  s.version = "1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ye Dingding"]
-  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", "lib/rtranslate/detection.rb", "tests/ts_detection.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/sishen}
-  s.rdoc_options = ["--main", "README.txt"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{a simple, unofficial, ruby client API for using Google Translate}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if current_version >= 3 then
-      s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.1.4"])
-      s.add_development_dependency(%q<json>, [">= 1.1.3"])
-      s.add_development_dependency(%q<activesupprt>, [">= 2.2.0"])
-    else
-      s.add_dependency(%q<hoe>, [">= 1.7.0"])
-      s.add_dependency(%q<rspec>, [">= 1.1.4"])
-      s.add_dependency(%q<json>, [">= 1.1.3"])
-      s.add_dependency(%q<activesupport>, [">= 2.2.0"])
-    end
-  else
-    s.add_dependency(%q<hoe>, [">= 1.7.0"])
-    s.add_dependency(%q<rspec>, [">= 1.1.4"])
-    s.add_dependency(%q<json>, [">= 1.1.3"])
-    s.add_dependency(%q<activesupport>, [">= 2.2.0"])
-  end
-end