google-translate 1.0.1 → 1.1.0

data/CHANGES

@@ -65,4 +65,8 @@
 
 == Version 1.0.1
 
-* Bug fixes
+* Bug fixes
+
+== Version 1.1.0
+
+* Reflects changes in recent google translate service.

data/Gemfile

@@ -1,13 +1,14 @@
 source "https://rubygems.org"
 
 group :default do
-  gem "json_pure"
-  gem "thor"
+  gem "json_pure", "~>1.8"
+  gem "resource_accessor", "~>1.2"
+  gem "thor", "~>0.19"
 end
 
 group :development do
-  gem "gemspec_deps_gen"
-  gem "gemcutter"
+  gem "gemspec_deps_gen", "~>1.1"
+  gem "gemcutter", "~>0.7"
 end
 
 group :test do

data/Gemfile.lock

@@ -2,30 +2,36 @@ GEM
   remote: https://rubygems.org/
   specs:
     awesome_print (1.2.0)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     file_utils (1.0.7)
     gemcutter (0.7.1)
-    gemspec_deps_gen (1.1.1)
+    gemspec_deps_gen (1.1.2)
       bundler
       file_utils
-    json_pure (1.8.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.1)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    thor (0.18.1)
+    json_pure (1.8.1)
+    resource_accessor (1.2.3)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   awesome_print
-  gemcutter
-  gemspec_deps_gen
-  json_pure
+  gemcutter (~> 0.7)
+  gemspec_deps_gen (~> 1.1)
+  json_pure (~> 1.8)
+  resource_accessor (~> 1.2)
   rspec
-  thor
+  thor (~> 0.19)

data/README.md

@@ -43,6 +43,10 @@ or
 
     $ ts ru hello world
 
+Translates and gives extra information (nouns, verbs, synonyms):
+
+    $ t -e ru help
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -10,7 +10,7 @@ version = GoogleTranslate::VERSION
 project_name = File.basename(Dir.pwd)
 
 task :gen do
-  generator = GemspecDepsGen.new project_name
+  generator = GemspecDepsGen.new
 
   generator.generate_dependencies "spec", "#{project_name}.gemspec.erb", "#{project_name}.gemspec"
 end

data/bin/translate

@@ -15,6 +15,7 @@ elsif ARGV.size == 1
 else
   params = []
   say = ENV['say'] ? (ENV['say'] == 'true') : false
+  extra = ENV['extra'] ? (ENV['extra'] == 'true') : false
 
   index = 0
 
@@ -23,6 +24,8 @@ else
 
     if param =~ /--say/ or param =~ /-s/
       say = true
+    elsif param =~ /--extra/ or param =~ /-e/
+      extra = true
     else
       params << param
     end
@@ -39,5 +42,5 @@ else
       ['en', '', '']
   end
 
-  TranslateCLI.start ["translate", "--say=#{say}", from.to_sym, to.to_sym, text]
+  TranslateCLI.start ["translate", "--say=#{say}", "--extra=#{extra}", from.to_sym, to.to_sym, text]
 end

data/google-translate.gemspec.erb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/lib/google_translate/version
 
 Gem::Specification.new do |spec|
   spec.name          = "google-translate"
-  spec.summary       = %q{Simple client for Google Translate API.}
+  spec.summary       = %q{Summary: Simple client for Google Translate API.}
   spec.description   = %q{Simple client for Google Translate API.}
   spec.email         = "alexander.shvets@gmail.com"
   spec.authors       = ["Alexander Shvets"]

data/lib/google_translate/google_translate.rb

@@ -3,9 +3,10 @@
 require 'net/http'
 require 'json'
 require 'tempfile'
+require 'resource_accessor'
 
 class GoogleTranslate
-  GOOGLE_TRANSLATE_SERVICE_URL = "http://translate.google.com"
+  GOOGLE_TRANSLATE_SERVICE_URL = "translate.google.com"
 
   def supported_languages
     response = call_service GOOGLE_TRANSLATE_SERVICE_URL
@@ -21,7 +22,9 @@ class GoogleTranslate
     raise("Missing 'to' language") unless to_lang
     raise("Missing text for translation") unless text
 
-    result = JSON.parse(call_translate_service(from_lang, to_lang, text))
+    r = call_translate_service(from_lang, to_lang, text)
+
+    result = JSON.parse(r.gsub('[,', '['))
 
     raise("Translate Server is down") if (!result || result.empty?)
 
@@ -31,7 +34,7 @@ class GoogleTranslate
   def say lang, text
     speech_content = call_speech_service(lang, text)
 
-    file = Tempfile.new('.google_translate_speech-')
+    file = Tempfile.new('.google_translate_speech---')
 
     file.write(speech_content)
 
@@ -45,17 +48,17 @@ class GoogleTranslate
   private
 
   def translate_url(from_lang, to_lang)
-    "#{GOOGLE_TRANSLATE_SERVICE_URL}/translate_a/t?client=t&sl=#{from_lang}&tl=#{to_lang}&hl=pl&sc=2&ie=UTF-8&oe=UTF-8&prev=enter&ssel=0&tsel=0&"
+    "https://#{GOOGLE_TRANSLATE_SERVICE_URL}/translate_a/single?client=t&sl=#{from_lang}&tl=#{to_lang}&hl=en&dt=bd&dt=ex&dt=ld&dt=md&dt=qc&dt=rw&dt=rm&dt=ss&dt=t&dt=at&dt=sw&ie=UTF-8&oe=UTF-8&prev=btn&rom=1&ssel=0&tsel=0"
   end
 
   def speech_url(lang)
-    "#{GOOGLE_TRANSLATE_SERVICE_URL}/translate_tts?tl=#{lang}&ie=UTF-8&oe=UTF-8"
+    "http://#{GOOGLE_TRANSLATE_SERVICE_URL}/translate_tts?tl=#{lang}&ie=UTF-8&oe=UTF-8"
   end
 
   def call_translate_service from_lang, to_lang, text
     url = translate_url(from_lang, to_lang)
 
-    response = call_service url, text
+    response = call_service url + "&q=#{text}"
 
     response.body.split(',').collect { |s| s == '' ? "\"\"" : s }.join(",") # fix json object
   end
@@ -63,24 +66,18 @@ class GoogleTranslate
   def call_speech_service lang, text
     url = speech_url(lang)
 
-    response = call_service url, text
+    response = call_service url + "&q=#{text}"
 
     response.body
   end
 
-  def call_service url, text=nil
-    uri = URI.parse(URI.escape(url))
-
-    http = Net::HTTP.new(uri.host, uri.port)
-    request = Net::HTTP::Post.new(uri.request_uri)
-    request.set_form_data(text: text)
+  def call_service url
+    accessor = ResourceAccessor.new
 
-    http.request(request)
+    accessor.get_response url: url
   end
 
   def collect_languages buffer, index, tag_name, tag_id
-    languages = []
-
     spaces = '\s?'
     quote  = '(\s|\'|")?'
 
@@ -109,10 +106,7 @@ class GoogleTranslate
       matches = text.gsub(/selected/i, '').squeeze.scan(re2)
     end
 
-    matches.each do |m| languages << Language.new(m[2], m[1])
-    end
-
-    languages
+    matches.map { |m| Language.new(m[2], m[1]) }
   end
 end
 

data/lib/google_translate/result_parser.rb

@@ -0,0 +1,83 @@
+class ResultParser
+
+  attr_reader :result
+
+  def initialize result
+    @result = result
+  end
+
+  def translation
+    result[0][0][0]
+  end
+
+  def translit
+    result[0][1][2]
+  end
+
+  def nouns
+    list = []
+
+    if result[1].size > 1
+      if result[1][0]
+        list = result[1][0][1]
+      end
+    end
+
+    list
+  end
+
+  def verbs
+    list = []
+
+    if result[1].size > 1
+      if result[1][1]
+        list = result[1][1][1]
+      end
+    end
+
+    list
+  end
+
+  def synonym_nouns
+    list = []
+
+    if result[11].size > 1
+      if result[1][0]
+        result[11][0][1].each do |r, _|
+          list << r
+        end
+      end
+    end
+
+    list
+  end
+
+  def synonym_verbs
+    list = []
+
+    if result[11].size > 1
+      if result[1][1]
+        result[11][1][1].each do |r, _|
+          list << r
+        end
+      end
+    end
+
+    list
+  end
+
+  def synonym_exclamations
+    list = []
+
+    if result[11].size > 1
+      if result[1][2]
+        result[11][2][1].each do |r, _|
+          list << r
+        end
+      end
+    end
+
+    list
+  end
+
+end

data/lib/google_translate/translate_cli.rb

@@ -1,6 +1,7 @@
 require "thor"
 require 'google_translate'
 require 'google_translate/version'
+require 'google_translate/result_parser'
 
 class TranslateCLI < Thor
   USAGE = <<-LONGDESC
@@ -13,6 +14,7 @@ class TranslateCLI < Thor
       translate en:ru Hello world    # translates from English to Russian
       translate ru Hello world       # translates to Russian from auto-detected language
       translate -s ru Hello world    # translates and tries to say it
+      translate -e ru help           # translates and gives extra information (nouns, verbs, synonyms)
   LONGDESC
 
   desc "version", "displays version"
@@ -31,45 +33,54 @@ class TranslateCLI < Thor
   end
 
   long_desc USAGE
-  desc "thanslate text", "thanslates the text"
-  option :say, :aliases => "-s"
+  desc "translate text", "translates the text"
+  option :say, aliases: "-s"
+  option :extra, aliases: "-e"
   def translate from_lang, to_lang, text
     translator = GoogleTranslate.new
 
     result = translator.translate(from_lang, to_lang, text)
 
-    translation = result[0][0][0]
-    translit = result[0][0][2]
+    result_parser = ResultParser.new result
 
-    puts "Translation: #{translation}"
-    puts "Translit: #{translit}" unless translit.size == 0
+    extra = options[:extra] ? (options[:extra] == 'true') : false
 
-    display_synonyms(result)
+    if extra
+      puts "Nouns: #{result_parser.nouns.join(", ")}"
+      puts "Verbs: #{result_parser.verbs.join(", ")}"
 
-    say = options[:say] ? (options[:say] == 'true') : false
+      puts "Synonym Nouns:"
 
-    if say and !!(RUBY_PLATFORM =~ /darwin/i)
-      translator.say(from_lang, text)
-      translator.say(to_lang, translation)
-    end
-  end
+      result_parser.synonym_nouns.each do |r|
+        puts "- " + r.join(", ")
+      end
 
-  private
+      puts "Synonym Verbs:"
 
-  def display_synonyms result
-    if result[5].size > 5
-      synonyms = result[5][0][2]
+      result_parser.synonym_verbs.each do |r|
+        puts "- " + r.join(", ")
+      end
 
-      if synonyms.size > 1
-        puts "Synonyms:"
+      puts "Synonym Exclamations:"
 
-        (1..synonyms.size-1).each do |index|
-          puts synonyms[index][0]
-        end
+      result_parser.synonym_exclamations.each do |r|
+        puts "- " + r.join(", ")
       end
     end
+
+    puts "Translation: #{result_parser.translation}"
+    puts "Translit: #{result_parser.translit}" unless result_parser.translit.size == 0
+
+    say = options[:say] ? (options[:say] == 'true') : false
+
+    if say and !!(RUBY_PLATFORM =~ /darwin/i)
+      translator.say(from_lang, text)
+      translator.say(to_lang, result_parser.translation)
+    end
   end
 
+  private
+
   def print_languages title, list
     puts title
     puts list.join(', ')

data/lib/google_translate/version.rb

@@ -1,3 +1,3 @@
 class GoogleTranslate
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/google_translate_spec.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 require 'google_translate'
 
-describe GoogleTranslate do
+RSpec.describe GoogleTranslate do
 
   it "should raise an error if one of parameters is missing" do
     expect { subject.translate(nil, :ru) }.to raise_error
@@ -17,13 +17,14 @@ describe GoogleTranslate do
   it "should translate test string from one language to another" do
     r = subject.translate(:en, :ru, "hello world!")
     puts r
-    r.size.should be > 0
+
+    expect(r.size).to be > 0
   end
 
   it "should translate test string from one language to another with autodetect" do
     r = subject.translate(:auto, :ru, "hello world!")
     puts r
-    r.size.should be > 0
+    expect(r.size).to be > 0
   end
 
   #it "should return unreliable flag if language is not recognized" do
@@ -31,9 +32,9 @@ describe GoogleTranslate do
   #end
 
   it "should return list of supported languages" do
-    languages = subject.supported_languages
+    from_languages, to_languages = subject.supported_languages
 
-    languages[:from_languages].size.should > 0
-    languages[:to_languages].size.should > 0
+    expect(from_languages.size).to be > 0
+    expect(to_languages.size).to be > 0
   end
 end