From 5f68962800876f635ead48e95b29bbe732275461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 12:25:51 +0100 Subject: [PATCH 01/24] Added comments to output. --- lib/babelish/csv2android.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/babelish/csv2android.rb b/lib/babelish/csv2android.rb index 4ce6204..336f34a 100644 --- a/lib/babelish/csv2android.rb +++ b/lib/babelish/csv2android.rb @@ -25,7 +25,8 @@ def process_value(row_value, default_value) end def get_row_format(row_key, row_value, comment = nil, indentation = 0) - "\t#{row_value}\n" + entry = comment.to_s.empty? ? "" : "\n\n" + entry + "\t#{row_value}\n" end def hash_to_output(content = {}) @@ -35,6 +36,7 @@ def hash_to_output(content = {}) output += "\n" content.each do |key, value| output += get_row_format(key, value) + comment = @comments[key] end output += "\n" end From a9e06efadaf30eb67800de1575be2afcbcc6887d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 12:26:20 +0100 Subject: [PATCH 02/24] Added comments to output. --- lib/babelish/csv2android.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/babelish/csv2android.rb b/lib/babelish/csv2android.rb index 336f34a..fca98ad 100644 --- a/lib/babelish/csv2android.rb +++ b/lib/babelish/csv2android.rb @@ -35,8 +35,8 @@ def hash_to_output(content = {}) output += "\n" output += "\n" content.each do |key, value| - output += get_row_format(key, value) comment = @comments[key] + output += get_row_format(key, value, comment) end output += "\n" end From 19c4cd0b839bfbf089777f4e52183c50bf60153e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 12:27:51 +0100 Subject: [PATCH 03/24] Fixed typo. --- lib/babelish/csv2android.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/babelish/csv2android.rb b/lib/babelish/csv2android.rb index fca98ad..b2253c5 100644 --- a/lib/babelish/csv2android.rb +++ b/lib/babelish/csv2android.rb @@ -25,8 +25,8 @@ def process_value(row_value, default_value) end def get_row_format(row_key, row_value, comment = nil, indentation = 0) - entry = comment.to_s.empty? ? "" : "\n\n" - entry + "\t#{row_value}\n" + entry = comment.to_s.empty? ? "" : "\n\n" + entry + "\t#{row_value}\n" end def hash_to_output(content = {}) From 7ae98bb87684bb5de434f442ad1d8159c48dcdd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 12:50:25 +0100 Subject: [PATCH 04/24] Added csv2android with comments test case. --- test/babelish/test_csv2android.rb | 14 ++++++++++++++ test/data/test_data_fr_with_comments.xml | 10 ++++++++++ 2 files changed, 24 insertions(+) create mode 100644 test/data/test_data_fr_with_comments.xml diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 7bd8ee4..0e964f8 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -35,4 +35,18 @@ def test_converting_csv_to_dotstrings_one_output_option # clean up system("rm -rf ./" + single_file) end + + def test_converting_with_comments + csv_file = "test/data/test_data_with_comments.csv" + french_file = "values-fr/strings.xml" + expected_output = File.read("test/data/test_data_fr_with_comments.xml") + converter = Babelish::CSV2Android.new(csv_file, + {"French" => "fr"}, + :default_lang => "English", :comments_column => 5) + converter.convert + assert File.exists?(french_file), "the ouptut file does not exist" + result = File.read(french_file) + assert_equal expected_output, result + system("rm -rf values-fr") + end end diff --git a/test/data/test_data_fr_with_comments.xml b/test/data/test_data_fr_with_comments.xml new file mode 100644 index 0000000..d5c6c46 --- /dev/null +++ b/test/data/test_data_fr_with_comments.xml @@ -0,0 +1,10 @@ + + + + + Salut + + + testEN + + \ No newline at end of file From 0cf5dab26f021c7ea6a4792f93d9e01a644540b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 12:56:11 +0100 Subject: [PATCH 05/24] Fixed typos. --- test/babelish/test_csv2android.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 0e964f8..09a2b97 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -35,16 +35,16 @@ def test_converting_csv_to_dotstrings_one_output_option # clean up system("rm -rf ./" + single_file) end - + def test_converting_with_comments csv_file = "test/data/test_data_with_comments.csv" french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") converter = Babelish::CSV2Android.new(csv_file, - {"French" => "fr"}, + {'French' => "fr"}, :default_lang => "English", :comments_column => 5) converter.convert - assert File.exists?(french_file), "the ouptut file does not exist" + assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) assert_equal expected_output, result system("rm -rf values-fr") From 2a87a91df047e19703c4cde4523917f30265fca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 13:03:53 +0100 Subject: [PATCH 06/24] Fixed new lines indentation. --- lib/babelish/csv2android.rb | 2 +- test/data/test_data_fr_with_comments.xml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/babelish/csv2android.rb b/lib/babelish/csv2android.rb index b2253c5..8452364 100644 --- a/lib/babelish/csv2android.rb +++ b/lib/babelish/csv2android.rb @@ -25,7 +25,7 @@ def process_value(row_value, default_value) end def get_row_format(row_key, row_value, comment = nil, indentation = 0) - entry = comment.to_s.empty? ? "" : "\n\n" + entry = comment.to_s.empty? ? "" : "\n\t\n" entry + "\t#{row_value}\n" end diff --git a/test/data/test_data_fr_with_comments.xml b/test/data/test_data_fr_with_comments.xml index d5c6c46..337f6f2 100644 --- a/test/data/test_data_fr_with_comments.xml +++ b/test/data/test_data_fr_with_comments.xml @@ -6,5 +6,4 @@ testEN - - \ No newline at end of file + From feab4b1b842d68cece1bda55c8b60fa6c3076411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 13:12:55 +0100 Subject: [PATCH 07/24] Fixed indentation issue. --- test/data/test_data_fr_with_comments.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/data/test_data_fr_with_comments.xml b/test/data/test_data_fr_with_comments.xml index 337f6f2..5b0c179 100644 --- a/test/data/test_data_fr_with_comments.xml +++ b/test/data/test_data_fr_with_comments.xml @@ -1,9 +1,9 @@ - - - Salut - - - testEN + + + Salut + + + testEN From d8757ebfb18378412ae97ccb7c8268a30abce63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 13:15:53 +0100 Subject: [PATCH 08/24] Fixed style. --- test/babelish/test_csv2android.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 09a2b97..765ca6d 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -41,8 +41,9 @@ def test_converting_with_comments french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") converter = Babelish::CSV2Android.new(csv_file, - {'French' => "fr"}, - :default_lang => "English", :comments_column => 5) + {"French" => "fr"}, + :default_lang => "English", + :comments_column => 5) converter.convert assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) From f857e06946317360afe8a656a778419180247b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 13:19:20 +0100 Subject: [PATCH 09/24] Fixed typos. --- test/babelish/test_csv2android.rb | 2 +- test/data/test_data_fr_with_comments.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 765ca6d..7af2a2a 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -41,7 +41,7 @@ def test_converting_with_comments french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") converter = Babelish::CSV2Android.new(csv_file, - {"French" => "fr"}, + { "French" => "fr" }, :default_lang => "English", :comments_column => 5) converter.convert diff --git a/test/data/test_data_fr_with_comments.xml b/test/data/test_data_fr_with_comments.xml index 5b0c179..70119a6 100644 --- a/test/data/test_data_fr_with_comments.xml +++ b/test/data/test_data_fr_with_comments.xml @@ -3,7 +3,7 @@ Salut - + testEN From f1375abe99abe9db7a1b9071498f03b97b71e4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Tue, 12 Jan 2016 13:22:27 +0100 Subject: [PATCH 10/24] Replaced single with double quotes. --- test/babelish/test_csv2android.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 7af2a2a..c660878 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -3,7 +3,7 @@ class TestCSV2Android < Test::Unit::TestCase def test_converting_csv_to_xml csv_file = "test/data/test_data.csv" - converter = Babelish::CSV2Android.new(csv_file, 'English' => "en") + converter = Babelish::CSV2Android.new(csv_file, "English" => "en") converter.convert assert File.exist?("values-en/strings.xml"), "the ouptut file does not exist" @@ -24,10 +24,10 @@ def test_converting_csv_with_special_chars def test_converting_csv_to_dotstrings_one_output_option csv_file = "test/data/test_data.csv" - single_file = 'myApp.xml' + single_file = "myApp.xml" converter = Babelish::CSV2Android.new(csv_file, - {'English' => "en"}, - :output_basename => 'myApp', + {"English" => "en"}, + :output_basename => "myApp", :ignore_lang_path => true) converter.convert assert File.exist?(single_file), "the ouptut file does not exist" From 2528ec9f3e7da583ee6cdd9928a8136e38e598dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:04:06 +0100 Subject: [PATCH 11/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index c660878..506ea57 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -26,7 +26,7 @@ def test_converting_csv_to_dotstrings_one_output_option csv_file = "test/data/test_data.csv" single_file = "myApp.xml" converter = Babelish::CSV2Android.new(csv_file, - {"English" => "en"}, + { "English" => "en" }, :output_basename => "myApp", :ignore_lang_path => true) converter.convert From 1a1498e1b34538683ac473a75a76789ba8a5edb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:11:28 +0100 Subject: [PATCH 12/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 506ea57..087cef3 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -3,7 +3,8 @@ class TestCSV2Android < Test::Unit::TestCase def test_converting_csv_to_xml csv_file = "test/data/test_data.csv" - converter = Babelish::CSV2Android.new(csv_file, "English" => "en") + converter = Babelish::CSV2Android.new(csv_file, + "English" => "en") converter.convert assert File.exist?("values-en/strings.xml"), "the ouptut file does not exist" @@ -13,7 +14,8 @@ def test_converting_csv_to_xml def test_converting_csv_with_special_chars csv_file = "test/data/android_special_chars.csv" - converter = Babelish::CSV2Android.new(csv_file, "german" => "de") + converter = Babelish::CSV2Android.new(csv_file, + "german" => "de") converter.convert assert File.exist?("values-de/strings.xml"), "the ouptut file does not exist" assert_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml") @@ -48,6 +50,8 @@ def test_converting_with_comments assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) assert_equal expected_output, result + + # clean up system("rm -rf values-fr") end end From f90246cfddc6bcc7d044f79ca53e71af4746708a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:14:08 +0100 Subject: [PATCH 13/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 087cef3..62caf89 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -4,7 +4,7 @@ class TestCSV2Android < Test::Unit::TestCase def test_converting_csv_to_xml csv_file = "test/data/test_data.csv" converter = Babelish::CSV2Android.new(csv_file, - "English" => "en") + "English" => "en") converter.convert assert File.exist?("values-en/strings.xml"), "the ouptut file does not exist" @@ -15,7 +15,7 @@ def test_converting_csv_to_xml def test_converting_csv_with_special_chars csv_file = "test/data/android_special_chars.csv" converter = Babelish::CSV2Android.new(csv_file, - "german" => "de") + "german" => "de") converter.convert assert File.exist?("values-de/strings.xml"), "the ouptut file does not exist" assert_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml") @@ -28,7 +28,7 @@ def test_converting_csv_to_dotstrings_one_output_option csv_file = "test/data/test_data.csv" single_file = "myApp.xml" converter = Babelish::CSV2Android.new(csv_file, - { "English" => "en" }, + { "English" => "en" }, :output_basename => "myApp", :ignore_lang_path => true) converter.convert @@ -43,7 +43,7 @@ def test_converting_with_comments french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") converter = Babelish::CSV2Android.new(csv_file, - { "French" => "fr" }, + { "French" => "fr" }, :default_lang => "English", :comments_column => 5) converter.convert @@ -51,7 +51,7 @@ def test_converting_with_comments result = File.read(french_file) assert_equal expected_output, result - # clean up + # clean up system("rm -rf values-fr") end end From 8879cab7dbba0e6e24348603f3c9e5c0c586d0b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:15:48 +0100 Subject: [PATCH 14/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 62caf89..285f314 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -15,7 +15,7 @@ def test_converting_csv_to_xml def test_converting_csv_with_special_chars csv_file = "test/data/android_special_chars.csv" converter = Babelish::CSV2Android.new(csv_file, - "german" => "de") + "german" => "de") converter.convert assert File.exist?("values-de/strings.xml"), "the ouptut file does not exist" assert_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml") @@ -28,7 +28,7 @@ def test_converting_csv_to_dotstrings_one_output_option csv_file = "test/data/test_data.csv" single_file = "myApp.xml" converter = Babelish::CSV2Android.new(csv_file, - { "English" => "en" }, + { "English" => "en" }, :output_basename => "myApp", :ignore_lang_path => true) converter.convert @@ -43,7 +43,7 @@ def test_converting_with_comments french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") converter = Babelish::CSV2Android.new(csv_file, - { "French" => "fr" }, + { "French" => "fr" }, :default_lang => "English", :comments_column => 5) converter.convert From 4d3b1b1898f3c47520d61c4dbb4fab04dbca11ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:19:26 +0100 Subject: [PATCH 15/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 285f314..f9878cc 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -3,10 +3,10 @@ class TestCSV2Android < Test::Unit::TestCase def test_converting_csv_to_xml csv_file = "test/data/test_data.csv" - converter = Babelish::CSV2Android.new(csv_file, - "English" => "en") + converter = Babelish::CSV2Android.new(csv_file, "English" => "en") converter.convert - assert File.exist?("values-en/strings.xml"), "the ouptut file does not exist" + assert File.exist?("values-en/strings.xml"), + "the ouptut file does not exist" # clean up system("rm -rf ./values-en") @@ -14,11 +14,12 @@ def test_converting_csv_to_xml def test_converting_csv_with_special_chars csv_file = "test/data/android_special_chars.csv" - converter = Babelish::CSV2Android.new(csv_file, - "german" => "de") + converter = Babelish::CSV2Android.new(csv_file, "german" => "de") converter.convert - assert File.exist?("values-de/strings.xml"), "the ouptut file does not exist" - assert_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml") + assert File.exist?("values-de/strings.xml"), + "the ouptut file does not exist" + assert_equal File.read("test/data/android_special_chars_test_result.xml"), + File.read("values-de/strings.xml") # clean up system("rm -rf ./values-de") @@ -27,8 +28,7 @@ def test_converting_csv_with_special_chars def test_converting_csv_to_dotstrings_one_output_option csv_file = "test/data/test_data.csv" single_file = "myApp.xml" - converter = Babelish::CSV2Android.new(csv_file, - { "English" => "en" }, + converter = Babelish::CSV2Android.new(csv_file, { "English" => "en" }, :output_basename => "myApp", :ignore_lang_path => true) converter.convert @@ -42,8 +42,7 @@ def test_converting_with_comments csv_file = "test/data/test_data_with_comments.csv" french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") - converter = Babelish::CSV2Android.new(csv_file, - { "French" => "fr" }, + converter = Babelish::CSV2Android.new(csv_file, { "French" => "fr" }, :default_lang => "English", :comments_column => 5) converter.convert From a8f31cff9b1d4134e38d42a14aa0d585457859b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:23:57 +0100 Subject: [PATCH 16/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index f9878cc..332792e 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -29,8 +29,8 @@ def test_converting_csv_to_dotstrings_one_output_option csv_file = "test/data/test_data.csv" single_file = "myApp.xml" converter = Babelish::CSV2Android.new(csv_file, { "English" => "en" }, - :output_basename => "myApp", - :ignore_lang_path => true) + :output_basename => "myApp", + :ignore_lang_path => true) converter.convert assert File.exist?(single_file), "the ouptut file does not exist" @@ -43,8 +43,8 @@ def test_converting_with_comments french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") converter = Babelish::CSV2Android.new(csv_file, { "French" => "fr" }, - :default_lang => "English", - :comments_column => 5) + :default_lang => "English", + :comments_column => 5) converter.convert assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) From 03f6b13b451020224402793e4375153464aa0ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:25:45 +0100 Subject: [PATCH 17/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 332792e..9eed261 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -28,9 +28,12 @@ def test_converting_csv_with_special_chars def test_converting_csv_to_dotstrings_one_output_option csv_file = "test/data/test_data.csv" single_file = "myApp.xml" - converter = Babelish::CSV2Android.new(csv_file, { "English" => "en" }, + converter = Babelish::CSV2Android.new( + csv_file, + { "English" => "en" }, :output_basename => "myApp", - :ignore_lang_path => true) + :ignore_lang_path => true + ) converter.convert assert File.exist?(single_file), "the ouptut file does not exist" @@ -42,9 +45,12 @@ def test_converting_with_comments csv_file = "test/data/test_data_with_comments.csv" french_file = "values-fr/strings.xml" expected_output = File.read("test/data/test_data_fr_with_comments.xml") - converter = Babelish::CSV2Android.new(csv_file, { "French" => "fr" }, + converter = Babelish::CSV2Android.new( + csv_file, + { "French" => "fr" }, :default_lang => "English", - :comments_column => 5) + :comments_column => 5 + ) converter.convert assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) From 274836b17e15498db03cfa8608d66e97464f0844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:27:13 +0100 Subject: [PATCH 18/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 9eed261..5931259 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -47,7 +47,7 @@ def test_converting_with_comments expected_output = File.read("test/data/test_data_fr_with_comments.xml") converter = Babelish::CSV2Android.new( csv_file, - { "French" => "fr" }, + { "French" => "fr" }, :default_lang => "English", :comments_column => 5 ) From 77cc37fed4cc8e74b55eb1c06b7f7078014cca13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:29:55 +0100 Subject: [PATCH 19/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 5931259..945cfa8 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -18,8 +18,9 @@ def test_converting_csv_with_special_chars converter.convert assert File.exist?("values-de/strings.xml"), "the ouptut file does not exist" - assert_equal File.read("test/data/android_special_chars_test_result.xml"), - File.read("values-de/strings.xml") + assert_equal + File.read("test/data/android_special_chars_test_result.xml"), + File.read("values-de/strings.xml") # clean up system("rm -rf ./values-de") @@ -52,7 +53,7 @@ def test_converting_with_comments :comments_column => 5 ) converter.convert - assert File.exist?(french_file), "the ouptut file does not exist" + assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) assert_equal expected_output, result From 308b39ab779a649b6dafb38ca565dfba999cb690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:32:07 +0100 Subject: [PATCH 20/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 945cfa8..e4ef857 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -5,8 +5,9 @@ def test_converting_csv_to_xml csv_file = "test/data/test_data.csv" converter = Babelish::CSV2Android.new(csv_file, "English" => "en") converter.convert - assert File.exist?("values-en/strings.xml"), - "the ouptut file does not exist" + assert + File.exist?("values-en/strings.xml"), + "the ouptut file does not exist" # clean up system("rm -rf ./values-en") @@ -16,8 +17,9 @@ def test_converting_csv_with_special_chars csv_file = "test/data/android_special_chars.csv" converter = Babelish::CSV2Android.new(csv_file, "german" => "de") converter.convert - assert File.exist?("values-de/strings.xml"), - "the ouptut file does not exist" + assert + File.exist?("values-de/strings.xml"), + "the ouptut file does not exist" assert_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml") From a88fd62d18e88ffedfcc34365c66804c3ce495da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:33:52 +0100 Subject: [PATCH 21/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index e4ef857..21fee2b 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -17,9 +17,7 @@ def test_converting_csv_with_special_chars csv_file = "test/data/android_special_chars.csv" converter = Babelish::CSV2Android.new(csv_file, "german" => "de") converter.convert - assert - File.exist?("values-de/strings.xml"), - "the ouptut file does not exist" + assert File.exist?("values-de/strings.xml"), "the ouptut file does not exist" assert_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml") @@ -55,7 +53,7 @@ def test_converting_with_comments :comments_column => 5 ) converter.convert - assert File.exist?(french_file), "the ouptut file does not exist" + assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) assert_equal expected_output, result From 70521d21f9e9f00bb7c34471ca181141c06365da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:36:57 +0100 Subject: [PATCH 22/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 21fee2b..da14165 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -18,9 +18,7 @@ def test_converting_csv_with_special_chars converter = Babelish::CSV2Android.new(csv_file, "german" => "de") converter.convert assert File.exist?("values-de/strings.xml"), "the ouptut file does not exist" - assert_equal - File.read("test/data/android_special_chars_test_result.xml"), - File.read("values-de/strings.xml") + assert_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml") # clean up system("rm -rf ./values-de") From b084e0fbbd2b1ec2e0f2df8888633c1dffece85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:38:55 +0100 Subject: [PATCH 23/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index da14165..62e3582 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -5,9 +5,7 @@ def test_converting_csv_to_xml csv_file = "test/data/test_data.csv" converter = Babelish::CSV2Android.new(csv_file, "English" => "en") converter.convert - assert - File.exist?("values-en/strings.xml"), - "the ouptut file does not exist" + assert File.exist?("values-en/strings.xml"), "the ouptut file does not exist" # clean up system("rm -rf ./values-en") From 3c779a62f3b78e9b460b83ab650656cc87376d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borut=20Tomaz=CC=8Cin?= Date: Fri, 29 Jan 2016 14:42:32 +0100 Subject: [PATCH 24/24] Fixed style issue. --- test/babelish/test_csv2android.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/babelish/test_csv2android.rb b/test/babelish/test_csv2android.rb index 62e3582..5b30b6a 100644 --- a/test/babelish/test_csv2android.rb +++ b/test/babelish/test_csv2android.rb @@ -52,7 +52,7 @@ def test_converting_with_comments assert File.exist?(french_file), "the ouptut file does not exist" result = File.read(french_file) assert_equal expected_output, result - + # clean up system("rm -rf values-fr") end