Merge branch 'fix/array_nil_import_and_cloud_translation'

Author: vincentvanbush

lib/lit/cloud_translation/providers/google.rb

@@ -96,6 +96,8 @@ def sanitize_text(text_or_array)
         text_or_array.gsub(/%{(.+?)}/, '<code>__LIT__\1__LIT__</code>')
       when Array
         text_or_array.map { |s| sanitize_text(s) }
+      when nil
+        ''
       else
         raise TypeError
       end

lib/lit/cloud_translation/providers/yandex.rb

@@ -63,6 +63,8 @@ def sanitize_text(text_or_array)
         text_or_array.gsub(/%{(.+?)}/, '%{_LIT_\1_LIT_}')
       when Array
         text_or_array.map { |s| sanitize_text(s) }
+      when nil
+        ''
       else
         raise TypeError
       end

lib/lit/import.rb

@@ -158,7 +158,7 @@ def concatenate_arrays(csv) # rubocop:disable Metrics/MethodLength, Metrics/AbcS
             accu[-1] = [
               row.first,
               *accu[-1].drop(1)
-                       .map { |x| Array.wrap(x) }
+                       .map { |x| Array.wrap(x).presence || [x] }
                        .zip(row.drop(1)).map(&:flatten)
             ]
           end

test/cassettes/Lit_CloudTranslation_Providers_Google/when_only_to_language_is_given/when_array_containing_nil_values_is_given/translates_array_to_target_language_converting_nil_to_.yml

@@ -0,0 +1,6 @@
+key,en,pl
+scopes.csvarray,,
+scopes.csvarray,val0 en,"val0 pl"
+scopes.csvarray,val1 en,"val1 pl"
+scopes.csvarray,,"val2 pl"
+scopes.csvarray,val3 en,

test/cassettes/Lit_CloudTranslation_Providers_Google/when_only_to_language_is_given/when_array_of_strings_is_given/translates_array_of_strings_to_target_language.yml

@@ -154,6 +154,28 @@ def setup
     end
   end
 
+  test "imports from csv preserving nil values in arrays" do
+    input = imported_file('import.csv.array_with_nil')
+    Lit::Import.call(input: input, format: 'csv')
+    new_localization_key =
+      Lit::LocalizationKey.find_by(localization_key: 'scopes.csvarray')
+      localization = lambda do |locale|
+        new_localization_key
+          .localizations
+          .joins(:locale)
+          .find_by(lit_locales: { locale: locale })
+      end
+      assert_equal(
+        localization.call('en').translated_value,
+        [nil, 'val0 en', 'val1 en', nil, 'val3 en']
+      )
+      assert_equal(
+        localization.call('pl').translated_value,
+        [nil, 'val0 pl', 'val1 pl', 'val2 pl', nil]
+      )
+
+  end
+
   def imported_file(name)
     File.read(Lit::Engine.root.join('test', 'fixtures', 'lit', 'files', name))
   end

test/cassettes/Lit_CloudTranslation_Providers_Yandex/when_only_to_language_is_given/when_array_containing_nil_values_is_given/translates_array_to_target_language_converting_nil_to_.yml

@@ -32,6 +32,18 @@ def cloud_provider_examples(described_klass)
         subject.length.must_equal 2
       end
     end
+
+    describe 'when array containing nil values is given' do
+      let(:text) { [nil, 'awesome', nil, 'stuff'] }
+
+      it 'translates array to target language, converting nil to ""' do
+        subject.first.must_equal ''
+        subject.second.must_be :present?
+        subject.third.must_equal ''
+        subject.fourth.must_be :present?
+        subject.length.must_equal 4
+      end
+    end
   end
 
   describe 'when :from and :to languages are given' do