babelish 0.4.1 → 0.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU1ODMxMGY0MGFhMWQ3MzZlMjI0N2MwZDNjODlkMTlkYjJlOWQ3ZQ==
+    MmI5Mjk2MTU1YmY5NTMyY2Q1ZjAxNzQxMDQ3ZWEzZTVlNTcxZTliMw==
   data.tar.gz: !binary |-
-    ZDY1Y2E1NjU2YjAzYjJlOTBjMmJmYjhmNWQ1ZmMwYjA3NmViZmY3Nw==
+    M2MyNjU2ZmIxYzNjZWI2OWJhOTAxNzhhNDczYmE5ZDJlZjA1YTE0Yg==
 SHA512:
   metadata.gz: !binary |-
-    ZWM2OWNiYmRjYjczZGY5MTUwN2Q0NGJjZDI1ZjdlMjc2M2MzZmU3ZjQ0MDgx
-    ZmMzNzkwOGVlNzc3NzMyNzk5YmViOWQyZTUzOTgzNzUzYTAyOTEzYTAzNmNl
-    NzNkZDhiNjU3OTkxNGU1NWQ2YWI1ZjY4NDRlNWRlZGY2N2Y5ZDY=
+    M2FiOTQ3MTZlZDYxNzkyNWViNGNkNGYyNDg3ZDZmZWQxOTJkYzliM2M5ZDA0
+    NTAxMThkZGZhM2U2MWY5OTJiNWIzYmI5Nzk1N2ZhMGQzOWZkYWM3Mjc2YzYy
+    ZjI1NjY2MjEzZGI5ZTg1N2ZhZjU2ODIyNjExMDU0ZDQ5Yjk0ZjE=
   data.tar.gz: !binary |-
-    MWVlYWQ5NDljOTEyMTk5M2EwOTM0OWZlZjYwODJhNWMzYzllNjFkMDZmMThk
-    OGQzYmIyNzBlOTJjOTYxNGU5YzIwOTJhMDQ2ZjM4MjNjMGEyNDZlODE1NjBh
-    MjMyZDk0ZGEwMDNmZmMzNjA1MTc1OWQ4YTA1NTY0NTI5MzM5MTI=
+    MDJhMWQxY2Q2ZTA0MTVkZmJiYTVjMzUyNjBlNTVhNGViMTFiNTI5ZDE1Y2Vm
+    NTkyNGU5YTE5Mjk4NjI4M2I5ZjMzNTY4ZDNkM2E2NmU1YmQ5NWQxNGQ3OWFh
+    NzY2OGVkYjhhZjczOTUyYWY1ZTEwNTM2NmU0ZGY3NWM4MjY0Njc=

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
+sudo: false
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2
 deploy:
   provider: rubygems
   api_key:

data/README.md

@@ -2,6 +2,7 @@
 [![Code Climate](https://codeclimate.com/github/netbe/Babelish.png)](https://codeclimate.com/github/netbe/Babelish)[![Coverage Status](https://coveralls.io/repos/netbe/Babelish/badge.png)](https://coveralls.io/r/netbe/Babelish)
 [![Gem Version](https://badge.fury.io/rb/babelish.svg)](http://badge.fury.io/rb/babelish)
 
+
 **Babelish : Chaotically confused, like Babel**
 
 Originally created to deal with localizedStrings files (aka *CSV-to-iOS-Localizable.strings-converter*), this command tool now converts a csv file of translations into the below file formats and vice-versa:
@@ -18,6 +19,8 @@ It can also fetch the csv file from GoogleDrive.
 
 Requires Ruby 1.9.3 or above.
 
+Or download [Latest Release](https://github.com/netbe/Babelish/releases/latest).
+
 # Usage
 
 ```

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-05-22'
+  s.date        = '2015-11-09'
   s.summary     = "CSV converter for localization files"
   s.description = "This set of commands converts a CSV file to the following formats:
                   - .strings (iOS)
@@ -21,11 +21,10 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
 
   s.add_dependency "google_drive", "~> 1.0.1"
+  s.add_dependency "nokogiri"
   # google_drive dependency to ask for mail and password
   s.add_dependency "highline"
 
-  # android support
-  s.add_dependency "xml-simple"
   # json support
   s.add_dependency "json"
 

data/lib/babelish/android2csv.rb

@@ -1,5 +1,5 @@
 module Babelish
-  require 'xmlsimple'
+  require "nokogiri"
   class Android2CSV < Base2Csv
 
     def initialize(args = {:filenames => []})
@@ -8,16 +8,19 @@ module Babelish
 
     def load_strings(strings_filename)
       strings = {}
-      raise Errno::ENOENT unless File.exist?(strings_filename)
+      xml_file = File.open(strings_filename)
 
-      xmlfile = XmlSimple.xml_in(strings_filename)
-      xmlfile['string'].each do |element|
-        if !element.nil? && !element['name'].nil?
-          content = element['content'].nil? ? '' : element['content']
-          strings.merge!({element['name'] => content})
+      parser = Nokogiri::XML(xml_file) do |config|
+        config.strict.noent
+      end
+      parser.xpath("//string").each do |node|
+        if !node.nil? && !node["name"].nil?
+          strings.merge!(node["name"] => node.inner_html)
         end
       end
 
+      xml_file.close
+
       [strings, {}]
     end
 

data/lib/babelish/csv2android.rb

@@ -1,7 +1,5 @@
 module Babelish
   class CSV2Android < Csv2Base
-    require 'xmlsimple'
-
     attr_accessor :file_path
 
     def initialize(filename, langs, args = {})
@@ -16,19 +14,29 @@ module Babelish
       return filepath ? [filepath] : []
     end
 
+    def process_value(row_value, default_value)
+      value = super(row_value, default_value)
+      # if the value begins and ends with a quote we must leave them unescapted
+      if value.size > 4 && value[0, 2] == "\\\"" && value[value.size - 2, value.size] == "\\\""
+        value[0, 2] = "\""
+        value[value.size - 2, value.size] = "\""
+      end
+      value.to_utf8
+    end
+
     def get_row_format(row_key, row_value, comment = nil, indentation = 0)
-        return "\t<string name=\"#{row_key}\">#{row_value}</string>\n"
+      "\t<string name=\"#{row_key}\">#{row_value}</string>\n"
     end
 
     def hash_to_output(content = {})
       output = ''
       if content && content.size > 0
-        output += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+        output += "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
         output += "<resources>\n"
         content.each do |key, value|
           output += get_row_format(key, value)
         end
-        output += "</resources>"
+        output += "</resources>\n"
       end
       return output
     end

data/lib/babelish/version.rb

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

data/test/babelish/test_android2csv.rb

@@ -15,21 +15,39 @@ class TestAndroid2CSV < Test::Unit::TestCase
 
   def test_initialize
     csv_filename = "file.csv"
-    filenames = %w{"french.strings english.strings"}
-    headers = %w{"constants french english"}
-    converter = Babelish::Android2CSV.new({
+    filenames = %w{french.strings english.strings}
+    headers = %w{constants french english}
+    converter = Babelish::Android2CSV.new(
       :csv_filename => csv_filename,
       :headers => headers,
-      :filenames => filenames
-      })
+      :filenames => filenames)
 
-      assert_equal csv_filename, converter.csv_filename
-      assert_equal headers, converter.headers
-      assert_equal filenames, converter.filenames
-    end
+    assert_equal csv_filename, converter.csv_filename
+    assert_equal headers, converter.headers
+    assert_equal filenames, converter.filenames
+  end
 
-    def test_initialize_with_default_values
-      converter = Babelish::Android2CSV.new
-      assert_not_nil converter.csv_filename
-    end
+  def test_initialize_with_default_values
+    converter = Babelish::Android2CSV.new
+    assert_not_nil converter.csv_filename
+  end
+
+  def test_special_chars
+    csv_filename = "./android_special_chars_output.csv"
+    filenames = "test/data/android_special_chars.xml"
+    headers = %w{variables german}
+
+    converter = Babelish::Android2CSV.new(
+      :csv_filename => csv_filename,
+      :headers => headers,
+      :filenames => [filenames])
+
+    converter.convert
+
+    assert File.exist?(converter.csv_filename)
+    assert_equal File.read("test/data/android_special_chars.csv"), File.read(csv_filename)
+
+    # clean up
+    system("rm -rf ./" + csv_filename)
   end
+end

data/test/babelish/test_bins.rb

@@ -6,7 +6,7 @@ class TestBins < Test::Unit::TestCase
     assert_nothing_raised do
       system("./bin/babelish csv2strings --fetch --filename my_strings --langs English:en")
     end
-    assert_equal $?.exitstatus, 0
+    assert_equal 0, $?.exitstatus
   end
 
   def test_csv2strings_with_google_doc_missing_langs
@@ -14,7 +14,7 @@ class TestBins < Test::Unit::TestCase
     assert_nothing_raised do
       system("./bin/babelish csv2strings --fetch --filename my_strings")
     end
-    assert_equal $?.exitstatus, 1
+    assert_equal 1, $?.exitstatus
   end
 
   def test_csv2strings_with_config_file
@@ -23,7 +23,7 @@ class TestBins < Test::Unit::TestCase
     assert_nothing_raised NameError do
       system("./bin/babelish csv2strings")
     end
-    assert_equal $?.exitstatus, 0
+    assert_equal 0, $?.exitstatus
   end
 
   def teardown

data/test/babelish/test_csv2android.rb

@@ -5,12 +5,23 @@ class TestCSV2Android < Test::Unit::TestCase
     csv_file = "test/data/test_data.csv"
     converter = Babelish::CSV2Android.new(csv_file, 'English' => "en")
     converter.convert
-    assert File.exists?("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
+    # clean up
     system("rm -rf ./values-en")
   end
 
+  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_equal File.read("test/data/android_special_chars_test_result.xml"), File.read("values-de/strings.xml")
+
+    # clean up
+    system("rm -rf ./values-de")
+  end
+
   def test_converting_csv_to_dotstrings_one_output_option
     csv_file = "test/data/test_data.csv"
     single_file = 'myApp.xml'
@@ -19,9 +30,9 @@ class TestCSV2Android < Test::Unit::TestCase
     :output_basename => 'myApp',
     :ignore_lang_path => true)
     converter.convert
-    assert File.exists?(single_file), "the ouptut file does not exist"
+    assert File.exist?(single_file), "the ouptut file does not exist"
 
-    #clean up
+    # clean up
     system("rm -rf ./" + single_file)
   end
 end

data/test/babelish/test_csv2base.rb

@@ -9,39 +9,36 @@ class TestCsv2Base < Test::Unit::TestCase
     converter = Babelish::Csv2Base.new(csv_filename, {"English" => ["en"]}, {
       :excluded_states => excluded_states,
       :state_column => state_column,
-      :keys_column => keys_column
-      })
+      :keys_column => keys_column })
 
-      assert_equal csv_filename, converter.csv_filename
-      assert_equal excluded_states, converter.excluded_states
-      assert_equal state_column, converter.state_column
-      assert_equal keys_column, converter.keys_column
-    end
+    assert_equal csv_filename, converter.csv_filename
+    assert_equal excluded_states, converter.excluded_states
+    assert_equal state_column, converter.state_column
+    assert_equal keys_column, converter.keys_column
+  end
 
-    def test_initialize_with_default_values
-      converter = Babelish::Csv2Base.new("file.csv", {"English" => ["en"]})
-      assert_not_nil converter.csv_filename
-    end
-    
-    def test_initialize_with_custom_separator
-      converter = Babelish::Csv2Base.new("file.csv", {"English" => ["en"]}, {
-        :csv_separator => ";"
-        })
-      assert_not_nil converter.csv_filename
-    end
+  def test_initialize_with_default_values
+    converter = Babelish::Csv2Base.new("file.csv", "English" => ["en"])
+    assert_not_nil converter.csv_filename
+  end
 
-    def test_create_file_from_path
-      test_file = "test_file.txt"
-      Babelish::Csv2Base.new("file.csv", {"English" => ["en"]}).create_file_from_path test_file
-      assert File.exist?(test_file)
+  def test_initialize_with_custom_separator
+    converter = Babelish::Csv2Base.new("file.csv", { "English" => ["en"] }, { :csv_separator => ";" })
+    assert_not_nil converter.csv_filename
+  end
 
-      #clean up
-      system("rm -rf ./" + test_file)
-    end
+  def test_create_file_from_path
+    test_file = "test_file.txt"
+    Babelish::Csv2Base.new("file.csv", "English" => ["en"]).create_file_from_path test_file
+    assert File.exist?(test_file)
+
+    # clean up
+    system("rm -rf ./" + test_file)
+  end
 
-    def test_get_row_format
-      expected_output = "\"test_key\" = \"test_value\""
-      output = Babelish::Csv2Base.new("file.csv", {"English" => ["en"]}).get_row_format("test_key", "test_value")
-      assert_equal expected_output, output
-    end
+  def test_get_row_format
+    expected_output = "\"test_key\" = \"test_value\""
+    output = Babelish::Csv2Base.new("file.csv", "English" => ["en"]).get_row_format("test_key", "test_value")
+    assert_equal expected_output, output
   end
+end

data/test/babelish/test_json2csv.rb

@@ -20,16 +20,15 @@ class JSON2CSVTest < Test::Unit::TestCase
     converter = Babelish::JSON2CSV.new({
       :csv_filename => csv_filename,
       :headers => headers,
-      :filenames => filenames
-      })
+      :filenames => filenames })
 
-      assert_equal csv_filename, converter.csv_filename
-      assert_equal headers, converter.headers
-      assert_equal filenames, converter.filenames
-    end
+    assert_equal csv_filename, converter.csv_filename
+    assert_equal headers, converter.headers
+    assert_equal filenames, converter.filenames
+  end
 
-    def test_initialize_with_default_values
-      converter = Babelish::JSON2CSV.new
-      assert_not_nil converter.csv_filename
-    end
+  def test_initialize_with_default_values
+    converter = Babelish::JSON2CSV.new
+    assert_not_nil converter.csv_filename
   end
+end

data/test/babelish/test_php2csv.rb

@@ -59,16 +59,15 @@ class TestPhp2CSV < Test::Unit::TestCase
     converter = Babelish::Php2CSV.new({
       :csv_filename => csv_filename,
       :headers => headers,
-      :filenames => filenames
-      })
+      :filenames => filenames })
 
-      assert_equal csv_filename, converter.csv_filename
-      assert_equal headers, converter.headers
-      assert_equal filenames, converter.filenames
-    end
+    assert_equal csv_filename, converter.csv_filename
+    assert_equal headers, converter.headers
+    assert_equal filenames, converter.filenames
+  end
 
-    def test_initialize_with_default_values
-      converter = Babelish::Php2CSV.new
-      assert_not_nil converter.csv_filename
-    end
+  def test_initialize_with_default_values
+    converter = Babelish::Php2CSV.new
+    assert_not_nil converter.csv_filename
   end
+end

data/test/babelish/test_strings2csv.rb

@@ -8,7 +8,7 @@ class TestStrings2CSV < Test::Unit::TestCase
     expected_output = ["MY_CONSTANT","This is ok"]
 
     output = Babelish::Strings2CSV.new.parse_dotstrings_line input
-    assert_equal expected_output, output 
+    assert_equal expected_output, output
   end
 
   def test_parse_dotstrings_line_with_single_quote
@@ -68,13 +68,13 @@ class TestStrings2CSV < Test::Unit::TestCase
   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"
-                      },{}]
+    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
@@ -127,13 +127,12 @@ class TestStrings2CSV < Test::Unit::TestCase
 
   def test_initialize
     csv_filename = "file.csv"
-    filenames = %w{"french.strings english.strings"}
-    headers = %w{"constants french english"}
+    filenames = %w{french.strings english.strings}
+    headers = %w{constants french english}
     converter = Babelish::Strings2CSV.new({
       :csv_filename => csv_filename,
       :headers => headers,
-      :filenames => filenames
-      })
+      :filenames => filenames })
 
       assert_equal csv_filename, converter.csv_filename
       assert_equal headers, converter.headers

data/test/data/android-en.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name">android2csv</string>

data/test/data/android-fr.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name">android2csv</string>

data/test/data/android.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name">android2csv</string>

data/test/data/android_special_chars.csv

@@ -0,0 +1,8 @@
+variables,german
+good_example_1,This\'ll work
+good_example_2,"This is a \""good string\""."
+good_example_3,"""This'll also work"""
+welcome_messages_1,"Hello, %1$s! You have %2$d new messages."
+welcome_messages_2,"Hello, %1$s! You have <b>%2$d new messages</b>."
+ANOTHER_STRING,"text <b>with</b> html and \' special # chars ` ´ !""§$%/()==?{[]}"
+title,"Title of &lt;a href=""asd""&gt;File&lt;/a&gt;"

data/test/data/android_special_chars.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<string name="good_example_1">This\'ll work</string>
+	<string name="good_example_2">This is a \"good string\".</string>
+	<string name="good_example_3">"This'll also work"</string>
+	<string name="welcome_messages_1">Hello, %1$s! You have %2$d new messages.</string>
+	<string name="welcome_messages_2">Hello, %1$s! You have &lt;b>%2$d new messages&lt;/b>.</string>
+	<string name="ANOTHER_STRING">text <b>with</b> html and \' special # chars ` ´ !"§$%/()==?{[]}</string>
+	<string name="title">Title of &lt;a href="asd">File&lt;/a></string>
+
+</resources>

data/test/data/android_special_chars_test_result.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="good_example_1">This\'ll work</string>
+	<string name="good_example_2">This is a \"good string\".</string>
+	<string name="good_example_3">"This'll also work"</string>
+	<string name="welcome_messages_1">Hello, %1$s! You have %2$d new messages.</string>
+	<string name="welcome_messages_2">Hello, %1$s! You have &lt;b&gt;%2$d new messages&lt;/b&gt;.</string>
+	<string name="ANOTHER_STRING">text <b>with</b> html and \' special # chars ` ´ !\"§$%/()==?{[]}</string>
+	<string name="title">Title of &lt;a href=\"asd\"&gt;File&lt;/a&gt;</string>
+</resources>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelish
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - François Benaiteau
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-simple
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -194,6 +194,9 @@ files:
 - test/data/android-en.xml
 - test/data/android-fr.xml
 - test/data/android.xml
+- test/data/android_special_chars.csv
+- test/data/android_special_chars.xml
+- test/data/android_special_chars_test_result.xml
 - test/data/genstrings.strings
 - test/data/json.json
 - test/data/php_lang.php