babelish 0.3.4 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGYzYzgwY2Y1NWU1MjVjMWY1YmI1YjhhMjc5M2VmZDlkODU5ODUxNg==
+    NTYwYjA5YzUyN2Q2YTQ1YjZjMjljMmU3ZGNlYTgxODFhYzY4NjYyMg==
   data.tar.gz: !binary |-
-    OTg3NjllNjQ4ZTRkM2UzMTBmZDFhMjNjZjdhMWVmOTY3NTczMjA0Mw==
+    NjkyYzg1ODVmYTUyNDdiNThmNTFiMjM2OWRmM2U4ZGRjOTIyNjdjZg==
 SHA512:
   metadata.gz: !binary |-
-    YzE3MjhiZjc3YmJiMThjNGMyNmY1OGU0YWFiZTE5MWMxMDdkMGVkZGZkZGRk
-    NWQ5NWQ3MDc1NmJkZWEyY2JiODNlNjBjODhhOWQ4YTZjOTdmZTZkMzliOTFk
-    MzJjYTQ1ZWNhMDQ2YTJiZTZmMDEzMDk4ZGMxZWFiOGZiYjIxYWY=
+    MTJiOGU1MGNhYmQ5OTI1NjZkM2JmNTcyYTRhY2M4ZGRjNzUyZDk1ZTQ4NjQ1
+    NzM1ZTUzNzIxZjNmMzQ1OTZjMTA4MjU1MDkwOGYwZTg1MDdhYjU0MzA3Njhk
+    OTNkOTc2MTc0MDQ1NTFmZjExOTFiOTkzZjNjN2Y5MjBlZTYxOTE=
   data.tar.gz: !binary |-
-    MTU1YmNiMDFjODRmMjQ0Y2UyYTE5Zjk1YjQxYjRlYWY5ODcyNzIwZjZkZTNh
-    MDFkNDVkYTIyMGExZTZmNTYzN2NhZTJjMDVhNGY0ZDJkN2ZkYTMwZDVhMjgy
-    ZjRiYmM5ZDQ4Zjk5Y2YxOGMwZmYwY2ZmNWYzMThjMmRhNTU3NDc=
+    M2FlYmFlNzIzYTQ2YzVhYzU5ZTMyYWM0MmNmNDk1Mjg0Zjk2NmRmZDJmMjBk
+    NDNhM2UyZGNkZDA3MzM3YjI3NWM0ZDk1YTQzZDFjYTM1MGY4ZmZmZWIxYmJi
+    YThmMDI1YWI2Yjk1YjFlNzVlN2RhMWI3Y2NlNGM5Zjk4MWExZjg=

data/.babelish.sample

@@ -20,6 +20,7 @@ langs:                               # Languages to convert. i.e. English:en
 ## optional
 # fetch: true                        # set to true to get file(filename) from google drive
 # excluded_states: ["Images", "Xib"] # Exclude rows with given state
+# comments_column: 4                 # Position of column for comments if any
 # state_column: 3                    # Position of column for state if any
 # keys_column: 0                     # Position of column for keys
 # default_lang: "English"            # Header name of column containing fallback value if value is empty

data/README.md

@@ -45,6 +45,9 @@ See [.babelish.sample](.babelish.sample) file in the doc folder. as the possible
 
 *For previous CSV-to-iOS-Localizable.strings-converter, rename your `.csvconverter` into `.babelish`.*
 
+**For more details, check the documentation:**
+https://github.com/netbe/Babelish/wiki/How-to-Use
+
 # Contributing
 
 Want to add another support for a new format or/and usage? Add a new feature? Fix a bug?

data/babelish.gemspec

@@ -6,7 +6,7 @@ require 'babelish/version'
 Gem::Specification.new do |s|
   s.name        = 'babelish'
   s.version     = Babelish::VERSION
-  s.date        = '2015-03-16'
+  s.date        = '2015-05-22'
   s.summary     = "CSV converter for localization files"
   s.description = "This set of commands converts a CSV file to the following formats:
                   - .strings (iOS)
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "thor"
 
-  s.add_dependency "google_drive", "~> 0.3.10"
+  s.add_dependency "google_drive", "~> 1.0.1"
   # google_drive dependency to ask for mail and password
   s.add_dependency "highline"
 

data/lib/babelish/android2csv.rb

@@ -18,7 +18,7 @@ module Babelish
         end
       end
 
-      strings
+      [strings, {}]
     end
 
   end

data/lib/babelish/base2csv.rb

@@ -24,17 +24,19 @@ module Babelish
     def convert(write_to_file = true)
       strings = {}
       keys = nil
+      comments = {}
 
       @filenames.each do |fname|
         header = fname
-        strings[header] = load_strings(fname)
+        strings[header], file_comments = load_strings(fname)
         keys ||= strings[header].keys
+        comments.merge!(file_comments)
       end
 
       if write_to_file
         # Create csv file
         puts "Creating #{@csv_filename}"
-        create_csv_file(keys, strings)
+        create_csv_file(keys, strings, comments)
       else
         return keys, strings
       end
@@ -48,7 +50,7 @@ module Babelish
     # for a given language
     # @return [Hash] the translations for a given language
     def load_strings(strings_filename)
-      return {}
+      return [{}, {}]
     end
 
     # Give the default headers of csv file
@@ -77,7 +79,8 @@ module Babelish
     #
     # @param [Array] keys references of all translations
     # @param [Array] strings translations of all languages
-    def create_csv_file(keys, strings)
+    # @param [Hash] comments hash containing keys, comments related to each keys, describe the translation
+    def create_csv_file(keys, strings, comments = nil)
       raise "csv_filename must not be nil" unless @csv_filename
       CSV.open(@csv_filename, "wb") do |csv|
         csv << @headers
@@ -89,6 +92,7 @@ module Babelish
             current_val = (lang != default_lang && strings[lang][key] == default_val) ? '' : strings[lang][key]
             line << current_val
           end
+          line << comments[key] if comments && comments[key]
           csv << line
         end
         puts "Done"

data/lib/babelish/commandline.rb

@@ -19,7 +19,8 @@ class Commandline < Thor
     # optional options
     method_option :excluded_states, :type => :array, :aliases => "-x", :desc => "Exclude rows with given state"
     method_option :state_column, :type => :numeric, :aliases => "-s", :desc => "Position of column for state if any"
-    method_option :keys_column,  :type => :numeric, :aliases => "-k", :desc => "Position of column for keys"
+    method_option :keys_column, :type => :numeric, :aliases => "-k", :desc => "Position of column for keys"
+    method_option :comments_column, :type => :numeric, :aliases => "-c", :desc => "Position of column for comments if any"
     method_option :default_lang, :type => :string, :aliases => "-l", :desc => "Default language to use for empty values if any"
     method_option :csv_separator, :type => :string, :aliases => "-cs", :desc => "CSV column separator character, uses ',' by default"
     method_option :output_dir, :type => :string, :aliases => "-d", :desc => "Path of output files"
@@ -85,6 +86,22 @@ class Commandline < Thor
     end
   end
 
+  desc "init", "Create a configuration file from template"
+  def init
+    if File.exists?(".babelish")
+      say "Config file '.babelish' already exists."
+    else
+      say "Creating new config file '.babelish'."
+      config_file = File.expand_path("../../../.babelish.sample", __FILE__)
+      if File.exists?(config_file)
+        system "cp #{config_file} .babelish"
+      else
+        say "Template '#{config_file}' not found."
+      end
+    end
+  end
+
+
   desc "version", "Display current version"
   def version
     require "babelish/version"
@@ -133,7 +150,7 @@ class Commandline < Thor
         args = Thor::CoreExt::HashWithIndifferentAccess.new(args)
         converter = class_object.new(filename, options[:langs], args)
         say converter.convert
-        xcode_macros.process(converter.table, converter.keys) if options[:macros_filename]
+        xcode_macros.process(converter.table, converter.keys, converter.comments) if options[:macros_filename]
       end
       if options[:macros_filename]
         say "generating macros"

data/lib/babelish/csv2android.rb

@@ -16,8 +16,8 @@ module Babelish
       return filepath ? [filepath] : []
     end
 
-    def get_row_format(row_key, row_value)
-      return "\t<string name=\"#{row_key}\">#{row_value}</string>\n"
+    def get_row_format(row_key, row_value, comment = nil, indentation = 0)
+        return "\t<string name=\"#{row_key}\">#{row_value}</string>\n"
     end
 
     def hash_to_output(content = {})

data/lib/babelish/csv2base.rb

@@ -7,7 +7,7 @@ module Babelish
     attr_accessor :csv_filename
     attr_accessor :default_lang
     attr_accessor :csv_separator
-    attr_accessor :excluded_states, :state_column, :keys_column
+    attr_accessor :excluded_states, :state_column, :keys_column, :comments_column
     attr_accessor :languages
 
     def initialize(filename, langs, args = {})
@@ -34,11 +34,13 @@ module Babelish
       @excluded_states = args[:excluded_states]
       @state_column = args[:state_column]
       @keys_column = args[:keys_column]
+      @comments_column = args[:comments_column]
       @default_lang = args[:default_lang]
       @csv_separator = args[:csv_separator]
       @ignore_lang_path = args[:ignore_lang_path]
       @stripping = args[:stripping]
       @languages = []
+      @comments = {}
     end
 
     def create_file_from_path(file_path)
@@ -59,6 +61,10 @@ module Babelish
       output_basename
     end
 
+    def comments
+      @comments  
+    end
+
     def language_filepaths(language)
       #implement in subclass
       []
@@ -82,8 +88,9 @@ module Babelish
       return value.to_utf8
     end
 
-    def get_row_format(row_key, row_value)
-      return "\"" + row_key + "\" = \"" + row_value + "\""
+    def get_row_format(row_key, row_value, comment = nil, indentation = 0)
+      # ignoring comment by default
+      "\"#{row_key}\"" + " " * indentation + " = \"#{row_value}\""
     end
 
     # Convert csv file to multiple Localizable.strings files for each column
@@ -124,10 +131,11 @@ module Babelish
             @languages[i] = language
           elsif !@state_column || (row[@state_column].nil? || row[@state_column] == '' || !@excluded_states.include?(row[@state_column]))
             key = row[@keys_column]
+            comment = @comments_column ? row[@comments_column] : nil
             key.strip! if @stripping
             default_value =  self.default_lang ? row[defaultCol] : nil
             value = self.process_value(row[i], default_value)
-
+            @comments[key] = comment
             @languages[i].add_content_pair(key, value)
           end
         end
@@ -167,9 +175,11 @@ module Babelish
 
     def hash_to_output(content = {})
       output = ''
+      indentation = content.map(&:first).max { |a, b| a.length <=> b.length }.length
       if content && content.size > 0
         content.each do |key, value|
-          output += get_row_format(key, value)
+          comment = @comments[key]
+          output += get_row_format(key, value, comment, indentation - key.length)
         end
       end
       return output

data/lib/babelish/csv2php.rb

@@ -14,8 +14,8 @@ module Babelish
       return filepath ? [filepath] : []
     end
 
-    def get_row_format(row_key, row_value)
-      return "$" + @php_tag + "['#{row_key}'] = \"#{row_value}\";\n"
+    def get_row_format(row_key, row_value, comment = nil, indentation = 0)
+      "$" + @php_tag + "['#{row_key}']" + " " * indentation + " = \"#{row_value}\";\n"
     end
 
     def extension

data/lib/babelish/csv2strings.rb

@@ -15,8 +15,9 @@ module Babelish
       filepaths
     end
 
-    def get_row_format(row_key, row_value)
-      return "\"#{row_key}\" = \"#{row_value}\";\n"
+    def get_row_format(row_key, row_value, comment = nil, indentation = 0)
+      entry = comment.to_s.empty? ? "" : "\n/* #{comment} */\n" 
+      entry + "\"#{row_key}\"" + " " * indentation + " = \"#{row_value}\";\n"
     end
 
     def extension

data/lib/babelish/google_doc.rb

@@ -24,9 +24,10 @@ module Babelish
 
     def download_spreadsheet(requested_filename, output_filename, worksheet_index = 0)
       output_filename ||= "translations.csv"
-      file = file_with_name(requested_filename)
-      return nil unless file
-      file.export_as_file(output_filename, "csv", worksheet_index)
+      spreadsheet = file_with_name(requested_filename)
+      return nil unless spreadsheet
+      worksheet = spreadsheet.worksheets[worksheet_index]
+      worksheet.export_as_file(output_filename)
       return output_filename
     end
 
@@ -48,12 +49,7 @@ module Babelish
       unless @session
         authenticate
       end
-      result = @session.file_by_title(name)
-      if result.is_a? Array
-        file = result.first
-      else
-        file = result
-      end
+      @session.spreadsheet_by_title(name)
     end
   end
 end

data/lib/babelish/strings2csv.rb

@@ -11,15 +11,23 @@ module Babelish
     def parse_dotstrings_line(line)
       line.strip!
       if line[0] != ?# && line[0] != ?= && line[0] != ?/
-        m = line.match(/^[^\"]*\"(.+)\"[^=]+=[^\"]*\"(.*)\";/)
-        return {m[1] => m[2]} unless m.nil?
+        m = line.match(/^[\s*]*\"(.+)\"[\s]*=\s*\"(.*)\"\s*;/)
+        return m[1], m[2] unless m.nil?
+      end
+    end
+
+    def parse_comment_line(line)
+      line.strip!
+      if line[0] != ?# && line[0] != ?=
+        m = line.match(/^\/\*(.*)\*\/\s*$/)
+        return m[1].strip! unless m.nil?
       end
     end
 
     # Load all strings of a given file
     def load_strings(strings_filename)
       strings = {}
-
+      comments = {}
       # genstrings uses utf16, so that's what we expect. utf8 should not be impact
       file = File.open(strings_filename, "r:utf-16:utf-8")
       begin
@@ -35,12 +43,18 @@ module Babelish
         # faults back to utf8
         contents = File.open(strings_filename, "r:utf-8")
       end
+      previous_comment = nil
       contents.each_line do |line|
-        hash = self.parse_dotstrings_line(line)
-        strings.merge!(hash) if hash
+        key, value = self.parse_dotstrings_line(line)
+        if key
+          strings.merge!({key => value}) 
+          comments[key] = previous_comment if previous_comment
+        else
+          previous_comment = self.parse_comment_line(line)
+        end
       end
 
-      strings
+      [strings, comments]
     end
 
   end

data/lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/lib/babelish/xcode_macros.rb

@@ -7,13 +7,13 @@ module Babelish
       @keys = keys
     end
 
-    def self.write_macros(file_path, table, keys)
+    def self.write_macros(file_path, table, keys, comments = {})
       instance = XcodeMacros.new
-      instance.process(table, keys)
+      instance.process(table, keys, comments)
       instance.write_content(file_path)
     end
 
-    def process(table, keys)
+    def process(table, keys, comments = {})
       keys.each do |key|
         clean_key = key.gsub(' ', '')
         clean_key.gsub!(/[[:punct:]]/, '_')       
@@ -22,8 +22,9 @@ module Babelish
         clean_key = clean_key[0..clean_key.size-2] if clean_key.size > 1 and clean_key[clean_key.size-1] == '_'
         macro_name = "LS_#{clean_key.upcase}" 
         macro_name += "_#{table.upcase}" if table != "Localizable" 
+        comment = comments[key]
         @content << String.new(<<-EOS)
-#define #{macro_name} NSLocalizedStringFromTable(@"#{key}",@"#{table}",@"")
+#define #{macro_name} NSLocalizedStringFromTable(@"#{key}",@"#{table}",@"#{comment.to_s}")
         EOS
       end
       @content

data/test/babelish/test_android2csv.rb

@@ -8,7 +8,7 @@ class TestAndroid2CSV < Test::Unit::TestCase
   end
 
   def test_load_strings
-    expected_output = {"app_name" => "android2csv", "action_greetings" => "Hello", "ANOTHER_STRING" => "testEN", "empty" => ""}
+    expected_output = [{"app_name" => "android2csv", "action_greetings" => "Hello", "ANOTHER_STRING" => "testEN", "empty" => ""}, {}]
     output = Babelish::Android2CSV.new.load_strings "test/data/android.xml"
     assert_equal expected_output, output
   end

data/test/babelish/test_base2csv.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 class TestBase2Csv < Test::Unit::TestCase
 
   def test_load_strings
-    expected_output = {}
+    expected_output = [{}, {}]
     output = Babelish::Base2Csv.new.send :load_strings, nil
     assert_equal expected_output, output
   end

data/test/babelish/test_commandline.rb

@@ -1,6 +1,14 @@
 require 'test_helper'
 class TestCommandLine < Test::Unit::TestCase
 
+  def test_init
+    assert_nothing_raised do
+      Commandline.new.init
+    end
+    #clean up
+    system("rm -f .babelish")
+  end
+
   def test_csv2base_with_config_file_all_required_options
     options = {
       :filename => "test/data/test_data_multiple_langs.csv",

data/test/babelish/test_csv2strings.rb

@@ -23,7 +23,7 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_default_lang
     expected_output = String.new(<<-EOS)
-"GREETINGS" = "Buenos dias";
+"GREETINGS"      = "Buenos dias";
 "ANOTHER_STRING" = "testEN";
     EOS
     csv_file = "test/data/test_data_multiple_langs.csv"
@@ -40,7 +40,7 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_with_no_default_lang_is_empty
     expected_output = String.new(<<-EOS)
-"GREETINGS" = "Buenos dias";
+"GREETINGS"      = "Buenos dias";
 "ANOTHER_STRING" = "";
     EOS
     csv_file = "test/data/test_data_multiple_langs.csv"
@@ -56,7 +56,7 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_default_lang_to_key
     expected_output = String.new(<<-EOS)
-"GREETINGS" = "Buenos dias";
+"GREETINGS"      = "Buenos dias";
 "ANOTHER_STRING" = "ANOTHER_STRING";
     EOS
     csv_file = "test/data/test_data_multiple_langs.csv"
@@ -73,7 +73,7 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_keys
     expected_output = String.new(<<-EOS)
-"GREETINGS" = "Buenos dias";
+"GREETINGS"      = "Buenos dias";
 "ANOTHER_STRING" = "ANOTHER_STRING";
     EOS
     csv_file = "test/data/test_data_multiple_langs.csv"
@@ -87,7 +87,7 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_with_percent
     expected_output = String.new(<<-EOS)
-"GREETINGS" = "hello_%@";
+"GREETINGS"      = "hello_%@";
 "ANOTHER_STRING" = "hello";
     EOS
     csv_file = "test/data/test_data_with_percent.csv"
@@ -100,7 +100,7 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_with_spaces
     expected_output = String.new(<<-EOS)
-"GREETINGS " = "hello ";
+"GREETINGS "     = "hello ";
 "ANOTHER_STRING" = " my other string with space at begin";
     EOS
     csv_file = "test/data/test_data_with_spaces.csv"
@@ -113,8 +113,8 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_with_percent_space
     expected_output = String.new(<<-EOS)
-"GREETINGS" = "you have %d points";
-"ANOTHER_STRING" = "this is a string with 10% of juice";
+"GREETINGS"       = "you have %d points";
+"ANOTHER_STRING"  = "this is a string with 10% of juice";
 "ANOTHER_EXAMPLE" = "tu as fait 10% d'efforts";
     EOS
     csv_file = "test/data/test_data_with_percent_space.csv"
@@ -127,7 +127,7 @@ class TestCSV2Strings < Test::Unit::TestCase
 
   def test_converting_csv_to_dotstrings_with_stripping_option
     expected_output = String.new(<<-EOS)
-"GREETINGS" = "hello";
+"GREETINGS"      = "hello";
 "ANOTHER_STRING" = "my other string with space at begin";
     EOS
     csv_file = "test/data/test_data_with_spaces.csv"
@@ -137,4 +137,18 @@ class TestCSV2Strings < Test::Unit::TestCase
     assert_equal expected_output, result
     system("rm -rf *.lproj")
   end
+
+  def test_converting_with_comments
+    csv_file = "test/data/test_data_with_comments.csv"
+    spanish_file = "fr.lproj/Localizable.strings"
+    expected_output = File.read("test/data/test_data_fr_with_comments.strings")
+    converter = Babelish::CSV2Strings.new(csv_file,
+    {"French" => "fr"},
+    :default_lang => "English", :comments_column => 5)
+    converter.convert
+    assert File.exists?(spanish_file), "the ouptut file does not exist"
+    result = File.read(spanish_file)
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
 end

data/test/babelish/test_strings2csv.rb

@@ -5,30 +5,30 @@ class TestStrings2CSV < Test::Unit::TestCase
     input = String.new(<<-EOS)
     "MY_CONSTANT" = "This is ok";
     EOS
-    expected_output = {"MY_CONSTANT"=>"This is ok"}
+    expected_output = ["MY_CONSTANT","This is ok"]
 
     output = Babelish::Strings2CSV.new.parse_dotstrings_line input
-    assert_equal output, expected_output
+    assert_equal expected_output, output 
   end
 
   def test_parse_dotstrings_line_with_single_quote
     input = String.new(<<-EOS)
     "MY_CONSTANT" = "This 'is' ok";
     EOS
-    expected_output = {"MY_CONSTANT"=>"This 'is' ok"}
+    expected_output = ["MY_CONSTANT","This 'is' ok"]
 
     output = Babelish::Strings2CSV.new.parse_dotstrings_line input
-    assert_equal output, expected_output
+    assert_equal expected_output, output
   end
 
   def test_parse_dotstrings_line_with_double_quotes
     input = String.new(<<-EOS)
     "MY_CONSTANT" = "This "is" ok";
     EOS
-    expected_output = {"MY_CONSTANT"=>"This \"is\" ok"}
+    expected_output = ["MY_CONSTANT","This \"is\" ok"]
 
     output = Babelish::Strings2CSV.new.parse_dotstrings_line input
-    assert_equal output, expected_output
+    assert_equal expected_output, output
   end
 
   def test_parse_dotstrings_line_with_wrong_string
@@ -49,6 +49,12 @@ class TestStrings2CSV < Test::Unit::TestCase
     assert_nil output, "output should be nil with comment"
   end
 
+  def test_parse_comment
+    comment= "/* this is a comment */"
+    output = Babelish::Strings2CSV.new.parse_comment_line comment
+    assert_equal "this is a comment", output
+  end
+
   def test_load_strings_with_wrong_file
     assert_raise(Errno::ENOENT) do
       output = Babelish::Strings2CSV.new.load_strings "file that does not exist.strings"
@@ -56,11 +62,30 @@ class TestStrings2CSV < Test::Unit::TestCase
   end
 
   def test_load_strings
-    expected_output = {"ERROR_HANDLER_WARNING_DISMISS" => "OK", "ANOTHER_STRING" => "hello"}
+    expected_output = [{"ERROR_HANDLER_WARNING_DISMISS" => "OK", "ANOTHER_STRING" => "hello"}, {}]
     output = Babelish::Strings2CSV.new.load_strings "test/data/test_data.strings"
     assert_equal expected_output, output
   end
 
+  def test_load_strings_with_spaces
+    expected_output = [{"name"=>"definition", 
+                       "name1"=>"definition1",
+                       "name2"=>"definition2",
+                       "name3"=>"definition3",
+                       "name4"=>"definition4",
+                       "this is a name"=>"a definition"
+                      },{}]
+    output = Babelish::Strings2CSV.new.load_strings "test/data/test_space.strings"
+    assert_equal expected_output, output
+  end
+
+  def test_load_strings_with_comments
+    expected_output = [{"MY_CONSTANT"=>"This 'is' ok"}, {"MY_CONSTANT"=> "this is a comment"}]
+
+    output = Babelish::Strings2CSV.new.load_strings "test/data/test_comments.strings"
+    assert_equal expected_output, output
+  end
+
   def test_load_strings_with_empty_lines
     assert_nothing_raised do
       output = Babelish::Strings2CSV.new.load_strings "test/data/test_with_nil.strings"
@@ -120,4 +145,4 @@ class TestStrings2CSV < Test::Unit::TestCase
     assert_not_nil converter.csv_filename
   end
 
-  end
+end

data/test/babelish/test_xcode_macros.rb

@@ -83,5 +83,30 @@ class TestXcodeMacros < Test::Unit::TestCase
     system("rm -f ./Babelish.h")
   end
 
+  def test_write_macros_with_comments_process
+    keys = ["login.title", "login.button"]
+    table = "Localizable"
+    comments = {"login.title" => "this is the login screen title", "login.button"  => nil}
+    macros = Babelish::XcodeMacros.new
+    macros.process(table, keys, comments)
+    macros.write_content("Babelish.h")
+    expected_output = String.new(<<-EOS)
+//
+//  Babelish.h
+//  
+//  This file was generated by Babelish
+//  
+//  https://github.com/netbe/babelish
+//
+#define LS_LOGIN_TITLE NSLocalizedStringFromTable(@"login.title",@"Localizable",@"this is the login screen title")
+#define LS_LOGIN_BUTTON NSLocalizedStringFromTable(@"login.button",@"Localizable",@"")
+    EOS
+    assert File.exists?("Babelish.h")
+    result = File.read("Babelish.h")
+    assert_equal expected_output, result
+    #clean up
+    system("rm -f ./Babelish.h")
+  end
+
 
 end

data/test/data/test_comments.strings

@@ -0,0 +1,2 @@
+/* this is a comment */
+"MY_CONSTANT" = "This 'is' ok";

data/test/data/test_data_fr_with_comments.strings

@@ -0,0 +1,6 @@
+
+/* this is a greeting string */
+"GREETINGS"      = "Salut";
+
+/* this is another example */
+"ANOTHER_STRING" = "testEN";

data/test/data/test_data_with_comments.csv

@@ -0,0 +1,3 @@
+variables,English,German,French,Spanish,Comments
+GREETINGS,Hello,Hallo,Salut,Buenos dias,this is a greeting string
+ANOTHER_STRING,testEN,,,,this is another example

data/test/data/test_space.strings

@@ -0,0 +1,10 @@
+"name"= "definition";
+"name1"="definition1";
+"name2"           =           "definition2";
+"name3" = "definition3"   ;
+"name4" = "definition4";
+"this is a name"="a definition";
+wrong format "should be ignored" = "really"  ;
+"should be ignored"wrong format = "really"  ;
+"should be ignored"= "really"  dd;
+"should be ignored"=aa "really";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -197,15 +197,19 @@ files:
 - test/data/genstrings.strings
 - test/data/json.json
 - test/data/php_lang.php
+- test/data/test_comments.strings
 - test/data/test_data.csv
 - test/data/test_data.strings
+- test/data/test_data_fr_with_comments.strings
 - test/data/test_data_multiple_langs.csv
+- test/data/test_data_with_comments.csv
 - test/data/test_data_with_percent.csv
 - test/data/test_data_with_percent_space.csv
 - test/data/test_data_with_semicolon.csv
 - test/data/test_data_with_spaces.csv
 - test/data/test_en.strings
 - test/data/test_fr.strings
+- test/data/test_space.strings
 - test/data/test_utf16.strings
 - test/data/test_with_nil.csv
 - test/data/test_with_nil.strings
@@ -236,3 +240,4 @@ signing_key:
 specification_version: 4
 summary: CSV converter for localization files
 test_files: []
+has_rdoc: