autotolk 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a89151960c946d0ee91034a75dee13bb1472c4
-  data.tar.gz: 15a5d1460cf1daf8267085ee324cfc3b80d4c82a
+  metadata.gz: 99ba99954c85978aed16ebf0967290cbbc67374c
+  data.tar.gz: f85a3b070fdbbf171d6190b2434ff6e0a4170b1f
 SHA512:
-  metadata.gz: 891d279c77b0caa274e1bb1b83d46496c98f40fd1c56e6d24ac67bf95132b10155db39818b42212a40126abfeee0848d478dcc3d3987b0dc520b01d711147194
-  data.tar.gz: b6920d50b0fc6e90b8cd592607d7d049bb59e141be8e8a5314af9e0acead1e8030de12050e25f68357ea153edc82f60d4347da2f3da8c8d28e568fa18781f384
+  metadata.gz: 7072bd5e147ca11b3d1ce68b74a06b63388f4a3c3ef6fa9fd8346523d3591c373d1f3e26287882149acacc3297bf4b6d9156bb78c68263c730f4bc38940060c4
+  data.tar.gz: 67b3a1afb4a1a07aed7659c7f20eb371b5d168e7c6b4364905ceab37b466c0e209adeb74539bfc9628489f4db44c49ca72e284f0dadb32877a34977811ec6868

data/README.md

@@ -26,7 +26,7 @@ And follow the instructions on the screen (you will have to add your bing tokens
 
 ## Usage
 
-Now when you go to `/tolk/locales/xx` you will see an alert informing you that when you double click anywhere, the translation will be automatic. The text areas will fill out with the translated text, so you could change it if needed and save.
+Now when you go to `/tolk/locales/xx` you will see a button `Start autotranslating!`. When you click on it, the translation will be automatic. The text areas will fill out with the translated text, so you could change it if needed and save.
 
 ## Issues
 

data/app/assets/javascripts/autotolk/locales.js.coffee

@@ -1,16 +1,19 @@
+autotranslatingClicked = 0
+
 $(document).on 'ready page:load', ->
-  if document.URL.includes("tolk/locales")
-    alert "Double click anywhere to start autotranslating."
-    autotranslatingClicked = 0
-    $('#container').dblclick ->
-      autotranslatingClicked += 1
-      to_lang = document.URL.split('/').slice(-1).pop()
-      $translation_rows = $('table.translations tbody tr:not(:first-child)')
-      for $translation_row in $translation_rows
-        original = $translation_row.querySelector('td.original textarea#translations__original_text').innerText
-        $translationArea = $translation_row.querySelector('td.translation textarea')
-        if $translationArea.innerText == '' && autotranslatingClicked == 1
-          translate(original, to_lang, $translationArea)
+  $( "#container div.translations" ).prepend( "<div id='autotranslate' style='text-align: right;'><button> Start autotranslating!</button></div>" )
+  $('div#autotranslate').on 'click', 'button', ->
+    startTranslating()
+
+startTranslating = () ->
+  autotranslatingClicked += 1
+  to_lang = document.URL.split('/').slice(-1).pop()
+  $translation_rows = $('table.translations tbody tr:not(:first-child)')
+  for $translation_row in $translation_rows
+    original = $translation_row.querySelector('td.original textarea#translations__original_text').innerText
+    $translationArea = $translation_row.querySelector('td.translation textarea')
+    if $translationArea.innerText == '' && autotranslatingClicked == 1
+      translate(original, to_lang, $translationArea)
 
 translate = (original, to, textarea) ->
   $.get '/translate', {original: original, to: to}, ((response) ->

data/app/controllers/translations_controller.rb

@@ -1,12 +1,8 @@
-require 'bing_translator'
-
 class TranslationsController < ApplicationController
   skip_before_action :authenticate_user!, :validate_subdomain
 
   def translate
-    translator = BingTranslator.new( Autotolk.bing_client_id, Autotolk.bing_client_secret,
-      false, Autotolk.azure_account_key)
-    translated = translator.translate params[:original], :to => params[:to]
+    translated = AutoTranslator.new(original: params[:original], to: params[:to]).perform
     render json: {status: 200, translated: translated}
   rescue Exception => e
     render json: {status: 500, error: e}

data/app/services/auto_translator.rb

@@ -0,0 +1,35 @@
+require 'bing_translator'
+
+class AutoTranslator
+
+  def initialize parameters = { original: nil, to: nil }
+    @translator = nil
+    @translation = nil
+    @original = parameters[:original]
+    @to = parameters[:to]
+  end
+
+  def perform
+    set_translator
+    raw_translate
+    fix_special_characters
+    @translation
+  end
+
+  private
+
+  def set_translator
+    @translator = BingTranslator.new( Autotolk.bing_client_id, Autotolk.bing_client_secret,
+      false, Autotolk.azure_account_key)
+  end
+
+  def raw_translate
+    @translation = @translator.translate @original, to: @to
+  end
+
+  def fix_special_characters
+    @translation.gsub!('% {', '%{')
+    @translation.gsub!(/{(?<word>\w+)} %[^{]*/, '%{\k<word>}')
+    @translation.gsub!('---', '')
+  end
+end

data/lib/autotolk/version.rb

@@ -1,3 +1,3 @@
 module Autotolk
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autotolk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Joanna Rajewska
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,8 +70,8 @@ files:
 - app/assets/.DS_Store
 - app/assets/javascripts/.DS_Store
 - app/assets/javascripts/autotolk/locales.js.coffee
-- app/assets/javascripts/locales.js.coffee
 - app/controllers/translations_controller.rb
+- app/services/auto_translator.rb
 - autotolk.gemspec
 - bin/console
 - bin/setup

data/app/assets/javascripts/locales.js.coffee

@@ -1,19 +0,0 @@
-$(document).on 'ready page:load', ->
-  $( "#container div.translations" ).prepend( "<div style='text-align: right;'><button onclick='startTranslating()'> Start autotranslating!</button></div>" )
-  autotranslatingClicked = 0
-
-startTranslating = ->
-  autotranslatingClicked += 1
-  to_lang = document.URL.split('/').slice(-1).pop()
-  $translation_rows = $('table.translations tbody tr:not(:first-child)')
-  for $translation_row in $translation_rows
-    original = $translation_row.querySelector('td.original textarea#translations__original_text').innerText
-    $translationArea = $translation_row.querySelector('td.translation textarea')
-    if $translationArea.innerText == '' && autotranslatingClicked == 1
-      translate(original, to_lang, $translationArea)
-
-translate = (original, to, textarea) ->
-  $.get '/translate', {original: original, to: to}, ((response) ->
-    if response.status == 200
-      textarea.innerText = response.translated
-  ), 'json'