lokalise_manager 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c30a729a77e6a27fef710604138f0fed6f0f48c019bba7cc3017ba9a70f5a8
-  data.tar.gz: db85f6500fbbe0e5728c00abb2b51290353b5a6b47a18f160ec2dbaab39a37c5
+  metadata.gz: ce9b9b942692532290c3ce12a3ff3bd10be3307b5dc02d260c39ae5eaad57c1f
+  data.tar.gz: 5d34cbe4085559ff97546bc4c631384d66850b40f77f0ab75793470bd9f53e4f
 SHA512:
-  metadata.gz: 19a205ecd21020dee1d506e0194be6ca964d0555cb7954d2eeb40ba14ab843870e056fc8e52a7ca306f791398d9e62589f272adc3419040d476e054d7435114d
-  data.tar.gz: f768da94e78938fabd30a6080e9b0cfa97510b6b07e35598951e5bd85cd831910f859f70abe5efa33473cd3d5f402349a1cadefe3147135a37a947a95edcdfaf
+  metadata.gz: 03a95203f89fea97d053c2dab70cc2b8fba87f85f79a6ed52e0805f73d9cca5a6c0a1edd6016e45faf2882764db45e7578fa2ceb37c07f6b98483fbfdaea511a
+  data.tar.gz: 866d8609f239f884b7a24caad7cdd58564156cc6f3358e2f8e94b5945b36629839bd931c42340c66736b281e67b22d08915fa3eae55e687b9c749f8ef4f84f80

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 6.2.0 (25-Feb-2025)
+
+* Strengthened configuration merging logic for `import_opts` and `export_opts` to retain default values when overridden.
+
+## 6.1.1 (20-Feb-2025)
+
+* Prevent error swallowing in rare cases
+
 ## 6.1.0 (19-Feb-2025)
 
 * Added support for `import_async` option (default to `false`). When enabled, the [import process will happen in the background](https://developers.lokalise.com/reference/download-files-async) and the gem will use exponential backoff to wait for its completion according to the `max_retries_import` option.

data/lib/lokalise_manager/global_config.rb

@@ -64,7 +64,7 @@ module LokaliseManager
 
       # Return import options with defaults
       def import_opts
-        @import_opts || {
+        defaults = {
           format: 'ruby_yaml',
           placeholder_format: :icu,
           yaml_include_root: true,
@@ -72,6 +72,8 @@ module LokaliseManager
           directory_prefix: '',
           indentation: '2sp'
         }
+
+        defaults.merge(@import_opts || {})
       end
 
       # Return export options

data/lib/lokalise_manager/task_definitions/exporter.rb

@@ -9,6 +9,8 @@ module LokaliseManager
       # Maximum number of concurrent uploads to avoid exceeding Lokalise API rate limits.
       MAX_THREADS = 6
 
+      ProcessResult = Struct.new(:success, :process, :path, :error, keyword_init: true)
+
       # Exports translation files to Lokalise in batches to optimize performance.
       #
       # - Validates configuration.
@@ -49,7 +51,7 @@ module LokaliseManager
       def raise_on_fail(thread)
         return if thread.success
 
-        raise thread.error.class, "Error while trying to upload #{thread.path}: #{thread.error.message}"
+        raise thread.error
       end
 
       # Uploads a single file to Lokalise.
@@ -60,15 +62,13 @@ module LokaliseManager
       # @param r_path [Pathname] Relative file path within the project.
       # @return [Struct] Struct containing upload status, process details, and error (if any).
       def do_upload(f_path, r_path)
-        proc_klass = Struct.new(:success, :process, :path, :error, keyword_init: true)
-
         process = with_exp_backoff(config.max_retries_export) do
           api_client.upload_file(project_id_with_branch, opts(f_path, r_path))
         end
 
-        proc_klass.new(success: true, process: process, path: f_path)
+        ProcessResult.new(success: true, process: process, path: f_path)
       rescue StandardError => e
-        proc_klass.new(success: false, path: f_path, error: e)
+        ProcessResult.new(success: false, path: f_path, error: e)
       end
 
       # Prints a message indicating that the export process is complete.

data/lib/lokalise_manager/task_definitions/importer.rb

@@ -99,8 +99,6 @@ module LokaliseManager
         Zip::File.open_buffer(open_file_or_remote(path)) do |zip|
           zip.each { |entry| process_entry(entry) if proper_ext?(entry.name) }
         end
-      rescue StandardError => e
-        raise e.class, "Error processing ZIP file: #{e.message}"
       end
 
       # Extracts data from a ZIP entry and writes it to the correct directory.
@@ -116,8 +114,6 @@ module LokaliseManager
         FileUtils.mkdir_p File.dirname(full_path)
 
         File.write(full_path, config.translations_converter.call(data), mode: 'w+:UTF-8')
-      rescue StandardError => e
-        raise e.class, "Error processing entry #{zip_entry.name}: #{e.message}"
       end
 
       # Checks whether the import should proceed under safe mode constraints.
@@ -157,8 +153,6 @@ module LokaliseManager
       # @return [Object] The result of the successful operation.
       def fetch_with_retry(&block)
         with_exp_backoff(config.max_retries_import, &block)
-      rescue StandardError => e
-        raise e.class, "Error during file download: #{e.message}"
       end
     end
   end

data/lib/lokalise_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LokaliseManager
-  VERSION = '6.1.0'
+  VERSION = '6.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: lokalise_manager
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Ilya Krukowski
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Lokalise integration for Ruby
 test_files: []