termit 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3877c35ca03dbfaef3fff20bfadaa6ffbefdc5d
-  data.tar.gz: 4137b5b15540835bc0d2af0f14dbe3489fa1a1ab
+  metadata.gz: 1cf7b6172a5154290b498284dd9905edf9a39a7f
+  data.tar.gz: 424b0e353b635f690344f4018d7a08a3a67f5c25
 SHA512:
-  metadata.gz: 7ee8e8ee1f6b27ef00e4d1233bf4d5b5157083e23484faf2afc13c8a3101e31b901b54ddcdf2787c77cdf3163ce11a088b561a096690763b1bdea5706f7920c0
-  data.tar.gz: e026e87b742764dd13376a431b0496883ab8d4b2b09d8b50681b42d057711b144c2733ffce89323e951bdfc61b34dcbb4a89f85e14491ef86faf8e6b7bf62dd0
+  metadata.gz: dc71554597190cebb2e2d3dc453cfd9fe5fb42fcf0bea4ba1854bb8fc44a99aacbec8f1a468a7cf9af0b0b34c2cf0f31ddcf174e12812e4f25fe664733e671c5
+  data.tar.gz: 739ed90976ed42c59773d754f43b48e9a8c635878cce6d60961cc7779f216eb19e0a7c68d341c5332e3eada1792baff9ad64dbdb54a7f2316f0bd4022bc5d8b8

data/.gitignore

@@ -1,3 +1,4 @@
 Gemfile.lock
 .ruby-version
 pkg/
+*.gem

data/README.md

@@ -3,19 +3,10 @@
 
 Termit is an easy way to use Google Translate in your terminal. It does not use paid Google Translate API but instead it headlessly browses www.translate.google.com and parses the response.
 
-## Requirements
-
-Works with Ruby 1.9.2 and higher.
-
-To use speech synthesis (yes it talks) you need to have mpg123 installed.
-
-For Ubuntu:
-
-    sudo apt-get install mpg123
-
-For MacOSX:
-
-    brew install mpg123
+## Installation
+```ruby
+gem install termit
+```
 
 ## Usage
 ```ruby
@@ -25,7 +16,6 @@ termit 'source_language' 'target_language' 'text'
 Example:
 
 ```ruby
-gem install termit
 
 termit en es "hey cowboy where is your horse?"
 => "Hey vaquero dónde está tu caballo?"
@@ -41,12 +31,23 @@ termit fr ru qui est votre papa?
 ```
 #### Speech synthesis
 
-Specify a **-v** (voice) flag to use speech synthesis:
+Specify a **-t** (talk) flag to use speech synthesis:
 ``` ruby
 termit en zh "hey cowboy where is your horse?" -v
-=> "嘿，牛仔是你的马在哪里？" #and a nice chinese girl voice says something about a horse
+=> "嘿，牛仔是你的马在哪里？" #and a chinese voice says something about a horse
 ```
 
+#### Synonyms
+
+Specify a **-s** (synonyms) flag to get the list of synonyms if available:
+``` ruby
+termit es en muchacho -s
+=> boy
+=> Synonyms: boy, lad, youngster, laddie, cully
+```
+
+
+
 ## Language codes:
 * english - en
 * polish - pl
@@ -59,15 +60,24 @@ termit en zh "hey cowboy where is your horse?" -v
 
 To find all available language codes visit www.translate.google.com. Choose langauges and their codes will appear in the url.
 
-## Status
+## Requirements
+
+Works with Ruby 1.9.2 and higher.
+
+To use speech synthesis (yes it talks) you need to have mpg123 installed.
+
+For Ubuntu:
 
-Project is in "but it works on my machine..." development phase. Any feedback will be appreciated. You can contact me on: p.urbanek89@gmail.com
+    sudo apt-get install mpg123
 
+For MacOSX:
 
+    brew install mpg123
 
 
 
 
+Any feedback will be appreciated. You can contact me on: p.urbanek89@gmail.com
 
 
 

data/bin/termit

@@ -5,20 +5,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib') unless $LOAD_PATH.include
 
 require 'termit'
 
-if ARGV.empty?
-  puts ""
-  puts "=========Termit========="
-  puts "USAGE:"
-  puts "termit 'source_language' 'target_language' 'text'"
-  puts ""
-  puts 'Example:'
-  puts "termit en fr 'hey cowboy where is your horse?'"
-  puts "=> 'hey cow-boy ou est votre cheval?'"
-  puts ""
-  puts "Check docs at: github.com/pawurb/termit "
-  puts ""
-else
-  options = Termit::UserInputParser.new(ARGV).options
-  Termit::Main.new(options).translate
-end
+options = Termit::UserInputParser.new(ARGV).options
+Termit::Main.new(options).translate
+
 

data/lib/termit.rb

@@ -1,3 +1,5 @@
+require 'termit/modules/delegation'
+require 'termit/output_manager'
 require 'termit/user_input_parser'
 require 'termit/main'
 require 'termit/sound_response_handler'
@@ -8,4 +10,4 @@ require 'termit/data_fetcher'
 require 'termit/text_response_handler'
 
 module Termit
-end
+end

data/lib/termit/data_fetcher.rb

@@ -1,3 +1,4 @@
+#encoding: UTF-8
 require 'net/http'
 require 'uri'
 

data/lib/termit/main.rb

@@ -1,3 +1,4 @@
+#encoding: UTF-8
 module Termit
   class Main
     def initialize options
@@ -7,7 +8,7 @@ module Termit
     def translate
       text_translator = Termit::TextTranslator.new(@options)
       text_translator.call
-      speech_synthesis text_translator.text if @options[:voice]
+      speech_synthesis text_translator.text if @options[:talk]
     end
 
     private

data/lib/termit/modules/delegation.rb

@@ -0,0 +1,11 @@
+module Delegation
+  def delegate *methods, receiver
+    define_method :method_missing do |method, *args, &block|
+      if methods.include?(method)
+        receiver[:to].send(method, *args, &block)
+      else
+        raise NoMethodError
+      end
+    end
+  end
+end

data/lib/termit/output_manager.rb

@@ -0,0 +1,34 @@
+#encoding: UTF-8
+class Termit::OutputManager
+  def display_error_info
+    puts "TERMIT: Wrong data. Example: 'termit en es the cowboy ' => 'el vaquero"
+  end
+
+  def display_help
+    puts    <<-EOS
+=========TERMIT=========
+USAGE:
+termit 'source_language' 'target_language' 'text'
+
+Example:
+termit en fr 'hey cowboy where is your horse?'
+=> 'hey cow-boy ou est votre cheval?'
+
+Check docs at: github.com/pawurb/termit
+EOS
+  end
+
+  def display_version
+    puts "Termit #{Termit::VERSION}"
+  end
+
+  def display_translation text
+    print "=> "
+    puts text
+  end
+
+  def display_synonyms synonyms
+    print '=> Synonyms:'
+    puts synonyms
+  end
+end

data/lib/termit/sound_response_handler.rb

@@ -1,3 +1,4 @@
+#encoding: UTF-8
 require 'fileutils'
 
 module Termit
@@ -7,7 +8,7 @@ module Termit
     end
 
     def call
-      location = "#{File.expand_path('~')}/.Termit"
+      location = "#{File.expand_path('~')}/.termit"
       create_target_dir location
       File.open("#{location}/sound_response.mpeg", "wb") do |file|
         file.write(@data)

data/lib/termit/speech_synthesizer.rb

@@ -1,3 +1,4 @@
+#encoding: UTF-8
 module Termit
   class SpeechSynthesizer
     def initialize options

data/lib/termit/text_response_handler.rb

@@ -1,20 +1,42 @@
+#encoding: UTF-8
 module Termit
   class TextResponseHandler
-    def initialize text
-      @text = text
+    extend ::Delegation
+    @output_manager = Termit::OutputManager.new
+    delegate :display_synonyms, :display_translation, to: @output_manager
+
+    def initialize text, synonyms_wanted
+      @text = decode text
+      @synonyms_wanted = synonyms_wanted
     end
 
     def call
-      p parsed_data
+      translation = extract_translation
+      display_translation translation
+      display_synonyms extract_synonyms if @synonyms_wanted
+      translation
     end
 
     private
 
-    def parsed_data
-      translation = @text.scan(/(TRANSLATED_TEXT=')(.*?)(')/).pop[1]
+    def extract_translation
+      @text.split("[[")[1].split("\"")[1]
+    end
+
+    def extract_synonyms
+      synonyms_data = @text.split("[[")[2].split("[")[1]
+      length = synonyms_data.length
+      if synonyms_data[0] == '4' # my code works i have no idea why ..
+        " ---"
+      else
+        synonyms_data[0..(length-3)].delete("\"").gsub(/(,)/, ", ")
+      end
+    end
+
+    def decode text
       encoding = 'UTF-8'
-      translation.gsub!(/(\\x26#39;)/, "'")
-      translation.force_encoding(encoding).encode(encoding)
+      text.gsub!(/(\\x26#39;)/, "'")
+      text.force_encoding(encoding).encode(encoding)
     end
   end
 end

data/lib/termit/text_translator.rb

@@ -1,20 +1,16 @@
+#encoding: UTF-8
 module Termit
   class TextTranslator
     attr_reader :text
 
     def initialize options
-      @options = options.merge(voice: false)
+      @options = options.merge(talk: false)
       @url = Termit::UrlConstructor.new(@options).url
     end
 
     def call
       response = Termit::DataFetcher.new(@url, @options[:text]).data
-      print_info
-      @text = Termit::TextResponseHandler.new(response.body).call
-    end
-
-    def print_info
-      puts "Translation from #{@options[:source_lang].upcase} to #{@options[:target_lang].upcase}:"
+      @text = Termit::TextResponseHandler.new(response.body, @options[:synonyms]).call
     end
   end
 end

data/lib/termit/url_constructor.rb

@@ -1,12 +1,15 @@
+#encoding: UTF-8
 module Termit
   class UrlConstructor
+    Host = "http://translate.google.com"
+
     def initialize options
       @options = options
     end
 
     def url
-      if @options[:voice]
-        construct_voice_url
+      if @options[:talk]
+        construct_sound_url
       else
         construct_text_url
       end
@@ -15,15 +18,11 @@ module Termit
     private
 
     def construct_text_url
-      "#{host}/?tl=#{@options[:target_lang]}&sl=#{@options[:source_lang]}&ie=UTF-8&oe=UTF-8"
-    end
-
-    def construct_voice_url
-      "#{host}/translate_tts?tl=#{@options[:target_lang]}&ie=UTF-8&oe=UTF-8"
+      "#{Host}/translate_a/t?client=t&sl=#{@options[:source_lang]}&tl=#{@options[:target_lang]}&hl=pl&sc=2&ie=UTF-8&oe=UTF-8&prev=enter&ssel=0&tsel=0&"
     end
 
-    def host
-      "http://translate.google.com"
+    def construct_sound_url
+      "#{Host}/translate_tts?tl=#{@options[:target_lang]}&ie=UTF-8&oe=UTF-8"
     end
   end
-end
+end

data/lib/termit/user_input_parser.rb

@@ -1,39 +1,55 @@
+#encoding: UTF-8
 module Termit
   class UserInputParser
+    extend ::Delegation
+    @output_manager = Termit::OutputManager.new
+
+    delegate :display_error_info, :display_help, :display_version, to: @output_manager
     def initialize user_input
-      raise ArgumentError unless user_input.is_a? Array
       @user_input = user_input
+      quit_if_required
+      validate_user_input
     end
 
     def options
-      parsed = parse_input
-      validate_user_input parsed
-      parsed
-    rescue ArgumentError, NoMethodError
-      puts "TERMIT: Wrong data. Example: 'termit pl en morowy' => pestiferous"
+      parse_input
+    rescue ArgumentError
+      display_error_info
       exit
     end
 
-
     private
 
     def parse_input
-      parsed = {
-       voice: voice_flag,
+      {
+       talk: extract_flag('t'),
+       synonyms: extract_flag('s'),
        source_lang: @user_input.shift.to_sym,
        target_lang: @user_input.shift.to_sym,
        text: @user_input.join(' ')
       }
     end
 
-    def voice_flag
-      flag_index = @user_input.index('-v')
+    def extract_flag(symbol)
+      flag_index = @user_input.index("-#{symbol}")
       flag_index ? !!@user_input.delete_at(flag_index) : false
     end
 
-    def validate_user_input hash
-      [:source_lang, :target_lang].each do |key|
-        raise ArgumentError unless [2, 4].include?(hash[key].length)
+    def validate_user_input
+      raise ArgumentError unless @user_input.is_a? Array
+      [0, 1].each do |index|
+        raise ArgumentError unless [2, 4].include?(@user_input[index].length)
+      end
+    end
+
+    def quit_if_required
+      if @user_input.index("-h") || @user_input.empty?
+        display_help
+        exit
+      end
+      if @user_input.index("-v")
+        display_version
+        exit
       end
     end
   end

data/lib/termit/version.rb

@@ -1,3 +1,3 @@
 module Termit
-  VERSION = "1.2.2"
+  VERSION = "2.0.0"
 end

data/spec/fixtures/google_1.yml

@@ -0,0 +1,73 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://translate.google.com/translate_a/t?client=t&hl=pl&ie=UTF-8&oe=UTF-8&prev=enter&sc=2&sl=en&ssel=0&tl=pl&tsel=0
+    body:
+      encoding: US-ASCII
+      string: text=hey+cowboy+where+is+your+horse
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Pragma:
+      - no-cache
+      Date:
+      - Wed, 23 Oct 2013 15:15:36 GMT
+      Expires:
+      - Wed, 23 Oct 2013 15:15:36 GMT
+      Cache-Control:
+      - private, max-age=600
+      Content-Type:
+      - text/javascript; charset=UTF-8
+      Content-Language:
+      - pl
+      Set-Cookie:
+      - PREF=ID=59f956040e7bb9f8:TM=1382541336:LM=1382541336:S=8F7wmAjCUSXM3gWD; expires=Fri,
+        23-Oct-2015 15:15:36 GMT; path=/; domain=.google.com
+      X-Content-Type-Options:
+      - nosniff
+      Content-Disposition:
+      - attachment
+      Server:
+      - HTTP server (unknown)
+      X-Xss-Protection:
+      - 1; mode=block
+      Alternate-Protocol:
+      - 80:quic
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        W1tbImhleSBjb3dib3kgZ2R6aWUgamVzdCB0d8OzaiBrb8WEIiwiaGV5IGNv
+        d2JveSB3aGVyZSBpcyB5b3VyIGhvcnNlIiwiIiwiIl1dLCwiZW4iLCxbWyJo
+        ZXkiLFs0XSwxLDAsNzk3LDAsMSwwXSxbImNvd2JveSIsWzVdLDEsMCw3OTEs
+        MSwyLDBdLFsiZ2R6aWUiLFs2XSwxLDAsNzU5LDIsMywwXSxbImplc3QiLFs3
+        XSwxLDAsNzU3LDMsNCwwXSxbInR3w7NqIGtvxYQiLFs4XSwxLDAsNzAzLDQs
+        NiwwXV0sW1siaGV5Iiw0LFtbImhleSIsNzk3LDEsMF0sWyJoZWoiLDIwMiwx
+        LDBdLFsiQ3plxZvEhyIsMCwxLDBdXSxbWzAsM11dLCJoZXkgY293Ym95IHdo
+        ZXJlIGlzIHlvdXIgaG9yc2UiXSxbImNvd2JveSIsNSxbWyJjb3dib3kiLDc5
+        MSwxLDBdLFsia293Ym9qIiw1LDEsMF0sWyJrb3dib2plbSIsMCwxLDBdLFsi
+        a293Ym9qc2tpZSIsMCwxLDBdLFsia293Ym9qc2tpIiwwLDEsMF1dLFtbNCwx
+        MF1dLCIiXSxbIndoZXJlIiw2LFtbImdkemllIiw3NTksMSwwXSxbImt0w7Ny
+        eW0iLDAsMSwwXSxbImt0w7NyeWNoIiwwLDEsMF0sWyJ3IGt0w7NyeW0iLDAs
+        MSwwXV0sW1sxMSwxNl1dLCIiXSxbImlzIiw3LFtbImplc3QiLDc1NywxLDBd
+        LFsidG8iLDAsMSwwXSxbIm1hIiwwLDEsMF0sWyJ6bmFqZHVqZSIsMCwxLDBd
+        LFsic2nEmSIsMCwxLDBdXSxbWzE3LDE5XV0sIiJdLFsieW91ciBob3JzZSIs
+        OCxbWyJ0d8OzaiBrb8WEIiw3MDMsMSwwXSxbImtvxYQiLDUzLDEsMF0sWyJr
+        b25pYSIsMCwxLDBdLFsidHdvamVnbyBrb25pYSIsMCwxLDBdLFsic3dvamVn
+        byBrb25pYSIsMCwxLDBdXSxbWzIwLDMwXV0sIiJdXSwsLFtbImVuIl1dLDFd
+    http_version: 
+  recorded_at: Wed, 23 Oct 2013 15:15:36 GMT
+recorded_with: VCR 2.5.0