rails_i18n_manager 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42c0b085e7edbb9d009e8bccba78e937350e914d44b6d571fbfa9dab4949f23f
-  data.tar.gz: cf189df04c6de14d7796a34a9da4328d290066a81e7992048703df65d2c71c8a
+  metadata.gz: defa73fd31070325ba7285823e0a03ace7ab8c9a5808030f26638c0019de1acd
+  data.tar.gz: 11ea4841b06c54736b5be651d5d8e50d7bb232e4aedbfeaa82f7c9883bf7b4e7
 SHA512:
-  metadata.gz: 7318df372d6f81bfd1a53592a5ebf5e3d390233c9834fcb6aa72529922c79052c9f64ecd623dfc2ee437a1e4ee45d20d60d43410a8594574f153848ecbbd5ea4
-  data.tar.gz: eb177a2ceddceb4f928d33e4119490ce8a8a61f8112e1453f80263ddf8395ce925d990e56998e513da5e78b32b90e22d11e430132d9f0a4a6b2a960288da8b23
+  metadata.gz: 95c8a9c7e660fbe4b3294eca65aceda6a3dd0c550acb41cf7abdb1aa4c585e45c529cee2b81d18ac692039d5525c07ae6b80c8a242963ff388cbd12f13db9f20
+  data.tar.gz: 79fd6614787767d5173d5b5812515dc7118f4dcfe2d9583a160c61b8760b13f7b06e8baaa5cb4a09c9ab1a60213d933d87c753db7f68881ef4ac71435d3299b0

data/app/controllers/rails_i18n_manager/translations_controller.rb

@@ -96,26 +96,21 @@ module RailsI18nManager
     end
 
     def import
-      @form = Forms::TranslationFileForm.new(params[:import_form])
-
       if request.get?
+        @form = Forms::TranslationFileForm.new
         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
+        @form = Forms::TranslationFileForm.new(params[:import_form])
 
+        if @form.valid?
           begin
-            TranslationsImportJob.new.perform(
+            TranslationsImporter.import(
               translation_app_id: @form.translation_app_id,
-              parsed_file_contents: parsed_file_contents,
+              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
@@ -123,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, permitted_classes: [Symbol])
+        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,9 +1,9 @@
 module RailsI18nManager
-  class TranslationsImportJob
+  class TranslationsImporter
 
     class ImportAbortedError < StandardError; end
 
-    def perform(translation_app_id:, parsed_file_contents:, 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)
 
       new_locales = parsed_file_contents.keys - app_record.all_locales
@@ -29,7 +29,18 @@ module RailsI18nManager
         app_record.all_locales.each do |locale|
           split_keys = [locale] + key.split(".").map{|x| x}
 
-          val = parsed_file_contents.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/app/views/layouts/rails_i18n_manager/_assets.html.slim

@@ -13,8 +13,4 @@ script src="https://cdnjs.cloudflare.com/ajax/libs/slim-select/2.4.5/slimselect.
 
 script src="https://cdnjs.cloudflare.com/ajax/libs/autosize.js/3.0.20/autosize.min.js" integrity="sha512-EAEoidLzhKrfVg7qX8xZFEAebhmBMsXrIcI0h7VPx2CyAyFHuDvOAUs9CEATB2Ou2/kuWEDtluEVrQcjXBy9yw==" crossorigin="anonymous" referrerpolicy="no-referrer"
 
-link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.min.css" integrity="sha512-IJ+BZHGlT4K43sqBGUzJ90pcxfkREDVZPZxeexRigVL8rzdw/gyJIflDahMdNzBww4k0WxpyaWpC2PLQUWmMUQ==" crossorigin="anonymous" referrerpolicy="no-referrer"
-
-link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw==" crossorigin="anonymous" referrerpolicy="no-referrer"
-
 = render "layouts/rails_i18n_manager/app_javascript"

data/app/views/rails_i18n_manager/form_builder/_basic_field.html.erb

@@ -71,6 +71,8 @@
     <% end %>
   <% elsif type == :textarea %>
     <%= f.text_area method, options[:input_html] %>
+  <% elsif type == :file %>
+    <%= f.file_field method, options[:input_html] %>
   <% else %>
     <%= f.text_field method, options[:input_html] %>
   <% end %>

data/app/views/rails_i18n_manager/translations/import.html.slim

@@ -4,7 +4,7 @@ h2.page-sub-title Import Translations from Source File
 
 .row
   .col-6
-    = custom_form_for @form, as: :import_form, url: import_translations_path, method: :post, multipart: true, html: {class: "form-horizontal"} do |f|
+    = custom_form_for @form, as: :import_form, url: import_translations_path, method: :post, html: {multipart: true, class: "form-horizontal"} do |f|
       = f.error_notification
 
       = f.field :translation_app_id, label: "App Name", type: :select, collection: RailsI18nManager::TranslationApp.order(name: :asc).pluck(:name, :id)

data/lib/rails_i18n_manager/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_i18n_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Weston Ganger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-html-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -224,11 +238,11 @@ files:
 - app/controllers/rails_i18n_manager/translation_apps_controller.rb
 - 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/translations_import_job.rb
+- app/lib/rails_i18n_manager/custom_form_builder.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