autotolk 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc8e5491bd9094856a5d8dff1c5d22380abf650
-  data.tar.gz: 3136eeae2d1d52f4dfc7165e4deed7a98d157a87
+  metadata.gz: 4ce724c992f0a77243f5b898ecd73f176917d2c3
+  data.tar.gz: f9028ac32fe73f94d8090b01984a33f4a8ca0e77
 SHA512:
-  metadata.gz: 5588876696258d52df1b5645e12ffc5bde967139a51f10805c8d29e0fffa7f5af07f7a67085fe3daa1bbb49857b4cad9e8c6e73118472c8d7361b69a25edf64b
-  data.tar.gz: b9bfa064f322bcc44891776a98770d5ab0e16cb35b536d418a8491eec3be66c2feb75afb77e19f6f0edce709680baed35229d10015e535216880a8b56663b8d9
+  metadata.gz: c3015153e1af8a160a296eb12f4d568f38f1c3b97e1b1ea01ba9347d71c98b90a58bd49275f0b07aafaefd615b24ad34b2a6f3a13adbb68980d587514cbea5f0
+  data.tar.gz: 71945b75bd58832efecdf406f06adc13aed9e89c76799ac461485415e812eb4e54d9da63b1ba646d648daac4928151d8f70fa6f4489408fe8fcfce7c9c3e7626

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

@@ -17,6 +17,6 @@ startTranslating = () ->
 
 translate = (original, to, textarea) ->
   $.get '/translate', {original: original, to: to}, ((response) ->
-    if response.status == 200
+    if response.status >= 200 && response.status < 400
       textarea.innerText = response.translated
   ), 'json'

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.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autotolk
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joanna Rajewska
 autorequire: 
 bindir: exe
 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: bundler
@@ -71,6 +71,7 @@ files:
 - app/assets/javascripts/.DS_Store
 - app/assets/javascripts/autotolk/locales.js.coffee
 - app/controllers/translations_controller.rb
+- app/services/auto_translator.rb
 - autotolk.gemspec
 - bin/console
 - bin/setup