rails_translation_manager 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e7ef3e878a1b5ffc7ae48ad8f683887e79073b3f34a5a3439656f5f7abb6e20
-  data.tar.gz: 2aac75f9cae7275812da73da0973de515baf0d78eb63e64182e683f8717696ca
+  metadata.gz: fbbde3519b97f6c9881189908af474ef24b5ad5dae1a3c6e3a590df8ca4b9885
+  data.tar.gz: f6ad0e6bf5584f6fa9db3b39d3a7d52c1b04786368c9297090a480690e2cf1e7
 SHA512:
-  metadata.gz: f0b2fa6abaadb21ea912976b1092c6459ea0194a8e19092c522e38224da218395d230936d0d4a0aa830e3d37bd9f6eb6ac1e4909bd5406369c0aa99d1a4d13f4
-  data.tar.gz: 0dbbefe8208052b63f5ddc80734340ed7985b199f9113aaf5457c48d50e34e889e7379a20c61963b002343f4fb0d35aacc0307b442a15a2b7fbdea77c25349dd
+  metadata.gz: befae5c31f13ce323a367033180d58d7969220cde8eded8dd213a0de5405fd82246f0b775c3761d45e2412b25699630538896d6b2ec9692a4f030ea751f9282c
+  data.tar.gz: 25979414b9918d47b58e3f87caa2ba967dcca0bc233c37854f270b8e93f0f95940b3c0f54b7f658ea4ed144b463b740569bebe4c0dfd98907a8e82d02c10fd6f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.3
+
+Handle importing files that contain rows with a blank "key". https://github.com/alphagov/rails_translation_manager/pull/28
+
 ## 1.1.2
 
 Handle importing files that contain Byte Order Marks. https://github.com/alphagov/rails_translation_manager/pull/27

data/lib/rails_translation_manager/importer.rb

@@ -15,7 +15,9 @@ class RailsTranslationManager::Importer
   end
 
   def import
-    csv = CSV.read(csv_path, encoding: "bom|utf-8", headers: true, header_converters: :downcase)
+    csv = reject_nil_keys(
+      CSV.read(csv_path, encoding: "bom|utf-8", headers: true, header_converters: :downcase)
+    )
 
     multiple_files_per_language ? import_csv_into_multiple_files(csv) : import_csv(csv)
   end
@@ -40,6 +42,14 @@ class RailsTranslationManager::Importer
     write_yaml(import_yml_path, { locale.to_s => data })
   end
 
+  def reject_nil_keys(csv)
+    csv.reject do |row|
+      nil_key = row["key"].nil?
+      puts "Invalid row: #{row.inspect} for csv_path: #{csv_path}\n" if nil_key == true
+      nil_key
+    end
+  end
+
   def parse_translation(translation)
     if translation =~ /^\[/
       values = translation.gsub(/^\[/, '').gsub(/\]$/, '').gsub("\"", '').split(/\s*,\s*/)

data/lib/rails_translation_manager/version.rb

@@ -1,3 +1,3 @@
 module RailsTranslationManager
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/lib/tasks/translation.rake

@@ -42,7 +42,7 @@ namespace :translation do
     )
     importer.import
 
-    puts "Imported CSV from: #{csv_path} to #{import_dir}"
+    puts "\nImported CSV from: #{csv_path} to #{import_dir}"
   end
 
   namespace :import do
@@ -61,7 +61,7 @@ namespace :translation do
         importer.import
       end
 
-      puts "Imported all CSVs from: #{directory} to #{import_dir}"
+      puts "\nImported all CSVs from: #{directory} to #{import_dir}"
     end
   end
 

data/spec/locales/importer/fr.csv

@@ -6,3 +6,4 @@ world_location.sentiment,:whatever,:bof
 shared.price,123,123
 shared.key1,is true,true
 shared.key2,is false,false
+,,

data/spec/rails_translation_manager/importer_spec.rb

@@ -16,6 +16,19 @@ RSpec.describe RailsTranslationManager::Importer do
     expect(File).to exist(import_directory + "/hy.yml")
   end
 
+  it "doesn't try to import a row with a blank key" do
+    importer = described_class.new(
+      locale: "hy",
+      csv_path: "spec/locales/importer/fr.csv",
+      import_directory: import_directory,
+      multiple_files_per_language: false
+    )
+
+    expect { importer.import }.to output(
+      "Invalid row: #<CSV::Row \"key\":nil \"source\":nil \"translation\":nil> for csv_path: spec/locales/importer/fr.csv\n"
+    ).to_stdout
+  end
+
   context "when there is one locale file per language" do
     let(:yaml_translation_data) { YAML.load_file(import_directory + "/fr.yml")["fr"] }
 

data/spec/tasks/translation_spec.rb

@@ -15,7 +15,7 @@ describe "rake tasks" do
 
     it "outputs to stdout" do
       expect { task.execute(csv_path: csv_path) }
-        .to output("Imported CSV from: #{csv_path} to #{Rails.root.join("config", "locales")}\n")
+        .to output("\nImported CSV from: #{csv_path} to #{Rails.root.join("config", "locales")}\n")
         .to_stdout
     end
 
@@ -39,7 +39,7 @@ describe "rake tasks" do
 
     it "outputs to stdout" do
       expect { task.execute(csv_directory: csv_directory) }
-        .to output("Imported all CSVs from: #{csv_directory} to #{Rails.root.join("config", "locales")}\n")
+        .to output("\nImported all CSVs from: #{csv_directory} to #{Rails.root.join("config", "locales")}\n")
         .to_stdout
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_translation_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Edd Sowden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport