ad_localize 6.1.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70487e0e8087dbbdb3c6873b025748b9fc97e68ac2abc5c13a0fe71a1a1011c
-  data.tar.gz: c82fe7eeb8bc946411c094f51d69df40a35bc9b9e5c5805203a976c4d2aba9c0
+  metadata.gz: 2e28db2bd871d27acd98fe88472fd383dbda178fdbc91d09dae21a8b644be60e
+  data.tar.gz: 5baaebf8a8ce774f7285f70d9a522f5a57451caeaabbb6081a1cc4898587d317
 SHA512:
-  metadata.gz: 8acdef650f29ede65b72fed96666be542f078337dd6e7b950a8be2ec18b1ff55ee65279dcd5736e5b4d229fed9796b30480cee9b72194ad1bdbba87fa388d81b
-  data.tar.gz: cad8b9ba73f3055cb7d000fdda14eb45f59a418d6e563a5d272855ff86000779c221282b07e8f33f07f793ecaec6e9150dc9b889c485e8a1496ee1839a5b9daa
+  metadata.gz: a7ae29824014dbd2c23d480f1d0441257a5c334e8bd0f7e3a7ddb0e98cdafcec06c44bd9ea32ec7f35471b415a6c05020c6391137ca0bd080d8de0440f8f9c0d
+  data.tar.gz: 8c38d9753cc91399d1856bdaca191f32e304f85bd8d94d45bbe2beb8324c99aab6319ef7736cda2e2dd684782b7451b436333f1a72edd4d79118326d0b1d3ce1

data/.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.0.6', '3.1.4', '3.2.0']
+        ruby: ['3.1.4', '3.2.0', '3.3.5']
 
     steps:
       - uses: actions/checkout@v2
@@ -19,6 +19,15 @@ jobs:
           gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Run linter
-        run: bundle exec rubocop
+        run: bundle exec rubocop --lint
       - name: Run tests
         run: bundle exec rake test
+      - run: 'echo "$GOOGLE_APPLICATION_CREDENTIALS" > account_secret.json'
+        shell: bash
+        env:
+          GOOGLE_APPLICATION_CREDENTIALS: ${{secrets.GOOGLE_APPLICATION_CREDENTIALS}}
+      - name: Run private google sheet tests
+        if: matrix.ruby == '3.3.5' # Limit execution on latest ruby version to prevent reaching rate limits
+        run: bundle exec rake test_private_google_sheet
+        env:
+          GOOGLE_APPLICATION_CREDENTIALS: 'account_secret.json'

data/.gitignore

@@ -11,3 +11,4 @@ ad_localize/tmp/
 .ruby-version
 pkg/
 exports/
+account_secret.json

data/.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.1
   NewCops: enable

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-02-02 13:39:01 UTC using RuboCop version 1.43.0.
+# on 2023-12-12 15:16:08 UTC using RuboCop version 1.58.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
 # Include: **/*.gemspec
@@ -14,25 +14,11 @@ Gemspec/OrderedDependencies:
   Exclude:
     - 'ad_localize.gemspec'
 
-# Offense count: 1
-# Configuration parameters: Severity, Include.
-# Include: **/*.gemspec
-Gemspec/RequiredRubyVersion:
-  Exclude:
-    - 'ad_localize.gemspec'
-
-# Offense count: 86
+# Offense count: 87
 # This cop supports safe autocorrection (--autocorrect).
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/ad_localize/mappers/locale_wording_to_hash.rb'
-
 # Offense count: 4
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
@@ -41,30 +27,30 @@ Lint/UnusedMethodArgument:
     - 'lib/ad_localize/interactors/base_generate_files.rb'
     - 'lib/ad_localize/serializers/templated_serializer.rb'
 
-# Offense count: 6
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 7
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 35
+  Max: 31
 
-# Offense count: 2
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 139
 
 # Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 11
+  Max: 9
 
-# Offense count: 11
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Offense count: 13
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 40
+  Max: 27
 
 # Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 11
+  Max: 9
 
 # Offense count: 1
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
@@ -101,7 +87,7 @@ Naming/VariableName:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
@@ -143,7 +129,7 @@ Style/FormatString:
 
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
 # SupportedStyles: annotated, template, unannotated
 Style/FormatStringToken:
   EnforcedStyle: template
@@ -161,13 +147,16 @@ Style/GuardClause:
   Exclude:
     - 'lib/ad_localize/repositories/drive_repository.rb'
 
-# Offense count: 57
+# Offense count: 15
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
 # SupportedShorthandSyntax: always, never, either, consistent
 Style/HashSyntax:
-  Enabled: false
+  Exclude:
+    - 'Rakefile'
+    - 'lib/ad_localize/option_handler.rb'
+    - 'test/interactors/process_export_request_test.rb'
 
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -197,13 +186,13 @@ Style/NegatedIf:
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
     - 'spec/**/*'
-    - 'test/interactors/process_export_request_test.rb'
     - 'test/repositories/drive_repository_test.rb'
+    - 'test/repositories/private_drive_repository_test.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -218,13 +207,13 @@ Style/RedundantAssignment:
   Exclude:
     - 'lib/ad_localize/parsers/csv_parser.rb'
 
-# Offense count: 1
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantBegin:
   Exclude:
     - 'lib/ad_localize/repositories/drive_repository.rb'
 
-# Offense count: 18
+# Offense count: 15
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantFreeze:
   Exclude:
@@ -234,7 +223,6 @@ Style/RedundantFreeze:
     - 'lib/ad_localize/interactors/generate_strings.rb'
     - 'lib/ad_localize/interactors/merge_wordings.rb'
     - 'lib/ad_localize/parsers/csv_parser.rb'
-    - 'lib/ad_localize/parsers/key_parser.rb'
     - 'lib/ad_localize/serializers/info_plist_serializer.rb'
     - 'lib/ad_localize/serializers/localizable_strings_serializer.rb'
     - 'lib/ad_localize/serializers/localizable_stringsdict_serializer.rb'
@@ -245,6 +233,12 @@ Style/RedundantPercentQ:
   Exclude:
     - 'ad_localize.gemspec'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpArgument:
+  Exclude:
+    - 'lib/ad_localize/sanitizers/ios_to_android_sanitizer.rb'
+
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Style/RedundantRegexpEscape:
@@ -290,30 +284,24 @@ Style/StringConcatenation:
     - 'lib/ad_localize/serializers/strings_serializer.rb'
     - 'lib/ad_localize/serializers/templated_serializer.rb'
 
-# Offense count: 85
+# Offense count: 146
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/SymbolLiteral:
-  Exclude:
-    - 'lib/ad_localize/mappers/options_to_export_request.rb'
-    - 'test/option_handler_test.rb'
-
-# Offense count: 3
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ZeroLengthPredicate:
   Exclude:
     - 'lib/ad_localize/mappers/locale_wording_to_hash.rb'
     - 'test/repositories/drive_repository_test.rb'
+    - 'test/repositories/private_drive_repository_test.rb'
 
-# Offense count: 10
+# Offense count: 15
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 153

data/CHANGELOG.md

@@ -7,12 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-## 6.1.0
+## [6.3.0] - 2024-11-04
+
+### Removed
+
+- Drop support for for ruby <3.1
+
+## [6.2.0] - 2023-12-12
+
+### Added
+
+- new option `--skip-value-stripping` that disable the leading and trailing whitespaces removal on wording values. The value stripping was introduced with version 6.0.0.
+
+### Changed
+
+- Updated dependencies
+- Increase number of retries to 5 and timeout delay to 120s when accessing Google APIs. This reduces the amount of rate limit error when using private Google spreadsheet.
+
+## [6.1.0] - 2023-09-12
+
 ### Added
 
 - new option (iOS only) `--auto-escape-percent` that escapes % character in wording. This option should be used if the wording is intended to be used with `String(format:)`.
 
-## 6.0.0
+## [6.0.0] - 2023-07-17
+
 ### Added
 
 - Remove extra spaces before and after key/translation contents

data/Gemfile

@@ -3,3 +3,11 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in ad_localize.gemspec
 gemspec
+
+gem 'bundler', '>= 1.12.0', '< 3.0.0'
+gem 'debug', ">= 1.0.0", '< 2.0'
+gem 'diffy', '~> 3.3'
+gem 'minitest', '~> 5.11'
+gem 'minitest-reporters', '~> 1.3'
+gem 'rake', '>= 12.3.0', '< 14.0.0'
+gem 'rubocop', "~> 1.0"

data/Gemfile.lock

@@ -1,117 +1,144 @@
 PATH
   remote: .
   specs:
-    ad_localize (6.1.0)
+    ad_localize (6.2.0)
       activesupport (>= 6.1.3.2, < 8.0)
-      colorize (~> 0.8)
+      colorize (~> 1.0)
       google-apis-drive_v3 (~> 0.33.0)
       google-apis-sheets_v4 (~> 0.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     ast (2.4.2)
-    builder (3.2.4)
-    colorize (0.8.1)
-    concurrent-ruby (1.1.10)
-    debug (1.7.1)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
+    base64 (0.2.0)
+    benchmark (0.3.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    colorize (1.1.0)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     declarative (0.0.20)
-    diffy (3.4.2)
-    faraday (2.7.2)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    google-apis-core (0.9.4)
+    diffy (3.4.3)
+    drb (2.2.1)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-net_http (3.3.0)
+      net-http
+    google-apis-core (0.15.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
     google-apis-drive_v3 (0.33.0)
       google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-sheets_v4 (0.21.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    googleauth (1.3.0)
-      faraday (>= 0.17.3, < 3.a)
+    google-apis-sheets_v4 (0.38.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-env (2.2.1)
+      faraday (>= 1.0, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.6.2)
-      reline (>= 0.3.0)
-    json (2.6.3)
-    jwt (2.6.0)
-    memoist (0.16.2)
-    mini_mime (1.1.2)
-    minitest (5.17.0)
-    minitest-reporters (1.5.0)
+    io-console (0.7.2)
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.5)
+    jwt (2.9.3)
+      base64
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
+    mini_mime (1.1.5)
+    minitest (5.25.1)
+    minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.15.0)
+    mutex_m (0.2.0)
+    net-http (0.4.1)
+      uri
     os (1.1.4)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    parallel (1.26.3)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
-    public_suffix (5.0.1)
+      racc
+    psych (5.1.2)
+      stringio
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.1)
-    reline (0.3.2)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.10)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
-    rubocop (1.43.0)
+    rubocop (1.68.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    signet (0.17.0)
+    rubocop-ast (1.33.1)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
+    stringio (3.1.1)
     trailblazer-option (0.1.2)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.4.2)
-    webrick (1.7.0)
+    unicode-display_width (2.6.0)
+    uri (0.13.1)
 
 PLATFORMS
-  arm64-darwin-21
+  ruby
 
 DEPENDENCIES
   ad_localize!
@@ -124,4 +151,4 @@ DEPENDENCIES
   rubocop (~> 1.0)
 
 BUNDLED WITH
-   2.4.3
+   2.3.10

data/Makefile

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

data/README.md

@@ -86,6 +86,11 @@ $ ad_localize --auto-escape-percent
 $ ad_localize -l fr,en
 ```
 
+* Keep extra spaces before and after translated values
+```
+$ ad_localize --skip-value-stripping
+```
+
 ### 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.
 
@@ -101,9 +106,9 @@ If you want more examples, please open a documentation issue.
     export_request.verbose = true
     begin
         # download files - be sure that GOOGLE_APPLICATION_CREDENTIALS is set if you use service account
-        export_request.downloaded_csvs = DownloadSpreadsheets.new.call(export_request: export_request)
+        export_request.downloaded_csvs = AdLocalize::Interactors::DownloadSpreadsheets.new.call(export_request: export_request)
         # execute request
-        AdLocalize::Interactors::ExecuteExportRequest.new.call(export_request: export_request)
+        AdLocalize::Interactors::ProcessExportRequest.new.call(export_request: export_request)
     ensure
         export_request.downloaded_csvs.each do |file|
             file.close
@@ -283,6 +288,15 @@ To see all available commands run `bundle exec rake -T` .
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/applidium/ad_localize. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
+## How to release a new version
+
+1. After all your changes are reviewed and merged
+2. Create a `release` branch
+3. Update the version in `lib/ad_localize/version.rb`
+4. Execute `make publish`
+
+You may need to configure your account at step `4.` if you've never pushed any gem. You can find all the informations you need on [the official documentation](https://guides.rubygems.org/make-your-own-gem/#your-first-gem).
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -5,7 +5,13 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.test_files = FileList["test/**/*_test.rb"].exclude("**/private_drive_repository_test.rb")
+end
+
+Rake::TestTask.new(:test_private_google_sheet) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/private_drive_repository_test.rb"]
 end
 
 task :default => :test

data/ad_localize.gemspec

@@ -39,19 +39,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '>= 1.12.0', '< 3.0.0'
-  spec.add_development_dependency 'rake', '>= 12.3.0', '< 14.0.0'
-  spec.add_development_dependency 'minitest', '~> 5.11'
-  spec.add_development_dependency 'minitest-reporters', '~> 1.3'
-  spec.add_development_dependency 'diffy', '~> 3.3'
-  spec.add_development_dependency 'debug', ">= 1.0.0", '< 2.0'
-  spec.add_development_dependency 'rubocop', "~> 1.0"
-
   spec.add_dependency 'activesupport', '>= 6.1.3.2', '< 8.0'
-  spec.add_dependency 'colorize', '~> 0.8'
+  spec.add_dependency 'colorize', '~> 1.0'
   spec.add_dependency 'google-apis-sheets_v4', '~> 0.9'
   spec.add_dependency 'google-apis-drive_v3', '~> 0.33.0'
 
-  spec.required_ruby_version = '>= 2.7', '< 4.0'
+  spec.required_ruby_version = '>= 3.1', '< 4.0'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/ad_localize/mappers/locale_wording_to_hash.rb

@@ -23,7 +23,7 @@ module AdLocalize
 
       def map_plurals(coumpound_wordings:)
         result = {}
-        coumpound_wordings.each do |label, simple_wordings|
+        coumpound_wordings.each_value do |simple_wordings|
           variants_hash = map_translations(translations: simple_wordings.values) do |keys, translation|
             dotted_key_to_hash(keys, { translation.key.variant_name => translation.value })
           end

data/lib/ad_localize/mappers/options_to_export_request.rb

@@ -7,6 +7,7 @@ module AdLocalize
         request.locales = options[:locales]
         request.bypass_empty_values = options[:'non-empty-values']
         request.auto_escape_percent = options[:'auto-escape-percent']
+        request.skip_value_stripping = options[:'skip-value-stripping']
         request.csv_paths = options[:csv_paths]
         request.merge_policy = options[:'merge-policy']
         request.output_path = options[:'target-dir']

data/lib/ad_localize/option_handler.rb

@@ -5,6 +5,7 @@ module AdLocalize
       locales: Requests::ExportRequest::DEFAULTS[:locales],
       :'non-empty-values' => Requests::ExportRequest::DEFAULTS[:bypass_empty_values],
       :'auto-escape-percent' => Requests::ExportRequest::DEFAULTS[:auto_escape_percent],
+      :'skip-value-stripping' => Requests::ExportRequest::DEFAULTS[:skip_value_stripping],
       csv_paths: Requests::ExportRequest::DEFAULTS[:csv_paths],
       :'merge-policy' => Requests::ExportRequest::DEFAULTS[:merge_policy],
       :'target-dir' => Requests::ExportRequest::DEFAULTS[:output_path],
@@ -39,6 +40,7 @@ module AdLocalize
         end
         parser.on("-x", "--non-empty-values", TrueClass, 'Do not export keys with empty values (iOS only)')
         parser.on("--auto-escape-percent", TrueClass, 'Add escaping for % symbol to support wording use with String formatting (iOS only)')
+        parser.on("--skip-value-stripping", TrueClass, 'Disable the removal of leading and trailing whitespaces on wording values')
       end.parse!(options, into: args)
 
       args[:csv_paths] = options

data/lib/ad_localize/parsers/csv_parser.rb

@@ -73,7 +73,8 @@ module AdLocalize
             next if export_request.bypass_empty_values && value.blank?
 
             comment = row["#{COMMENT_KEY_COLUMN_IDENTIFIER} #{locale}"]
-            wording[locale].add_wording(key: key, value: value&.strip, comment: comment)
+            value = value&.strip unless export_request.skip_value_stripping
+            wording[locale].add_wording(key: key, value: value, comment: comment)
           end
           added_keys[raw_key] = true
         end

data/lib/ad_localize/repositories/drive_repository.rb

@@ -17,7 +17,7 @@ module AdLocalize
         sheet_ids.filter_map do |sheet_id|
           begin
             url = export_url(spreadsheet_id: spreadsheet_id, sheet_id: sheet_id)
-            string = @drive_service.http(:get, url, options: { retries: 3, max_elapsed_time: 60 })
+            string = @drive_service.http(:get, url, options: { retries: 5, max_elapsed_time: 120 })
             next unless string
 
             tempfile = Tempfile.new

data/lib/ad_localize/requests/export_request.rb

@@ -6,6 +6,7 @@ module AdLocalize
         locales: [],
         bypass_empty_values: false,
         auto_escape_percent: false,
+        skip_value_stripping: false,
         csv_paths: [],
         merge_policy: Interactors::MergeWordings::DEFAULT_POLICY,
         output_path: Pathname.new('exports'),
@@ -23,6 +24,7 @@ module AdLocalize
         :locales,
         :bypass_empty_values,
         :auto_escape_percent,
+        :skip_value_stripping,
         :csv_paths,
         :merge_policy,
         :output_path,
@@ -38,6 +40,7 @@ module AdLocalize
         @locales = DEFAULTS[:locales]
         @bypass_empty_values = DEFAULTS[:bypass_empty_values]
         @auto_escape_percent = DEFAULTS[:auto_escape_percent]
+        @skip_value_stripping = DEFAULTS[:skip_value_stripping]
         @csv_paths = DEFAULTS[:csv_paths]
         @merge_policy = DEFAULTS[:merge_policy]
         @output_path = DEFAULTS[:output_path]
@@ -63,6 +66,10 @@ module AdLocalize
         @auto_escape_percent = [true, 'true'].include?(value)
       end
 
+      def skip_value_stripping=(value)
+        @skip_value_stripping = [true, 'true'].include?(value)
+      end
+
       def csv_paths=(value)
         return unless value.is_a? Array
 
@@ -127,6 +134,7 @@ module AdLocalize
         "locales: #{locales}, " \
           "bypass_empty_values: #{bypass_empty_values}, " \
           "auto_escape_percent: #{auto_escape_percent}, " \
+          "skip_value_stripping: #{skip_value_stripping}, " \
           "csv_paths: #{csv_paths}, " \
           "merge_policy: #{merge_policy}, " \
           "output_path: #{output_path}, " \

data/lib/ad_localize/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module AdLocalize
-  VERSION = "6.1.0"
+  VERSION = "6.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Edouard Siegel
@@ -21,124 +21,8 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        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: 14.0.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: diffy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -165,14 +49,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: google-apis-sheets_v4
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +107,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - ad_localize.gemspec
@@ -292,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'
@@ -302,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: AdLocalize helps with mobile and web applications wording