rails_translation_manager 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 234b68e06027a3335015a5818993014afea669efe42729d87f4de40efd4dc487
-  data.tar.gz: 54a16b4f583813415a6801c62fda5eb9ee603e84bf65206700c0bc33b295b238
+  metadata.gz: 6e7ef3e878a1b5ffc7ae48ad8f683887e79073b3f34a5a3439656f5f7abb6e20
+  data.tar.gz: 2aac75f9cae7275812da73da0973de515baf0d78eb63e64182e683f8717696ca
 SHA512:
-  metadata.gz: 2ab59ec749b2827c011728fe5711c850099d379d9089c2d73fc112def0f02c994b58ed646f42fe106c2d15d56cd5aaad1db636d7afe1504740109b57baca3c2f
-  data.tar.gz: 9313168a8704e4985ae4a57d89fb6bc8dc47a5ac2f1ae6cdd73686aeec0fe657617776620db6a65c0c45b708ec2de06dc390d546509198a836b6ff7a14212ca3
+  metadata.gz: f0b2fa6abaadb21ea912976b1092c6459ea0194a8e19092c522e38224da218395d230936d0d4a0aa830e3d37bd9f6eb6ac1e4909bd5406369c0aa99d1a4d13f4
+  data.tar.gz: 0dbbefe8208052b63f5ddc80734340ed7985b199f9113aaf5457c48d50e34e889e7379a20c61963b002343f4fb0d35aacc0307b442a15a2b7fbdea77c25349dd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.2
+
+Handle importing files that contain Byte Order Marks. https://github.com/alphagov/rails_translation_manager/pull/27
+
 ## 1.1.1
 
 Fix Rails Translation Manager / Rails naming clash for class. https://github.com/alphagov/rails_translation_manager/pull/26

data/lib/rails_translation_manager/importer.rb

@@ -15,7 +15,7 @@ class RailsTranslationManager::Importer
   end
 
   def import
-    csv = CSV.read(csv_path, headers: true, header_converters: :downcase)
+    csv = 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

data/lib/rails_translation_manager/version.rb

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

data/rails_translation_manager.gemspec

@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails-i18n"
   spec.add_dependency "activesupport"
+  spec.add_dependency "csv", "~> 3.2"
   spec.add_dependency "i18n-tasks"
+  spec.add_dependency "rails-i18n"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

data/spec/locales/importer/hy_with_byte_order_mark.csv

@@ -0,0 +1,4 @@
+key,source,translation
+unpublishing.title,The page you're looking for is no longer available,Ձեր փնտրած էջն այլևս հասանելի չէ
+working_group.contact_details,Contact details,Կոնտակտային տվյալներ
+working_group.policies,Policies,Քաղաքականություններ

data/spec/rails_translation_manager/importer_spec.rb

@@ -4,6 +4,18 @@ require "tmpdir"
 RSpec.describe RailsTranslationManager::Importer do
   let(:import_directory) { Dir.mktmpdir }
 
+  it "imports CSV containing a byte order mark" do
+    importer = described_class.new(
+      locale: "hy",
+      csv_path: "spec/locales/importer/hy_with_byte_order_mark.csv",
+      import_directory: import_directory,
+      multiple_files_per_language: false
+    )
+    importer.import
+
+    expect(File).to exist(import_directory + "/hy.yml")
+  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

@@ -45,14 +45,18 @@ describe "rake tasks" do
 
     it "calls the importer class for each target path" do
       task.execute(csv_directory: csv_directory, multiple_files_per_language: true)
-
-      expect(RailsTranslationManager::Importer)
-        .to have_received(:new)
-        .with(locale: "fr",
-              csv_path: "spec/locales/importer/fr.csv",
-              import_directory: Rails.root.join("config", "locales"),
-              multiple_files_per_language: true)
-      expect(importer_instance).to have_received(:import)
+      import_paths = Dir["spec/locales/importer/*.csv"]
+
+      import_paths.each do |csv_path|
+        expect(RailsTranslationManager::Importer)
+          .to have_received(:new)
+          .with(locale: File.basename(csv_path, ".csv"),
+                csv_path: csv_path,
+                import_directory: Rails.root.join("config", "locales"),
+                multiple_files_per_language: true)
+      end
+
+      expect(importer_instance).to have_received(:import).exactly(import_paths.count)
     end
   end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rails_translation_manager
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Edd Sowden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n-tasks
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -161,6 +175,7 @@ files:
 - spec/locales/cleaner/clean.yml
 - spec/locales/cleaner/with_whitespace.yml
 - spec/locales/importer/fr.csv
+- spec/locales/importer/hy_with_byte_order_mark.csv
 - spec/locales/in_sync/cy/browse.yml
 - spec/locales/in_sync/en/browse.yml
 - spec/locales/out_of_sync/cy.yml
@@ -208,6 +223,7 @@ test_files:
 - spec/locales/cleaner/clean.yml
 - spec/locales/cleaner/with_whitespace.yml
 - spec/locales/importer/fr.csv
+- spec/locales/importer/hy_with_byte_order_mark.csv
 - spec/locales/in_sync/cy/browse.yml
 - spec/locales/in_sync/en/browse.yml
 - spec/locales/out_of_sync/cy.yml