ad_localize 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e28db2bd871d27acd98fe88472fd383dbda178fdbc91d09dae21a8b644be60e
-  data.tar.gz: 5baaebf8a8ce774f7285f70d9a522f5a57451caeaabbb6081a1cc4898587d317
+  metadata.gz: 0fe1c4ef7a0a7be9e6dc5396baac0d71f6fd2bfc4cba1cb076abba1200714dc3
+  data.tar.gz: 0ced5f8eb06b1edc0699bd9f976a31f51499397bd49e8380babfca7bb20b312a
 SHA512:
-  metadata.gz: a7ae29824014dbd2c23d480f1d0441257a5c334e8bd0f7e3a7ddb0e98cdafcec06c44bd9ea32ec7f35471b415a6c05020c6391137ca0bd080d8de0440f8f9c0d
-  data.tar.gz: 8c38d9753cc91399d1856bdaca191f32e304f85bd8d94d45bbe2beb8324c99aab6319ef7736cda2e2dd684782b7451b436333f1a72edd4d79118326d0b1d3ce1
+  metadata.gz: f3c982c48934e519fc58f739b73f4a36424e018f2c09ba30a414432990a0db3ec8a3fe057f5adfbbdf785dec348b4b416b8db23019bffd72fbf7613be758ffe7
+  data.tar.gz: 915907946b8f8c7fe8c596e6810c7d72acdbee3cdfb2bbe5d8462083cd4e3636c125bfd6b379f4285e8d12df9da918d185379b20356c82378204ea4b5b4e6bd8

data/.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.1.4', '3.2.0', '3.3.5']
+        ruby: ["3.2.0", "3.3.5", "3.4.10"]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,11 +23,15 @@ jobs:
       - name: Run tests
         run: bundle exec rake test
       - run: 'echo "$GOOGLE_APPLICATION_CREDENTIALS" > account_secret.json'
+        # Disabled: only needed by the private google sheet tests below
+        if: false
         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
+        # Disabled: the private google sheet used by these tests is missing
+        # if: matrix.ruby == '3.3.5' # Limit execution on latest ruby version to prevent reaching rate limits
+        if: false
         run: bundle exec rake test_private_google_sheet
         env:
-          GOOGLE_APPLICATION_CREDENTIALS: 'account_secret.json'
+          GOOGLE_APPLICATION_CREDENTIALS: "account_secret.json"

data/.gitignore

@@ -12,3 +12,5 @@ ad_localize/tmp/
 pkg/
 exports/
 account_secret.json
+.DS_Store
+__pycache__/

data/CHANGELOG.md

@@ -7,11 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [6.4.0] - 2026-10-02
+
+### Added
+
+- Add `--excel-file` option to support XLSX file format in addition of CSV files.
+- Add `scripts/download_with_navigator`, a temporary workaround script that downloads a file through the user browser session (`--source sharepoint` turns a SharePoint share link into a download link)
+
+### Removed
+
+- Drop support for ruby 3.1
+
+### Fixed
+
+- Fix plurals and adaptive wordings emptied when merging several sheets or csv files with the default `keep` merge policy
+- Fix the key appended to the last value of a Google Sheet export without trailing newline, by requiring csv >= 3.2.7
+
 ## [6.3.0] - 2024-11-04
 
 ### Removed
 
-- Drop support for for ruby <3.1
+- Drop support for ruby <3.1
 
 ## [6.2.0] - 2023-12-12
 

data/Gemfile

@@ -4,6 +4,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in ad_localize.gemspec
 gemspec
 
+ruby ">= 3.2.0"
+
 gem 'bundler', '>= 1.12.0', '< 3.0.0'
 gem 'debug', ">= 1.0.0", '< 2.0'
 gem 'diffy', '~> 3.3'

data/Gemfile.lock

@@ -1,102 +1,114 @@
 PATH
   remote: .
   specs:
-    ad_localize (6.2.0)
+    ad_localize (6.4.0)
       activesupport (>= 6.1.3.2, < 8.0)
       colorize (~> 1.0)
+      csv (~> 3.2, >= 3.2.7)
       google-apis-drive_v3 (~> 0.33.0)
       google-apis-sheets_v4 (~> 0.9)
+      rubyXL (~> 3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.2)
+    activesupport (7.2.4)
       base64
       benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
+      connection_pool (>= 2.2.5, < 3)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     ansi (1.5.0)
     ast (2.4.2)
-    base64 (0.2.0)
-    benchmark (0.3.0)
-    bigdecimal (3.1.8)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.3)
     builder (3.3.0)
     colorize (1.1.0)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.8)
+    connection_pool (2.5.5)
+    csv (3.3.6)
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
     declarative (0.0.20)
     diffy (3.4.3)
-    drb (2.2.1)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    drb (2.2.3)
+    faraday (2.14.4)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.3.0)
-      net-http
-    google-apis-core (0.15.1)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 1.9)
-      httpclient (>= 2.8.3, < 3.a)
-      mini_mime (~> 1.0)
-      mutex_m
+    faraday-follow_redirects (0.5.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.4.4)
+      net-http (~> 0.5)
+    google-apis-core (1.2.5)
+      addressable (~> 2.9)
+      faraday (~> 2.13)
+      faraday-follow_redirects (~> 0.3)
+      googleauth (~> 1.14)
+      mini_mime (~> 1.1)
+      multi_json (~> 1.11)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
+      retriable (>= 3.1, < 5.0)
     google-apis-drive_v3 (0.33.0)
       google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-sheets_v4 (0.38.0)
+    google-apis-sheets_v4 (0.48.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-cloud-env (2.2.1)
+    google-cloud-env (2.4.0)
+      base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
-    googleauth (1.11.2)
+    google-logging-utils (0.2.0)
+    googleauth (1.17.4)
       faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
-      jwt (>= 1.4, < 3.0)
-      multi_json (~> 1.11)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 4.0)
       os (>= 0.9, < 2.0)
+      pstore (~> 0.1)
       signet (>= 0.16, < 2.a)
-    httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.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)
+    jwt (3.3.0)
       base64
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
+    logger (1.7.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
     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
+    multi_json (1.21.2)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    nokogiri (1.19.4)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     os (1.1.4)
     parallel (1.26.3)
     parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
+    pstore (0.2.1)
     psych (5.1.2)
       stringio
-    public_suffix (6.0.1)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
@@ -105,11 +117,11 @@ GEM
     regexp_parser (2.9.2)
     reline (0.5.10)
       io-console (~> 0.5)
-    representable (3.2.0)
+    representable (3.3.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
+    retriable (4.2.0)
     rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -123,19 +135,22 @@ GEM
     rubocop-ast (1.33.1)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.1)
-    signet (0.19.0)
+    rubyXL (3.4.38)
+      nokogiri (>= 1.10.8)
+      rubyzip (>= 3.2.2)
+    rubyzip (3.7.0)
+    securerandom (0.4.1)
+    signet (0.22.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
+      jwt (>= 1.5, < 4.0)
     stringio (3.1.1)
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
-    uri (0.13.1)
+    uri (1.1.1)
 
 PLATFORMS
   ruby
@@ -150,5 +165,8 @@ DEPENDENCIES
   rake (>= 12.3.0, < 14.0.0)
   rubocop (~> 1.0)
 
+RUBY VERSION
+   ruby 3.2.2p53
+
 BUNDLED WITH
    2.3.10

data/README.md

@@ -1,6 +1,6 @@
 # AdLocalize
 
-The purpose of this gem is to automatically generate wording files from a CSV input (CSV file or Google Spreadsheet).
+The purpose of this gem is to automatically generate wording files from a CSV or Excel input (CSV file, `.xlsx` file or Google Spreadsheet).
 It supports iOS, Android, JSON, YAML and Java Properties.
 It is a useful tool when working on a mobile application or a SPA.
 
@@ -46,6 +46,23 @@ $ ad_localize -k <your-spreadsheet-drive-key>
 $ ad_localize -k <your-spreadsheet-drive-key> -s <comma-separated-sheet-id-list>
 ```
 
+Google is the default download source. Use `--excel-file` to convert Microsoft Excel `.xlsx` sources before export.
+
+* Export wording from a local Excel file. Only `.xlsx` files are supported. This can be used as an offline fallback.
+```
+$ ad_localize --excel-file wordings.xlsx
+```
+
+* Export wording from an Excel sharing URL. Remote Excel files are downloaded through Microsoft Graph API and require a `MICROSOFT_GRAPH_ACCESS_TOKEN` environment variable.
+```
+$ MICROSOFT_GRAPH_ACCESS_TOKEN=<token> ad_localize --excel-file https://example.sharepoint.com/.../wordings.xlsx
+```
+
+* Export wording from specific Excel sheets.
+```
+$ ad_localize --excel-file wordings.xlsx -s <comma-separated-sheet-name-list>
+```
+
 * Export wording from a private google spreadsheet. It requires a [Google Cloud Service Account](#using-a-google-cloud-service-account).
 ```
 $ GOOGLE_APPLICATION_CREDENTIALS=<path-to-client-secret.json> ad_localize -k <your-spreadsheet-drive-key>
@@ -91,6 +108,32 @@ $ ad_localize -l fr,en
 $ ad_localize --skip-value-stripping
 ```
 
+### Download from an external source with the browser
+
+When the wording file must first be downloaded from an external source (for example a SharePoint share link) and no API access is available, `scripts/download_with_navigator` downloads it through your browser, so that your browser session and cookies are used.
+
+The script opens the URL in the default browser, waits for the download to complete in `~/Downloads`, moves the file to a temporary directory (or to the `-o` path) and prints its path on stdout.
+
+If you download the script on its own (outside of this repository), make it executable with `chmod +x download_with_navigator`, or run it with `python3 download_with_navigator ...`.
+
+* Download a file from its raw URL
+```
+$ scripts/download_with_navigator <url>
+```
+
+* Download a file from a SharePoint share link
+```
+$ scripts/download_with_navigator <sharepoint share url> --source sharepoint
+```
+
+* Download a file then export its wording with ad_localize
+```
+$ XLSX_FILE=$(scripts/download_with_navigator <sharepoint share url> --source sharepoint)
+$ ad_localize --excel-file "$XLSX_FILE"
+```
+
+Run `scripts/download_with_navigator -h` for all options, and `scripts/download_with_navigator --version` to check the version of a downloaded copy. The `DOWNLOADS_DIR` (default `~/Downloads`) and `DOWNLOAD_TIMEOUT` (default `180` seconds) environment variables can be used to change the watched directory and the wait duration.
+
 ### 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.
 
@@ -105,7 +148,8 @@ If you want more examples, please open a documentation issue.
     export_request.sheet_ids = %w[first second]
     export_request.verbose = true
     begin
-        # download files - be sure that GOOGLE_APPLICATION_CREDENTIALS is set if you use service account
+        # download Google spreadsheets and convert Excel files to CSV tempfiles
+        # be sure that GOOGLE_APPLICATION_CREDENTIALS is set if you use service account
         export_request.downloaded_csvs = AdLocalize::Interactors::DownloadSpreadsheets.new.call(export_request: export_request)
         # execute request
         AdLocalize::Interactors::ProcessExportRequest.new.call(export_request: export_request)

data/ad_localize.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   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)
+                          Supported wording format : CSV, XLSX. Supported export format: iOS, Android, JSON and YAML)
   spec.homepage      = 'https://github.com/applidium/ad_localize'
 
   # Specify which files should be added to the gem when it is released.
@@ -41,9 +41,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 6.1.3.2', '< 8.0'
   spec.add_dependency 'colorize', '~> 1.0'
+  spec.add_dependency 'csv', '~> 3.2', '>= 3.2.7'
   spec.add_dependency 'google-apis-sheets_v4', '~> 0.9'
   spec.add_dependency 'google-apis-drive_v3', '~> 0.33.0'
+  spec.add_dependency 'rubyXL', '~> 3.4'
 
-  spec.required_ruby_version = '>= 3.1', '< 4.0'
+  spec.required_ruby_version = '>= 3.2', '< 4.0'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/ad_localize/cli.rb

@@ -5,7 +5,7 @@ module AdLocalize
       options = OptionHandler.parse!(args)
       export_request = Mappers::OptionsToExportRequest.new.map(options: options)
       LOGGER.debug("Export request options : #{export_request}")
-      export_request.downloaded_csvs = Interactors::DownloadSpreadsheets.new.call(export_request: export_request) if export_request.has_sheets?
+      export_request.downloaded_csvs = Interactors::DownloadSpreadsheets.new.call(export_request: export_request)
       Interactors::ProcessExportRequest.new.call(export_request: export_request)
     ensure
       export_request&.downloaded_csvs&.each do |file|

data/lib/ad_localize/interactors/download_spreadsheets.rb

@@ -4,9 +4,19 @@ module AdLocalize
     class DownloadSpreadsheets
       def initialize
         @drive_repository = Repositories::DriveRepository.new
+        @office_repository = Repositories::OfficeRepository.new
       end
 
       def call(export_request:)
+        return download_google_spreadsheets(export_request: export_request) if export_request.has_sheets?
+        return download_office_spreadsheets(export_request: export_request) if export_request.has_excel_file?
+
+        []
+      end
+
+      private
+
+      def download_google_spreadsheets(export_request:)
         LOGGER.debug("Downloading spreadsheets")
         if export_request.export_all
           @drive_repository.download_all_sheets(spreadsheet_id: export_request.spreadsheet_id)
@@ -15,6 +25,12 @@ module AdLocalize
                                                   sheet_ids: export_request.sheet_ids)
         end
       end
+
+      def download_office_spreadsheets(export_request:)
+        @office_repository.convert_to_csvs(paths: [export_request.excel_file],
+                                           sheet_ids: export_request.sheet_ids,
+                                           export_all: export_request.export_all)
+      end
     end
   end
 end

data/lib/ad_localize/interactors/merge_wordings.rb

@@ -32,7 +32,8 @@ module AdLocalize
 
       def merge_compound_wordings(reference_hash:, new_hash:, merge_policy:)
         new_hash.each do |new_label, new_list|
-          if reference_hash[new_label].nil?
+          # key? instead of [] : plurals and adaptives hashes create an empty entry on read
+          if !reference_hash.key?(new_label)
             reference_hash[new_label] = new_list
           elsif merge_policy == REPLACE_MERGE_POLICY
             merge_simple_wordings(reference_list: reference_hash[new_label], new_list: new_list, merge_policy: merge_policy)

data/lib/ad_localize/mappers/options_to_export_request.rb

@@ -9,6 +9,7 @@ module AdLocalize
         request.auto_escape_percent = options[:'auto-escape-percent']
         request.skip_value_stripping = options[:'skip-value-stripping']
         request.csv_paths = options[:csv_paths]
+        request.excel_file = options[:'excel-file']
         request.merge_policy = options[:'merge-policy']
         request.output_path = options[:'target-dir']
         request.platforms = options[:only]

data/lib/ad_localize/option_handler.rb

@@ -7,6 +7,7 @@ module AdLocalize
       :'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],
+      :'excel-file' => Requests::ExportRequest::DEFAULTS[:excel_file],
       :'merge-policy' => Requests::ExportRequest::DEFAULTS[:merge_policy],
       :'target-dir' => Requests::ExportRequest::DEFAULTS[:output_path],
       :'drive-key' => Requests::ExportRequest::DEFAULTS[:spreadsheet_id],
@@ -17,7 +18,7 @@ module AdLocalize
     }
 
     def self.parse!(options)
-      args = DEFAULT_OPTIONS
+      args = DEFAULT_OPTIONS.deep_dup
       OptionParser.new do |parser|
         parser.banner = 'Usage: exe/ad_localize [options] file(s)'
         parser.on("-d", "--debug", TrueClass, 'Run in debug mode')
@@ -31,8 +32,7 @@ module AdLocalize
                   'LOCALES is a comma separated list. Only generate localisation files for the specified locales')
         merge_policy_option(parser)
         platforms_option(parser)
-        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')
+        spreadsheet_options(parser)
         parser.on("-t", "--target-dir PATH", String, 'Path to the target directory')
         parser.on("-v", "--version", 'Prints current version') do
           puts AdLocalize::VERSION
@@ -43,15 +43,16 @@ module AdLocalize
         parser.on("--skip-value-stripping", TrueClass, 'Disable the removal of leading and trailing whitespaces on wording values')
       end.parse!(options, into: args)
 
+      validate_download_source!(args)
       args[:csv_paths] = options
       return args
     end
 
     def self.export_all_option(parser)
       export_all_option = <<~DOC
-        Export all sheets from spreadsheet specified by --drive-key option.
-        \tBy default, generates one export directory per sheet (see -m|--merge-sheets option to merge them).
-        \tAn GCLOUD_CLIENT_SECRET environment variable containing the client_secret.json content is needed.
+        Export all sheets from spreadsheet specified by --drive-key or --excel-file option.
+        \tSheets are merged into a single export (see -m|--merge-policy option to handle duplicated keys).
+        \tWith --drive-key, an GCLOUD_CLIENT_SECRET environment variable containing the client_secret.json content is needed.
       DOC
       parser.on("-e", "--export-all-sheets", TrueClass, export_all_option)
     end
@@ -65,6 +66,18 @@ module AdLocalize
       parser.on("-m", "--merge-policy POLICY", Interactors::MergeWordings::MERGE_POLICIES, merge_policy_option)
     end
 
+    def self.spreadsheet_options(parser)
+      parser.on("-f", "--excel-file XLSX_PATH_OR_URL", String, 'Use a Microsoft Excel .xlsx file path or sharing URL')
+      parser.on("-s", "--sheets SHEET_IDS", Array,
+                'SHEET_IDS is a comma separated list. Use specific sheet ids for Google Drive spreadsheets or sheet names for Excel files')
+    end
+
+    def self.validate_download_source!(args)
+      return unless args[:'drive-key'].present? && args[:'excel-file'].present?
+
+      raise OptionParser::InvalidOption.new('Use either --drive-key or --excel-file, not both')
+    end
+
     def self.platforms_option(parser)
       platforms_option = <<~DOC
         PLATFORMS is a comma separated list.

data/lib/ad_localize/repositories/office_repository.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+module AdLocalize
+  module Repositories
+    class OfficeRepository
+      EXCEL_EXTENSION = '.xlsx'
+      GRAPH_ACCESS_TOKEN_ENV = 'MICROSOFT_GRAPH_ACCESS_TOKEN'
+      GRAPH_URL = 'https://graph.microsoft.com/v1.0'
+
+      def office_source?(path:)
+        File.extname(URI(path.to_s).path) == EXCEL_EXTENSION
+      rescue URI::InvalidURIError
+        false
+      end
+
+      def convert_to_csvs(paths:, sheet_ids:, export_all: false)
+        paths.flat_map do |path|
+          convert_to_csv(path: path, sheet_ids: sheet_ids, export_all: export_all)
+        end
+      end
+
+      private
+
+      def convert_to_csv(path:, sheet_ids:, export_all:)
+        source_file = download(path: path) if remote_source?(path)
+        workbook = RubyXL::Parser.parse(source_file&.path || path.to_s)
+        worksheets = worksheets_for(workbook: workbook, sheet_ids: sheet_ids, path: path, export_all: export_all)
+        worksheets.map { |worksheet| write_csv(worksheet: worksheet) }
+      rescue StandardError => e
+        LOGGER.error("Cannot convert Excel file #{path}. Error: #{e.message}")
+        []
+      ensure
+        source_file&.close
+        source_file&.unlink
+      end
+
+      def download(path:)
+        file = Tempfile.new(['ad_localize', EXCEL_EXTENSION])
+        file.binmode
+        file.write(download_body(uri: graph_content_uri(path: path)))
+        file.rewind
+        file
+      end
+
+      def download_body(uri:, limit: 5)
+        raise 'Too many redirects' if limit.zero?
+
+        response = get(uri: uri)
+        case response.code.to_i
+        when 200..299
+          response.body
+        when 300..399
+          redirect_uri = URI.join(uri, response['location'])
+          raise "Refusing to follow non-https redirect to #{redirect_uri.hostname}" unless redirect_uri.scheme == 'https'
+
+          download_body(uri: redirect_uri, limit: limit - 1)
+        else
+          raise "HTTP #{response.code}: #{response.body}"
+        end
+      end
+
+      def get(uri:)
+        request = Net::HTTP::Get.new(uri)
+        # Graph redirects to a pre-authenticated download URL: never leak the token to another host
+        request['Authorization'] = "Bearer #{graph_access_token}" if uri.hostname == URI(GRAPH_URL).hostname
+        Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+          http.request(request)
+        end
+      end
+
+      def graph_content_uri(path:)
+        URI("#{GRAPH_URL}/shares/#{share_id(url: path.to_s)}/driveItem/content")
+      end
+
+      def share_id(url:)
+        encoded_url = Base64.urlsafe_encode64(url, padding: false)
+        "u!#{encoded_url}"
+      end
+
+      def graph_access_token
+        ENV.fetch(GRAPH_ACCESS_TOKEN_ENV) do
+          raise "Missing #{GRAPH_ACCESS_TOKEN_ENV} environment variable"
+        end
+      end
+
+      def worksheets_for(workbook:, sheet_ids:, path:, export_all:)
+        return workbook.worksheets if export_all
+        return [workbook.worksheets.first] if sheet_ids == Requests::ExportRequest::DEFAULTS[:sheet_ids]
+
+        sheet_ids.filter_map do |sheet_id|
+          worksheet = workbook.worksheets.find { |sheet| sheet.sheet_name == sheet_id }
+          LOGGER.error("Cannot find Excel sheet named #{sheet_id} in #{path}") unless worksheet
+          worksheet
+        end
+      end
+
+      def write_csv(worksheet:)
+        file = Tempfile.new(['ad_localize', '.csv'])
+        CSV.open(file.path, 'w') do |csv|
+          worksheet.each do |row|
+            csv << (row&.cells || []).map { |cell| cell&.value }
+          end
+        end
+        file.rewind
+        file
+      end
+
+      def remote_source?(path)
+        raise "Only https URLs are supported for Excel files: #{path}" if path.to_s.start_with?('http://')
+
+        path.to_s.start_with?('https://')
+      end
+    end
+  end
+end

data/lib/ad_localize/requests/export_request.rb

@@ -8,6 +8,7 @@ module AdLocalize
         auto_escape_percent: false,
         skip_value_stripping: false,
         csv_paths: [],
+        excel_file: nil,
         merge_policy: Interactors::MergeWordings::DEFAULT_POLICY,
         output_path: Pathname.new('exports'),
         spreadsheet_id: nil,
@@ -26,6 +27,7 @@ module AdLocalize
         :auto_escape_percent,
         :skip_value_stripping,
         :csv_paths,
+        :excel_file,
         :merge_policy,
         :output_path,
         :platforms,
@@ -42,6 +44,7 @@ module AdLocalize
         @auto_escape_percent = DEFAULTS[:auto_escape_percent]
         @skip_value_stripping = DEFAULTS[:skip_value_stripping]
         @csv_paths = DEFAULTS[:csv_paths]
+        @excel_file = DEFAULTS[:excel_file]
         @merge_policy = DEFAULTS[:merge_policy]
         @output_path = DEFAULTS[:output_path]
         @platforms = DEFAULTS[:platforms]
@@ -76,6 +79,10 @@ module AdLocalize
         @csv_paths = value.compact.map { |path| Pathname.new(path) }
       end
 
+      def excel_file=(value)
+        @excel_file = Pathname.new(value) unless value.blank?
+      end
+
       def merge_policy=(value)
         @merge_policy = value unless value.blank?
       end
@@ -118,6 +125,10 @@ module AdLocalize
         spreadsheet_id.present?
       end
 
+      def has_excel_file?
+        excel_file.present?
+      end
+
       def has_csv_paths?
         all_csv_paths.present?
       end
@@ -136,6 +147,7 @@ module AdLocalize
           "auto_escape_percent: #{auto_escape_percent}, " \
           "skip_value_stripping: #{skip_value_stripping}, " \
           "csv_paths: #{csv_paths}, " \
+          "excel_file: #{excel_file}, " \
           "merge_policy: #{merge_policy}, " \
           "output_path: #{output_path}, " \
           "spreadsheet_id: #{spreadsheet_id}, " \

data/lib/ad_localize/version.rb

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

data/lib/ad_localize.rb

@@ -1,21 +1,27 @@
 # frozen_string_literal: true
 require 'active_support'
 require 'active_support/core_ext'
+require 'base64'
 require 'fileutils'
 require 'pathname'
 require 'yaml'
 require 'json'
 require 'csv'
 require 'logger'
+require 'net/http'
+require 'uri'
 require 'colorize'
 require 'optparse'
 require 'erb'
+require 'tempfile'
 require 'googleauth'
 require 'google/apis/sheets_v4'
 require 'google/apis/drive_v3'
+require 'rubyXL'
 
 require 'ad_localize/repositories/drive_repository'
 require 'ad_localize/repositories/file_system_repository'
+require 'ad_localize/repositories/office_repository'
 
 require 'ad_localize/view_models/simple_wording_view_model'
 require 'ad_localize/view_models/compound_wording_view_model'

data/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "3.2"

data/scripts/download_with_navigator

@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+#
+# Download a file through the user browser, so that the download uses the browser session and cookies.
+# The URL is opened as is, unless a --source option tells how to turn it into a download URL :
+#
+# --source sharepoint : the URL is a SharePoint share link, its query is replaced with download=1
+#
+# This script can be used with ad_localize like this :
+#
+# XLSX_FILE=$(./download_with_navigator <sharepoint share url> --source sharepoint)
+# ad_localize --excel-file "$XLSX_FILE"
+#
+
+import argparse
+import os
+import shutil
+import sys
+import tempfile
+import time
+import webbrowser
+from pathlib import Path
+from urllib.parse import urlencode, urlparse, urlunparse
+
+VERSION = "1.0.0"
+
+# Browsers write to a temporary name and rename it when the download is complete
+PARTIAL_SUFFIXES = (".crdownload", ".part", ".download", ".tmp")
+STABLE_CHECKS = 3
+
+
+def sharepoint_url(url):
+    parsed = urlparse(url)
+
+    return urlunparse(parsed._replace(query=urlencode({"download": "1"}), fragment=""))
+
+
+SOURCES = {
+    "sharepoint": sharepoint_url,
+}
+
+
+def download_url(url, source):
+    parsed = urlparse(url)
+
+    if parsed.scheme not in ("http", "https") or not parsed.hostname:
+        raise ValueError(f"http(s) URL expected: {url}")
+
+    return SOURCES[source](url) if source else url
+
+
+def completed_files(downloads_dir):
+    return [
+        p for p in Path(downloads_dir).iterdir()
+        if p.is_file()
+        and not p.name.startswith(".")
+        and p.suffix.lower() not in PARTIAL_SUFFIXES
+    ]
+
+
+def snapshot(downloads_dir):
+    return {p.name: p.stat().st_mtime_ns for p in completed_files(downloads_dir)}
+
+
+def wait_for_download(downloads_dir, baseline, timeout):
+    deadline = time.monotonic() + timeout
+    last_seen = None
+    stable_count = 0
+
+    while time.monotonic() < deadline:
+        candidates = [
+            p for p in completed_files(downloads_dir)
+            if baseline.get(p.name) != p.stat().st_mtime_ns
+        ]
+
+        if candidates:
+            newest = max(candidates, key=lambda p: p.stat().st_mtime_ns)
+            current = (newest, newest.stat().st_size)
+
+            stable_count = stable_count + 1 if current == last_seen else 1
+            last_seen = current
+
+            if current[1] > 0 and stable_count >= STABLE_CHECKS:
+                return newest
+
+        time.sleep(1)
+
+    raise TimeoutError(f"No file downloaded in {downloads_dir}")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Download a file through the browser, using the user session"
+    )
+    parser.add_argument("url", help="URL of the file to download")
+    parser.add_argument(
+        "--source",
+        choices=sorted(SOURCES),
+        help="Origin of the URL, used to turn it into a download URL. If missing, the URL is opened as is.",
+    )
+    parser.add_argument(
+        "-o",
+        "--output",
+        help="Output file. If missing, a temporary file is used.",
+    )
+    parser.add_argument("-v", "--version", action="version", version=f"%(prog)s {VERSION}")
+    args = parser.parse_args()
+
+    downloads_dir = os.environ.get("DOWNLOADS_DIR", str(Path.home() / "Downloads"))
+    timeout = int(os.environ.get("DOWNLOAD_TIMEOUT", "180"))
+
+    try:
+        url = download_url(args.url, args.source)
+        baseline = snapshot(downloads_dir)
+
+        print("Opening browser...", file=sys.stderr)
+        webbrowser.open(url)
+
+        downloaded_file = wait_for_download(downloads_dir, baseline, timeout)
+    except (ValueError, TimeoutError, OSError) as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+    if args.output:
+        final_file = Path(args.output).resolve()
+        final_file.parent.mkdir(parents=True, exist_ok=True)
+    else:
+        final_file = Path(tempfile.mkdtemp(prefix="navigator-download-")) / downloaded_file.name
+
+    shutil.move(downloaded_file, final_file)
+
+    print("Download succeeded:", final_file, file=sys.stderr)
+    print(final_file)
+
+
+if __name__ == "__main__":
+    main()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - Edouard Siegel
@@ -21,7 +21,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2026-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,6 +57,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: google-apis-sheets_v4
   requirement: !ruby/object:Gem::Requirement
@@ -85,9 +105,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.33.0
+- !ruby/object:Gem::Dependency
+  name: rubyXL
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: |-
   AdLocalize produces localization files from platform agnostic wording.
-                            Supported wording format : CSV. Supported export format: iOS, Android, JSON and YAML
+                            Supported wording format : CSV, XLSX. Supported export format: iOS, Android, JSON and YAML
 email:
 - joanna.vigne@fabernovel.com
 - pierre.felgines@fabernovel.com
@@ -144,6 +178,7 @@ files:
 - lib/ad_localize/parsers/key_parser.rb
 - lib/ad_localize/repositories/drive_repository.rb
 - lib/ad_localize/repositories/file_system_repository.rb
+- lib/ad_localize/repositories/office_repository.rb
 - lib/ad_localize/requests/export_request.rb
 - lib/ad_localize/sanitizers/ios_sanitizer.rb
 - lib/ad_localize/sanitizers/ios_to_android_sanitizer.rb
@@ -164,6 +199,8 @@ files:
 - lib/ad_localize/version.rb
 - lib/ad_localize/view_models/compound_wording_view_model.rb
 - lib/ad_localize/view_models/simple_wording_view_model.rb
+- mise.toml
+- scripts/download_with_navigator
 homepage: https://github.com/applidium/ad_localize
 licenses:
 - MIT
@@ -177,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'
@@ -187,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: AdLocalize helps with mobile and web applications wording