web_translate_it 2.8.2 → 3.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f545288c55ba7994137a77fe9c33a1f5ad9a0a9ef0e7e1fb55adabef34db04
-  data.tar.gz: 276e1a44adfb1dead4c72f7d3f66c520a2e75e64621b378756ca9e05f4924a91
+  metadata.gz: 34ec034f6bb1b51c1acbe92a15edaf0e7d280bcb659af2264362d62d93c1b357
+  data.tar.gz: e56a0518f643f2732dd03d20c6d6b21aaa1ce113ee53ef8f80a48e4f2fe525d5
 SHA512:
-  metadata.gz: 2cfc4cd709ec351d3581c896b5657144b94859519bb14a6d61f4873f11db880d199af20dcb733c460a90fe33456a57878ffa040c221f0e44735b15c143b92630
-  data.tar.gz: 2aea23da596406f7536d4b1c9e62005a1891fffd3ff89a5010a79efde5aee38adc84b3c0c38b203cc8d78aaa1c763c87c1f9779dc48a1b1417fe275fd8e2e6df
+  metadata.gz: 106bf20797262e6a5fc4d55e4c6799cce2f406242e14320324c53943940012d7dfbef4dd5c22437414236e27826806011011b4b0c478bb7189bc27ce17174876
+  data.tar.gz: 7e89486b8fdf46a4c971b08112cd466d91573ad5b56c5f057320cd7ff9171d96c343c080938eca4d170e00b0afb0156a6275fc7b3384a9cca77b6451c2d89a1e

data/bin/wti

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $PROGRAM_NAME = 'wti'
 

data/examples/locale.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Locale
 
   def initialize(app)

data/generators/webtranslateit/lib/insert_commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Mostly pinched from http://github.com/ryanb/nifty-generators/tree/master
 
 Rails::Generator::Commands::Base.class_eval do

data/generators/webtranslateit/webtranslateit_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path("#{File.dirname(__FILE__)}/lib/insert_commands.rb")
 
 class WebtranslateitGenerator < Rails::Generator::Base

data/history.md

@@ -1,3 +1,14 @@
+## Version 3.0.0.beta1 / 2023-09-20
+
+* Remove dependency on `multipart_post`. #255
+* Add frozen string litteral comments. #251
+* Bump minimum ruby version to ruby 2.7.
+* Don’t rescue SSL errors. #257
+
+## Version 2.8.3 / 2023-04-19
+
+* Fix `wti addlocale` and `wti rmlocale` commands. #253
+
 ## Version 2.8.2 / 2023-04-18
 
 * Fix crash caused by use of API from older Multipart versions. #246 (@rogerluan)

data/lib/web_translate_it/auto_fetch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   # Class to automatically fetch the last translations from Web Translate It

data/lib/web_translate_it/command_line.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   class CommandLine # rubocop:todo Metrics/ClassLength
@@ -58,7 +60,7 @@ module WebTranslateIt
         time = Time.now
         threads = []
         n_threads = [(files.size.to_f / 3).ceil, 10].min
-        ArrayUtil.chunk(files, n_threads).each do |file_array|
+        files.each_slice(n_threads).each do |file_array|
           next if file_array.empty?
 
           threads << Thread.new(file_array) do |f_array|

data/lib/web_translate_it/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   # Handles the configuration of your project, both via the the configuration file

data/lib/web_translate_it/connection.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   class Connection
 
-    attr_reader :api_key, :http_connection
-
-    @api_key = nil
-    @http_connection = nil
-    @debug = false
+    @@api_key = nil
+    @@http_connection = nil
+    @@debug = false
 
     #
     # Initialize and yield a HTTPS Keep-Alive connection to WebTranslateIt.com
@@ -23,33 +23,35 @@ module WebTranslateIt
     #   http_connection.request(request)
     # end
     #
-    def initialize(api_key) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
-      @api_key = api_key
+    def initialize(api_key) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+      @@api_key = api_key
       proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : Struct.new(:host, :port, :user, :password).new
       http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
       http.use_ssl      = true
       http.open_timeout = http.read_timeout = 60
-      http.set_debug_output($stderr) if @debug
+      http.set_debug_output($stderr) if @@debug
       begin
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        @http_connection = http.start
-        yield @http_connection if block_given?
+        @@http_connection = http.start
+        yield @@http_connection if block_given?
       rescue OpenSSL::SSL::SSLError
-        puts 'Unable to verify SSL certificate.' unless @silent
-        http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
-        http.set_debug_output($stderr) if @debug
-        http.use_ssl      = true
-        http.open_timeout = http.read_timeout = 60
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        @http_connection = http.start
-        yield @http_connection if block_given?
+        puts 'Error: Unable to verify SSL certificate.'
+        exit 1
       rescue StandardError
         puts $ERROR_INFO
       end
     end
 
     def self.turn_debug_on
-      @debug = true
+      @@debug = true
+    end
+
+    def self.api_key
+      @@api_key
+    end
+
+    def self.http_connection
+      @@http_connection
     end
 
   end

data/lib/web_translate_it/project.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   class Project

data/lib/web_translate_it/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   class String # rubocop:todo Metrics/ClassLength

data/lib/web_translate_it/term.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   class Term # rubocop:todo Metrics/ClassLength

data/lib/web_translate_it/term_translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   class TermTranslation

data/lib/web_translate_it/translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   class Translation

data/lib/web_translate_it/translation_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   # A TranslationFile is the representation of a master language file
@@ -68,7 +70,7 @@ module WebTranslateIt
       else
         display.push StringUtil.success('Skipped')
       end
-      print ArrayUtil.to_columns(display)
+      print StringUtil.array_to_columns(display)
       success
     end
 
@@ -96,11 +98,18 @@ module WebTranslateIt
       if File.exist?(file_path)
         if force || (remote_checksum != local_checksum)
           File.open(file_path) do |file|
-            params = {'file' => UploadIO.new(file, 'text/plain', file.path), 'merge' => merge, 'ignore_missing' => ignore_missing, 'label' => label, 'minor_changes' => minor_changes}
-            params['name'] = destination_path unless destination_path.nil?
-            params['rename_others'] = rename_others
-            request = Net::HTTP::Put::Multipart.new(api_url, params)
+            params = [
+              ['merge', merge.to_s],
+              ['ignore_missing', ignore_missing.to_s],
+              ['label', label.to_s],
+              ['minor_changes', minor_changes.to_s],
+              ['rename_others', rename_others.to_s],
+              ['file', file]
+            ]
+            params += [['name', destination_path]] unless destination_path.nil?
+            request = Net::HTTP::Put.new(api_url)
             WebTranslateIt::Util.add_fields(request)
+            request.set_form params, 'multipart/form-data'
             display.push Util.handle_response(http_connection.request(request))
           rescue Timeout::Error
             puts StringUtil.failure('Request timeout. Will retry in 5 seconds.')
@@ -117,7 +126,7 @@ module WebTranslateIt
         else
           display.push StringUtil.success('Skipped')
         end
-        puts ArrayUtil.to_columns(display)
+        puts StringUtil.array_to_columns(display)
       else
         puts StringUtil.failure("Can't push #{file_path}. File doesn't exist locally.")
       end
@@ -147,10 +156,13 @@ module WebTranslateIt
       display.push "#{StringUtil.checksumify(local_checksum.to_s)}..[     ]"
       if File.exist?(file_path)
         File.open(file_path) do |file|
-          request = Net::HTTP::Post::Multipart.new(api_url_for_create, {'name' => file_path, 'file' => UploadIO.new(file, 'text/plain', file.path)})
+          params = [['name', file_path]]
+          params += [['file', file]]
+          request = Net::HTTP::Post.new(api_url_for_create)
           WebTranslateIt::Util.add_fields(request)
+          request.set_form params, 'multipart/form-data'
           display.push Util.handle_response(http_connection.request(request))
-          puts ArrayUtil.to_columns(display)
+          puts StringUtil.array_to_columns(display)
         rescue Timeout::Error
           puts StringUtil.failure('Request timeout. Will retry in 5 seconds.')
           if (tries -= 1).positive?
@@ -181,7 +193,7 @@ module WebTranslateIt
           request = Net::HTTP::Delete.new(api_url_for_delete)
           WebTranslateIt::Util.add_fields(request)
           display.push Util.handle_response(http_connection.request(request))
-          puts ArrayUtil.to_columns(display)
+          puts StringUtil.array_to_columns(display)
         rescue Timeout::Error
           puts StringUtil.failure('Request timeout. Will retry in 5 seconds.')
           if (tries -= 1).positive?

data/lib/web_translate_it/util/hash_util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HashUtil
 
   def self.to_params(hash) # rubocop:todo Metrics/MethodLength

data/lib/web_translate_it/util/string_util.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class StringUtil
 
   def self.backward_truncate(str)
     return '...' << str[str.length - 50 + 3..str.length] if str.length > 50
 
     spaces = ''
-    (50 - str.length).times { spaces << ' ' }
-    str.dup << spaces
+    (50 - str.length).times { spaces += ' ' }
+    str + spaces
   end
 
   def self.success(str)
@@ -28,4 +30,12 @@ class StringUtil
     WebTranslateIt::Util.can_display_colors? ? "\e[1m#{str}\e[0m" : str
   end
 
+  def self.array_to_columns(array)
+    if array[0][0] == '*'
+      "*#{backward_truncate(array[0][1..])} | #{array[1]}  #{array[2]}\n"
+    else
+      " #{backward_truncate(array[0])} | #{array[1]}  #{array[2]}\n"
+    end
+  end
+
 end

data/lib/web_translate_it/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WebTranslateIt
 
   # A few useful functions
@@ -33,7 +35,8 @@ module WebTranslateIt
         return StringUtil.success('Created') if response.code.to_i == 201
         return StringUtil.success('Accepted') if response.code.to_i == 202
         return StringUtil.success('Not Modified') if response.code.to_i == 304
-        return StringUtil.failure("Locked\n                                                    (another import in progress)") if response.code.to_i == 503
+
+        StringUtil.failure("Locked\n                                                    (another import in progress)") if response.code.to_i == 503
       end
     end
     # rubocop:enable Metrics/AbcSize

data/lib/web_translate_it.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'json'
 require 'yaml'
 require 'erb'
 require 'net/http'
 require 'net/https'
-require 'net/http/post/multipart'
 require 'openssl'
 require 'uri'
 require 'multi_json'
@@ -13,7 +14,6 @@ require 'English'
 
 require 'web_translate_it/connection'
 require 'web_translate_it/util'
-require 'web_translate_it/util/array_util'
 require 'web_translate_it/util/string_util'
 require 'web_translate_it/util/hash_util'
 require 'web_translate_it/configuration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Edouard Briere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: multipart-post
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +64,6 @@ files:
 - lib/web_translate_it/translation.rb
 - lib/web_translate_it/translation_file.rb
 - lib/web_translate_it/util.rb
-- lib/web_translate_it/util/array_util.rb
 - lib/web_translate_it/util/hash_util.rb
 - lib/web_translate_it/util/string_util.rb
 - license
@@ -107,14 +92,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: A CLI tool to sync locale files with WebTranslateIt.com.

data/lib/web_translate_it/util/array_util.rb

@@ -1,25 +0,0 @@
-class ArrayUtil
-
-  def self.to_columns(arr)
-    if arr[0][0] == '*'
-      "*#{StringUtil.backward_truncate(arr[0][1..])} | #{arr[1]}  #{arr[2]}\n"
-    else
-      " #{StringUtil.backward_truncate(arr[0])} | #{arr[1]}  #{arr[2]}\n"
-    end
-  end
-
-  def self.chunk(arr, pieces = 2) # rubocop:todo Metrics/MethodLength
-    len = arr.length
-    mid = (len / pieces)
-    chunks = []
-    start = 0
-    1.upto(pieces) do |i|
-      last = start + mid
-      last -= 1 unless len % pieces >= i
-      chunks << (arr[start..last] || [])
-      start = last + 1
-    end
-    chunks
-  end
-
-end