babelish 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzk3MzY5NzE0NzhmMDBiZmFlMmQ2OTJhMzdiZjE4YjFjMDU2YzUwZA==
+    NDQ1NTdlNzA0OGNiMjcxMDZjZmE5NTEzNmExY2JlNzZiZTUwYWYwMw==
   data.tar.gz: !binary |-
-    MGUxMTM3OGI3OTU4M2I3M2FjYWEwNTRmMDljZjJkZTUxZDQxZDBkNQ==
+    MGMyZGE0NTk1MzE4Njc2ZTE2OWY1YjA4MWUwOTU1ZWQ4YTVmOWZmMQ==
 SHA512:
   metadata.gz: !binary |-
-    NzljNjRjMDk4MmEyOGI0MmZjYmUzMGVlYTEwZTBjMzZkZjJjNGU3NWU3NDI1
-    MjFjNmRhOGRlNmE0NGU5NTU2NjdlOTM0MDZhZDgwNTIyYjE1MzkwODNkMWUx
-    NGQ2Y2Q5ODhjZGM5ZDkyNjYwMWExOTY0OGU5Y2UxOTQ5NDBiYjI=
+    MzgzMmY1ZDM1ZTQ3YmM2NDlhOWI0ZTFhNTYwM2Y1YjNhZWQ2YzNlNGM0ZDcy
+    NDI0NjAzNjA5OTkyMjA3MGM5OTU1OGUxZGU2YjdiOTk4YzI5MWVkZTM0Yjcw
+    OTI1MDQ1ODFiOGE0ZGEzZWQ4MTI0YTRiYmY4OTQ2Y2M1MzEzYTE=
   data.tar.gz: !binary |-
-    NjRiMDk1NDI1Y2M3OTc0OTUzNjA2ODAzNDllZjQ5MGQ2YzQxZTdlZDViNDIx
-    ZWNiODdlMTY2MzUzNjQ5NjY3ZjBiNmY3MjViZjUwMWE2ZGEzNGI3Y2IyMDI1
-    MGFhMzhkYzBkNmQxNmU0NzY5OTdmN2YxOTY3NzVkM2RkMGY3ZGM=
+    YTYwZjZmNWUzZTlhOTljNDdlN2E4ZjA5Y2Y1ZjgwMGMxY2E2OTIzMDNiYzc1
+    ZmE3NWU0OTc3YzRiM2U2NDk1YTM3YzdiYWRiMWE5ZjNiNmZkNTM1MDJlZmZl
+    ODI1NWRjMThjNWYxNDIxN2FkMTYyMjE5OWFjMmM3ZGM0MzkyNjI=

data/.babelish.sample

@@ -1,6 +1,6 @@
 # This is a sample configuration file
 
-# Base2CSV
+###################################### Base2CSV ######################################
 
 ## required, location of strings files (FILENAMES)
 filenames: ["test/data/test_en.strings", "test/data/test_fr.strings"]
@@ -10,7 +10,7 @@ filenames: ["test/data/test_en.strings", "test/data/test_fr.strings"]
 # csv_filename: "testconfig.csv"              # location of output file
 # dryrun: true                                # prints out content of hash without writing file
 
-# CSV2Base
+###################################### CSV2Base ######################################
 
 ## required
 filename: test/data/test_data.csv    # CSV file (CSV_FILENAME) to convert from or name of file in Google Drive
@@ -30,3 +30,4 @@ langs:                               # Languages to convert. i.e. English:en
 # ignore_lang_path: true             # does not care about lang component path. i.e: en.lproj/
 # sheet: 0                           # Index of worksheet to download. First index is 0.
 # macros_filename: Babelish.h        # File to output the defines of localized strings
+# stripping: false				     # Strips values inside the spreadsheet

data/.travis.yml

@@ -9,5 +9,6 @@ deploy:
     secure: Xjq+v+jEU6wK4BtyfnV1elegNcxK6Ah/O99Sn9c2IlkCmJ1wxLBouqzEiSorSJ4IOMa5H2y3gwo5GXOr6Y7d8huyGrPuBeCSGqAmH77wNCIv7G+jnLiYb1sRZbtKcPW2QaN6JF81qDIelwyspMfo6/ug1qN1x323UaxZl7f7nUE=
   gem: babelish
   on:
+    tags: true
     repo: netbe/Babelish
     all_branches: true

data/babelish.gemspec

@@ -6,7 +6,7 @@ require 'babelish/version'
 Gem::Specification.new do |s|
   s.name        = 'babelish'
   s.version     = Babelish::VERSION
-  s.date        = '2014-09-24'
+  s.date        = '2014-10-29'
   s.summary     = "CSV converter for localization files"
   s.description = "This set of commands converts a CSV file to the following formats:
                   - .strings (iOS)

data/lib/babelish/commandline.rb

@@ -23,6 +23,7 @@ class Commandline < Thor
     method_option :default_lang, :type => :string, :aliases => "-l", :desc => "Default language to use for empty values if any"
     method_option :output_dir, :type => :string, :aliases => "-d", :desc => "Path of output files"
     method_option :output_basenames, :type => :array, :aliases => "-o", :desc => "Basename of output files"
+    method_option :stripping, :type => :boolean, :aliases => "-N", :default => false, :desc => "Strips values of spreadsheet"
     method_option :ignore_lang_path, :type => :boolean, :aliases => "-I", :lazy_default => false, :desc => "Ignore the path component of langs"
     method_option :fetch, :type => :boolean, :desc => "Download file from Google Drive"
     method_option :sheet, :type => :numeric, :desc => "Index of worksheet to download. First index is 0"

data/lib/babelish/csv2base.rb

@@ -34,6 +34,7 @@ module Babelish
       @keys_column = args[:keys_column]
       @default_lang = args[:default_lang]
       @ignore_lang_path = args[:ignore_lang_path]
+      @stripping = args[:stripping]
       @languages = []
     end
 
@@ -72,11 +73,9 @@ module Babelish
     def process_value(row_value, default_value)
       value = row_value.nil? ? default_value : row_value
       value = "" if value.nil?
-      value.gsub!(/\\*\"/, "\\\"") #escape double quotes
-      value.gsub!(/\s*(\n|\\\s*n)\s*/, "\\n") #replace new lines with \n + strip
-      value.gsub!(/%\s+([a-zA-Z@])([^a-zA-Z@]|$)/, "%\\1\\2") #repair string formats ("% d points" etc)
-      value.gsub!(/([^0-9\s\(\{\[^])%/, "\\1 %")
-      value.strip!
+      value.gsub!(/\\*\"/, "\\\"") # escape double quotes
+      value.gsub!(/\n/, "\\n") # replace new lines with \n, dont strip
+      value.strip! if @stripping
       return value.to_utf8
     end
 
@@ -121,8 +120,8 @@ module Babelish
             end
             @languages[i] = language
           elsif !@state_column || (row[@state_column].nil? || row[@state_column] == '' || !@excluded_states.include?(row[@state_column]))
-            # TODO: add option to strip the constant or referenced language
-            key = row[@keys_column].strip
+            key = row[@keys_column]
+            key.strip! if @stripping
             default_value =  self.default_lang ? row[defaultCol] : nil
             value = self.process_value(row[i], default_value)
 

data/lib/babelish/version.rb

@@ -1,3 +1,3 @@
 module Babelish
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/babelish/xcode_macros.rb

@@ -15,11 +15,13 @@ module Babelish
 
     def process(table, keys)
       keys.each do |key|
-        macro_name = "LS_#{key.upcase}" 
+        clean_key = key.gsub(' ', '')
+        clean_key.gsub!(/[[:punct:]]/, '_')       
+        clean_key.gsub!('__', '_')
+        clean_key = clean_key[1..clean_key.size-1] if clean_key[0] == '_'
+        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" 
-        macro_name.gsub!(' ', '')
-        macro_name.gsub!('.', '_')
-        macro_name.gsub!('-', '_')
         @content << String.new(<<-EOS)
 #define #{macro_name} NSLocalizedStringFromTable(@"#{key}",@"#{table}",@"")
         EOS

data/test/babelish/test_bins.rb

@@ -4,7 +4,7 @@ class TestBins < Test::Unit::TestCase
   def test_csv2strings_with_google_doc
     omit if ENV['TRAVIS']
     assert_nothing_raised do
-      system("./bin/csv2strings --fetch --filename my_strings --langs English:en")
+      system("./bin/babelish csv2strings --fetch --filename my_strings --langs English:en")
     end
     assert_equal $?.exitstatus, 0
   end
@@ -12,7 +12,7 @@ class TestBins < Test::Unit::TestCase
   def test_csv2strings_with_google_doc_missing_langs
     omit if ENV['TRAVIS']
     assert_nothing_raised do
-      system("./bin/csv2strings --fetch --filename my_strings")
+      system("./bin/babelish csv2strings --fetch --filename my_strings")
     end
     assert_equal $?.exitstatus, 1
   end
@@ -21,7 +21,7 @@ class TestBins < Test::Unit::TestCase
     system("cp .babelish.sample .babelish")
 
     assert_nothing_raised NameError do
-      system("./bin/csv2strings")
+      system("./bin/babelish csv2strings")
     end
     assert_equal $?.exitstatus, 0
   end

data/test/babelish/test_csv2strings.rb

@@ -85,4 +85,56 @@ class TestCSV2Strings < Test::Unit::TestCase
     system("rm -rf *.lproj")
   end
 
+  def test_converting_csv_to_dotstrings_with_percent
+    expected_output = String.new(<<-EOS)
+"GREETINGS" = "hello_%@";
+"ANOTHER_STRING" = "hello";
+    EOS
+    csv_file = "test/data/test_data_with_percent.csv"
+    converter = Babelish::CSV2Strings.new(csv_file, "English" => [:en])
+    converter.convert
+    result = File.read("en.lproj/Localizable.strings")
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
+
+  def test_converting_csv_to_dotstrings_with_spaces
+    expected_output = String.new(<<-EOS)
+"GREETINGS " = "hello ";
+"ANOTHER_STRING" = " my other string with space at begin";
+    EOS
+    csv_file = "test/data/test_data_with_spaces.csv"
+    converter = Babelish::CSV2Strings.new(csv_file, "English" => [:en])
+    converter.convert
+    result = File.read("en.lproj/Localizable.strings")
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
+
+  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";
+"ANOTHER_EXAMPLE" = "tu as fait 10% d'efforts";
+    EOS
+    csv_file = "test/data/test_data_with_percent_space.csv"
+    converter = Babelish::CSV2Strings.new(csv_file, "English" => [:en])
+    converter.convert
+    result = File.read("en.lproj/Localizable.strings")
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
+
+  def test_converting_csv_to_dotstrings_with_stripping_option
+    expected_output = String.new(<<-EOS)
+"GREETINGS" = "hello";
+"ANOTHER_STRING" = "my other string with space at begin";
+    EOS
+    csv_file = "test/data/test_data_with_spaces.csv"
+    converter = Babelish::CSV2Strings.new(csv_file, {"English" => [:en]}, :stripping => true)
+    converter.convert
+    result = File.read("en.lproj/Localizable.strings")
+    assert_equal expected_output, result
+    system("rm -rf *.lproj")
+  end
 end

data/test/babelish/test_xcode_macros.rb

@@ -57,4 +57,31 @@ class TestXcodeMacros < Test::Unit::TestCase
     #clean up
     system("rm -f ./Babelish.h")
   end
+
+  def test_write_macros_process_with_special_characters
+    keys = ["%d blabla", "login!", "HEY!!"]
+    table = "Localizable"
+    macros = Babelish::XcodeMacros.new
+    macros.process(table, keys)
+    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_DBLABLA NSLocalizedStringFromTable(@"%d blabla",@"Localizable",@"")
+#define LS_LOGIN NSLocalizedStringFromTable(@"login!",@"Localizable",@"")
+#define LS_HEY NSLocalizedStringFromTable(@"HEY!!",@"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_data_with_percent.csv

@@ -0,0 +1,3 @@
+variables,English
+GREETINGS,hello_%@
+ANOTHER_STRING,hello

data/test/data/test_data_with_percent_space.csv

@@ -0,0 +1,4 @@
+variables,English
+GREETINGS,you have %d points
+ANOTHER_STRING,this is a string with 10% of juice
+ANOTHER_EXAMPLE,tu as fait 10% d'efforts

data/test/data/test_data_with_spaces.csv

@@ -0,0 +1,3 @@
+variables,English
+GREETINGS ,hello 
+ANOTHER_STRING, my other string with space at begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -144,15 +144,7 @@ email:
 - francois.benaiteau@gmail.com
 - markus.paeschke@gmail.com
 executables:
-- android2csv
 - babelish
-- csv2android
-- csv2json
-- csv2php
-- csv2strings
-- json2csv
-- php2csv
-- strings2csv
 extensions: []
 extra_rdoc_files: []
 files:
@@ -165,15 +157,7 @@ files:
 - README.md
 - Rakefile
 - babelish.gemspec
-- bin/android2csv
 - bin/babelish
-- bin/csv2android
-- bin/csv2json
-- bin/csv2php
-- bin/csv2strings
-- bin/json2csv
-- bin/php2csv
-- bin/strings2csv
 - lib/babelish.rb
 - lib/babelish/android2csv.rb
 - lib/babelish/base2csv.rb
@@ -216,6 +200,9 @@ files:
 - test/data/test_data.csv
 - test/data/test_data.strings
 - test/data/test_data_multiple_langs.csv
+- test/data/test_data_with_percent.csv
+- test/data/test_data_with_percent_space.csv
+- test/data/test_data_with_spaces.csv
 - test/data/test_en.strings
 - test/data/test_fr.strings
 - test/data/test_utf16.strings
@@ -243,9 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: CSV converter for localization files
 test_files: []
-has_rdoc: 

data/bin/android2csv

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)

data/bin/csv2android

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)

data/bin/csv2json

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)

data/bin/csv2php

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)

data/bin/csv2strings

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)

data/bin/json2csv

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)

data/bin/php2csv

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)

data/bin/strings2csv

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.expand_path("../../lib", __FILE__)
-require 'babelish'
-require 'babelish/commandline'
-
-puts "DEPRECATED: use babelish command"
-args = [File.basename(__FILE__)]
-if ARGV.first == "help"
-  args.insert(0, ARGV.first)
-  ARGV.delete(ARGV.first)
-end
-args += ARGV
-Commandline.start(args)