babelish 0.4.2 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI5Mjk2MTU1YmY5NTMyY2Q1ZjAxNzQxMDQ3ZWEzZTVlNTcxZTliMw==
+    YWFiZDM4NDg3Zjg2NGRjYThiYmJmZjZkNjY2NDM0MzgxMjFhZmVmNg==
   data.tar.gz: !binary |-
-    M2MyNjU2ZmIxYzNjZWI2OWJhOTAxNzhhNDczYmE5ZDJlZjA1YTE0Yg==
+    MDkxZmQ1ZjY1ZDE3OWQwN2YzYzJiMzkyYTI1ODhmMWUwYjU3YTdhYg==
 SHA512:
   metadata.gz: !binary |-
-    M2FiOTQ3MTZlZDYxNzkyNWViNGNkNGYyNDg3ZDZmZWQxOTJkYzliM2M5ZDA0
-    NTAxMThkZGZhM2U2MWY5OTJiNWIzYmI5Nzk1N2ZhMGQzOWZkYWM3Mjc2YzYy
-    ZjI1NjY2MjEzZGI5ZTg1N2ZhZjU2ODIyNjExMDU0ZDQ5Yjk0ZjE=
+    YWQ0ZTVlOTkzM2ZmNDI1ODJjNWUwZGM4YzkyNjZmOTQ1Y2M2ODEwZTlhMDE0
+    YTM0ZjU4OTQzNWU3MDdiYTQwMWViMWE0M2E0MjcyZDk3MzczMGM4MThkOGNi
+    YWQ3NTRmMzMyOTIyYWJjMzViZGZiMGU0NzZkMjgzOWEzOGNkNGI=
   data.tar.gz: !binary |-
-    MDJhMWQxY2Q2ZTA0MTVkZmJiYTVjMzUyNjBlNTVhNGViMTFiNTI5ZDE1Y2Vm
-    NTkyNGU5YTE5Mjk4NjI4M2I5ZjMzNTY4ZDNkM2E2NmU1YmQ5NWQxNGQ3OWFh
-    NzY2OGVkYjhhZjczOTUyYWY1ZTEwNTM2NmU0ZGY3NWM4MjY0Njc=
+    ZDEwNTU2ZGQ0YTA4NWI5NmEzMTdkMWVhN2RjMDI2YjkwN2FiODAwM2EyZjcz
+    MmVmOGYwM2NjYmY0ZDA5YTUzOGY3YTM0YjM4MDc5MTY0NDU5YjYyN2FhOTVh
+    ZWRlNTY1NTkwYmMwOWIyMDA3MDQyMjMwMmZkZjk5N2NiYWFjMTM=

data/lib/babelish/csv2android.rb

@@ -25,7 +25,8 @@ module Babelish
     end
 
     def get_row_format(row_key, row_value, comment = nil, indentation = 0)
-      "\t<string name=\"#{row_key}\">#{row_value}</string>\n"
+      entry = comment.to_s.empty? ? "" : "\n\t<!-- #{comment} -->\n"
+      entry + "\t<string name=\"#{row_key}\">#{row_value}</string>\n"
     end
 
     def hash_to_output(content = {})
@@ -34,7 +35,8 @@ module Babelish
         output += "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
         output += "<resources>\n"
         content.each do |key, value|
-          output += get_row_format(key, value)
+          comment = @comments[key]
+          output += get_row_format(key, value, comment)
         end
         output += "</resources>\n"
       end

data/lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/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,15 +24,36 @@ class TestCSV2Android < Test::Unit::TestCase
 
   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)
+    single_file = "myApp.xml"
+    converter = Babelish::CSV2Android.new(
+      csv_file,
+      { "English" => "en" },
+      :output_basename => "myApp",
+      :ignore_lang_path => true
+    )
     converter.convert
     assert File.exist?(single_file), "the ouptut file does not exist"
 
     # 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.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

data/test/data/test_data_fr_with_comments.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<!-- this is a greeting string -->
+	<string name="GREETINGS">Salut</string>
+
+	<!-- this is another example -->
+	<string name="ANOTHER_STRING">testEN</string>
+</resources>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - François Benaiteau
@@ -204,6 +204,7 @@ files:
 - test/data/test_data.csv
 - test/data/test_data.strings
 - test/data/test_data_fr_with_comments.strings
+- test/data/test_data_fr_with_comments.xml
 - test/data/test_data_multiple_langs.csv
 - test/data/test_data_with_comments.csv
 - test/data/test_data_with_percent.csv
@@ -243,3 +244,4 @@ signing_key:
 specification_version: 4
 summary: CSV converter for localization files
 test_files: []
+has_rdoc: