lokalise_rails 1.2.0 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02b78ecae0b5dbf76599249606858c5b24e31fc9826f8795feb34abac9d5ffb4
-  data.tar.gz: b7bc51d45b689181ae0d3d5366f507ae0e43c878c4ab55979ba54d7089eb49f7
+  metadata.gz: d8c05601cd8f8684c1523aa4b92d87d10afad700c50d197e40b6886fd4bc9412
+  data.tar.gz: ddc3d0616655b4bda4a40ecf1a96af9c17c5ef54d7c372a05bdf9eb29c2dcdee
 SHA512:
-  metadata.gz: 838ddae7af99842dbc4a7ce900c8b02a07571ff9c561e642e3bac6f92dbaabd9132f775b0ff1877ffd18fc20c1bf84ec3f7792139bad0c9fc97dec1d03389e64
-  data.tar.gz: 79c0314752c8e48b552eb78c564d24da0cd14fa41b1195909d8d06ca81913322fefa56a696f3c20d1c53c51aa16feb731c85f6fdd860242c98ad8b018b9c68ae
+  metadata.gz: 1bfb463dbed7826bf9cad245c53cca76b5ec0c0bc35ddeb42c24c0e9789e93d77adf45e12c772dfcb764e60ffbe3724ecbebb0106bbead653030db1a458df275
+  data.tar.gz: aadd4c0108d6871683c90f4d0d8647f80f072a34e0d4597ec9d4fcb97a9e9494e085b6fe93481925d71a594e0a110ef6575d0499ede0e407d517727bdb0b9baf

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 2.0.0.rc1 (12-Aug-21)
+
+* **Lokalise is introducing API rate limiting.** Access to all endpoints will be limited to 6 requests per second from 14 September, 2021. This limit is applied per API token and per IP address. If you exceed the limit, a 429 HTTP status code will be returned and a `Lokalise::Error::TooManyRequests` exception will be raised. Therefore, to overcome this issue LokaliseRails is introducing an exponential backoff mechanism for file exports. Why? Because if you have, say, 10 translation files, we'll have to send 10 separate API requests which will probably mean exceeding the limit (this is not the case with importing as we're always receiving a single archive). Thus, if the HTTP status code 429 was received, we'll do the following:
+
+```ruby
+sleep 2 ** retries
+retries += 1
+```
+
+* If the maximum number of retries has been reached LokaliseRails will re-raise the `Lokalise::Error::TooManyRequests` error and give up. By default, the maximum number of retries is set to `5` but you can control it using the `max_retries_export` option.
+* Enabled compression for the API client.
+
+## 1.4.0 (29-Jun-21)
+
+* Re-worked exception handling. Now when something goes wrong during the import or export process, this gem will re-raise all such errors (previously it just printed out some errors to the `$stdout`). If you run a Rake task, it will exit with a status code `1` and the actual error message. If you run a task programattically, you'll get an exception.
+* Dropped support for Ruby 2.5
+* Test against Ruby 3
+
+## 1.3.1 (01-Apr-21)
+
+* A bit better exception handling
+* Update dependencies
+
+## 1.3.0 (02-Feb-21)
+
+* Use ruby-lokalise-api v3
+
 ## 1.2.0 (11-Nov-20)
 
 * New option `translations_loader`

data/README.md

@@ -1,8 +1,9 @@
 # LokaliseRails
 
-[![Gem Version](https://badge.fury.io/rb/lokalise_rails.svg)](https://badge.fury.io/rb/lokalise_rails)
-[![Build Status](https://travis-ci.org/bodrovis/lokalise_rails.svg?branch=master)](https://travis-ci.org/bodrovis/lokalise_rails)
+![Gem](https://img.shields.io/gem/v/lokalise_rails)
+[![Build Status](https://travis-ci.com/bodrovis/lokalise_rails.svg?branch=master)](https://travis-ci.com/github/bodrovis/lokalise_rails)
 [![Test Coverage](https://codecov.io/gh/bodrovis/lokalise_rails/graph/badge.svg)](https://codecov.io/gh/bodrovis/lokalise_rails)
+![Downloads total](https://img.shields.io/gem/dt/lokalise_rails)
 
 This gem provides [Lokalise](http://lokalise.com) integration for Ruby on Rails and allows to exchange translation files easily. It relies on [ruby-lokalise-api](https://lokalise.github.io/ruby-lokalise-api) to send APIv2 requests.
 
@@ -133,6 +134,8 @@ en_US:
 c.skip_file_export = ->(file) { f.split[1].to_s.include?('fr') }
 ```
 
+* `max_retries_export` (`integer`) - this option is introduced to properly handle Lokalise API rate limiting during file exporting. If the HTTP status code 429 (too many requests) has been received, LokaliseRails will apply an exponential backoff mechanism with a very simple formula: `2 ** retries` (initially `retries` is `0`). If the maximum number of retries has been reached, a `Lokalise::Error::TooManyRequests` exception will be raised and the export operation will be halted. By default, LokaliseRails will make up to `5` retries which potentially means `1 + 2 + 4 + 8 + 16 + 32 = 63` seconds of waiting time. If the `max_retries_export` is less than `1`, LokaliseRails will not perform any retries and give up immediately after receiving error 429.
+
 ### Settings to work with formats other than YAML
 
 If your translation files are not in YAML format, you will need to adjust the following options:

data/lib/generators/templates/lokalise_rails_config.rb

@@ -16,6 +16,9 @@ LokaliseRails.config do |c|
   # Provide request timeouts for the Lokalise API client:
   # c.timeouts = {open_timeout: nil, timeout: nil}
 
+  # Provide maximum number of retries for file exporting:
+  # c.max_retries_export = 5
+
   # Import options have the following defaults:
   # c.import_opts = {
   #   format: 'yaml',

data/lib/lokalise_rails.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'lokalise_rails/error'
 require 'lokalise_rails/task_definition/base'
 require 'lokalise_rails/task_definition/importer'
 require 'lokalise_rails/task_definition/exporter'
@@ -9,7 +10,7 @@ module LokaliseRails
     attr_accessor :api_token, :project_id
     attr_writer :import_opts, :import_safe_mode, :export_opts, :locales_path,
                 :file_ext_regexp, :skip_file_export, :branch, :timeouts,
-                :translations_loader, :translations_converter, :lang_iso_inferer
+                :translations_loader, :translations_converter, :lang_iso_inferer, :max_retries_export
 
     # Main interface to provide configuration options for rake tasks
     def config
@@ -31,6 +32,11 @@ module LokaliseRails
       @timeouts || {}
     end
 
+    # Maximum number of retries for file exporting
+    def max_retries_export
+      @max_retries_export || 5
+    end
+
     # Regular expression used to select translation files with proper extensions
     def file_ext_regexp
       @file_ext_regexp || /\.ya?ml\z/i

data/lib/lokalise_rails/error.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module LokaliseRails
+  class Error < StandardError
+    # Initializes a new Error object
+    def initialize(message = '')
+      super(message)
+    end
+  end
+end

data/lib/lokalise_rails/task_definition/base.rb

@@ -13,7 +13,7 @@ module LokaliseRails
         #
         # @return [Lokalise::Client]
         def api_client
-          @api_client ||= ::Lokalise.client LokaliseRails.api_token, LokaliseRails.timeouts
+          @api_client ||= ::Lokalise.client LokaliseRails.api_token, {enable_compression: true}.merge(LokaliseRails.timeouts)
         end
 
         # Resets API client
@@ -25,11 +25,12 @@ module LokaliseRails
         # Checks task options
         #
         # @return Array
-        def opt_errors
+        def check_options_errors!
           errors = []
-          errors << 'Project ID is not set! Aborting...' if LokaliseRails.project_id.nil? || LokaliseRails.project_id.empty?
-          errors << 'Lokalise API token is not set! Aborting...' if LokaliseRails.api_token.nil? || LokaliseRails.api_token.empty?
-          errors
+          errors << 'Project ID is not set!' if LokaliseRails.project_id.nil? || LokaliseRails.project_id.empty?
+          errors << 'Lokalise API token is not set!' if LokaliseRails.api_token.nil? || LokaliseRails.api_token.empty?
+
+          raise(LokaliseRails::Error, errors.join(' ')) if errors.any?
         end
 
         private

data/lib/lokalise_rails/task_definition/exporter.rb

@@ -10,20 +10,13 @@ module LokaliseRails
         #
         # @return [Array]
         def export!
-          errors = opt_errors
-
-          if errors.any?
-            errors.each { |e| $stdout.puts e }
-            return errors
-          end
+          check_options_errors!
 
           queued_processes = []
           each_file do |full_path, relative_path|
-            queued_processes << api_client.upload_file(
-              project_id_with_branch, opts(full_path, relative_path)
-            )
+            queued_processes << do_upload(full_path, relative_path)
           rescue StandardError => e
-            $stdout.puts "Error while trying to upload #{full_path}: #{e.inspect}"
+            raise e.class, "Error while trying to upload #{full_path}: #{e.message}"
           end
 
           $stdout.print 'Task complete!'
@@ -31,6 +24,21 @@ module LokaliseRails
           queued_processes
         end
 
+        # Performs the actual file uploading to Lokalise. If the API rate limit is exceeed,
+        # applies exponential backoff
+        def do_upload(f_path, r_path)
+          retries = 0
+          begin
+            api_client.upload_file project_id_with_branch, opts(f_path, r_path)
+          rescue Lokalise::Error::TooManyRequests => e
+            raise(e.class, "Gave up after #{retries} retries") if retries >= LokaliseRails.max_retries_export
+
+            sleep 2**retries
+            retries += 1
+            retry
+          end
+        end
+
         # Processes each translation file in the specified directory
         def each_file
           return unless block_given?

data/lib/lokalise_rails/task_definition/importer.rb

@@ -13,12 +13,7 @@ module LokaliseRails
         #
         # @return [Boolean]
         def import!
-          errors = opt_errors
-
-          if errors.any?
-            errors.each { |e| $stdout.puts e }
-            return false
-          end
+          check_options_errors!
 
           unless proceed_when_safe_mode?
             $stdout.print 'Task cancelled!'
@@ -39,7 +34,7 @@ module LokaliseRails
 
           api_client.download_files project_id_with_branch, opts
         rescue StandardError => e
-          $stdout.puts "There was an error when trying to download files: #{e.inspect}"
+          raise e.class, "There was an error when trying to download files: #{e.message}"
         end
 
         # Opens ZIP archive (local or remote) with translations and processes its entries
@@ -49,6 +44,8 @@ module LokaliseRails
           Zip::File.open_buffer(open_file_or_remote(path)) do |zip|
             fetch_zip_entries(zip) { |entry| process!(entry) }
           end
+        rescue StandardError => e
+          raise e.class, "There was an error when trying to process the downloaded files: #{e.message}"
         end
 
         # Iterates over ZIP entries. Each entry may be a file or folder.
@@ -73,7 +70,7 @@ module LokaliseRails
             f.write LokaliseRails.translations_converter.call(data)
           end
         rescue StandardError => e
-          $stdout.puts "Error when trying to process #{zip_entry&.name}: #{e.inspect}"
+          raise e.class, "Error when trying to process #{zip_entry&.name}: #{e.message}"
         end
 
         # Checks whether the user wishes to proceed when safe mode is enabled and the target directory is not empty

data/lib/lokalise_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LokaliseRails
-  VERSION = '1.2.0'
+  VERSION = '2.0.0.rc1'
 end

data/lib/tasks/lokalise_rails_tasks.rake

@@ -6,9 +6,13 @@ require "#{Rails.root}/config/lokalise_rails"
 namespace :lokalise_rails do
   task :import do
     LokaliseRails::TaskDefinition::Importer.import!
+  rescue StandardError => e
+    abort e.inspect
   end
 
   task :export do
     LokaliseRails::TaskDefinition::Exporter.export!
+  rescue StandardError => e
+    abort e.inspect
   end
 end

data/lokalise_rails.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.extra_rdoc_files = ['README.md']
   spec.require_paths    = ['lib']
 
-  spec.add_dependency 'ruby-lokalise-api', '~> 3.1'
+  spec.add_dependency 'ruby-lokalise-api', '~> 4.0'
   spec.add_dependency 'rubyzip', '~> 2.3'
 
-  spec.add_development_dependency 'codecov', '~> 0.1'
+  spec.add_development_dependency 'codecov', '~> 0.2'
   spec.add_development_dependency 'dotenv', '~> 2.5'
   if ENV['TEST_RAILS_VERSION'].nil?
-    spec.add_development_dependency 'rails', '~> 6.0.3'
+    spec.add_development_dependency 'rails', '~> 6.1.0'
   else
     spec.add_development_dependency 'rails', ENV['TEST_RAILS_VERSION'].to_s
   end
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'rubocop', '~> 1.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.5'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.0.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.4.0'
   spec.add_development_dependency 'simplecov', '~> 0.16'
   spec.add_development_dependency 'vcr', '~> 6.0'
 end

data/spec/dummy/config/environments/test.rb

@@ -17,9 +17,7 @@ Rails.application.configure do
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
-  config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
-  }
+  config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/lib/lokalise_rails/task_definition/base_spec.rb

@@ -34,22 +34,18 @@ describe LokaliseRails::TaskDefinition::Base do
     end
   end
 
-  describe '.opt_errors' do
-    it 'returns an error when the API key is not set' do
+  describe '.check_options_errors!' do
+    it 'raises an error when the API key is not set' do
       allow(LokaliseRails).to receive(:api_token).and_return(nil)
-      errors = described_class.opt_errors
+
+      expect(-> { described_class.check_options_errors! }).to raise_error(LokaliseRails::Error, /API token is not set/i)
 
       expect(LokaliseRails).to have_received(:api_token)
-      expect(errors.length).to eq(1)
-      expect(errors.first).to include('API token is not set')
     end
 
     it 'returns an error when the project_id is not set' do
       allow_project_id nil do
-        errors = described_class.opt_errors
-
-        expect(errors.length).to eq(1)
-        expect(errors.first).to include('Project ID is not set')
+        expect(-> { described_class.check_options_errors! }).to raise_error(LokaliseRails::Error, /ID is not set/i)
       end
     end
   end

data/spec/lib/lokalise_rails/task_definition/exporter_spec.rb

@@ -7,6 +7,45 @@ describe LokaliseRails::TaskDefinition::Exporter do
   let(:path) { "#{Rails.root}/config/locales/nested/#{filename}" }
   let(:relative_name) { "nested/#{filename}" }
 
+  context 'with many translation files' do
+    let(:fake_class) { described_class }
+
+    before :all do
+      add_translation_files! with_ru: true, additional: 5
+    end
+
+    after :all do
+      rm_translation_files
+    end
+
+    describe '.export!' do
+      it 'sends a proper API request and handles rate limiting' do
+        allow_project_id '672198945b7d72fc048021.15940510'
+
+        process = VCR.use_cassette('upload_files_multiple') do
+          described_class.export!
+        end.first
+
+        expect(process.project_id).to eq(LokaliseRails.project_id)
+        expect(process.status).to eq('queued')
+      end
+
+      it 'handles too many requests' do
+        allow_project_id '672198945b7d72fc048021.15940510'
+        allow(LokaliseRails).to receive(:max_retries_export).and_return(2)
+
+        fake_client = double
+        allow(fake_client).to receive(:upload_file).and_raise(Lokalise::Error::TooManyRequests)
+        allow(fake_class).to receive(:api_client).and_return(fake_client)
+
+        expect(-> { fake_class.export! }).to raise_error(Lokalise::Error::TooManyRequests, /Gave up after 2 retries/i)
+        expect(LokaliseRails).to have_received(:max_retries_export).exactly(3).times
+        expect(fake_class).to have_received(:api_client).exactly(3).times
+        expect(fake_client).to have_received(:upload_file).exactly(3).times
+      end
+    end
+  end
+
   context 'with one translation file' do
     before :all do
       add_translation_files!
@@ -26,6 +65,7 @@ describe LokaliseRails::TaskDefinition::Exporter do
 
         expect(process.project_id).to eq(LokaliseRails.project_id)
         expect(process.status).to eq('queued')
+        expect(LokaliseRails.max_retries_export).to eq(5)
       end
 
       it 'sends a proper API request when a different branch is provided' do
@@ -44,13 +84,13 @@ describe LokaliseRails::TaskDefinition::Exporter do
       it 'halts when the API key is not set' do
         allow(LokaliseRails).to receive(:api_token).and_return(nil)
 
-        expect(-> { described_class.export! }).to output(/API token is not set/).to_stdout
+        expect(-> { described_class.export! }).to raise_error(LokaliseRails::Error, /API token is not set/i)
         expect(LokaliseRails).to have_received(:api_token)
       end
 
       it 'halts when the project_id is not set' do
         allow_project_id nil do
-          expect(-> { described_class.export! }).to output(/Project ID is not set/).to_stdout
+          expect(-> { described_class.export! }).to raise_error(LokaliseRails::Error, /ID is not set/i)
         end
       end
     end
@@ -107,17 +147,12 @@ describe LokaliseRails::TaskDefinition::Exporter do
     end
 
     describe '.export!' do
-      it 'rescues from export errors' do
+      it 're-raises export errors' do
         allow_project_id
 
-        processes = VCR.use_cassette('upload_files_error') do
-          described_class.export!
+        VCR.use_cassette('upload_files_error') do
+          expect { described_class.export! }.to raise_error(Lokalise::Error::BadRequest, /Unknown `lang_iso`/)
         end
-
-        expect(processes.length).to eq(1)
-        process = processes.first
-        expect(process.project_id).to eq(LokaliseRails.project_id)
-        expect(process.status).to eq('queued')
       end
     end
 

data/spec/lib/lokalise_rails/task_definition/importer_spec.rb

@@ -4,29 +4,35 @@ describe LokaliseRails::TaskDefinition::Importer do
   describe '.open_and_process_zip' do
     let(:faulty_trans) { "#{Rails.root}/public/faulty_trans.zip" }
 
-    it 'rescues from errors during file processing' do
+    it 're-raises errors during file processing' do
       expect(-> { described_class.open_and_process_zip(faulty_trans) }).
-        to output(/Psych::DisallowedClass/).to_stdout
+        to raise_error(Psych::DisallowedClass, /Error when trying to process fail\.yml/)
+    end
+
+    it 're-raises errors during file opening' do
+      expect(-> { described_class.open_and_process_zip('http://fake.url/wrong/path.zip') }).
+        to raise_error(SocketError, /Failed to open TCP connection/)
     end
   end
 
   describe '.download_files' do
     it 'returns a proper download URL' do
-      allow_project_id '189934715f57a162257d74.88352370' do
+      allow_project_id '672198945b7d72fc048021.15940510' do
         response = VCR.use_cassette('download_files') do
           described_class.download_files
         end
 
-        expect(response['project_id']).to eq('189934715f57a162257d74.88352370')
+        expect(response['project_id']).to eq('672198945b7d72fc048021.15940510')
         expect(response['bundle_url']).to include('s3-eu-west-1.amazonaws.com')
+        expect(described_class.api_client.enable_compression).to eq(true)
       end
     end
 
-    it 'rescues from errors during file download' do
+    it 're-raises errors during file download' do
       allow_project_id 'invalid'
       VCR.use_cassette('download_files_error') do
         expect(-> { described_class.download_files }).
-          to output(/Lokalise::Error::BadRequest/).to_stdout
+          to raise_error(Lokalise::Error::BadRequest, /Invalid `project_id` parameter/)
       end
     end
   end
@@ -34,14 +40,14 @@ describe LokaliseRails::TaskDefinition::Importer do
   describe '.import!' do
     it 'halts when the API key is not set' do
       allow(LokaliseRails).to receive(:api_token).and_return(nil)
-      expect(-> { described_class.import! }).to output(/API token is not set/).to_stdout
+      expect(-> { described_class.import! }).to raise_error(LokaliseRails::Error, /API token is not set/i)
       expect(LokaliseRails).to have_received(:api_token)
       expect(count_translations).to eq(0)
     end
 
     it 'halts when the project_id is not set' do
       allow_project_id nil do
-        expect(-> { described_class.import! }).to output(/Project ID is not set/).to_stdout
+        expect(-> { described_class.import! }).to raise_error(LokaliseRails::Error, /ID is not set/i)
         expect(count_translations).to eq(0)
       end
     end

data/spec/lib/lokalise_rails_spec.rb

@@ -58,6 +58,11 @@ describe LokaliseRails do
       fake_class.import_safe_mode = true
     end
 
+    it 'is possible to set max_retries_export' do
+      allow(fake_class).to receive(:max_retries_export=).with(10)
+      fake_class.max_retries_export = 10
+    end
+
     it 'is possible to set api_token' do
       allow(fake_class).to receive(:api_token=).with('abc')
       fake_class.api_token = 'abc'

data/spec/lib/tasks/export_task_spec.rb

@@ -1,7 +1,44 @@
 # frozen_string_literal: true
 
 RSpec.describe LokaliseRails do
+  it 'halts when the API key is not set' do
+    allow(described_class).to receive(:api_token).and_return(nil)
+
+    expect(export_executor).to raise_error(SystemExit, /API token is not set/i)
+    expect(described_class).to have_received(:api_token)
+  end
+
+  it 'halts when the project ID is not set' do
+    allow_project_id nil do
+      expect(export_executor).to raise_error(SystemExit, /ID is not set/i)
+    end
+  end
+
   it 'runs export rake task properly' do
     expect(export_executor).to output(/complete!/).to_stdout
   end
+
+  context 'with two translation files' do
+    let(:filename_ru) { 'ru.yml' }
+    let(:path_ru) { "#{Rails.root}/config/locales/#{filename_ru}" }
+    let(:relative_name_ru) { filename_ru }
+
+    before :all do
+      add_translation_files! with_ru: true
+    end
+
+    after :all do
+      rm_translation_files
+    end
+
+    describe '.export!' do
+      it 're-raises export errors' do
+        allow_project_id
+
+        VCR.use_cassette('upload_files_error') do
+          expect(export_executor).to raise_error(SystemExit, /Unknown `lang_iso`/)
+        end
+      end
+    end
+  end
 end

data/spec/lib/tasks/import_task_spec.rb

@@ -7,6 +7,19 @@ RSpec.describe LokaliseRails do
   let(:local_trans) { "#{Rails.root}/public/trans.zip" }
   let(:remote_trans) { 'https://github.com/bodrovis/lokalise_rails/blob/master/spec/dummy/public/trans.zip?raw=true' }
 
+  it 'halts when the API key is not set' do
+    allow(described_class).to receive(:api_token).and_return(nil)
+
+    expect(import_executor).to raise_error(SystemExit, /API token is not set/i)
+    expect(described_class).to have_received(:api_token)
+  end
+
+  it 'halts when the project ID is not set' do
+    allow_project_id nil do
+      expect(import_executor).to raise_error(SystemExit, /ID is not set/i)
+    end
+  end
+
   context 'when directory is empty' do
     before do
       mkdir_locales

data/spec/spec_helper.rb

@@ -20,7 +20,6 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
-
 require_relative '../spec/dummy/config/environment'
 ENV['RAILS_ROOT'] ||= "#{File.dirname(__FILE__)}../../../spec/dummy"
 

data/spec/support/file_manager.rb

@@ -24,16 +24,20 @@ module FileManager
     locales_dir.count { |file| File.file?(file) }
   end
 
-  def add_translation_files!(with_ru: false)
+  def add_translation_files!(with_ru: false, additional: nil)
     FileUtils.mkdir_p "#{Rails.root}/config/locales/nested"
-    File.open("#{Rails.root}/config/locales/nested/en.yml", 'w+:UTF-8') do |f|
-      f.write en_data
-    end
+    open_and_write('config/locales/nested/en.yml') { |f| f.write en_data }
 
     return unless with_ru
 
-    File.open("#{Rails.root}/config/locales/ru.yml", 'w+:UTF-8') do |f|
-      f.write ru_data
+    open_and_write('config/locales/ru.yml') { |f| f.write ru_data }
+
+    return unless additional
+
+    additional.times do |i|
+      data = {'en' => {"key_#{i}" => "value #{i}"}}
+
+      open_and_write("config/locales/en_#{i}.yml") { |f| f.write data.to_yaml }
     end
   end
 
@@ -46,9 +50,13 @@ module FileManager
       end
     DATA
 
-    File.open("#{Rails.root}/config/lokalise_rails.rb", 'w+:UTF-8') do |f|
-      f.write data
-    end
+    open_and_write('config/lokalise_rails.rb') { |f| f.write data }
+  end
+
+  def open_and_write(rel_path, &block)
+    return unless block
+
+    File.open("#{Rails.root}/#{rel_path}", 'w+:UTF-8', &block)
   end
 
   def remove_config

data/spec/support/spec_addons.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SpecAddons
-  def allow_project_id(value = ENV['LOKALISE_PROJECT_ID'])
+  def allow_project_id(value = '189934715f57a162257d74.88352370')
     allow(LokaliseRails).to receive(:project_id).and_return(value)
     return unless block_given?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokalise_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Ilya Bodrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-lokalise-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +198,7 @@ files:
 - lib/generators/lokalise_rails/install_generator.rb
 - lib/generators/templates/lokalise_rails_config.rb
 - lib/lokalise_rails.rb
+- lib/lokalise_rails/error.rb
 - lib/lokalise_rails/railtie.rb
 - lib/lokalise_rails/task_definition/base.rb
 - lib/lokalise_rails/task_definition/exporter.rb
@@ -254,11 +255,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.25
 signing_key:
 specification_version: 4
 summary: Lokalise integration for Ruby on Rails