tr4n5l4te 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31315930a643f75755dcf9f2519553049ba3b8df2f4bf692190245781b276c53
-  data.tar.gz: 3a09ca03ca46a0fa256f81cef8196239155daeb35dd9fbe3da6d9dd4d3bb6b72
+  metadata.gz: 45d5c65129cb215f8944b57099506e55d8d52de535b72aaad71d2307a3fda211
+  data.tar.gz: 6a6415d824135ab7135799dc94ac67df1643a00ec942b5ac72df56fb4fa5e5ec
 SHA512:
-  metadata.gz: 3baeae8f21ab55ff7c6593e126830a555d8d70d073a1ad5bd066e12aa2f242496902bd38d621837da68275085551da7abf37474d1b488003b231c97a1aca7e1c
-  data.tar.gz: 9f075f32d79b0ececc80b9879c2d658ecc3e2cd2f2b1dbf116d8ef5be244dd916ea7ad726b0317ad6defd35e631e70dee09b03321bcaf8ec9fa5a33faa7b0465
+  metadata.gz: f7e4c5013a566196776e9baf20aa9aa9b901dd941c80098a591cd5c8bf14a521aa057ab536822af225a6939ebd7c87dd8339feb2a2b2385fe84d220e0fad591f
+  data.tar.gz: 5d6b0d6f2d60d048c3136155bafba29620a959dcafc2f3b02d0ba624a962580b8654f3036572a25fe1507fab44a8b6dab1cc421cb405fb70d793c291b6f24d6b

data/CHANGELOG

@@ -1,3 +1,8 @@
+*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.

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    tr4n5l4te (0.1.8)
+    tr4n5l4te (0.1.9)
       capybara (~> 2.6)
       colored (~> 1)
       midwire_common (~> 0.1)
-      optimist
+      optimist (~> 3.0)
       poltergeist (~> 1.9)
 
 GEM
@@ -33,7 +33,7 @@ GEM
       thor (~> 0.19)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     optimist (3.0.0)
     parallel (1.19.1)
@@ -53,7 +53,7 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -94,7 +94,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0.1)
   pry-nav
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   simplecov (~> 0.11)

data/README.md

@@ -1,6 +1,6 @@
 # Tr4n5l4te
 
-**Version: 0.1.8**
+**Version: 0.1.9**
 
 Use Google Translate without an API key.
 

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/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,13 +14,12 @@ 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
+      postprocess(result_box.text)
     rescue Capybara::Ambiguous
       all_translations = browser.find_all('.tlid-translation')
       multiples = all_translations.collect(&:text)
@@ -30,11 +29,28 @@ module Tr4n5l4te
 
     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}/
+        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.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

data/tr4n5l4te.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0.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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Chris Blackburn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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