ad_localize 3.1.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9510eed71bfba2c01f047d80707eaaeffbe24d6fefc4f65927b1afe8e44c2a49
-  data.tar.gz: 3aba4a56d7f7b5fd0da6056471c55cf025a9133dd3d5a815fe06ac89a662d645
+  metadata.gz: 736260ad38d18773bf3b8ed6441534bb3467f49edeae2335c7ec5b8742f934e9
+  data.tar.gz: 38cb4f5d8647cc997dc2eb0c784b42469ae5dbb51aad9ba8f19f97907654a181
 SHA512:
-  metadata.gz: b87614c092bd2c6fcee5deeba77add9035f01c4861d526081e91606e6613827f4199d2fccb1f69aa7149f6c7a2755536d7e7a2b5d50901455b519fc20a98d695
-  data.tar.gz: 22b0cc2b7b3a6290017b7cdd9e8bb0a7bb30b662bdeada9669d9fd10a670af0f3d4e99919fca9023b0cd289d0ad254d45e14dc7d7fdc20f0b6fac25f92017eca
+  metadata.gz: 5448a25049abad18258c563bd84809a3f38cfefa54a60ace5c80fd7f214af81dcb30effb3a1d907962e6fb7d5707de322159e7361ef80ae01925124914d1a9ac
+  data.tar.gz: a139d77e6c76386493c3cb8d7d39aaf2c3a9526cba30a05b9aff2adaaccf326cb71303919a888da7329b4d56bef72f51211b0ee7fd3aa21e1641e0156ea0461e

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/.gitignore

@@ -9,4 +9,5 @@ ad_localize/tmp/
 .idea
 .byebug_history
 .ruby-version
-
+pkg/
+exports/

data/CHANGELOG.md

@@ -4,9 +4,50 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.6.0] - 2020-06-23
+### Added
+  - add documentation for service account usage by [@sjcqs](https://github.com/sjcqs)
+  - add compatibility with activesupport 6 by [@Hugo-Hache](https://github.com/Hugo-Hache)
+
+### Changed
+
+### Fixed
+  
+## [3.5.0] - 2020-05-12
+### Added
+  - add support for private spreadsheet using google service acccount by [@sjcqs](https://github.com/sjcqs). Fixes [#31](https://github.com/applidium/ad_localize/issues/31)
+  - add makefile for easier testing by [@felginep](https://github.com/felginep)
+
+### Changed
+  - improve error message to have useful information in case of google spreadsheet use by [@felginep](https://github.com/felginep). Fixes [#27](https://github.com/applidium/ad_localize/issues/27)
+  - platform folder is no longer generated when there is only one platform selected. The files are directly generated in the output path. By [@felginep](https://github.com/felginep). Fixes [#29](https://github.com/applidium/ad_localize/issues/29)
+  - raise error when google spreadsheet key is invalid by [@felginep](https://github.com/felginep)
+
+### Fixed
+  - auto escape strings in Localizable.strings by [@felginep](https://github.com/felginep). Fixes [#26](https://github.com/applidium/ad_localize/issues/26)
+  - trim keys to prevent user error by [@felginep](https://github.com/felginep). Fixes [#16](https://github.com/applidium/ad_localize/issues/16)
+
+## [3.4.0] - 2019-02-10
+### Added
+  - Rails folks, [@epaillous](https://github.com/epaillous) has improved the YAML support. You can now have multi-level wording.
+
+## [3.3.0] - 2019-02-10
+### Added
+  - improve React support using keys with dots to generate nested JSON files by [@epaillous](https://github.com/epaillous)
+
+## [3.2.0] - 2019-12-10
+### Added
+  - Add tests to compare reference exports by [@felginep](https://github.com/felginep)
+  - [iOS only] Handle [adaptive strings](https://developer.apple.com/documentation/foundation/nsstring/1413104-variantfittingpresentationwidth) by [@felginep](https://github.com/felginep)
+
+### Changed
+  - Fix issue with Info.plist format by [@felginep](https://github.com/felginep)
+  - Do not export plurals for android when there are no values by [@felginep](https://github.com/felginep)
+
 ## [3.1.0] - 2019-09-30
 ### Added
   - [iOS only] Info.plist generation support by [@felginep](https://github.com/felginep)
+
 ### Changed
   - No more warning log for empty lines by [@felginep](https://github.com/felginep)
 
@@ -27,4 +68,3 @@ TODO
 
 ## [0.1.0] - 2016-04-25
 TODO
-

data/Gemfile.lock

@@ -0,0 +1,78 @@
+PATH
+  remote: .
+  specs:
+    ad_localize (3.5.0)
+      activesupport (>= 5.2, < 7.0)
+      colorize (~> 0.8)
+      googleauth (~> 0.12)
+      nokogiri (~> 1.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansi (1.5.0)
+    builder (3.2.4)
+    byebug (11.1.3)
+    colorize (0.8.1)
+    concurrent-ruby (1.1.6)
+    diffy (3.3.0)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    googleauth (0.12.0)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.14)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    jwt (2.2.1)
+    memoist (0.16.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    minitest-reporters (1.4.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    multi_json (1.14.1)
+    multipart-post (2.1.1)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    os (1.1.0)
+    public_suffix (4.0.5)
+    rake (12.3.3)
+    ruby-progressbar (1.10.1)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ad_localize!
+  bundler (>= 1.12.0, < 3.0.0)
+  byebug (~> 11.0)
+  diffy (~> 3.3)
+  minitest (~> 5.11)
+  minitest-reporters (~> 1.3)
+  rake (~> 12.3)
+
+BUNDLED WITH
+   2.1.4

data/Makefile

@@ -0,0 +1,11 @@
+build:
+	gem build ad_localize.gemspec
+
+install: clean build
+	gem install ad_localize-*.gem
+
+clean:
+	rm -f ad_localize-*.gem
+
+tests:
+	bundle exec rake test

data/README.md

@@ -29,15 +29,31 @@ $ gem install ad_localize
 $ bundle exec ad_localize -h
 ```
 
-* Export wording from a google drive spreadsheet, using the file key
+* Export wording from a google spreadsheet, using the file key. Make sure to enable _Allow external access_ in sharing options.
 ```
 $ bundle exec ad_localize -k <your-spreadsheet-drive-key>
 ```
-* Export wording from a google drive spreadsheet, using the file key and specifying a sheet (useful when your file has multiple sheets)
+
+* Export wording from a google spreadsheet, using the file key and specifying a sheet (useful when your file has multiple sheets)
 ```
 $ bundle exec ad_localize -k <your-spreadsheet-drive-key> -s <your-specific-sheet-id>
 ```
 
+* Export wording from a private google spreadsheet using a Google Cloud Service Account.
+    1. Create a GCloud Service Account:
+        - Go to [Google Cloud Console](https://console.cloud.google.com/)
+        - Either create a new project or use an existing one (when using Firebase, a GCloud project is created)
+        - Go to *IAM & Admin / Service Account* and create a new service account.
+        - Store the created `client-secret.json` (in a password manager for example)
+    2. Enable Google Drive API for the projet
+        - Go to *API / Library* and enable the **Drive API** there.
+    3. Add the service account to a spreadsheet.
+        - In *IAM & Admin / Service Account*, the service account's email is listed. Invite it to the spreadsheet to export.
+```
+$ export GCLOUD_CLIENT_SECRET=$(cat <client-secret.json>)
+$ bundle exec ad_localize -k <your-spreadsheet-drive-key> -a
+```
+
 * Only generate wording files for the specified platforms
 ```
 $ bundle exec ad_localize -o ios
@@ -62,10 +78,11 @@ $ bundle exec ad_localize -d
 | favorites | Mes favoris | My favorites |
 | from_to | du %1$@ au %2$@ | from %1$@ to %2$@ |
 
-- Any column after the `key` column will be considered as a locale column (except from the optional `comment columns) 
+- Any column after the `key` column will be considered as a locale column (except from the optional `comment columns)
 - Keys should be written in Android format : [a-z0-9_]+
 - Format specifiers must be numeroted if there are more than one in a translation string (eg: "%1$@ %2$@'s report").
 
+
 #### Comment columns
 
 In iOS (and only iOS) you can add a comment to a missing translation.
@@ -111,6 +128,8 @@ exports/
     └── fr.yml
 ```
 
+NB: If you select only one platform, the wording files will directly be generated in the output path. The output path is the `exports` folder in the current directory by default and you can change it using the option `-o`.
+
 ## Plurals
 
 Plurals are supported for iOS and Android.
@@ -177,6 +196,41 @@ Every key that matches the following formats will be added to the `InfoPlist.str
 
 Source: https://developer.apple.com/documentation/bundleresources/information_property_list
 
+## Adaptive strings
+
+_Only for iOS._
+
+Syntax for adaptive keys in the CSV file:
+
+       key##{20}
+       key##{25}
+       key##{50}
+       …
+
+Sample of iOS output in .stringsdict
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<plist>
+    <dict>
+        <key>start_countdown</key>
+        <dict>
+            <key>NSStringVariableWidthRuleType</key>
+            <dict>
+                <key>20</key>
+                <string>Start</string>
+                <key>25</key>
+                <string>Start countdown</string>
+                <key>50</key>
+                <string>Start countdown</string>
+            </dict>
+        </dict>
+    </dict>
+</plist>
+```
+
+Source: https://developer.apple.com/documentation/foundation/nsstring/1413104-variantfittingpresentationwidth
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/ad_localize.gemspec

@@ -19,14 +19,16 @@ Gem::Specification.new do |spec|
     'Nicolas Braun',
     'Corentin Huard',
     'Claire Peyron',
-    'Claire Dufetrelle'
+    'Claire Dufetrelle',
+    'Pierre Felgines',
+    'Satyan Jacquens'
   ]
   spec.email         = %w(joanna.vigne@fabernovel.com hugo.hache@fabernovel.com edouard.siegel@fabernovel.com)
 
   spec.summary       = %q{AdLocalize helps with mobile and web applications wording}
   spec.description   = %q{AdLocalize produces localization files from platform agnostic wording.
                           Supported wording format : CSV. Supported export format: iOS, Android, JSON and YAML}
-  spec.homepage      = 'https://technologies.fabernovel.com'
+  spec.homepage      = 'https://github.com/applidium/ad_localize'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -42,10 +44,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'byebug', '~> 11.0'
   spec.add_development_dependency 'minitest-reporters', '~> 1.3'
+  spec.add_development_dependency 'diffy', '~> 3.3'
 
-  spec.add_dependency 'activesupport', '~> 4.2' ,'>= 4.2.10' # Fastlane does not support activesupport 5
-  spec.add_dependency 'nokogiri', '~> 1.8', '>= 1.8.2'
+  spec.add_dependency 'activesupport', '>= 5.2', '< 7.0'
+  spec.add_dependency 'nokogiri', '~> 1.10'
   spec.add_dependency 'colorize', '~> 0.8'
+  spec.add_dependency 'googleauth', '~> 0.12'
 
-  spec.required_ruby_version     = '~> 2.3'
+  spec.required_ruby_version = '~> 2.3'
 end

data/lib/ad_localize.rb

@@ -8,6 +8,8 @@ require 'csv'
 require 'logger'
 require 'colorize'
 require 'open-uri'
+require 'stringio'
+require 'googleauth'
 require 'optparse'
 require 'nokogiri'
 

data/lib/ad_localize/constant.rb

@@ -2,6 +2,7 @@ module AdLocalize
   module Constant
     SUPPORTED_PLATFORMS = %w(ios android yml json)
     PLURAL_KEY_SYMBOL = :plural
+    ADAPTIVE_KEY_SYMBOL = :adaptive
     SINGULAR_KEY_SYMBOL = :singular
     COMMENT_KEY_SYMBOL = :comment
     INFO_PLIST_KEY_SYMBOL = :info_plist

data/lib/ad_localize/csv_file_manager.rb

@@ -8,13 +8,20 @@ module AdLocalize
       end
 
       # Returns the downloaded file name (it is located in the current directory)
-      def download_from_drive(key, sheet)
-        LOGGER.log(:info, :black, "Downloading file from google drive...")
+      def download_from_drive(key, sheet, use_service_account=false)
+        LOGGER.log(:info, :green, "Downloading file from google drive...")
         download_string_path = "./#{key}.csv"
         begin
           File.open(download_string_path, "wb") do |saved_file|
+            download_url = drive_download_url(key, sheet)
+            headers = {}
+            if use_service_account
+              LOGGER.log(:debug, :green, "Using a service account...")
+              token = service_account_access_token()
+              headers["Authorization"] = "#{token["token_type"]} #{token["access_token"]}"
+            end
             # the following "open" is provided by open-uri
-            open(drive_download_url(key, sheet), "rb") do |read_file|
+            open(download_url, "rb", headers) do |read_file|
               saved_file.write(read_file.read)
             end
             File.basename saved_file
@@ -42,6 +49,16 @@ module AdLocalize
         query_id = sheet ? "gid=#{sheet}" : "id=#{key}"
         "https://docs.google.com/spreadsheets/d/#{key}/export?format=csv&#{query_id}"
       end
+      private
+      def service_account_access_token()
+          scope = "https://www.googleapis.com/auth/drive.readonly"
+          json_key_io = StringIO.new ENV["GCLOUD_CLIENT_SECRET"]
+          authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+            json_key_io: json_key_io,
+            scope: scope
+          )
+         authorizer.fetch_access_token!
+      end
     end
   end
 end

data/lib/ad_localize/csv_parser.rb

@@ -1,7 +1,8 @@
 module AdLocalize
   class CsvParser
     CSV_WORDING_KEYS_COLUMN = "key"
-    PLURAL_KEY_REGEXP = /\#\#\{(\w+)\}/
+    PLURAL_KEY_REGEXP = /\#\#\{([A-Za-z]+)\}/
+    ADAPTIVE_KEY_REGEXP = /\#\#\{(\d+)\}/
     INFO_PLIST_KEY_REGEXP = /(NS.+UsageDescription)|(CF.+Name)/ # see https://developer.apple.com/documentation/bundleresources/information_property_list
 
     attr_accessor :locales
@@ -57,7 +58,7 @@ module AdLocalize
       if locales.empty?
         raise 'NO DETECTED LOCALES'
       else
-        LOGGER.log(:debug, :black, "DETECTED LOCALES : #{locales.join(', ')}")
+        LOGGER.log(:debug, :green, "DETECTED LOCALES : #{locales.join(', ')}")
       end
     end
 
@@ -78,6 +79,11 @@ module AdLocalize
             "[#{locale.upcase}] Plural key ---> plural_identifier : #{key_infos.dig(:plural_identifier)}, key : #{current_key}",
             "[#{locale.upcase}] Missing translation for #{current_key} (#{key_infos.dig(:plural_identifier)})")
           value = { key_infos.dig(:plural_identifier) => row[locale] || default_wording(locale, "#{current_key} (#{key_infos.dig(:plural_identifier)})") }
+        elsif key_infos.dig(:numeral_key) == Constant::ADAPTIVE_KEY_SYMBOL
+          trace_wording(row[locale],
+            "[#{locale.upcase}] Adaptive key ---> adaptive_identifier : #{key_infos.dig(:adaptive_identifier)}, key : #{current_key}",
+            "[#{locale.upcase}] Missing translation for #{current_key} (#{key_infos.dig(:adaptive_identifier)})")
+          value = { key_infos.dig(:adaptive_identifier) => row[locale] || default_wording(locale, "#{current_key} (#{key_infos.dig(:adaptive_identifier)})") }
         elsif key_infos.dig(:numeral_key) == Constant::INFO_PLIST_KEY_SYMBOL
           trace_wording(row[locale], "[#{locale.upcase}] Info.plist key ---> #{current_key}", "[#{locale.upcase}] Missing translation for #{current_key}")
           value = row[locale] || default_wording(locale, current_key)
@@ -93,27 +99,36 @@ module AdLocalize
     end
 
     def parse_key(row)
-      key = row.field(CSV_WORDING_KEYS_COLUMN)
+      key = row.field(CSV_WORDING_KEYS_COLUMN).strip
       plural_prefix = key.match(PLURAL_KEY_REGEXP)
       plural_identifier = nil
       invalid_plural = false
 
-      if plural_prefix.nil?
-        if key.match(INFO_PLIST_KEY_REGEXP).nil?
-          numeral_key = Constant::SINGULAR_KEY_SYMBOL
-        else
-          numeral_key = Constant::INFO_PLIST_KEY_SYMBOL
-        end
-      else
+      adaptive_prefix = key.match(ADAPTIVE_KEY_REGEXP)
+      adaptive_identifier = nil
+      invalid_adaptive = false
+
+      if plural_prefix != nil
         numeral_key = Constant::PLURAL_KEY_SYMBOL
         key = plural_prefix.pre_match
         plural_identifier = plural_prefix.captures&.first
         LOGGER.log(:debug, :red, "Invalid key #{key}") if key.nil?
         LOGGER.log(:debug, :red, "Empty plural prefix!") if plural_identifier.nil?
         invalid_plural = plural_identifier.nil?
+      elsif adaptive_prefix != nil
+        numeral_key = Constant::ADAPTIVE_KEY_SYMBOL
+        key = adaptive_prefix.pre_match
+        adaptive_identifier = adaptive_prefix.captures&.first
+        LOGGER.log(:debug, :red, "Invalid key #{key}") if key.nil?
+        LOGGER.log(:debug, :red, "Empty adaptive prefix!") if adaptive_identifier.nil?
+        invalid_adaptive = adaptive_identifier.nil?
+      elsif key.match(INFO_PLIST_KEY_REGEXP) != nil
+        numeral_key = Constant::INFO_PLIST_KEY_SYMBOL
+      else
+        numeral_key = Constant::SINGULAR_KEY_SYMBOL
       end
 
-      (key.nil? or invalid_plural) ? nil : { key: key.to_sym, numeral_key: numeral_key, plural_identifier: plural_identifier&.to_sym }
+      (key.nil? or invalid_plural or invalid_adaptive) ? nil : { key: key.to_sym, numeral_key: numeral_key, plural_identifier: plural_identifier&.to_sym, adaptive_identifier: adaptive_identifier&.to_sym }
     end
 
     def default_wording(locale, key)
@@ -122,7 +137,7 @@ module AdLocalize
 
     def trace_wording(wording, present_message, missing_message)
       if wording
-        LOGGER.log(:debug, :black, present_message)
+        LOGGER.log(:debug, :green, present_message)
       else
         LOGGER.log(:debug, :yellow, missing_message)
       end

data/lib/ad_localize/option_handler.rb

@@ -20,11 +20,15 @@ module AdLocalize
           end
           opts.on("-k", "--drive-key #{GOOGLE_DRIVE_DOCUMENT_ID.dig(:length)}_characters", String, "Use google drive spreadsheets") do |key|
             is_valid_drive_key = !!(key =~ GOOGLE_DRIVE_DOCUMENT_ID.dig(:regexp)) && (key.size >= GOOGLE_DRIVE_DOCUMENT_ID.dig(:length))
-            args[:drive_key] = is_valid_drive_key ? key : nil
+            raise ArgumentError.new("Invalid google drive spreadsheet key \"#{key}\"") unless is_valid_drive_key
+            args[:drive_key] = key
           end
           opts.on("-s", "--drive-sheet SHEET_ID", String, "Use a specific sheet id for Google Drive spreadsheets with several sheets") do |value|
             args[:sheet_id] = value
           end
+          opts.on("-a", "--use-service-account", "Use a Google Cloud Service Account to access the file. An GCLOUD_CLIENT_SECRET environment variable containting the client_secret.json content is needed.") do
+            args[:use_service_account] = true
+          end
           opts.on("-o", "--only platform1,platform2", Array, "Only generate localisation files for the specified platforms. Supported platforms : #{Constant::SUPPORTED_PLATFORMS.join(', ')}") do |platforms|
             args[:only] = filter_option_args("-o", platforms) { |platform| !!Constant::SUPPORTED_PLATFORMS.index(platform) }
           end
@@ -44,6 +48,7 @@ module AdLocalize
           LOGGER.log(:error, :red, "Missing argument for option #{e.args.join(',')}")
         rescue ArgumentError => e
           LOGGER.log(:error, :red, e.message)
+          raise e
         end
         args
       end

data/lib/ad_localize/platform/android_formatter.rb

@@ -57,7 +57,7 @@ module AdLocalize::Platform
             add_wording_text_to_xml(plural_text, xml)
           }
         end
-      }
+      } unless plural_hash.values.all? &:empty?
     end
 
     def add_wording_text_to_xml(wording_text, xml)
@@ -67,4 +67,4 @@ module AdLocalize::Platform
       )
     end
   end
-end
+end

data/lib/ad_localize/platform/ios_formatter.rb

@@ -6,10 +6,16 @@ module AdLocalize::Platform
 
     def export(locale, data, export_extension = nil, substitution_format = nil)
       create_locale_dir(locale)
-      [AdLocalize::Constant::PLURAL_KEY_SYMBOL, AdLocalize::Constant::SINGULAR_KEY_SYMBOL, AdLocalize::Constant::INFO_PLIST_KEY_SYMBOL].each do |numeral_key|
+      all_symbols = [
+        AdLocalize::Constant::PLURAL_KEY_SYMBOL,
+        AdLocalize::Constant::ADAPTIVE_KEY_SYMBOL,
+        AdLocalize::Constant::SINGULAR_KEY_SYMBOL,
+        AdLocalize::Constant::INFO_PLIST_KEY_SYMBOL
+      ]
+      all_symbols.each do |numeral_key|
         numeral_data = data.select {|key, wording| wording.dig(locale.to_sym)&.key? numeral_key}
         if numeral_data.empty?
-          AdLocalize::LOGGER.log(:info, :black, "[#{locale.upcase}] no #{numeral_key.to_s} keys were found to generate the file")
+          AdLocalize::LOGGER.log(:info, :green, "[#{locale.upcase}] no #{numeral_key.to_s} keys were found to generate the file")
         else
           send("write_#{numeral_key}", locale, numeral_data)
         end
@@ -36,53 +42,102 @@ module AdLocalize::Platform
       )
     end
 
+    def write_plural(locale, plurals)
+      locale = locale.to_sym
+
+      append_to_localizable_plist(locale) do |xml|
+        plurals.each do |wording_key, translations|
+          xml.key wording_key
+          xml.dict {
+            xml.key "NSStringLocalizedFormatKey"
+            xml.string "%\#@key@"
+            xml.key "key"
+            xml.dict {
+              xml.key "NSStringFormatSpecTypeKey"
+              xml.string "NSStringPluralRuleType"
+              xml.key "NSStringFormatValueTypeKey"
+              xml.string "d"
+              translations[locale][AdLocalize::Constant::PLURAL_KEY_SYMBOL].each do |wording_type, wording_value|
+                xml.key wording_type
+                xml.string wording_value
+              end
+            }
+          }
+        end
+      end
+      AdLocalize::LOGGER.log(:debug, :green, "iOS plural [#{locale}] ---> DONE!")
+    end
+
+    def write_adaptive(locale, adaptives)
+      locale = locale.to_sym
+
+      append_to_localizable_plist(locale) do |xml|
+        adaptives.each do |wording_key, translations|
+          xml.key wording_key
+          xml.dict {
+            xml.key "NSStringVariableWidthRuleType"
+            xml.dict {
+              translations[locale][AdLocalize::Constant::ADAPTIVE_KEY_SYMBOL].each do |wording_type, wording_value|
+                xml.key wording_type
+                xml.string wording_value
+              end
+            }
+          }
+        end
+      end
+      AdLocalize::LOGGER.log(:debug, :black, "iOS adaptive [#{locale}] ---> DONE!")
+    end
+
+    private
+
+    def escape_quotes_if_needed(value)
+      value.gsub(/(?<!\\)\"/, "\\\"") # match " unless there is a \ before
+    end
+
     def write_localizable(locale:, singulars:, wording_type:, filename:)
       locale = locale.to_sym
 
       singulars.each do |key, locales_wording|
         value = locales_wording.dig(locale, wording_type)
+        value = escape_quotes_if_needed(value)
         comment = locales_wording.dig(locale, AdLocalize::Constant::COMMENT_KEY_SYMBOL)
         export_dir(locale).join(filename).open("a") do |file|
-          line =  "\"#{key}\" = \"#{value}\";"
+          line = ""
+          if wording_type == AdLocalize::Constant::INFO_PLIST_KEY_SYMBOL
+            line = %(#{key} = "#{value}";)
+          else
+            line = %("#{key}" = "#{value}";)
+          end
           line << " // #{comment}" unless comment.nil?
           line << "\n"
           file.puts line
         end
       end
-      AdLocalize::LOGGER.log(:debug, :black, "iOS #{wording_type} [#{locale}] ---> DONE!")
+      AdLocalize::LOGGER.log(:debug, :green, "iOS #{wording_type} [#{locale}] ---> DONE!")
     end
 
-    def write_plural(locale, plurals)
-      locale = locale.to_sym
-
-      xml_doc = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-        xml.plist {
-          xml.dict {
-            plurals.each do |wording_key, translations|
-              xml.key wording_key
-              xml.dict {
-                xml.key "NSStringLocalizedFormatKey"
-                xml.string "%\#@key@"
-                xml.key "key"
-                xml.dict {
-                  xml.key "NSStringFormatSpecTypeKey"
-                  xml.string "NSStringPluralRuleType"
-                  xml.key "NSStringFormatValueTypeKey"
-                  xml.string "d"
-                  translations[locale][AdLocalize::Constant::PLURAL_KEY_SYMBOL].each do |wording_type, wording_value|
-                    xml.key wording_type
-                    xml.string wording_value
-                  end
-                }
-              }
-            end
+    def append_to_localizable_plist(locale)
+      filename = export_dir(locale).join(AdLocalize::Constant::IOS_PLURAL_EXPORT_FILENAME)
+      xml_doc = nil
+      if File.exist?(filename)
+        xml_content = Nokogiri::XML(open(filename)) do |config|
+          config.default_xml.noblanks # minimify xml
+        end
+        xml_doc = Nokogiri::XML::Builder.with(xml_content.css('plist>dict').first) do |xml|
+          yield(xml)
+        end
+      else
+        xml_doc = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+          xml.plist {
+            xml.dict {
+              yield(xml)
+            }
           }
-        }
+        end
       end
-      export_dir(locale).join(AdLocalize::Constant::IOS_PLURAL_EXPORT_FILENAME).open("w") do |file|
+      filename.open("w") do |file|
         file.puts xml_doc.to_xml(indent: 4)
       end
-      AdLocalize::LOGGER.log(:debug, :black, "iOS plural [#{locale}] ---> DONE!")
     end
   end
-end
+end

data/lib/ad_localize/platform/json_formatter.rb

@@ -4,15 +4,14 @@ module AdLocalize::Platform
       :json
     end
 
-    def export(locale, data, export_extension = "json", substitution_format = "angular")
-      super(locale, data, export_extension, substitution_format) do |json_data, file|
+    def export(locale, data, export_extension = "json", substitution_format = "react")
+      locale = locale.to_sym
+      json_data = build_platform_data_splitting_on_dots(locale, data)
+      platform_dir.join("#{locale.to_s}.#{export_extension}").open("w") do |file|
         file.puts json_data.to_json
       end
-    end
 
-    protected
-    def ios_converter(value)
-      value.gsub(/(%(?!)?(\d+\$)?[@isd])/, "VARIABLE_TO_SET")
+      AdLocalize::LOGGER.log(:debug, :green, "JSON [#{locale}] ---> DONE!")
     end
   end
-end
+end

data/lib/ad_localize/platform/platform_formatter.rb

@@ -5,12 +5,13 @@ module AdLocalize::Platform
     OPTIONS = {output_path: ".."}
 
     attr_accessor :platform_dir
-    attr_reader :default_locale, :output_path
+    attr_reader :default_locale, :output_path, :add_intermediate_platform_dir
 
-    def initialize(default_locale, output_path)
+    def initialize(default_locale, output_path, add_intermediate_platform_dir)
       @default_locale = default_locale.to_sym
       @output_path = output_path # Must be set before platform_dir
-      @platform_dir = export_base_directory.join(platform.to_s)
+      @platform_dir = add_intermediate_platform_dir ? export_base_directory.join(platform.to_s) : export_base_directory
+      @add_intermediate_platform_dir = add_intermediate_platform_dir
       create_platform_dir
     end
 
@@ -39,7 +40,7 @@ module AdLocalize::Platform
         yield(formatted_data, file)
       end
 
-      AdLocalize::LOGGER.log(:debug, :black, "#{platform.to_s.upcase} [#{locale}] ---> DONE!")
+      AdLocalize::LOGGER.log(:debug, :green, "#{platform.to_s.upcase} [#{locale}] ---> DONE!")
     end
 
     protected
@@ -52,7 +53,7 @@ module AdLocalize::Platform
     end
 
     def create_platform_dir
-      if platform_dir.directory?
+      if platform_dir.directory? && add_intermediate_platform_dir
         FileUtils.rm_rf("#{platform_dir}/.", secure: true)
       else
         platform_dir.mkpath
@@ -72,5 +73,37 @@ module AdLocalize::Platform
         export_dir(locale).mkdir
       end
     end
+
+    def build_platform_data_splitting_on_dots(locale, data)
+      data.each_with_object({}) do |(key, wording), hash_acc|
+        hash_acc[locale.to_s] = {} unless hash_acc.key? locale.to_s
+        keys = key.to_s.split('.')
+        hash = hash_acc[locale.to_s]
+        keys.each_with_index do |inner_key, index|
+          if index === keys.count - 1
+            fill_hash(wording, locale, hash, inner_key)
+          else
+            if hash[inner_key].nil?
+              hash[inner_key] = {}
+            end
+            hash = hash[inner_key]
+          end
+        end
+      end
+    end
+
+    def fill_hash(wording, locale, hash, key)
+      if wording.dig(locale)&.key? :singular
+        value = wording.dig(locale, :singular)
+        hash[key.to_s] = value
+      end
+      if wording.dig(locale)&.key? :plural
+        hash[key.to_s] = {}
+        wording.dig(locale, :plural).each do |plural_type, plural_text|
+          value = plural_text
+          hash[key.to_s][plural_type.to_s] = value
+        end
+      end
+    end
   end
 end

data/lib/ad_localize/platform/yml_formatter.rb

@@ -5,14 +5,15 @@ module AdLocalize::Platform
     end
 
     def export(locale, data, export_extension = "yml", substitution_format = "yml")
-      super(locale, data, export_extension, substitution_format) do |yml_data, file|
+      locale = locale.to_sym
+      yml_data = build_platform_data_splitting_on_dots(locale, data)
+
+      platform_dir.join("#{locale.to_s}.#{export_extension}").open("w") do |file|
         file.puts yml_data.to_yaml
       end
-    end
 
-    protected
-    def ios_converter(value)
-      value.gsub(/(%(?!)?(\d+\$)?[@isd])/, "VARIABLE_TO_SET")
+      AdLocalize::LOGGER.log(:debug, :green, "YAML [#{locale}] ---> DONE!")
     end
+
   end
 end

data/lib/ad_localize/runner.rb

@@ -7,7 +7,7 @@ module AdLocalize
     end
 
     def run(args = ARGV)
-      LOGGER.log(:info, :black, "OPTIONS : #{options}")
+      LOGGER.log(:info, :green, "OPTIONS : #{options}")
       input_files = (args + [options.dig(:drive_key)]).compact # drive_key can be nil
       if input_files.length.zero?
         LOGGER.log(:error, :red, "No CSV to parse. Use option -h to see how to use this script")
@@ -15,26 +15,36 @@ module AdLocalize
         file_to_parse = args.first
         LOGGER.log(:warn, :yellow, "Only one CSV can be treated - the priority goes to #{file_to_parse}") if input_files.length > 1
         if args.empty?
-          options[:drive_file] = CsvFileManager.download_from_drive(options.dig(:drive_key), options.dig(:sheet_id))
+          options[:drive_file] = CsvFileManager.download_from_drive(options.dig(:drive_key), options.dig(:sheet_id), options.dig(:use_service_account))
           file_to_parse = options.dig(:drive_file)
         end
-        CsvFileManager.csv?(file_to_parse) ? export(file_to_parse) : LOGGER.log(:error, :red, "#{file_to_parse} is not a csv")
+        if CsvFileManager.csv?(file_to_parse)
+          export(file_to_parse)
+        else
+          LOGGER.log(:error, :red, "#{file_to_parse} is not a csv. Make sure to enable \"Allow external access\" in sharing options.")
+        end
         CsvFileManager.delete_drive_file(options[:drive_file]) if options[:drive_file]
       end
     end
 
     private
+
     def export(file)
-      LOGGER.log(:info, :black, "********* PARSING #{file} *********")
-      LOGGER.log(:info, :black, "Extracting data from file...")
+      LOGGER.log(:info, :green, "********* PARSING #{file} *********")
+      LOGGER.log(:info, :green, "Extracting data from file...")
       parser = CsvParser.new
       data = parser.extract_data(file)
       if data.empty?
         LOGGER.log(:error, :red, "No data were found in the file - check if there is a key column in the file")
       else
         export_platforms = options.dig(:only) || Constant::SUPPORTED_PLATFORMS
+        add_intermediate_platform_dir = export_platforms.length > 1
         export_platforms.each do |platform|
-          platform_formatter = "AdLocalize::Platform::#{platform.to_s.camelize}Formatter".constantize.new(parser.locales.first, options.dig(:output_path))
+          platform_formatter = "AdLocalize::Platform::#{platform.to_s.camelize}Formatter".constantize.new(
+            parser.locales.first,
+            options.dig(:output_path),
+            add_intermediate_platform_dir
+          )
           parser.locales.each do |locale|
             platform_formatter.export(locale, data)
           end
@@ -42,4 +52,4 @@ module AdLocalize
       end
     end
   end
-end
+end

data/lib/ad_localize/version.rb

@@ -1,3 +1,3 @@
 module AdLocalize
-  VERSION = "3.1.0"
+  VERSION = "3.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Edouard Siegel
@@ -15,6 +15,8 @@ authors:
 - Corentin Huard
 - Claire Peyron
 - Claire Dufetrelle
+- Pierre Felgines
+- Satyan Jacquens
 autorequire: 
 bindir: exe
 cert_chain: []
@@ -97,45 +99,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +160,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: googleauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 description: |-
   AdLocalize produces localization files from platform agnostic wording.
                             Supported wording format : CSV. Supported export format: iOS, Android, JSON and YAML
@@ -162,12 +186,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - ad_localize.gemspec
@@ -188,7 +215,7 @@ files:
 - lib/ad_localize/platform/yml_formatter.rb
 - lib/ad_localize/runner.rb
 - lib/ad_localize/version.rb
-homepage: https://technologies.fabernovel.com
+homepage: https://github.com/applidium/ad_localize
 licenses:
 - MIT
 metadata: {}
@@ -207,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AdLocalize helps with mobile and web applications wording