translation_engine 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8031fcf2dc7a9c9ccc1943a6a7eef302d15648
-  data.tar.gz: 20d9f72bd23ce85b9231bc1ccddb4f10b4771a72
+  metadata.gz: d9403edc4263e3baab5d75038e0ce23c2d3e3b46
+  data.tar.gz: 63b5ce8b73ebe6a3866913167d347feae3048830
 SHA512:
-  metadata.gz: 16a396afc09a799a4cf485d6cf53b972aa334220aae56bb9bd5d3a588b10edb0ed6bcd6b9df5bb98b85373dfca019b98858b41cbb4495596cc1f9819064ecae5
-  data.tar.gz: 2637aefa8b0c515bfd28cc0e6d5d7474d0036f9c1298c69f0d2359c32734d7f89ed4a2006c58a4359c150b13cac9e102733c2e9d9fab15141c04b23b8c54f90b
+  metadata.gz: a527f2cc3b1387ce2e44d0fcfa04c169c87e1575acbe5d1e4319366ba39604ee37399d96959fc1e9e8cb6b525253690748314c41cc3bec96f61973faf9e62249
+  data.tar.gz: ac3c31d8ee464e4d11cd25be693122b0d9765c7e210b56c016c185559b6d2aea0fc877162a4709b50bb20bdc14409f97d3de5edd1e598e1fe522d8f54838ebd9

data/app/middlewares/translation_engine/catcher_middleware.rb

@@ -1,64 +1,68 @@
-class TranslationEngine::CatcherMiddleware
-  REMOVE_QUERY = /\?.*/
-  REPLACE_IDS = /\d+/
+module TranslationEngine
+  class CatcherMiddleware
+    include Request
 
-  def initialize(app)
-    @app = app
-  end
+    REMOVE_QUERY = /\?.*/
+    REPLACE_IDS = /\d+/
 
-  def call(env)
-    if TranslationEngine.use_catcher
-      call_catcher(env)
-    else
-      @app.call(env)
+    def initialize(app)
+      @app = app
     end
-  end
 
-  private
+    def call(env)
+      if TranslationEngine.use_catcher
+        call_catcher(env)
+      else
+        @app.call(env)
+      end
+    end
 
-  def call_catcher(env)
-    TranslationEngine::Translation.clear_catched
+    private
 
-    if env['QUERY_STRING'].include?('translation_release')
-      I18n.backend.release = params(env)['translation_release']
-    end
+    def call_catcher(env)
+      TranslationEngine::Translation.clear_catched
 
-    update_translations unless assets_request?(env)
+      if env['QUERY_STRING'].include?('translation_release')
+        I18n.backend.release = params(env)['translation_release']
+      end
 
-    response = @app.call(env)
+      update_translations unless assets_request?(env)
 
-    send_translations(env)
+      response = @app.call(env)
 
-    response
-  end
+      send_translations(env)
 
-  def assets_request?(env)
-    env['PATH_INFO'] =~ /\/assets/
-  end
+      response
+    end
 
-  def params(env)
-    Rack::Utils.parse_query(env['QUERY_STRING'], '&')
-  end
+    def assets_request?(env)
+      env['PATH_INFO'] =~ /\/assets/
+    end
 
-  def update_translations
-    translation_downloader.update
-  end
+    def params(env)
+      Rack::Utils.parse_query(env['QUERY_STRING'], '&')
+    end
+
+    def update_translations
+      translation_downloader.update
+    end
 
-  def send_translations(env)
-    return if TranslationEngine::Translation.catched.empty?
+    def send_translations(env)
+      return if TranslationEngine::Translation.catched.empty?
 
-    location = env['PATH_INFO'].gsub(REMOVE_QUERY, '').gsub(REPLACE_IDS, ':id')
+      location = env['PATH_INFO'].gsub(REMOVE_QUERY, '').gsub(REPLACE_IDS, ':id')
 
-    data = {
-      location:     location,
-      locale:       I18n.locale,
-      translations: TranslationEngine::Translation.catched.uniq
-    }
+      data = {
+        location:     location,
+        locale:       I18n.locale,
+        translations: TranslationEngine::Translation.catched.uniq
+      }
 
-    Thread.new { TranslationEngine::Connection.new.send_translations(data) }
-  end
+      Thread.new { TranslationEngine::Connection.new.send_translations(data, remote_ip(env)) }
+    end
 
-  def translation_downloader
-    @translation_downloader ||= TranslationEngine::Downloader.new
+    def translation_downloader
+      @translation_downloader ||= TranslationEngine::Downloader.new
+    end
   end
 end

data/app/middlewares/translation_engine/connection_exception_middleware.rb

@@ -1,17 +1,19 @@
 require 'faraday'
 
-class TranslationEngine::ConnectionExceptionMiddleware < Faraday::Middleware
-  def call(env)
-    begin
-      @app.call(env)
-    rescue Faraday::Error => e
-      message = "Connecting to TranslationServer got #{e.class}: #{e.message}"
+module TranslationEngine
+  class ConnectionExceptionMiddleware < Faraday::Middleware
+    def call(env)
+      begin
+        @app.call(env)
+      rescue Faraday::Error => e
+        message = "Connecting to TranslationServer got #{e.class}: #{e.message}"
 
-      if TranslationEngine.raise_exceptions
-        raise TranslationEngine::ConnectionError, message
-      else
-        Rails.logger.error { message }
-        {}
+        if TranslationEngine.raise_exceptions
+          raise TranslationEngine::ConnectionError, message
+        else
+          Rails.logger.error { message }
+          {}
+        end
       end
     end
   end

data/app/middlewares/translation_engine/keys_middleware.rb

@@ -1,31 +1,33 @@
-class TranslationEngine::KeysMiddleware
+module TranslationEngine
+  class KeysMiddleware
 
-  URL_PATH = /\A\/translation_engine\/keys/
+    URL_PATH = /\A\/translation_engine\/keys/
 
-  def initialize(app)
-    @app = app
-  end
+    def initialize(app)
+      @app = app
+    end
 
-  def call(env)
-    if env['PATH_INFO'] =~ URL_PATH
-      handle_redirect_request(env)
-    else
-      @app.call(env)
+    def call(env)
+      if env['PATH_INFO'] =~ URL_PATH
+        handle_redirect_request(env)
+      else
+        @app.call(env)
+      end
     end
-  end
 
-  private
+    private
 
-  def handle_redirect_request(env)
-    key_path = env['PATH_INFO'].gsub(URL_PATH, '')
+    def handle_redirect_request(env)
+      key_path = env['PATH_INFO'].gsub(URL_PATH, '')
 
-    [
-      302,
-      {
-        'Location' => "#{TranslationEngine.api_host}/#{key_path}",
-        'Content-Type' => 'text/html'
-      },
-      ['Moved Temporarily']
-    ]
+      [
+        302,
+        {
+          'Location' => "#{TranslationEngine.api_host}/#{key_path}",
+          'Content-Type' => 'text/html'
+        },
+        ['Moved Temporarily']
+      ]
+    end
   end
 end

data/app/middlewares/translation_engine/request.rb

@@ -0,0 +1,13 @@
+module TranslationEngine
+  module Request
+    def remote_ip(env)
+      request(env).ip
+    end
+
+    private
+
+    def request(env)
+      Rack::Request.new(env)
+    end
+  end
+end

data/app/middlewares/translation_engine/screenshots_middleware.rb

@@ -1,31 +1,34 @@
-class TranslationEngine::ScreenshotsMiddleware
+module TranslationEngine
+  class ScreenshotsMiddleware
+    include Request
 
-  URL_PATH = /\A\/translation_engine\/screenshots/
+    URL_PATH = /\A\/translation_engine\/screenshots/
 
-  def initialize(app)
-    @app = app
-  end
+    def initialize(app)
+      @app = app
+    end
 
-  def call(env)
-    if TranslationEngine.use_screenshots && env['PATH_INFO'] =~ URL_PATH
-      handle_translation_request(env)
-    else
-      @app.call(env)
+    def call(env)
+      if TranslationEngine.use_screenshots && env['PATH_INFO'] =~ URL_PATH
+        handle_translation_request(env)
+      else
+        @app.call(env)
+      end
     end
-  end
 
-  private
+    private
 
-  def handle_translation_request(env)
-    data = JSON.parse(env["rack.input"].read)
+    def handle_translation_request(env)
+      data = JSON.parse(env["rack.input"].read)
 
-    TranslationEngine::Connection.new
-      .send_images(data.merge(locale: I18n.locale))
+      TranslationEngine::Connection.new
+        .send_images(data.merge(locale: I18n.locale), remote_ip(env))
 
-    [
-      200,
-      { 'Content-Type' => 'application/json' },
-      [{ message: 'translations saved' }.to_json]
-    ]
+      [
+        200,
+        { 'Content-Type' => 'application/json' },
+        [{ message: 'translations saved' }.to_json]
+      ]
+    end
   end
 end

data/app/models/translation_engine/connection.rb

@@ -4,22 +4,24 @@ class TranslationEngine::Connection
 
   NotFound = Class.new(Exception)
 
-  def send_images(data)
+  def send_images(data, ip_address = nil)
     connection.post do |req|
       req.url '/api/v1/images'
       req.headers['Content-Type']  = 'application/json'
       req.headers['Authorization'] = api_token
+      req.headers['Original-IP-Address'] = ip_address if ip_address.present?
       req.body = data.to_json
     end
   end
 
-  def send_translations(data)
+  def send_translations(data, ip_address = nil)
     Thread.new do
       begin
         puts "Sending translations in separate thread"
         connection(60).post do |req|
           req.url '/api/v1/translations'
-          req.headers['Content-Type']  = 'application/json'
+          req.headers['Content-Type'] = 'application/json'
+          req.headers['Original-IP-Address'] = ip_address if ip_address.present?
           req.headers['Authorization'] = api_token
           req.body = data.to_json
         end

data/lib/translation_engine/version.rb

@@ -1,3 +1,3 @@
 module TranslationEngine
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: translation_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ondrej Bartas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,7 @@ files:
 - app/middlewares/translation_engine/catcher_middleware.rb
 - app/middlewares/translation_engine/connection_exception_middleware.rb
 - app/middlewares/translation_engine/keys_middleware.rb
+- app/middlewares/translation_engine/request.rb
 - app/middlewares/translation_engine/screenshots_middleware.rb
 - app/models/translation_engine/backend.rb
 - app/models/translation_engine/connection.rb