tr4n5l4te 0.1.6 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b2e251b178f16e954b56a61d499486d4e369f66bee5f68ed016ac16270ef7a5
-  data.tar.gz: 41894125f771195f11788b26781e1122aa27e39abf8674544aedbd9424d1a19b
+  metadata.gz: 954010f8de8d82aea0e42aff158589f845ce7c90ad62070823f2237e83445620
+  data.tar.gz: 4590211be6847e3727577e40f4f1528c6b42e1013d6e55152797b958044436ee
 SHA512:
-  metadata.gz: 16490612ad1a9683ef67626f15120748e7e6c52f78684cc8a50053ae272e2ee45583ce7880ccc00e4a125b28a16dd0cc9b50bcb3c2f89b1c62843a1ef34a4ff3
-  data.tar.gz: ef4b21e7beb0888aee641f23f812690794317fe5da708b6d62b47cdc5fdfa9cbca2c2cd5c1b1f29961bcbab6d5b27b92d2f4922ba22f0916a382863d4ff5cfde
+  metadata.gz: f11f27204c1e2e85ff05c88e243653a883fcfefb207c13f75aca511298a204999e2172c0e1eed8d50fffe4c16a7c5608003571d4ca0c5d3289ca2e435f5ad7d9
+  data.tar.gz: e8532e8eb379618167df35341ac713fd48e40686e6b3a0a8a084909563fe46b44af981c9d40d5dd0dbfc2d0e51b9177a0525e4cf1ba5351b5f894365b6c57c6f

data/.gitignore

@@ -9,3 +9,5 @@
 test.html
 /vendor
 /stubs
+/node_modules/
+yarn.lock

data/CHANGELOG

@@ -1,3 +1,30 @@
+*0.1.12* (March 11, 2021)
+
+* Dump console message into oblivion, do we don't see stupid warning messages like "Using this console may allow attackers to impersonate you and steal your information using an attack called Self-XSS"
+
+*0.1.11* (March 09, 2021)
+
+* Disregard case when using variable interpolation.
+
+*0.1.10* (March 09, 2021)
+
+* Accomodate latest changes to the web interface.
+
+*0.1.9* (March 05, 2020)
+
+* The top-level primary language key was being propagated from the source .yml file to the translated target .yml file.  That is now fixed.
+* Now keeps the interpolation tags intact.
+
+*0.1.8* (February 21, 2020)
+
+* Address ambiguous translations without stopping the run when the exception occurs.
+* Fixes issue #9
+
+*0.1.7* (January 14, 2020)
+
+* Remove midwire common String usage
+* Fixes issue #7
+
 *0.1.6* (January 14, 2020)
 
 * Fix rubocop violations

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    tr4n5l4te (0.1.6)
+    tr4n5l4te (0.1.12)
       capybara (~> 2.6)
       colored (~> 1)
       midwire_common (~> 0.1)
-      optimist
+      optimist (~> 3.0)
       poltergeist (~> 1.9)
 
 GEM
@@ -13,7 +13,7 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
+    ast (2.4.2)
     capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -22,23 +22,22 @@ GEM
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
     cliver (0.3.2)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colored (1.2)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    jaro_winkler (1.5.4)
-    json (2.3.0)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
     method_source (0.9.2)
     midwire_common (0.3.0)
       thor (~> 0.19)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    optimist (3.0.0)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
+    mini_portile2 (2.5.0)
+    nokogiri (1.11.2)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    optimist (3.0.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
@@ -48,43 +47,51 @@ GEM
       method_source (~> 0.9.0)
     pry-nav (0.3.0)
       pry (>= 0.9.10, < 0.13.0)
-    public_suffix (4.0.3)
-    rack (2.1.1)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.79.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     thor (0.20.3)
-    unicode-display_width (1.6.0)
-    websocket-driver (0.7.1)
+    unicode-display_width (2.0.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -92,13 +99,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0.1)
+  bundler (~> 2.1)
   pry-nav
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   simplecov (~> 0.11)
   tr4n5l4te!
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/README.md

@@ -1,6 +1,6 @@
 # Tr4n5l4te
 
-**Version: 0.1.6**
+**Version: 0.1.12**
 
 Use Google Translate without an API key.
 
@@ -30,10 +30,10 @@ In your code:
 
 ```ruby
 translator = Tr4n5l4te::Translator.new
-english_strings = %w(
-  hello
-  how are you
-)
+english_strings = [
+  'hello',
+  'how are you'
+]
 english_strings.each do |text|
   puts translator.translate(text, :en, :es)
 end
@@ -65,7 +65,7 @@ Warning: If you pass in '0' and translate a large file, it is very likely that G
 
 To list all known languages
 
-    $ ./exe/translate -t
+    $ ./exe/translate --list
 
 ## Development
 

data/bin/console

@@ -7,8 +7,8 @@ require 'tr4n5l4te'
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require 'pry'
+Pry.start
 
-require 'irb'
-IRB.start
+# require 'irb'
+# IRB.start

data/lib/tr4n5l4te.rb

@@ -2,7 +2,6 @@
 
 require 'tr4n5l4te/version'
 
-require 'midwire_common/string'
 require 'midwire_common/yaml_setting'
 require 'midwire_common/hash'
 
@@ -15,7 +14,7 @@ module Tr4n5l4te
     end
 
     def string_id
-      to_s.snakerize
+      'tr4n5l4te'
     end
 
     def default_config_directory

data/lib/tr4n5l4te/agent.rb

@@ -10,7 +10,9 @@ module Tr4n5l4te
       app,
       js_errors: false,
       timeout: Tr4n5l4te.configuration.timeout,
-      phantomjs_options: ['--load-images=no']
+      phantomjs_options: ['--load-images=no', '--ignore-ssl-errors=yes', '--web-security=false'],
+      phantomjs_logger: StringIO.new,
+      logger: StringIO.new
     )
   end
   Capybara.default_driver = :poltergeist

data/lib/tr4n5l4te/runner.rb

@@ -4,6 +4,7 @@ require 'optimist'
 require 'colored'
 require 'fileutils'
 require 'midwire_common/string'
+require 'pry' unless ENV.fetch('GEM_ENV', nil).nil?
 
 module Tr4n5l4te
   class Runner
@@ -30,7 +31,7 @@ module Tr4n5l4te
 
       hash = YAML.load_file(options[:yaml_file])
       translated = process(hash)
-      store_translation(translated)
+      store_translation(replace_lang_key(translated))
 
       puts("Processed #{@count} strings in [#{Time.now - start_time}] seconds.".yellow)
     end
@@ -47,7 +48,7 @@ module Tr4n5l4te
 
     def translate(string)
       @count += 1
-      puts("[#{string}]") if options[:verbose]
+      puts("Translating [#{string}]") if options[:verbose]
       translator.translate(string, from_lang, options[:lang])
     end
 
@@ -56,10 +57,19 @@ module Tr4n5l4te
     end
 
     def from_lang
-      md = File.basename(options[:yaml_file]).match(/^(\w\w)\.yml$/)
-      fail "Could not determine language from yaml file: '#{options[:yaml_file]}'" unless md
+      @from_lang ||= begin
+        md = File.basename(options[:yaml_file]).match(/^(\w\w)\.yml$/)
+        fail "Could not determine language from yaml file: '#{options[:yaml_file]}'" unless md
 
-      md[1]
+        md[1]
+      end
+    end
+
+    def replace_lang_key(translated)
+      assumed_source_lang = translated.keys.first
+      return translated unless assumed_source_lang == from_lang
+
+      { options[:lang] => translated.values.first }
     end
 
     def store_translation(translated)

data/lib/tr4n5l4te/translator.rb

@@ -14,22 +14,43 @@ module Tr4n5l4te
     end
 
     def translate(text, from_lang, to_lang)
-      puts "Translating: #{text}"
       encoded_text = validate_and_encode(text)
       return '' if encoded_text == ''
 
       smart_visit(translator_url(encoded_text, from_lang, to_lang))
-      result_box = browser.find('.tlid-translation')
-      result_box.text
+      result_box = browser.find('.JLqJ4b.ChMk0b > span:first-child')
+      postprocess(result_box.text)
+    rescue Capybara::Ambiguous
+      all_translations = browser.find_all('.JLqJ4b.ChMk0b > span:first-child')
+      multiples = all_translations.collect(&:text)
+      puts("WARNING: '#{text}' has multiple translations: [#{multiples.join(', ')}]")
+      text
     end
 
     private
 
+    def preprocess(text)
+      @interpolations = text.scan(/(%{.*})/).flatten
+      @interpolations.each_with_index do |var, ndx|
+        stub = "VAR#{ndx}"
+        text.gsub!(%r{#{var}}, stub)
+      end
+      text
+    end
+
+    def postprocess(text)
+      @interpolations.each_with_index do |interp, ndx|
+        stub = /VAR#{ndx}/i
+        text.gsub!(stub, interp)
+      end
+      text
+    end
+
     def validate_and_encode(text)
       return '' if text.nil?
       fail "Cannot translate a [#{text.class}]: '#{text}'" unless text.respond_to?(:gsub)
 
-      CGI.escape(text.strip)
+      CGI.escape(preprocess(text.strip))
     end
 
     def smart_visit(url)

data/lib/tr4n5l4te/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tr4n5l4te
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.12'.freeze
 end

data/tr4n5l4te.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.0.1'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'pry-nav'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov', '~> 0.11'
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capybara', '~> 2.6'
   spec.add_dependency 'colored', '~> 1'
   spec.add_dependency 'midwire_common', '~> 0.1'
-  spec.add_dependency 'optimist'
+  spec.add_dependency 'optimist', '~> 3.0'
   spec.add_dependency 'poltergeist', '~> 1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tr4n5l4te
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.12
 platform: ruby
 authors:
 - Chris Blackburn
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +140,16 @@ dependencies:
   name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ homepage: https://github.com/midwire/tr4n5l4te
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Use Google Translate without an API key.
 test_files: []