web_translate_it 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48cb64ddfb593274e4eefbca5fde69d8ee35a1fc3c7d1776ef0fc094a64d7db5
-  data.tar.gz: 684e5a256509281d8d2913c4c14aa5d6c9757ef0cce6c9edb00f8d5f84bb90df
+  metadata.gz: 0b4f8260eedb1c889b34365fbb4d5e5f00b4907c52068a5f9ee1271eac7e0aa8
+  data.tar.gz: b872158814a7a958c873ddb603651b14aab8a2809c5ee42fbc7398d01fe71218
 SHA512:
-  metadata.gz: cb75b3f71b20995afb60038a39ce148d92d9b2abd15074a076e9abe14a04d4f0d171e89d75ce864272fa4d6d1ddce62ac5359dcdbf492bc9b10f8931247665ca
-  data.tar.gz: 28cbdd2751c994a285d71d3eee33141b2d0011a79e469375fc28d05da45d775a9e8d31e8b7de3b60b84043e18a0e603b4bfd493cc49e73da54774f1d8cc5a4bd
+  metadata.gz: 2e71ac4f5c76fb436583cd10b1f2092528eb5204a4b777a97b611eff2e55600c07f192c4844794d20c8e5dc800af5e0c73d308f074dc643917173efd5a0703e6
+  data.tar.gz: 5955c786b2a7f69f55e9ac9126d0a4637a4ecb9e286b9d810efdb1a5c58450cf183dee71601eb35454798c244c8d098f8af635e25988a4a1b30935e8eeb5fc11

data/history.md

@@ -1,3 +1,12 @@
+## Version 2.6.3 / 2022-06-14
+
+* Fix deprecation warning. #181
+* Set minimum ruby version to 2.6. It is [EOL since December 2018](https://endoflife.date/ruby), but it’s still the default ruby shipped with Mac OS Monterey.
+
+## Version 2.6.2 / 2022-04-05
+
+* Fix `wti init` command with ruby 3.1. #177
+
 ## Version 2.6.1 / 2022-03-09
 
 * Display error message for `before_pull`, `after_pull`, `before_push`, `after_push` hooks.

data/lib/web_translate_it/command_line.rb

@@ -294,7 +294,11 @@ module WebTranslateIt
         path = Util.ask(' Path to configuration file:', '.wti')
       end
       FileUtils.mkpath(path.split('/')[0..path.split('/').size - 2].join('/')) unless path.split('/').size == 1
-      project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
+      project = if RUBY_VERSION >= '3.1'
+                  YAML.safe_load WebTranslateIt::Project.fetch_info(api_key), permitted_classes: [Time]
+                else
+                  YAML.load WebTranslateIt::Project.fetch_info(api_key)
+                end
       project_info = project['project']
       if File.exist?(path) && !File.writable?(path)
         puts StringUtil.failure("Error: `#{path}` file is not writable.")
@@ -414,24 +418,32 @@ module WebTranslateIt
 
     def generate_configuration(api_key, project_info)
       <<~FILE
+        # Required - The Project API Token from WebTranslateIt.com
+        # More information: https://github.com/webtranslateit/webtranslateit/wiki#configuration-file
+
         api_key: #{api_key}
 
-        # Optional: locales not to sync with WebTranslateIt.
+        # Optional - Locales not to sync with WebTranslateIt.
+        # Takes a string, a symbol, or an array of string or symbol.
+
+        # ignore_locales: [#{project_info['source_locale']['code']}]
+
+        # Optional - Locales to sync with WebTranslateIt.
         # Takes a string, a symbol, or an array of string or symbol.
-        # More information here: https://github.com/AtelierConvivialite/webtranslateit/wiki
-        # ignore_locales: '#{project_info['source_locale']['code']}'
 
-        # Or if you prefer a list of locales to sync with WebTranslateIt:
         # needed_locales: #{project_info['target_locales'].map { |locale| locale['code'] }}
 
         # Optional: files not to sync with WebTranslateIt.
         # Takes an array of globs.
+
         # ignore_files: ['somefile*.csv']
 
-        # Optional
+        # Optional - Hooks
+        # Takes a string containing a command to run.
+
         # before_pull: "echo 'some unix command'"   # Command executed before pulling files
         # after_pull:  "touch tmp/restart.txt"      # Command executed after pulling files
-        #
+
         # before_push: "echo 'some unix command'"   # Command executed before pushing files
         # after_push:  "touch tmp/restart.txt"      # Command executed after pushing files
 

data/lib/web_translate_it/configuration.rb

@@ -17,7 +17,7 @@ module WebTranslateIt
       self.path           = root_path
       self.logger         = logger
       if File.exist?(File.expand_path(path_to_config_file, path))
-        self.api_key        = ENV['WTI_PROJECT_API_KEY'] || configuration['api_key']
+        self.api_key        = ENV.fetch('WTI_PROJECT_API_KEY') { configuration['api_key'] }
         self.before_pull    = configuration['before_pull']
         self.after_pull     = configuration['after_pull']
         self.before_push    = configuration['before_push']

data/lib/web_translate_it/translation_file.rb

@@ -99,7 +99,7 @@ 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, 'low_priority' => low_priority, 'minor_changes' => minor_changes }
+            params = { 'file' => Multipart::Post::UploadIO.new(file, 'text/plain', file.path), 'merge' => merge, 'ignore_missing' => ignore_missing, 'label' => label, 'low_priority' => low_priority, '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)
@@ -150,7 +150,7 @@ 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), 'low_priority' => low_priority })
+          request = Net::HTTP::Post::Multipart.new(api_url_for_create, { 'name' => file_path, 'file' => Multipart::Post::UploadIO.new(file, 'text/plain', file.path), 'low_priority' => low_priority })
           WebTranslateIt::Util.add_fields(request)
           display.push Util.handle_response(http_connection.request(request))
           puts ArrayUtil.to_columns(display)

data/lib/web_translate_it/util/array_util.rb

@@ -1,7 +1,7 @@
 class ArrayUtil
   def self.to_columns(arr)
     if arr[0][0] == '*'
-      "*#{StringUtil.backward_truncate(arr[0][1..-1])} | #{arr[1]}  #{arr[2]}\n"
+      "*#{StringUtil.backward_truncate(arr[0][1..])} | #{arr[1]}  #{arr[2]}\n"
     else
       " #{StringUtil.backward_truncate(arr[0])} | #{arr[1]}  #{arr[2]}\n"
     end

data/readme.md

@@ -1,6 +1,6 @@
 # WebTranslateIt Synchronization Tool : wti
 
-[RubyDoc](https://rubydoc.info/github/webtranslateit/webtranslateit/master) |
+[RubyDoc](https://www.rubydoc.info/gems/web_translate_it/) |
 [Report a bug](https://github.com/webtranslateit/webtranslateit/issues) |
 [Support](https://webtranslateit.com/support) |
 [WebTranslateIt.com Homepage](https://webtranslateit.com)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.3
 platform: ruby
 authors:
 - Edouard Briere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -156,12 +156,6 @@ files:
 - man/wti.1.html
 - man/wti.1.ron
 - readme.md
-- spec/examples/config/translation.yml
-- spec/examples/en.yml
-- spec/spec_helper.rb
-- spec/web_translate_it/auto_fetch_spec.rb
-- spec/web_translate_it/string_spec.rb
-- spec/web_translate_it/term_spec.rb
 homepage: https://webtranslateit.com
 licenses:
 - MIT
@@ -183,21 +177,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A CLI tool to sync locale files with WebTranslateIt.com.
-test_files:
-- spec/web_translate_it/auto_fetch_spec.rb
-- spec/web_translate_it/term_spec.rb
-- spec/web_translate_it/string_spec.rb
-- spec/spec_helper.rb
-- spec/examples/config/translation.yml
-- spec/examples/en.yml
+test_files: []

data/spec/examples/config/translation.yml

@@ -1,9 +0,0 @@
-# The Project API Token from Web Translate It
-api_key: 4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2
-
-# Optional: locales not to sync with Web Translate It.
-# eg. [:en, :fr] or just 'en'
-# ignore_locales: :en
-
-# Silence SSL errors
-# silence_errors: true

data/spec/examples/en.yml

@@ -1,38 +0,0 @@
-en:
-  activerecord:
-    errors:
-      templates:
-        header:
-          one: "1 error prohibited this {{model}} from being saved"
-          other: "{{count}} errors prohibited this {{model}} from being saved"
-          body: "there were problems with the following fields:"
-          messages:
-            accepted: "must be accepted"
-            blank: "can't be blank"
-            confirmation: "doesn't match confirmation"
-            empty: "can't be empty"
-            equal_to: "must be equal to {{count}}"
-            even: "must be even"
-            exclusion: "is reserved"
-            greater_than: "must be greater than {{count}}"
-            greater_than_or_equal_to: "must be greater than or equal to {{count}}"
-            inclusion: "is not included in the list"
-            invalid: "is invalid"
-            less_than: "must be less than {{count}}"
-            less_than_or_equal_to: "must be less than or equal to {{count}}"
-            not_a_number: "is not a number"
-            odd: "must be odd"
-            taken: "is already taken"
-            too_long: "is too long (maximum is {{count}} characters)"
-            too_short: "is too short (minimum is {{count}} characters)"
-            wrong_length: "is the wrong length (should be {{count}} characters)" 
-      models:
-        invitation:
-          attributes:
-            email:
-              user_already_invited: "This user has already been invited"
-              user_already_member: "This user is already a member"
-        project_file:
-          attributes:
-            file:
-              file_format_not_supported: "Sorry, we currenly support only Gettext .pot/.po, .yml/.yaml and .strings"

data/spec/spec_helper.rb

@@ -1,11 +0,0 @@
-if ENV['COVERAGE']
-  require 'simplecov'
-  SimpleCov.start
-end
-
-require File.expand_path('../lib/web_translate_it', __dir__)
-require 'rspec'
-
-class I18n
-  def self.reload!; end
-end

data/spec/web_translate_it/auto_fetch_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe WebTranslateIt::AutoFetch do
-  let(:application) { double(:application, call: []) }
-
-  let(:env) do
-    { 'PATH_INFO' => path }
-  end
-
-  subject { described_class.new(application) }
-
-  before { WebTranslateIt.stub(:fetch_translations) }
-
-  after { subject.call(env) }
-
-  context 'path is /' do
-    let(:path) { '/' }
-
-    it 'should call the application' do
-      application.should_receive(:call).with(env)
-    end
-
-    it 'should update the translations' do
-      WebTranslateIt.should_receive(:fetch_translations)
-    end
-
-    it 'should reload the I18n definitions' do
-      I18n.should_receive(:reload!)
-    end
-  end
-
-  context 'path is /assets/application.js' do
-    let(:path) { '/assets/application.js' }
-
-    it 'should call the application' do
-      application.should_receive(:call).with(env)
-    end
-
-    it 'should not update the translations' do
-      WebTranslateIt.should_not_receive(:fetch_translations)
-    end
-
-    it 'should not reload the I18n definitions' do
-      I18n.should_not_receive(:reload!)
-    end
-  end
-end

data/spec/web_translate_it/string_spec.rb

@@ -1,153 +0,0 @@
-require 'spec_helper'
-
-describe WebTranslateIt::String do
-  let(:api_key) { 'proj_pvt_glzDR250FLXlMgJPZfEyHQ' }
-
-  describe '#initialize' do
-    it 'should assign api_key and many parameters' do
-      string = WebTranslateIt::String.new({ 'id' => 1234, 'key' => 'bacon' })
-      string.id.should == 1234
-      string.key.should == 'bacon'
-    end
-
-    it 'should assign parameters using symbols' do
-      string = WebTranslateIt::String.new({ id: 1234, key: 'bacon' })
-      string.id.should == 1234
-      string.key.should == 'bacon'
-    end
-  end
-
-  describe '#save' do
-    it 'should create a new String' do
-      WebTranslateIt::Connection.new(api_key) do
-        string = WebTranslateIt::String.new({ 'key' => 'bacon' })
-        string.save
-        string.id.should_not be_nil
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.should_not be_nil
-        string_fetched.should be_a(WebTranslateIt::String)
-        string_fetched.id.should == string.id
-        string.delete
-      end
-    end
-
-    it 'should update an existing String' do
-      WebTranslateIt::Connection.new(api_key) do
-        string = WebTranslateIt::String.new({ 'key' => 'bacony' })
-        string.save
-        string.key = 'bacon changed'
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.key.should == 'bacon changed'
-        string.delete
-      end
-    end
-
-    it 'should create a new String with Translation' do
-      translation1 = WebTranslateIt::Translation.new({ 'locale' => 'en', 'text' => 'Hello' })
-      translation2 = WebTranslateIt::Translation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-
-      string = WebTranslateIt::String.new({ 'key' => 'bacon', 'translations' => [translation1, translation2] })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('en').should_not be_nil
-        string_fetched.translation_for('en').text.should == 'Hello'
-        string_fetched.translation_for('fr').should_not be_nil
-        string_fetched.translation_for('fr').text.should == 'Bonjour'
-        string_fetched.translation_for('es').should be_nil
-        string.delete
-      end
-    end
-
-    it 'should update a String and save its Translation' do
-      translation1 = WebTranslateIt::Translation.new({ 'locale' => 'en', 'text' => 'Hello' })
-      translation2 = WebTranslateIt::Translation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-
-      string = WebTranslateIt::String.new({ 'key' => 'bacon' })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('fr').should be_nil
-
-        string_fetched.translations = [translation1, translation2]
-        string_fetched.save
-
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('en').should_not be_nil
-        string_fetched.translation_for('en').text.should == 'Hello'
-        string_fetched.translation_for('fr').should_not be_nil
-        string_fetched.translation_for('fr').text.should == 'Bonjour'
-        string.delete
-      end
-    end
-  end
-
-  describe '#delete' do
-    it 'should delete a String' do
-      string = WebTranslateIt::String.new({ 'key' => 'bacon' })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.should_not be_nil
-
-        string_fetched.delete
-        WebTranslateIt::String.find(string.id).should be_nil
-      end
-    end
-  end
-
-  describe '#find_all' do
-    it 'should find many strings' do
-      WebTranslateIt::Connection.new(api_key) do
-        string1 = WebTranslateIt::String.new({ 'key' => 'one two three' })
-        string1.save
-        string2 = WebTranslateIt::String.new({ 'key' => 'four five six' })
-        string2.save
-        string3 = WebTranslateIt::String.new({ 'key' => 'six seven eight' })
-        string3.save
-
-        strings = WebTranslateIt::String.find_all({ 'key' => 'six' })
-        strings.count.should == 2
-        strings[0].key.should == 'four five six'
-        strings[1].key.should == 'six seven eight'
-
-        strings = WebTranslateIt::String.find_all({ key: 'six' })
-        strings.count.should == 2
-        strings[0].key.should == 'four five six'
-        strings[1].key.should == 'six seven eight'
-
-        strings = WebTranslateIt::String.find_all({ 'key' => 'eight' })
-        strings.count.should == 1
-        strings[0].key.should == 'six seven eight'
-
-        strings = WebTranslateIt::String.find_all({ 'key' => 'three' })
-        strings.count.should == 1
-        strings[0].key.should == 'one two three'
-      end
-    end
-  end
-
-  describe '#translation_for' do
-    it 'should fetch translations' do
-      translation = WebTranslateIt::Translation.new({ 'locale' => 'en', 'text' => 'Hello' })
-      string = WebTranslateIt::String.new({ 'key' => 'greetings', 'translations' => [translation] })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('en').should_not be_nil
-        string_fetched.translation_for('en').text.should == 'Hello'
-        string_fetched.translation_for('fr').should be_nil
-        string.delete
-      end
-    end
-
-    it 'should not return a stale object' do
-      string = WebTranslateIt::String.new({ key: 'greetings 2' })
-      translation = WebTranslateIt::Translation.new({ locale: 'es', text: 'text', string_id: string.id })
-      string.translations << translation
-      string.translation_for('fr').should be_nil
-      string.translation_for('es').should_not be_nil
-    end
-  end
-end

data/spec/web_translate_it/term_spec.rb

@@ -1,121 +0,0 @@
-require 'spec_helper'
-
-describe WebTranslateIt::Term do
-  let(:api_key) { 'proj_pvt_glzDR250FLXlMgJPZfEyHQ' }
-
-  describe '#initialize' do
-    it 'should assign api_key and many parameters' do
-      term = WebTranslateIt::Term.new({ 'id' => 1234, 'text' => 'bacon' })
-      term.id.should == 1234
-      term.text.should == 'bacon'
-    end
-
-    it 'should assign parameters using symbols' do
-      term = WebTranslateIt::Term.new({ id: 1234, text: 'bacon' })
-      term.id.should == 1234
-      term.text.should == 'bacon'
-    end
-  end
-
-  describe '#save' do
-    it 'should create a new Term' do
-      WebTranslateIt::Connection.new(api_key) do
-        term = WebTranslateIt::Term.new({ 'text' => 'Term', 'description' => 'A description' })
-        term.save
-        term.id.should_not be_nil
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.should_not be_nil
-        term_fetched.should be_a(WebTranslateIt::Term)
-        term_fetched.id.should == term.id
-        term.delete
-      end
-    end
-
-    it 'should update an existing Term' do
-      WebTranslateIt::Connection.new(api_key) do
-        term = WebTranslateIt::Term.new({ 'text' => 'Term 2', 'description' => 'A description' })
-        term.save
-        term.text = 'A Term'
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.text.should == 'A Term'
-        term.delete
-      end
-    end
-
-    it 'should create a new Term with a TermTranslation' do
-      translation1 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-      translation2 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Salut' })
-
-      term = WebTranslateIt::Term.new({ 'text' => 'Hello', 'translations' => [translation1, translation2] })
-      WebTranslateIt::Connection.new(api_key) do
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.translation_for('fr').should_not be_nil
-        term_fetched.translation_for('fr')[0].text.should == 'Salut'
-        term_fetched.translation_for('fr')[1].text.should == 'Bonjour'
-        term_fetched.translation_for('es').should be_nil
-        term.delete
-      end
-    end
-
-    it 'should update a Term and save its Translation' do
-      translation1 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-      translation2 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Salut' })
-
-      term = WebTranslateIt::Term.new({ 'text' => 'Hi!' })
-      WebTranslateIt::Connection.new(api_key) do
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.translation_for('fr').should be_nil
-
-        term_fetched.translations = [translation1, translation2]
-        term_fetched.save
-
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.translation_for('fr').should_not be_nil
-        term_fetched.translation_for('fr')[0].text.should == 'Salut'
-        term_fetched.translation_for('fr')[1].text.should == 'Bonjour'
-        term.delete
-      end
-    end
-  end
-
-  describe '#delete' do
-    it 'should delete a Term' do
-      term = WebTranslateIt::Term.new({ 'text' => 'bacon' })
-      WebTranslateIt::Connection.new(api_key) do
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.should_not be_nil
-
-        term_fetched.delete
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.should be_nil
-      end
-    end
-  end
-
-  describe '#find_all' do
-    it 'should fetch many terms' do
-      WebTranslateIt::Connection.new(api_key) do
-        terms = WebTranslateIt::Term.find_all
-        count = terms.count
-
-        term1 = WebTranslateIt::Term.new({ 'text' => 'greeting 1' })
-        term1.save
-        term2 = WebTranslateIt::Term.new({ 'text' => 'greeting 2' })
-        term2.save
-        term3 = WebTranslateIt::Term.new({ 'text' => 'greeting 3' })
-        term3.save
-
-        terms = WebTranslateIt::Term.find_all
-        count - terms.count.should == 3
-
-        term1.delete
-        term2.delete
-        term3.delete
-      end
-    end
-  end
-end