ad_localize 4.0.9 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e17293e2000accb75875be47bacc58bf7193039c4f0f2a407c5787fbcde38d6
-  data.tar.gz: e0b68dcc055d3e303878496953411b96926f774fbd28805ec9684d4022a54c2a
+  metadata.gz: e367d46040937d12da9dabf34045b83a66a3e3a042833f96971c84621f326ff7
+  data.tar.gz: d6939a29627f1c1681525c5618dd2f68e78132de0d75d3208ad53c8495c346d3
 SHA512:
-  metadata.gz: e81296d0f5bb5bbe41d1fedddf36814a0ee695919bf8f00f527ecdf02a830e6f1ccb5c3a4c4542c47345d552cac0d229f4dbb41797e1bdd66d89dbd7d6b812d1
-  data.tar.gz: 7a963846243a0fd6026bb3f9e604ea946937cace3f6d66d8e22a4a698d0aa3c2f4fe1b98a60620f1d21cbd179f75e153e216b2736827b7c5b8409b9ef25e94a8
+  metadata.gz: d05c3855c3a3b1de045b7f808d8e7e1898ba6f1a65e27cb9cd1788578ae4c448abb6960b450a09c43416b8744c6ec8857b936889111ca10553daf17771b40692
+  data.tar.gz: c52f9eee3bab2dd91b8786ff6eb848c9da3b3ef3e0a9a3bccf0445783118432be8538ac3a12ef6639831ab920df37b98c7e8cbee0cbdf595a4e475e419a70261

data/.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.6.6', '2.7.3', '3.0.1']
+        ruby: ['2.7.3', '3.0.1', '3.1.0']
 
     steps:
       - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -5,14 +5,43 @@ 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).
 
+## Unreleased
+
+## [5.0.0] - 2022-07-26
+
+### Added
+
+- Added new option (-x) to bypass keys with empty values for iOS only in
+  PR [#78](https://github.com/faberNovel/ad_localize/pull/78) by [ThomasEsterlin](https://github.com/ThomasEsterlin)
+
+### Breaking change
+
+- Drop support for Ruby >= 2.3, < 2.7
+
+## [4.1.1] - 2022-04-15
+
+### Fixed
+
+- Fix an issue with percent export in PR [#74](https://github.com/faberNovel/ad_localize/pull/74)
+
+## [4.1.0] - 2022-03-02
+
+### Changed
+
+- Do not export empty translation on Android in PR [#72](https://github.com/faberNovel/ad_localize/pull/72)
+
 ## [4.0.9] - 2021-09-05
 
 ### Fixed
 
-- Fix error warning when spreadsheet is empty. Fix [#58](https://github.com/applidium/ad_localize/issues/58) in PR [#69](https://github.com/applidium/ad_localize/pull/69)
-- Add warning messages when input is corrupted. Fix [#59](https://github.com/applidium/ad_localize/issues/59) in PR [#69](https://github.com/applidium/ad_localize/pull/69)
-- Fix performance issue and add warning messages. Fix [#61](https://github.com/applidium/ad_localize/issues/61) in PR [#69](https://github.com/applidium/ad_localize/pull/69)
-- Update deprecated `google-api-client` gem. Fix [#63](https://github.com/applidium/ad_localize/issues/63) in PR [#70](https://github.com/applidium/ad_localize/pull/70)
+- Fix error warning when spreadsheet is empty. Fix [#58](https://github.com/applidium/ad_localize/issues/58) in
+  PR [#69](https://github.com/applidium/ad_localize/pull/69)
+- Add warning messages when input is corrupted. Fix [#59](https://github.com/applidium/ad_localize/issues/59) in
+  PR [#69](https://github.com/applidium/ad_localize/pull/69)
+- Fix performance issue and add warning messages. Fix [#61](https://github.com/applidium/ad_localize/issues/61) in
+  PR [#69](https://github.com/applidium/ad_localize/pull/69)
+- Update deprecated `google-api-client` gem. Fix [#63](https://github.com/applidium/ad_localize/issues/63) in
+  PR [#70](https://github.com/applidium/ad_localize/pull/70)
 
 ## [4.0.8] - 2021-05-25
 
@@ -60,7 +89,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Use percent HTML char for escaping '%' on android. [#49](https://github.com/applidium/ad_localize/pull/49) by [flolom](https://github.com/flolom)
+- Use percent HTML char for escaping '%' on android. [#49](https://github.com/applidium/ad_localize/pull/49)
+  by [flolom](https://github.com/flolom)
 
 ## [4.0.1] - 2020-10-19
 
@@ -73,8 +103,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Breaking change
 
 - Precedence to csv files. Only CSV files will be exported if both csv file and google spreadsheet are provided
-- In case of multiple CSVs or sheet ids, you should be aware that all sources will be merged. By default the merge policy to keep the first wording translation for each key
-- New architecture. Separate export process responsibilities in dedicated classes. Fixes [#48](https://github.com/applidium/ad_localize/issues/48), [#20](https://github.com/applidium/ad_localize/issues/20)
+- In case of multiple CSVs or sheet ids, you should be aware that all sources will be merged. By default the merge
+  policy to keep the first wording translation for each key
+- New architecture. Separate export process responsibilities in dedicated classes.
+  Fixes [#48](https://github.com/applidium/ad_localize/issues/48)
+  , [#20](https://github.com/applidium/ad_localize/issues/20)
 
 ### Changed
 
@@ -109,7 +142,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
-- no more option -a option to indicate that a service account configuration will be provided. If set, the environment variable `GCLOUD_CLIENT_SECRET` content will be used
+- no more option -a option to indicate that a service account configuration will be provided. If set, the environment
+  variable `GCLOUD_CLIENT_SECRET` content will be used
 - no more substitution of empty wording with by "Missing Translation" when using the option -d
 - no more Makefile, the Rakefile is sufficient. Use `bundle exec rake -T` to display the available commands
 - no more check for ordered interpolation variables in translations
@@ -129,25 +163,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 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 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)
+- 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)
+- 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.
+- 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
 
@@ -160,7 +201,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### 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)
+- [iOS only]
+  Handle [adaptive strings](https://developer.apple.com/documentation/foundation/nsstring/1413104-variantfittingpresentationwidth)
+  by [@felginep](https://github.com/felginep)
 
 ### Changed
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ad_localize (4.0.9)
-      activesupport (>= 6.1.3.2, < 7.0)
+    ad_localize (5.0.0)
+      activesupport (>= 6.1.3.2, < 8.0)
       colorize (~> 0.8)
       google-apis-sheets_v4 (~> 0.9)
       googleauth (~> 0.12)
@@ -11,41 +11,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.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.9)
+    concurrent-ruby (1.1.10)
     declarative (0.0.20)
-    diffy (3.3.0)
-    faraday (1.7.1)
+    diffy (3.4.2)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    google-apis-core (0.4.1)
+    faraday-retry (1.0.3)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -54,8 +56,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-sheets_v4 (0.9.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-sheets_v4 (0.17.0)
+      google-apis-core (>= 0.7, < 2.a)
     googleauth (0.17.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
@@ -64,12 +66,12 @@ GEM
       os (>= 0.9, < 2.0)
       signet (~> 0.15)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.3)
+    jwt (2.4.1)
     memoist (0.16.2)
-    mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
     minitest (5.14.4)
     minitest-reporters (1.4.2)
       ansi
@@ -77,15 +79,15 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.15.0)
-    multipart-post (2.1.1)
-    nokogiri (1.12.4)
-      mini_portile2 (~> 2.6.1)
+    multipart-post (2.2.3)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    os (1.1.1)
-    public_suffix (4.0.6)
-    racc (1.5.2)
+    os (1.1.4)
+    public_suffix (4.0.7)
+    racc (1.6.0)
     rake (12.3.3)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -93,17 +95,16 @@ GEM
     rexml (3.2.5)
     ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.5)
-    signet (0.16.0)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    trailblazer-option (0.1.1)
-    tzinfo (2.0.4)
+    trailblazer-option (0.1.2)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     webrick (1.7.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -111,11 +112,10 @@ PLATFORMS
 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)
+  rake (>= 12.3.0, < 14.0.0)
 
 BUNDLED WITH
    2.2.26

data/README.md

@@ -66,6 +66,11 @@ $ ad_localize -t <path-to-the-output-directory>
 $ ad_localize -d
 ```
 
+* Won't generate keys with empty values (iOS feature only, automatically handled for Android)
+```
+$ ad_localize -x
+```
+
 ### In a Ruby program
 There are many possibilities when using AdLocalize in a ruby program. You can add support to your own wording format, support other platforms, select which locales you want to export, generate wording file content without writing on the disk and many more.
 
@@ -123,6 +128,7 @@ $ ad_localize -k <your-spreadsheet-drive-key> -s <comma-separated-sheet-id-list>
 - Any column after the `key` column will be considered as a locale column (except from the optional `comment` columns)
 - Keys should contain only letter, number, underscore and dot : [a-z0-9_.]+.
 - Format specifiers must be numeroted if there are more than one in a translation string (eg: `"%1$@ %2$@'s report"`).
+- _Only for Android_ keys without translation won't be considered
 
 ### Comments
 

data/ad_localize.gemspec

@@ -21,9 +21,10 @@ Gem::Specification.new do |spec|
     'Claire Peyron',
     'Claire Dufetrelle',
     'Pierre Felgines',
-    'Satyan Jacquens'
+    'Satyan Jacquens',
+    'Thomas Esterlin'
   ]
-  spec.email         = %w(joanna.vigne@fabernovel.com hugo.hache@fabernovel.com edouard.siegel@fabernovel.com)
+  spec.email         = %w(joanna.vigne@fabernovel.com pierre.felgines@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.
@@ -40,17 +41,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '>= 1.12.0', '< 3.0.0'
-  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rake', '>= 12.3.0', '< 14.0.0'
   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', '>= 6.1.3.2', '< 7.0'
+  spec.add_dependency 'activesupport', '>= 6.1.3.2', '< 8.0'
   spec.add_dependency 'nokogiri', '~> 1.10'
   spec.add_dependency 'colorize', '~> 0.8'
   spec.add_dependency 'googleauth', '~> 0.12'
   spec.add_dependency 'google-apis-sheets_v4', '~> 0.9'
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.7'
 end

data/bin/console

@@ -2,7 +2,6 @@
 
 require "bundler/setup"
 require "ad_localize"
-require 'byebug'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/ad_localize/entities/translation.rb

@@ -23,6 +23,10 @@ module AdLocalize
         o.value == value &&
         o.comment == comment
       end
+
+      def has_value?
+        value.present?
+      end
     end
   end
 end

data/lib/ad_localize/interactors/execute_export_request.rb

@@ -11,6 +11,7 @@ module AdLocalize
         print_export_request(export_request: export_request) if export_request.verbose?
         LOGGER.debug("Checking request validity")
         return unless export_request.valid?
+
         if export_request.has_csv_files?
           ExportCSVFiles.new(csv_path_to_wording: @csv_path_to_wording).call(export_request: export_request)
         elsif export_request.has_g_spreadsheet_options?
@@ -27,6 +28,7 @@ module AdLocalize
         LOGGER.debug("platforms : #{export_request.platforms.to_sentence}")
         LOGGER.debug("output_path : #{export_request.output_path}")
         LOGGER.debug("verbose : #{export_request.verbose}")
+        LOGGER.debug("non_empty_values : #{export_request.non_empty_values}")
         LOGGER.debug("merge_policy : #{export_request.merge_policy&.policy}")
         LOGGER.debug("csv_paths : #{export_request.csv_paths.to_sentence}")
         if export_request.has_g_spreadsheet_options?

data/lib/ad_localize/interactors/export_csv_files.rb

@@ -4,13 +4,16 @@ module AdLocalize
       def initialize(csv_path_to_wording: nil)
         @csv_path_to_wording = csv_path_to_wording.presence || Mappers::CSVPathToWording.new
         @merge_wordings = MergeWordings.new
+        @export_wording = ExportWording.new
       end
 
       def call(export_request:)
         LOGGER.debug("Starting export csv files : #{export_request.csv_paths.to_sentence}")
-        wordings = export_request.csv_paths.map { |csv_path| @csv_path_to_wording.map(csv_path: csv_path) }
-        wording = @merge_wordings.call(wordings: wordings.compact, merge_policy: export_request.merge_policy)
-        ExportWording.new.call(export_request: export_request, wording: wording)
+        wordings = export_request.csv_paths.map { |csv_path| @csv_path_to_wording.map(csv_path: csv_path) }.compact
+        return if wordings.blank?
+
+        wording = @merge_wordings.call(wordings: wordings, merge_policy: export_request.merge_policy)
+        @export_wording.call(export_request: export_request, wording: wording)
       end
     end
   end

data/lib/ad_localize/interactors/export_g_spreadsheet.rb

@@ -4,6 +4,9 @@ module AdLocalize
       def initialize(value_range_to_wording: nil)
         @value_range_to_wording = value_range_to_wording.presence || Mappers::ValueRangeToWording.new
         @g_sheets_repository = Repositories::GSheetsRepository.new
+        @export_wording = ExportWording.new
+        @merge_wordings = MergeWordings.new
+        @export_csv_files = ExportCSVFiles.new
       end
 
       def call(export_request:)
@@ -20,9 +23,11 @@ module AdLocalize
       def export_with_service_account(export_request:)
         LOGGER.debug("Using service account")
         value_ranges = @g_sheets_repository.get_sheets_values(g_spreadsheet_options: export_request.g_spreadsheet_options)
-        wordings = value_ranges.map { |value_range| @value_range_to_wording.map(value_range: value_range) }
-        wording = MergeWordings.new.call(wordings: wordings.compact, merge_policy: export_request.merge_policy)
-        ExportWording.new.call(export_request: export_request, wording: wording)
+        wordings = value_ranges.map { |value_range| @value_range_to_wording.map(value_range: value_range) }.compact
+        return if wordings.blank?
+
+        wording = @merge_wordings.call(wordings: wordings, merge_policy: export_request.merge_policy)
+        @export_wording.call(export_request: export_request, wording: wording)
       end
 
       def export_without_service_account(export_request:)
@@ -32,7 +37,7 @@ module AdLocalize
         end
         export_request.csv_paths = downloaded_files.map(&:path)
         if export_request.has_csv_files?
-          ExportCSVFiles.new.call(export_request: export_request)
+          @export_csv_files.call(export_request: export_request)
         elsif export_request.has_empty_files?
           # When downloading an empty spreadsheet, the content type of the downloaded file is "inode/x-empty"
           LOGGER.warn("Your spreadsheet is empty. Add content and retry.")

data/lib/ad_localize/interactors/export_wording.rb

@@ -8,23 +8,26 @@ module AdLocalize
       def call(export_request:, wording:)
         LOGGER.debug("Starting export wording")
         export_request.platforms.each do |platform|
-          platform_dir = compute_platform_dir(export_request: export_request, platform: platform)
-          export_platform = @export_platform_factory.build(platform: platform)
-          if export_platform.should_export_locale_by_locale?
-            locales = export_request.locales.size.zero? ? wording.locales : wording.locales & export_request.locales
-            locales.each do |locale|
-              export_platform.call(wording: wording, locale: locale, platform_dir: platform_dir)
-            end
-          else
-            export_platform.call(export_request: export_request, platform_dir: platform_dir)
-          end
+          platform_interactor = @export_platform_factory.build(platform: platform)
+          options = build_export_wording_options(wording: wording, export_request: export_request, platform: platform)
+          platform_interactor.call(export_wording_options: options)
         end
       end
 
       private
 
-      def compute_platform_dir(export_request:, platform:)
-        export_request.multiple_platforms? ? export_request.output_path.join(platform.to_s) : export_request.output_path
+      def build_export_wording_options(wording:, export_request:, platform:)
+        platform_output_directory = export_request.output_path
+        platform_output_directory = platform_output_directory.join(platform.to_s) if export_request.multiple_platforms?
+        locales = export_request.locales.size.zero? ? wording.locales : wording.locales & export_request.locales
+
+        Requests::ExportWordingOptions.new(
+          locales: locales,
+          wording: wording,
+          platform_output_directory: platform_output_directory,
+          bypass_empty_values: export_request.non_empty_values,
+          csv_paths: export_request.csv_paths
+        )
       end
     end
   end

data/lib/ad_localize/interactors/platforms/export_android_locale_wording.rb

@@ -10,21 +10,22 @@ module AdLocalize
           @file_system_repository = Repositories::FileSystemRepository.new
         end
 
-        def call(wording:, locale:, platform_dir:)
-          LOGGER.debug("Starting export Android wording for locale #{locale}")
-          locale_wording = wording.translations_for(locale: locale)
-          return unless has_android_wording?(locale_wording: locale_wording)
-
-          output_dir = compute_output_dir(wording: wording, locale: locale, platform_dir: platform_dir)
-          @file_system_repository.create_directory(path: output_dir)
-
-          content = @strings_serializer.render(locale_wording: locale_wording)
-          @file_system_repository.write(content: content, path: output_dir.join(STRINGS_FILENAME))
-          LOGGER.debug("#{STRINGS_FILENAME} done !")
-        end
-
-        def should_export_locale_by_locale?
-          true
+        def call(export_wording_options:)
+          platform_dir = export_wording_options.platform_output_directory
+          wording = export_wording_options.wording
+
+          export_wording_options.locales.each do |locale|
+            LOGGER.debug("Starting export Android wording for locale #{locale}")
+            locale_wording = export_wording_options.wording.translations_for(locale: locale)
+            return unless has_android_wording?(locale_wording: locale_wording)
+
+            output_dir = compute_output_dir(wording: wording, locale: locale, platform_dir: platform_dir)
+            @file_system_repository.create_directory(path: output_dir)
+
+            content = @strings_serializer.render(locale_wording: locale_wording)
+            @file_system_repository.write(content: content, path: output_dir.join(STRINGS_FILENAME))
+            LOGGER.debug("#{STRINGS_FILENAME} done !")
+          end
         end
 
         private

data/lib/ad_localize/interactors/platforms/export_csv_locale_wording.rb

@@ -6,19 +6,16 @@ module AdLocalize
           @file_system_repository = Repositories::FileSystemRepository.new
         end
 
-        def call(export_request:, platform_dir:)
+        def call(export_wording_options:)
           LOGGER.debug("Starting export CSV wording")
-          @file_system_repository.create_directory(path: platform_dir)
-          export_request.csv_paths.each_with_index do |csv_path, i|
+          @file_system_repository.create_directory(path: export_wording_options.platform_output_directory)
+          export_wording_options.csv_paths.each_with_index do |csv_path, i|
             file = File.basename("localization_#{i}.csv")
-            FileUtils.cp(csv_path, platform_dir.join(file.to_s))
+            output_path = export_wording_options.platform_output_directory.join(file.to_s)
+            FileUtils.cp(csv_path, output_path)
           end
           LOGGER.debug("CSV wording export done !")
         end
-
-        def should_export_locale_by_locale?
-          false
-        end
       end
     end
   end

data/lib/ad_localize/interactors/platforms/export_ios_locale_wording.rb

@@ -9,30 +9,34 @@ module AdLocalize
 
         def initialize
           @info_plist_serializer = Serializers::InfoPlistSerializer.new
-          @localizable_strings_serializer = Serializers::LocalizableStringsSerializer.new
-          @localizable_stringsdict_serializer = Serializers::LocalizableStringsdictSerializer.new
+          @strings_serializer = Serializers::LocalizableStringsSerializer.new
+          @stringsdict_serializer = Serializers::LocalizableStringsdictSerializer.new
           @file_system_repository = Repositories::FileSystemRepository.new
         end
 
-        def call(wording:, locale:, platform_dir:)
-          LOGGER.debug("Starting export iOS wording for locale #{locale}")
-          locale_wording = wording.translations_for(locale: locale)
-          return unless has_ios_wording?(locale_wording: locale_wording)
+        def call(export_wording_options:)
+          bypass_empty_values = export_wording_options.bypass_empty_values
 
-          output_dir = platform_dir.join(LOCALE_DIRECTORY_CONVENTION % { locale: locale })
-          @file_system_repository.create_directory(path: output_dir)
+          export_wording_options.locales.each do |locale|
+            LOGGER.debug("Starting export iOS wording for locale #{locale}")
+            locale_wording = export_wording_options.wording.translations_for(locale: locale)
+            next unless has_ios_wording?(locale_wording: locale_wording)
 
-          export_info_plist(locale_wording: locale_wording, output_dir: output_dir)
-          export_localizable_strings(locale_wording: locale_wording, output_dir: output_dir)
-          export_localizable_stringsdict(locale_wording: locale_wording, output_dir: output_dir)
-        end
-
-        def should_export_locale_by_locale?
-          true
+            locale_directory_name = LOCALE_DIRECTORY_CONVENTION % { locale: locale }
+            output_dir = export_wording_options.platform_output_directory.join(locale_directory_name)
+            @file_system_repository.create_directory(path: output_dir)
+            export_files(locale_wording: locale_wording, output_dir: output_dir, bypass_empty_values: bypass_empty_values)
+          end
         end
 
         private
 
+        def export_files(locale_wording:, output_dir:, bypass_empty_values:)
+          export_info_plist(locale_wording: locale_wording, output_dir: output_dir)
+          export_localizable_strings(locale_wording: locale_wording, output_dir: output_dir, bypass_empty_values: bypass_empty_values)
+          export_localizable_stringsdict(locale_wording: locale_wording, output_dir: output_dir, bypass_empty_values: bypass_empty_values)
+        end
+
         def has_ios_wording?(locale_wording:)
           locale_wording.has_info_plist_keys? ||
             locale_wording.has_singular_keys? ||
@@ -42,21 +46,26 @@ module AdLocalize
 
         def export_info_plist(locale_wording:, output_dir:)
           return unless locale_wording.has_info_plist_keys?
+
           content = @info_plist_serializer.render(locale_wording: locale_wording)
           @file_system_repository.write(content: content, path: output_dir.join(INFO_PLIST_FILENAME))
           LOGGER.debug("#{INFO_PLIST_FILENAME} done !")
         end
 
-        def export_localizable_strings(locale_wording:, output_dir:)
+        def export_localizable_strings(locale_wording:, output_dir:, bypass_empty_values:)
           return unless locale_wording.has_singular_keys?
-          content = @localizable_strings_serializer.render(locale_wording: locale_wording)
+
+          @strings_serializer.bypass_empty_values = bypass_empty_values
+          content = @strings_serializer.render(locale_wording: locale_wording)
           @file_system_repository.write(content: content, path: output_dir.join(LOCALIZABLE_STRINGS_FILENAME))
           LOGGER.debug("#{LOCALIZABLE_STRINGS_FILENAME} done !")
         end
 
-        def export_localizable_stringsdict(locale_wording:, output_dir:)
+        def export_localizable_stringsdict(locale_wording:, output_dir:, bypass_empty_values:)
           return unless locale_wording.has_plural_keys? || locale_wording.has_adaptive_keys?
-          content = @localizable_stringsdict_serializer.render(locale_wording: locale_wording)
+
+          @stringsdict_serializer.bypass_empty_values = bypass_empty_values
+          content = @stringsdict_serializer.render(locale_wording: locale_wording)
           @file_system_repository.write(content: content, path: output_dir.join(LOCALIZABLE_STRINGSDICT_FILENAME))
           LOGGER.debug("#{LOCALIZABLE_STRINGSDICT_FILENAME} done !")
         end

data/lib/ad_localize/interactors/platforms/export_json_locale_wording.rb

@@ -7,19 +7,19 @@ module AdLocalize
           @file_system_repository = Repositories::FileSystemRepository.new
         end
 
-        def call(wording:, locale:, platform_dir:)
-          LOGGER.debug("Starting export JSON wording for locale #{locale}")
-          locale_wording = wording.translations_for(locale: locale)
-          content = @json_serializer.render(locale_wording: locale_wording)
-          return if content[locale].blank?
+        def call(export_wording_options:)
+          output_dir = export_wording_options.platform_output_directory
 
-          @file_system_repository.create_directory(path: platform_dir)
-          @file_system_repository.write(content: content, path: platform_dir.join("#{locale}.json"))
-          LOGGER.debug("#{locale}.json done !")
-        end
+          export_wording_options.locales.each do |locale|
+            LOGGER.debug("Starting export JSON wording for locale #{locale}")
+            locale_wording = export_wording_options.wording.translations_for(locale: locale)
+            content = @json_serializer.render(locale_wording: locale_wording)
+            next if content[locale].blank?
 
-        def should_export_locale_by_locale?
-          true
+            @file_system_repository.create_directory(path: output_dir)
+            @file_system_repository.write(content: content, path: output_dir.join("#{locale}.json"))
+            LOGGER.debug("#{locale}.json done !")
+          end
         end
       end
     end

data/lib/ad_localize/interactors/platforms/export_properties_locale_wording.rb

@@ -7,19 +7,18 @@ module AdLocalize
           @file_system_repository = Repositories::FileSystemRepository.new
         end
 
-        def call(wording:, locale:, platform_dir:)
-          LOGGER.debug("Starting export Properties wording for locale #{locale}")
-          locale_wording = wording.translations_for(locale: locale)
-          return unless has_properties_wording?(locale_wording: locale_wording)
+        def call(export_wording_options:)
+          export_wording_options.locales.each do |locale|
+            LOGGER.debug("Starting export Properties wording for locale #{locale}")
+            locale_wording = export_wording_options.wording.translations_for(locale: locale)
+            return unless has_properties_wording?(locale_wording: locale_wording)
 
-          content = @properties_serializer.render(locale_wording: locale_wording)
-          @file_system_repository.create_directory(path: platform_dir)
-          @file_system_repository.write(content: content, path: platform_dir.join("#{locale}.properties"))
-          LOGGER.debug("#{locale}.properties done !")
-        end
-
-        def should_export_locale_by_locale?
-          true
+            content = @properties_serializer.render(locale_wording: locale_wording)
+            @file_system_repository.create_directory(path: export_wording_options.platform_output_directory)
+            output_path = export_wording_options.platform_output_directory.join("#{locale}.properties")
+            @file_system_repository.write(content: content, path: output_path)
+            LOGGER.debug("#{locale}.properties done !")
+          end
         end
 
         private

data/lib/ad_localize/interactors/platforms/export_yaml_locale_wording.rb

@@ -7,19 +7,19 @@ module AdLocalize
           @file_system_repository = Repositories::FileSystemRepository.new
         end
 
-        def call(wording:, locale:, platform_dir:)
-          LOGGER.debug("Starting export YAML wording for locale #{locale}")
-          locale_wording = wording.translations_for(locale: locale)
-          content = @yaml_serializer.render(locale_wording:locale_wording)
-          return if content[locale].blank?
+        def call(export_wording_options:)
+          output_dir = export_wording_options.platform_output_directory
 
-          @file_system_repository.create_directory(path: platform_dir)
-          @file_system_repository.write(content: content, path: platform_dir.join("#{locale}.yml"))
-          LOGGER.debug("#{locale}.yml done !")
-        end
+          export_wording_options.locales.each do |locale|
+            LOGGER.debug("Starting export YAML wording for locale #{locale}")
+            locale_wording = export_wording_options.wording.translations_for(locale: locale)
+            content = @yaml_serializer.render(locale_wording: locale_wording)
+            next if content[locale].blank?
 
-        def should_export_locale_by_locale?
-          true
+            @file_system_repository.create_directory(path: output_dir)
+            @file_system_repository.write(content: content, path: output_dir.join("#{locale}.yml"))
+            LOGGER.debug("#{locale}.yml done !")
+          end
         end
       end
     end

data/lib/ad_localize/mappers/android_translation_mapper.rb

@@ -9,9 +9,17 @@ module AdLocalize
         processedValue = processedValue.gsub(/(?<!\\)\"/, '&#34;') # match " unless there is a \ before
         processedValue = processedValue.gsub(">", '&gt;')
         processedValue = processedValue.gsub("<", '&lt;')
+        hasFormatting = processedValue.match(/(%(\d+\$)?@)/)
         processedValue = processedValue.gsub(/(%(\d+\$)?@)/, '%\2s') # should match values like %1$s and %s
+        hasFormatting = hasFormatting || processedValue.match(/(%((\d+\$)?(\d+)?)i)/)
         processedValue = processedValue.gsub(/(%((\d+\$)?(\d+)?)i)/, '%\2d') # should match values like %i, %3$i, %01i, %1$02i
-        processedValue = processedValue.gsub(/%(?!((\d+\$)?(s|(\d+)?d)))/, '&#37;') # negative lookahead: identifies when user really wants to display a %
+        # On Android, '%' must be escaped with a second '%' if and only if the string has at least one formatting pattern. In this specific case, 
+        # a Java formatting method will be used which interprets every non escaped '%' as the start of a formatting pattern.
+        if hasFormatting 
+          processedValue = processedValue.gsub(/%(?!((\d+\$)?(s|(\d+)?d)))/, '%%') # negative lookahead: identifies when user really wants to display a %
+        else
+          processedValue = processedValue.gsub(/%(?!((\d+\$)?(s|(\d+)?d)))/, '%') # negative lookahead: identifies when user really wants to display a %
+        end
         processedValue = processedValue.gsub("\\U", "\\u")
         processedValue = processedValue.gsub(/&(?!((#\d+)|(\w+));)/, '&#38;')
         processedValue = processedValue.gsub(/&/) { |match| match.replace('\&') }

data/lib/ad_localize/mappers/options_to_export_request.rb

@@ -6,6 +6,7 @@ module AdLocalize
           platforms: options[:only],
           g_spreadsheet_options: map_g_spreadsheet_options(options: options),
           verbose: options[:debug],
+          non_empty_values: options[:'non-empty-values'],
           output_path: options[:'target-dir'],
           merge_policy: options[:'merge-policy'],
           csv_paths: options[:csv_paths]

data/lib/ad_localize/option_handler.rb

@@ -27,6 +27,7 @@ module AdLocalize
         parser.on("-o", "--only PLATFORMS", Array, "PLATFORMS is a comma separated list. Only generate localisation files for the specified platforms. Supported platforms : #{Requests::ExportRequest::SUPPORTED_PLATFORMS.to_sentence}")
         parser.on("-s", "--sheets SHEET_IDS", Array, "SHEET_IDS is a comma separated list. Use a specific sheet id for Google Drive spreadsheets with several sheets")
         parser.on("-t", "--target-dir PATH", String, "Path to the target directory")
+        parser.on("-x", "--non-empty-values", TrueClass, "Do not export keys with empty values (iOS only)")
       end
 
       args = {}

data/lib/ad_localize/requests/export_request.rb

@@ -12,6 +12,7 @@ module AdLocalize
         @csv_paths = Array(args[:csv_paths])
         @g_spreadsheet_options = args[:g_spreadsheet_options]
         @verbose = args[:verbose].presence || false
+        @non_empty_values = args[:non_empty_values].presence || false
         @output_path = Pathname.new(args[:output_path].presence || DEFAULT_EXPORT_FOLDER)
         if @csv_paths.size > 1 || @g_spreadsheet_options&.has_multiple_sheets?
           @merge_policy = MergePolicy.new(policy: args[:merge_policy].presence || MergePolicy::DEFAULT_POLICY)
@@ -26,6 +27,7 @@ module AdLocalize
         :g_spreadsheet_options,
         :output_path,
         :verbose,
+        :non_empty_values,
         :merge_policy
       )
 
@@ -55,6 +57,10 @@ module AdLocalize
         verbose
       end
 
+      def non_empty_values?
+        non_empty_values
+      end
+
       private
 
       def valid_csv_options?

data/lib/ad_localize/requests/export_wording_options.rb

@@ -0,0 +1,24 @@
+module AdLocalize
+    module Requests
+      class ExportWordingOptions
+        def initialize(wording:, platform_output_directory:, locales: [], bypass_empty_values: false, csv_paths: [])
+            @wording = wording
+            @locales = locales
+            @platform_output_directory = platform_output_directory
+            @bypass_empty_values = bypass_empty_values
+            @csv_paths = csv_paths
+        end
+        
+        attr_reader(
+            :wording,
+            :platform_output_directory,
+            :bypass_empty_values,
+            :locales
+        )
+
+        attr_accessor(
+            :csv_paths
+        )
+      end
+    end
+end

data/lib/ad_localize/serializers/localizable_strings_serializer.rb

@@ -9,6 +9,10 @@ module AdLocalize
         @translation_mapper = Mappers::IOSTranslationMapper.new
       end
 
+      attr_accessor(
+        :bypass_empty_values
+      )
+
       private
 
       def template_path
@@ -20,7 +24,7 @@ module AdLocalize
       end
 
       def map_translations(translations:)
-        translations.map { |translation| @translation_mapper.map(translation: translation) }
+        translations.select(&:has_value?).map { |translation| @translation_mapper.map(translation: translation) }
       end
     end
   end

data/lib/ad_localize/serializers/localizable_stringsdict_serializer.rb

@@ -10,6 +10,10 @@ module AdLocalize
         @translation_group_mapper = Mappers::TranslationGroupMapper.new(translation_mapper: @translation_mapper)
       end
 
+      attr_accessor(
+        :bypass_empty_values
+      )
+
       private
 
       def template_path
@@ -24,11 +28,13 @@ module AdLocalize
       end
 
       def map_plurals(plurals:)
-        plurals.map { |label, translations| @translation_group_mapper.map(label: label, translations: translations) }
+        plurals.map { |label, translations| @translation_group_mapper.map(label: label, translations: translations.select(&:has_value?)) }
+        .select(&:has_translations?)
       end
 
       def map_adaptives(adaptives:)
-        adaptives.map { |label, translations| @translation_group_mapper.map(label: label, translations: translations) }
+        adaptives.map { |label, translations| @translation_group_mapper.map(label: label, translations: translations.select(&:has_value?)) }
+        .select(&:has_translations?)
       end
     end
   end

data/lib/ad_localize/serializers/strings_serializer.rb

@@ -22,11 +22,13 @@ module AdLocalize
       end
 
       def map_singulars(translations:)
-        translations.map { |translation| @translation_mapper.map(translation: translation) }
+        translations.select(&:has_value?).map { |translation| @translation_mapper.map(translation: translation) }
       end
 
       def map_plurals(plurals:)
-        plurals.map { |label, translations| @translation_group_mapper.map(label: label, translations: translations) }
+        plurals
+        .map { |label, translations| @translation_group_mapper.map(label: label, translations: translations.select(&:has_value?)) }
+        .select(&:has_translations?)
       end
     end
   end

data/lib/ad_localize/version.rb

@@ -1,3 +1,3 @@
 module AdLocalize
-  VERSION = "4.0.9"
+  VERSION = "5.0.0"
 end

data/lib/ad_localize/view_models/translation_group_view_model.rb

@@ -10,6 +10,10 @@ module AdLocalize
         @label = label
         @translation_view_models = translation_view_models
       end
+
+      def has_translations?
+        (translation_view_models || []).any?(&:has_value?)
+      end
     end
   end
 end

data/lib/ad_localize/view_models/translation_view_model.rb

@@ -14,6 +14,10 @@ module AdLocalize
         @value = value
         @comment = comment
       end
+
+      def has_value?
+        value.present?
+      end
     end
   end
 end

data/lib/ad_localize.rb

@@ -41,6 +41,7 @@ require 'ad_localize/entities/wording'
 
 require 'ad_localize/requests/g_spreadsheet_options'
 require 'ad_localize/requests/export_request'
+require 'ad_localize/requests/export_wording_options'
 require 'ad_localize/requests/merge_policy'
 
 require 'ad_localize/interactors/merge_wordings'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 5.0.0
 platform: ruby
 authors:
 - Edouard Siegel
@@ -17,7 +17,8 @@ authors:
 - Claire Dufetrelle
 - Pierre Felgines
 - Satyan Jacquens
-autorequire: 
+- Thomas Esterlin
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2018-04-18 00:00:00.000000000 Z
@@ -46,16 +47,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 12.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 14.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 14.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -70,20 +77,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +114,7 @@ dependencies:
         version: 6.1.3.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +124,7 @@ dependencies:
         version: 6.1.3.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +186,7 @@ description: |-
                             Supported wording format : CSV. Supported export format: iOS, Android, JSON and YAML
 email:
 - joanna.vigne@fabernovel.com
-- hugo.hache@fabernovel.com
+- pierre.felgines@fabernovel.com
 - edouard.siegel@fabernovel.com
 executables:
 - ad_localize
@@ -247,6 +240,7 @@ files:
 - lib/ad_localize/repositories/file_system_repository.rb
 - lib/ad_localize/repositories/g_sheets_repository.rb
 - lib/ad_localize/requests/export_request.rb
+- lib/ad_localize/requests/export_wording_options.rb
 - lib/ad_localize/requests/g_spreadsheet_options.rb
 - lib/ad_localize/requests/merge_policy.rb
 - lib/ad_localize/serializers/info_plist_serializer.rb
@@ -270,7 +264,7 @@ homepage: https://github.com/applidium/ad_localize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -278,15 +272,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: AdLocalize helps with mobile and web applications wording
 test_files: []