rails_i18n_manager 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f728ba9cda5d596101c9da0d9e5336ca468d9db8b9c7c15d1bd621db9e065fc9
-  data.tar.gz: 800e36c720bf9a2a2c18b9f2e286507b463cda8dbecdb3a7b67237c2faea20a7
+  metadata.gz: 42c0b085e7edbb9d009e8bccba78e937350e914d44b6d571fbfa9dab4949f23f
+  data.tar.gz: cf189df04c6de14d7796a34a9da4328d290066a81e7992048703df65d2c71c8a
 SHA512:
-  metadata.gz: 9c5fa427b474d3e313adc680decffb40f9b403e6a1cd9fa362d6c698b17170842b57d44650d0a0c19fd6f41d179f232880a16911d01f56c0e98f61ad7543daf2
-  data.tar.gz: 3cd51e42ac3cec4465cf10b3a7de4c52cca60268bccc70485a8b9ae7a1087f764e3dfe13abfdade0cbe758a12a5b7ea0cad6edcc90a48348e37e11cd512afda9
+  metadata.gz: 7318df372d6f81bfd1a53592a5ebf5e3d390233c9834fcb6aa72529922c79052c9f64ecd623dfc2ee437a1e4ee45d20d60d43410a8594574f153848ecbbd5ea4
+  data.tar.gz: eb177a2ceddceb4f928d33e4119490ce8a8a61f8112e1453f80263ddf8395ce925d990e56998e513da5e78b32b90e22d11e430132d9f0a4a6b2a960288da8b23

data/app/controllers/rails_i18n_manager/translations_controller.rb

@@ -102,10 +102,16 @@ module RailsI18nManager
         render
       else
         if @form.valid?
+          if @form.file.path.end_with?(".json")
+            parsed_file_contents = JSON.parse(@form.file.read)
+          else
+            parsed_file_contents = YAML.safe_load(@form.file.read)
+          end
+
           begin
             TranslationsImportJob.new.perform(
               translation_app_id: @form.translation_app_id,
-              import_file: @form.file.path,
+              parsed_file_contents: parsed_file_contents,
               overwrite_existing: @form.overwrite_existing,
               mark_inactive_translations: @form.mark_inactive_translations,
             )

data/app/jobs/rails_i18n_manager/translations_import_job.rb

@@ -1,24 +1,18 @@
 module RailsI18nManager
-  class TranslationsImportJob < ApplicationJob
+  class TranslationsImportJob
 
     class ImportAbortedError < StandardError; end
 
-    def perform(translation_app_id:, import_file:, overwrite_existing: false, mark_inactive_translations: false)
+    def perform(translation_app_id:, parsed_file_contents:, overwrite_existing: false, mark_inactive_translations: false)
       app_record = TranslationApp.find(translation_app_id)
 
-      if import_file.end_with?(".json")
-        translations_hash = JSON.parse(File.read(import_file))
-      else
-        translations_hash = YAML.safe_load(File.read(import_file))
-      end
-
-      new_locales = translations_hash.keys - app_record.all_locales
+      new_locales = parsed_file_contents.keys - app_record.all_locales
 
       if new_locales.any?
         raise ImportAbortedError.new("Import aborted. Locale not listed in translation app: #{new_locales.join(', ')}")
       end
 
-      all_keys = RailsI18nManager.fetch_flattened_dot_notation_keys(translations_hash)
+      all_keys = RailsI18nManager.fetch_flattened_dot_notation_keys(parsed_file_contents)
 
       key_records_by_key = app_record.translation_keys.includes(:translation_values).index_by(&:key)
 
@@ -35,7 +29,7 @@ module RailsI18nManager
         app_record.all_locales.each do |locale|
           split_keys = [locale] + key.split(".").map{|x| x}
 
-          val = translations_hash.dig(*split_keys)
+          val = parsed_file_contents.dig(*split_keys)
 
           if val.present?
             val_record = key_record.translation_values.detect{|x| x.locale == locale.to_s }

data/config/routes.rb

@@ -14,8 +14,6 @@ RailsI18nManager::Engine.routes.draw do
 
   get "/robots", to: "application#robots", constraints: ->(req){ req.format == :text }
 
-  match "*a", to: "application#render_404", via: :get
-
   get "/", to: "translations#index"
 
   root "translations#index"

data/lib/rails_i18n_manager/version.rb

@@ -1,3 +1,3 @@
 module RailsI18nManager
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_i18n_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Weston Ganger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-18 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -225,7 +225,6 @@ files:
 - app/controllers/rails_i18n_manager/translations_controller.rb
 - app/helpers/rails_i18n_manager/application_helper.rb
 - app/helpers/rails_i18n_manager/custom_form_builder.rb
-- app/jobs/rails_i18n_manager/application_job.rb
 - app/jobs/rails_i18n_manager/translations_import_job.rb
 - app/lib/rails_i18n_manager/forms/base.rb
 - app/lib/rails_i18n_manager/forms/translation_file_form.rb

data/app/jobs/rails_i18n_manager/application_job.rb

@@ -1,5 +0,0 @@
-module RailsI18nManager
-  class ApplicationJob < ActiveJob::Base
-    self.queue_adapter = :async
-  end
-end