lita-translation 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92de845747ee164159ffba572f90f692d6d42ea6
-  data.tar.gz: 2681a8075c783578e9d115ca7975083401c59b77
+  metadata.gz: c6b394891aa7a2a8e8584c5ab87415405a5c5397
+  data.tar.gz: be41483e5ca7729b0097879a665e46fb55e860a7
 SHA512:
-  metadata.gz: 4408c35c04ec73dd30b1de26772be8ce47dc16aa7e227dd3151fa9e9c5c284e186f77c7150eaf8dfd8ce09e369adbed8b8659d39c1024a3afc3123da3b9a40ac
-  data.tar.gz: 8eeb31021dbb354d75886894b7835540c6597afffb6d311d36859367075b57865f2603ab1bba7e184255a02ee67ecde83dd58d24e46fa65704a22f2bdec3631a
+  metadata.gz: 8dfe633f4303ee1d47181dc4162e2fd64a37047386644e6bb7b5182fb2c7471a26471c051f9df750571f3f74e1f0fe9b1a079193244c66b836a7e212d714c560
+  data.tar.gz: 5e5eac53fd6e6464898b48db5b853736001a580459220105d50ee9b68bf0506a43ae5883e3c5924506a896c5c7708dbe963466e9ba3a730dca3f052536ce7dbc

data/README.md

@@ -36,8 +36,8 @@ Microsoft uses ISO-639 codes to identify languages. Klingon is available.
 
 * languages - List language codes supported by Microsoft's Translator API
 * determine '[text]' - Determine language of the given text
-* translate '[text]' to [code] (from [code]) - Translate the given text from one language to another
-* translate me to [code] (from [code]) - Begin auto-translating all user's speech to the given language
+* translate '[text]' to \[code\] (from [code]) - Translate the given text from one language to another
+* translate me to \[code\] (from [code]) - Begin auto-translating all user's speech to the given language
 * stop translating me - End any auto-translation
 
 Source language is optional during translation. Microsoft will attempt to detect the source language if none is supplied.

data/lib/lita/handlers/msTranslator.rb

@@ -4,7 +4,8 @@ class MSTranslator
   OAUTH_URI = "https://datamarket.accesscontrol.windows.net/v2/OAuth2-13"
   API_URI = "https://api.microsofttranslator.com/V2/Ajax.svc/"
 
-  REST_LANGUAGES = "GetLanguagesForTranslate"
+  REST_LANGCODES = "GetLanguagesForTranslate"
+  REST_LANGNAMES = "GetLanguageNames"
   REST_DETECTION = "Detect"
   REST_TRANSLATE = "Translate"
 
@@ -51,9 +52,28 @@ class MSTranslator
     end
   end
 
-  def languages()
+  def languageCodes()
     result = @http.get do |req|
-      req.url API_URI+REST_LANGUAGES
+      req.url API_URI+REST_LANGCODES
+      req.headers['Authorization'] = "Bearer "+@redis.get("token")
+    end
+    if apiSuccess?(result)
+      TranslationResult.new(
+        true,
+        JSON.parse(result.body.slice(3..result.body.length)).join(",")
+      )
+    else
+      TranslationResult.new(
+        false,
+        result.body.slice(3..result.body.length)
+      )
+    end
+  end
+
+  def languageNames(codes)
+    codes = '['+codes.split(",").map { |code| '"'+code+'"' }.join(",")+']'
+    result = @http.get do |req|
+      req.url API_URI+REST_LANGNAMES, {:locale => "en", :languageCodes => codes}
       req.headers['Authorization'] = "Bearer "+@redis.get("token")
     end
     if apiSuccess?(result)

data/lib/lita/handlers/translation.rb

@@ -6,6 +6,37 @@ module Lita
       config :client_id, type: String, required: true
       config :client_secret, type: String, required: true
 
+      def updateStoredLang(codes, names)
+        languages = {}
+        codes.split(",").zip(names.split(",")).each { |pair|
+          languages[pair[0]] = pair[1]
+        }
+        redis.set("languages", languages.to_json)
+        languages
+      end
+
+      on :connected, :init_lang
+      def init_lang(payload)
+        translator = MSTranslator.new(config.client_id, config.client_secret, http, redis)
+        if translator.staleToken?
+          translator.grabAccessToken
+        end
+
+        result = translator.languageCodes
+        if !result.success
+          return
+        end
+
+        codes = result.message
+        result = translator.languageNames(codes)
+        if !result.success
+          return
+        end
+
+        names = result.message
+        updateStoredLang(codes, names)
+      end
+
       def tokenAvailable?(response, translator)
         if translator.staleToken?
           response.reply(t("replies.access_token.attempt"))
@@ -27,13 +58,25 @@ module Lita
       def languages(response)
         translator = MSTranslator.new(config.client_id, config.client_secret, http, redis)
         if tokenAvailable?(response, translator)
-          result = translator.languages
-          if result.success
-            response.reply(t("replies.languages"))
-          else
+          codeResult = translator.languageCodes
+          if !codeResult.success
             response.reply(t("replies.failure"))
+            response.reply(codeResult.message)
+            return
           end
-          response.reply(result.message)
+
+          nameResult = translator.languageNames(codeResult.message)
+          if !nameResult.success
+            response.reply(t("replies.failure"))
+            response.reply(nameResult.message)
+            return
+          end
+
+          languages = updateStoredLang(codeResult.message, nameResult.message)
+          response.reply_privately(t("replies.languages"))
+          languages.each{ |code, name|
+            response.reply_privately("#{code}(#{name})")
+          }
         end
       end
 
@@ -46,7 +89,10 @@ module Lita
           result = translator.detect(response.matches.pop[0])
           if result.success
             code = result.message
-            response.reply(t("replies.determine", code: code))
+            code[0] = ''
+            code = code[0..-2]
+            name = JSON.parse(redis.get("languages"))[code]
+            response.reply(t("replies.determine", code: code, name: name))
           else
             response.reply(t("replies.failure"))
             response.reply(result.message)
@@ -54,7 +100,7 @@ module Lita
         end
       end
 
-      route /^translate me to (\w+)( from (\w+))?$/, :auto_start, help: {
+      route /^translate me to ([-\w]+)( from ([-\w]+))?$/, :auto_start, help: {
         t("help.auto_start.usage") => t("help.auto_start.description")
       }
       def auto_start(response)
@@ -62,9 +108,13 @@ module Lita
         if tokenAvailable?(response, translator)
           to = response.matches.flatten[0]
           from = response.matches.flatten[2]
+          name = JSON.parse(redis.get("languages"))[to]
+          if name.nil?
+            response.reply(t("replies.unknown_code", code: to))
+          end
           redis.set(response.user.id+":to", to)
           redis.set(response.user.id+":from", from)
-          response.reply(t("replies.auto_start", code: to, user: response.user.name))
+          response.reply(t("replies.auto_start", code: to, name: name, user: response.user.name))
         end
       end
 
@@ -77,7 +127,7 @@ module Lita
         response.reply(t("replies.auto_end", user: response.user.name))
       end
 
-      route /^translate '(.+)' to (\w+)( from (\w+))?$/, :tran_lang, help: {
+      route /^translate '(.+)' to ([-\w]+)( from ([-\w]+))?$/, :tran_lang, help: {
         t("help.translate.usage") => t("help.translate.description")
       }
       def tran_lang(response)
@@ -86,9 +136,10 @@ module Lita
           text = response.matches.flatten[0]
           to = response.matches.flatten[1]
           from = response.matches.flatten[3]
+          name = JSON.parse(redis.get("languages"))[to]
           result = translator.translate(text, to, from)
           if result.success
-            response.reply(t("replies.translate", translated: result.message))
+            response.reply(t("replies.translate", code: to, name: name, translated: result.message))
           else
             response.reply(t("replies.failure"))
             response.reply(result.message)

data/lita-translation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-translation"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.1"
   spec.authors       = ["Michael Chua"]
   spec.email         = ["chua.mbt@gmail.com"]
   spec.description   = %q{Language translation plugin that uses Microsoft's Translator API. }

data/locales/en.yml

@@ -5,7 +5,7 @@ en:
         help:
           languages:
             usage: "languages"
-            description: "List language codes supported by Microsoft's Translator API"
+            description: "List languages supported by Microsoft's Translator API"
           determine:
             usage: "determine '[text]'"
             description: "Determine language of the given text"
@@ -23,10 +23,11 @@ en:
             attempt: "Requesting an access token..."
             success: "Got an access token for Microsoft's Translator API!"
             fail: "Could not get an access token!"
-          languages: "The following language codes are supported: "
-          determine: "Language code: %{code}"
-          translate: "Translation: %{translated}"
+          languages: "The following languages are supported: "
+          determine: "Language: %{name}(%{code})"
+          translate: "Translation in %{name}(%{code}: %{translated}"
           failure: "API Failure: "
-          auto_start: "Beginning translation to %{code} for %{user}."
+          auto_start: "Beginning translation to %{name}(%{code}) for %{user}."
           auto: "%{user}: %{translated}."
-          auto_end: "Ceasing translation for %{user}."
+          auto_end: "Ceasing translation for %{user}."
+          unknown_code: "Warning: %{code} is unrecognized. The service may not be able to translate with the given code."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-translation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Chua
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita