rails_i18n_manager 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f728ba9cda5d596101c9da0d9e5336ca468d9db8b9c7c15d1bd621db9e065fc9
-  data.tar.gz: 800e36c720bf9a2a2c18b9f2e286507b463cda8dbecdb3a7b67237c2faea20a7
+  metadata.gz: 3398a11d93b08bd8d36e596876a4022bd6317cf45f99f69884652e39a66637ae
+  data.tar.gz: 1c2e294199f783bdd8edffea56742e20de92368e4e12cd386c8203d3fc4d640b
 SHA512:
-  metadata.gz: 9c5fa427b474d3e313adc680decffb40f9b403e6a1cd9fa362d6c698b17170842b57d44650d0a0c19fd6f41d179f232880a16911d01f56c0e98f61ad7543daf2
-  data.tar.gz: 3cd51e42ac3cec4465cf10b3a7de4c52cca60268bccc70485a8b9ae7a1087f764e3dfe13abfdade0cbe758a12a5b7ea0cad6edcc90a48348e37e11cd512afda9
+  metadata.gz: a5e012eac4960dd31575b95670eef389abee24fce0e5e12111e6d38d401bf2dc518d46c169679609c1108015a8c2762c99f3a84f1a10b8bcdfbe65f2d41c086f
+  data.tar.gz: 9b8b8ec138663a5d6a536f5db8b5a743ae870a9ac07addbf5246decbbff84427af676158165a4db15599e2ce9e7ca51572a87aeb7bd59d0be97f55b83e977ab5

data/app/controllers/rails_i18n_manager/translations_controller.rb

@@ -96,20 +96,21 @@ module RailsI18nManager
     end
 
     def import
-      @form = Forms::TranslationFileForm.new(params[:import_form])
-
       if request.get?
+        @form = Forms::TranslationFileForm.new
         render
       else
+        @form = Forms::TranslationFileForm.new(params[:import_form])
+
         if @form.valid?
           begin
-            TranslationsImportJob.new.perform(
+            TranslationsImporter.import(
               translation_app_id: @form.translation_app_id,
-              import_file: @form.file.path,
+              parsed_file_contents: @form.parsed_file_contents,
               overwrite_existing: @form.overwrite_existing,
               mark_inactive_translations: @form.mark_inactive_translations,
             )
-          rescue TranslationsImportJob::ImportAbortedError => e
+          rescue TranslationsImporter::ImportAbortedError => e
             flash.now.alert = e.message
             render
             return
@@ -117,7 +118,7 @@ module RailsI18nManager
 
           redirect_to translations_path, notice: "Import Successful"
         else
-          flash.now.alert = "Import not started due to form errors."
+          flash.now.alert = "Please see form errors below"
           render
         end
       end

data/app/lib/rails_i18n_manager/forms/translation_file_form.rb

@@ -17,36 +17,53 @@ module RailsI18nManager
         @mark_inactive_translations = ["1", "true", "t"].include?(val.to_s.downcase)
       end
 
+      def file_extname
+        @file_extname ||= File.extname(file)
+      end
+
+      def file_contents_string
+        @file_contents_string ||= file.read
+      end
+
+      def parsed_file_contents
+        if defined?(@parsed_file_contents)
+          return @parsed_file_contents
+        end
+
+        case file_extname
+        when ".yml", ".yaml"
+          @parsed_file_contents = YAML.safe_load(file_contents_string)
+        when ".json"
+          @parsed_file_contents = JSON.parse(file_contents_string)
+        end
+      end
+
       def validate_file
         if file.blank?
           errors.add(:file, "Must upload a valid translation file.")
           return
         end
 
-        file_extname = File.extname(file)
-
         if [".yml", ".yaml", ".json"].exclude?(file_extname)
           errors.add(:file, "Invalid file format. Must be yaml or json file.")
           return
         end
 
-        file_contents = File.read(file)
-
-        if file_contents.blank?
+        if file_contents_string.blank?
           errors.add(:file, "Empty file provided.")
           return
         end
 
         case file_extname
         when ".yml", ".yaml"
-          if !YAML.safe_load(file_contents).is_a?(Hash)
+          if !parsed_file_contents.is_a?(Hash)
             errors.add(:file, "Invalid #{file_extname.sub(".","")} file.")
             return
           end
 
         when ".json"
           begin
-            JSON.parse(file_contents)
+            parsed_file_contents
           rescue JSON::ParserError
             errors.add(:file, "Invalid json file.")
             return

data/app/{jobs/rails_i18n_manager/translations_import_job.rb → lib/rails_i18n_manager/translations_importer.rb}

@@ -1,24 +1,18 @@
 module RailsI18nManager
-  class TranslationsImportJob < ApplicationJob
+  class TranslationsImporter
 
     class ImportAbortedError < StandardError; end
 
-    def perform(translation_app_id:, import_file:, overwrite_existing: false, mark_inactive_translations: false)
+    def self.import(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,18 @@ module RailsI18nManager
         app_record.all_locales.each do |locale|
           split_keys = [locale] + key.split(".").map{|x| x}
 
-          val = translations_hash.dig(*split_keys)
+          val = nil
+
+          current_hash = parsed_file_contents
+
+          split_keys.each do |k|
+            if current_hash[k].is_a?(Hash)
+              current_hash = current_hash[k]
+            else
+              val = current_hash[k]
+              break
+            end
+          end
 
           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.2".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.2
 platform: ruby
 authors:
 - Weston Ganger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-18 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -225,11 +225,10 @@ 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
 - app/lib/rails_i18n_manager/google_translate.rb
+- app/lib/rails_i18n_manager/translations_importer.rb
 - app/models/rails_i18n_manager/application_record.rb
 - app/models/rails_i18n_manager/translation_app.rb
 - app/models/rails_i18n_manager/translation_key.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