termit 2.13.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03da012e4736546f272bfc815d2c0ab42f5834dd
-  data.tar.gz: eb1f139218f730cb41f6b2bce15d13c2655e0c47
+  metadata.gz: 3680dbb44b5cee62158114bcf90c80a8ade54d44
+  data.tar.gz: bbe3e3a1a2b3ad7b7217e45d3b365d3908b9a50d
 SHA512:
-  metadata.gz: 5da92ba28b64fa0357609da5d096d83f19a6cd8836b6733bf236c48cdadfd83c3c97d33aec032b492e9fab5733f669a0ab121b374fa9d859c0cd85d7ee1d0959
-  data.tar.gz: ec56a89a3e9f032f0cd09ff71a106d81f1906c82d0ffc1d290dc0e8056053d050fceb2ea2994535c23912c9fcbad8ae8b96f2af40231aae9c79549be407b76ba
+  metadata.gz: 6a7522104160c70136639feca9d136c6cbdea3aa63ddad28fabedee4311fba37c33ccb7e372cb9d621819d9ad97229d94042d52f74f6b3b01d88bf5039bd5a34
+  data.tar.gz: 624929e643c2218b9d10e41f28c8bb4376aea036c858b97289be446f115f1b3fa04797c8743c68c08d7159e59031f60f207ec5b0963be78d29463cc99aea010f

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - 1.9.2
   - 2.0.0
   - 2.1.1
   - 2.2.0
+  - 2.3.1

data/README.md

@@ -1,7 +1,10 @@
 #Termit [![Build Status](https://travis-ci.org/pawurb/termit.png)](https://travis-ci.org/pawurb/termit) [![Gem Version](https://badge.fury.io/rb/termit.png)](http://badge.fury.io/rb/termit) [![Coverage Status](https://coveralls.io/repos/pawurb/termit/badge.png)](https://coveralls.io/r/pawurb/termit)
 
+Termit is an easy way to translate stuff in your terminal. You can check out its node.js npm version [normit](https://github.com/pawurb/normit)
 
-Termit is an easy way to use Google Translate in your terminal. You can check out its node.js npm version [normit](https://github.com/pawurb/normit)
+## Status
+
+I rewrote it to work with [Bing Translator](https://www.bing.com/translator) . Thanks to [Ragnarson](https://ragnarson.com) for supporting it !
 
 ## Installation
 ```ruby
@@ -43,15 +46,6 @@ termit en en "hold your horses cowboy !" -t
 => "hold your horses cowboy !" # and an english voice asks you to hold on
 ```
 
-#### 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
-```
-
 #### Learning language when committing to git
 
 Idea by [Nedomas](https://news.ycombinator.com/item?id=7545747). See and hear your messages translated to target lang every time you commit. You can do this two ways: overriding the `git` command, and using a post-commit hook in git.
@@ -82,16 +76,8 @@ If you want this to be in every one of your git repositories, see [this Stack Ov
 
 ## Language codes:
 
-* english - en
-* polish - pl
-* french - fr
-* spanish - es
-* slovakian - sk
-* chinese - zh
-* russian - ru
-* automatic source language detection - auto
+To find all available language codes visit https://msdn.microsoft.com/en-us/library/hh456380.aspx
 
-To find all available language codes visit https://developers.google.com/translate/v2/using_rest#language-params.
 
 ## Requirements
 
@@ -107,7 +93,6 @@ For MacOSX:
 
     brew install mpg123
 
+## Disclaimer
 
-
-
-
+Termit works by scraping the private APIs and is therefore not recommended for use in production or on a large scale.

data/lib/termit/data_fetcher_base.rb

@@ -0,0 +1,28 @@
+#encoding: UTF-8
+require 'rest-client'
+
+module Termit
+  class DataFetcherBase
+    include CanOutput
+    delegate :display_no_internet_msg, :display_invalid_data_msg, to: :output_manager
+
+    def initialize url, text
+      @url = url
+      @text = text
+    end
+
+    def data
+      send_request
+    rescue RestClient::BadRequest
+      display_invalid_data_msg
+    rescue RestClient::Exception
+      display_error_msg
+    end
+
+    private
+
+    def self.auth_cookies
+      @@_auth_cookies ||= RestClient.get('https://www.bing.com/translator').cookies
+    end
+  end
+end

data/lib/termit/output_manager.rb

@@ -29,7 +29,6 @@ termit en fr 'hey cowboy where is your horse?'
 
 Options:
 -t - speech synthesis
--s - synonyms list
 
 Check docs at: github.com/pawurb/termit
 EOS
@@ -47,13 +46,13 @@ EOS
       puts text
     end
 
-    def display_synonyms synonyms
-      print '=> Synonyms: '
-      puts synonyms
+    def display_invalid_data_msg
+      puts "TERMIT: Looks like you provided invalid options, or speech synthesis is not supported for this language."
+      exit
     end
 
-    def display_no_internet_msg
-      puts "TERMIT: There seems to be a problem with your internet connection"
+    def display_error_msg
+      puts "TERMIT: We are sorry but something went wrong."
       exit
     end
   end

data/lib/termit/sound_fetcher.rb

@@ -0,0 +1,14 @@
+#encoding: UTF-8
+
+module Termit
+  class SoundFetcher < DataFetcherBase
+    private
+
+    def send_request
+      RestClient.get(
+        @url,
+        { cookies: self.class.auth_cookies }
+      )
+    end
+  end
+end

data/lib/termit/sound_response_handler.rb

@@ -10,10 +10,10 @@ module Termit
     def call
       location = "#{File.expand_path('~')}/.termit"
       create_target_dir location
-      File.open("#{location}/sound_response.mpeg", "wb") do |file|
+      File.open("#{location}/sound_response.mp3", "wb") do |file|
         file.write(@data)
       end
-      system "mpg123 -q #{location}/sound_response.mpeg"
+      system "mpg123 -q #{location}/sound_response.mp3"
     end
 
     private

data/lib/termit/speech_synthesizer.rb

@@ -11,7 +11,7 @@ module Termit
     end
 
     def call
-      response = Termit::DataFetcher.new(@url, @text).data
+      response = Termit::SoundFetcher.new(@url, @text).data
       Termit::SoundResponseHandler.new(response.body).call
     end
 

data/lib/termit/text_fetcher.rb

@@ -0,0 +1,21 @@
+#encoding: UTF-8
+
+module Termit
+  class TextFetcher < DataFetcherBase
+    private
+
+    def send_request
+      RestClient.post(@url,
+        text_payload,
+        {
+          :cookies => self.class.auth_cookies,
+          'Content-Type' => 'application/json'
+        }
+      )
+    end
+
+    def text_payload
+      "[{\"id\":#{rand(20168810)},\"text\":\"#{@text}\"}]"
+    end
+  end
+end

data/lib/termit/text_response_handler.rb

@@ -1,35 +1,25 @@
 #encoding: UTF-8
+require 'json'
+
 module Termit
   class TextResponseHandler
     include CanOutput
-    delegate :display_synonyms, :display_translation, to: :output_manager
+    delegate :display_translation, to: :output_manager
 
-    def initialize text, synonyms_wanted
+    def initialize text
       @text = decode text
-      @synonyms_wanted = synonyms_wanted
     end
 
     def call
       translation = extract_translation
       display_translation translation
-      display_synonyms extract_synonyms if @synonyms_wanted
       translation
     end
 
     private
 
     def extract_translation
-      @text.split("[[")[1].split("\"")[1]
-    end
-
-    def extract_synonyms
-      synonyms_data = @text.split("[[")[2].split("[")[1]
-      length = synonyms_data && synonyms_data.length
-      if length && synonyms_available(synonyms_data)
-        synonyms_data[0..(length-3)].delete("\"").gsub(/(,)/, ", ")
-      else
-        " ---"
-      end
+      JSON.parse(@text)["items"][0]["text"]
     end
 
     def decode text
@@ -37,9 +27,5 @@ module Termit
       text.gsub!(/(\\x26#39;)/, "'")
       text.force_encoding(encoding).encode(encoding)
     end
-
-    def synonyms_available synonyms_data
-      !synonyms_data.include?('true,false')
-    end
   end
 end

data/lib/termit/text_translator.rb

@@ -9,8 +9,8 @@ module Termit
     end
 
     def call
-      response = Termit::DataFetcher.new(@url, @options[:text]).data
-      @text = Termit::TextResponseHandler.new(response.body, @options[:synonyms]).call
+      response = Termit::TextFetcher.new(@url, @options[:text]).data
+      @text = Termit::TextResponseHandler.new(response.body).call
     end
   end
 end

data/lib/termit/url_constructor.rb

@@ -1,7 +1,8 @@
 #encoding: UTF-8
+
 module Termit
   class UrlConstructor
-    Host = "https://translate.google.com"
+    Host = "https://www.bing.com"
 
     def initialize options
       @options = options
@@ -14,11 +15,19 @@ module Termit
     private
 
     def construct_text_url
-      "#{Host}/translate_a/single?client=t&sl=#{@options[:source_lang]}&tl=#{@options[:target_lang]}&hl=pl&dt=bd&dt=ex&dt=ld&dt=md&dt=qca&dt=rw&dt=rm&dt=ss&dt=t&dt=at&ie=UTF-8&oe=UTF-8&otf=2&srcrom=1&ssel=3&tsel=6&kc=2&tk=522578"
+      "#{Host}/translator/api/Translate/TranslateArray?from=#{@options.fetch(:source_lang)}&to=#{@options.fetch(:target_lang)}"
     end
 
     def construct_sound_url
-      "#{Host}/translate_tts?ie=UTF-8&tl=#{@options[:target_lang]}&total=1&idx=0&textlen=5&tk=735012&client=t"
+      "#{Host}/translator/api/language/Speak?locale=#{transform_country_code(@options.fetch(:target_lang))}&gender=male&media=audio/mp3&text=#{URI.encode(@options.fetch(:text))}"
+    end
+
+    def transform_country_code(code)
+      if code == :en
+        'en-US'
+      else
+        "#{code}-#{code.upcase}"
+      end
     end
   end
 end

data/lib/termit/user_input_parser.rb

@@ -22,7 +22,6 @@ module Termit
     def parse_input
       {
        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(' ').gsub('.', ',')
@@ -38,7 +37,7 @@ module Termit
       raise ArgumentError unless @user_input.is_a? Array
       raise ArgumentError unless @user_input.length > 1
       @user_input.first(2).each do |language_code|
-        raise ArgumentError unless [2,3,4,5].include? language_code.length
+        raise ArgumentError unless (2..7).cover? language_code.length
       end
     end
 

data/lib/termit/version.rb

@@ -1,3 +1,3 @@
 module Termit
-  VERSION = "2.13.0"
+  VERSION = "3.0.0"
 end

data/lib/termit.rb

@@ -7,7 +7,9 @@ require 'termit/sound_response_handler'
 require 'termit/text_translator'
 require 'termit/speech_synthesizer'
 require 'termit/url_constructor'
-require 'termit/data_fetcher'
+require 'termit/data_fetcher_base'
+require 'termit/text_fetcher'
+require 'termit/sound_fetcher'
 require 'termit/text_response_handler'
 require 'termit/version'