ad_localize 4.0.3 → 4.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b482ce9a7080380dfef2db59f93af1752fa1b570764393bfc163a10bec1fa81c
-  data.tar.gz: d1a1a841fba380486a618627541d9a50ce1c322a9695ce3ac904faf259458950
+  metadata.gz: 0c46c9d2fd0ef0b980ac43804c9f063d52b36be6083de7193c3e65dde9447030
+  data.tar.gz: 3a6eac4fe189d7e6de30220b410f0331d8b3a3a90a72c970a9e7ee4aa727c67c
 SHA512:
-  metadata.gz: 717d03d8cacc640e384cd1cf7c961a8e52ca8e9bc4545ee2ba6d92e4f9f698112b491640bf53b99dbe159b659c037e4a6154caf632e4fe7f908394a0115ff238
-  data.tar.gz: 0703ee04049d0a12c6b111ea623759dc1da8d9a820aec1f0ed992fffdb967a014337a4b5cda92d74b2b600bd0d8200e7c1f4264ab3a1f90e0946d1f154e5be5e
+  metadata.gz: 59fcc792844bf2558f2323f99de099709bae2145ae399231509855230268dd85756cc85145d38b5bdceb908b10635d59f6a2a7067ba32de51bae754c1e99af4a
+  data.tar.gz: 795f9239b4548412ba8f251d6328c5240d387e6089fa389e0d9c4581673dd40eb3dbc7808cc0c07b3cc8fe2c4935cc427d9c51b689bc57fb897b9b01bf8f77a6

data/.github/workflows/ruby.yml

@@ -4,17 +4,18 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.6.6', '2.7.3', '3.0.1']
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
-    - name: Build and test with Rake
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
-        bundle exec rake
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Build and test with Rake
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+          bundle exec rake

data/CHANGELOG.md

@@ -4,6 +4,30 @@ 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).
 
+## [4.0.8] - 2021-05-25
+### Fixed
+- Add `NFCReaderUsageDescription` to InfoPlist keys for iOS
+
+## [4.0.7] - 2021-05-18
+### Changed
+- Support Ruby 3.x
+
+## [4.0.6] - 2020-01-25
+### Fixed
+  - Fix google spreadsheet sheet id comparison with sheet_ids option value
+
+## [4.0.5] - 2020-11-12
+### Fixed
+  - Fix csv file type check (also add compatibility with macOS Big Sur)
+
+## [4.0.4] - 2020-11-09
+### Fixed
+  - Fix android special character escaping [#56](https://github.com/applidium/ad_localize/issues/56)
+  - Fix platform filter on export [#55](https://github.com/applidium/ad_localize/issues/55)
+
+### Changed
+  - Use default terminal color for debug log
+
 ## [4.0.3] - 2020-10-27
 ### Fixed
   - Fix CSV detection and remove dependency to MimeType gem

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ad_localize (4.0.3)
-      activesupport (>= 5.2, < 7.0)
+    ad_localize (4.0.8)
+      activesupport (>= 6.1.3.2, < 7.0)
       colorize (~> 0.8)
       google-api-client (~> 0.34)
       googleauth (~> 0.12)
@@ -11,35 +11,57 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     builder (3.2.4)
     byebug (11.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     declarative (0.0.20)
-    declarative-option (0.1.0)
     diffy (3.3.0)
-    faraday (1.1.0)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    google-api-client (0.46.2)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    gems (1.2.0)
+    google-api-client (0.53.0)
+      google-apis-core (~> 0.1)
+      google-apis-generator (~> 0.1)
+    google-apis-core (0.3.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
+      googleauth (~> 0.14)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       rexml
-      signet (~> 0.12)
-    googleauth (0.14.0)
+      signet (~> 0.14)
+      webrick
+    google-apis-discovery_v1 (0.4.0)
+      google-apis-core (~> 0.1)
+    google-apis-generator (0.2.0)
+      activesupport (>= 5.0)
+      gems (~> 1.2)
+      google-apis-core (~> 0.1)
+      google-apis-discovery_v1 (~> 0.0)
+      thor (>= 0.20, < 2.a)
+    googleauth (0.16.2)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -47,13 +69,13 @@ GEM
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
     httpclient (2.8.3)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jwt (2.2.2)
+    jwt (2.2.3)
     memoist (0.16.2)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
+    minitest (5.14.4)
     minitest-reporters (1.4.2)
       ansi
       builder
@@ -61,29 +83,33 @@ GEM
       ruby-progressbar
     multi_json (1.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.5)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     os (1.1.1)
     public_suffix (4.0.6)
+    racc (1.5.2)
     rake (12.3.3)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.4)
+    rexml (3.2.5)
     ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    signet (0.14.0)
+    ruby2_keywords (0.0.4)
+    signet (0.15.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    thor (1.1.0)
+    trailblazer-option (0.1.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    zeitwerk (2.4.0)
+    webrick (1.7.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -98,4 +124,4 @@ DEPENDENCIES
   rake (~> 12.3)
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/README.md

@@ -2,7 +2,7 @@
 
 The purpose of this gem is to automatically generate wording files from a CSV input (CSV 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.  
+It is a useful tool when working on a mobile application or a SPA.
 
 ## Installation
 
@@ -31,7 +31,7 @@ $ gem install ad_localize
 $ ad_localize -h
 ```
 
-* Export wording from a google spreadsheet, default tab. The spreadsheet key and sheet_id are available in the spreadsheet url. For example `https://docs.google.com/spreadsheets/d/<your-spreadsheet-drive-key>/edit#gid=<sheet-id>`.
+* Export wording from a public google spreadsheet, default tab. The spreadsheet key and sheet_id are available in the spreadsheet url. For example `https://docs.google.com/spreadsheets/d/<your-spreadsheet-drive-key>/edit#gid=<sheet-id>`.
 ```
 $ ad_localize -k <your-spreadsheet-drive-key>
 ```
@@ -41,7 +41,12 @@ $ ad_localize -k <your-spreadsheet-drive-key>
 $ ad_localize -k <your-spreadsheet-drive-key> -s <comma-separated-sheet-id-list>
 ```
 
-* Export wording from all sheets in a google spreadsheet. It requires a [Google Cloud Service Account](#using-a-google-cloud-service-account). 
+* Export wording from a private google spreadsheet. It requires a [Google Cloud Service Account](#using-a-google-cloud-service-account).
+```
+$ GCLOUD_CLIENT_SECRET=$(cat <path-to-client-secret.json>) ad_localize -k <your-spreadsheet-drive-key>
+```
+
+* Export wording from all sheets in a google spreadsheet. It requires a [Google Cloud Service Account](#using-a-google-cloud-service-account).
 ```
 $ GCLOUD_CLIENT_SECRET=$(cat <path-to-client-secret.json>) ad_localize -k <your-spreadsheet-drive-key> -e
 ```
@@ -71,7 +76,7 @@ If you want more examples, please open a documentation issue.
     require 'ad_localize'
     # create optional google spreasheet options
     g_spreadsheet_options = AdLocalize::Requests::GSpreadsheetOptions.new(spreadsheet_id: 'some_id', sheet_ids: ['first', 'second'], service_account_config: ENV['GCLOUD_CLIENT_SECRET'])
-    # create export request    
+    # create export request
     export_request = AdLocalize::Requests::ExportRequest.new(g_spreadsheet_options: g_spreadsheet_options, verbose: true)
     # execute request
     AdLocalize::Interactors::ExecuteExportRequest.new.call(export_request: export_request)
@@ -81,20 +86,20 @@ If you want more examples, please open a documentation issue.
 ### Share to anyone with the link
 
 If you do not have high security concerns, the simplest way to access a google spreadsheet is to allow **anyone** with the link to **view** it and enable the `Viewers and commenters can see the option to download, print, and copy` option in the spreadsheet sharing settings.
-    
+
 ### Use a Google Cloud Service Account
 
-To use a private google spreasheet you need to use a Google Cloud Service Account. Here are the steps to follow :    
-1. Create a GCloud Service Account:    
-    - Go to [Google Cloud Console](https://console.cloud.google.com/)  
-    - Either create a new project or use an existing one (when using Firebase, a GCloud project is created)  
-    - Go to *IAM & Admin / Service Account* and create a new service account.  
-    - Store the created `client-secret.json` (in a password manager for example)  
-2. Enable Google Spreadsheet API for the project  
-    - Go to *API / Library* and enable the **Google Spreadsheet API** there.  
-3. Add the service account to a spreadsheet.  
+To use a private google spreasheet you need to use a Google Cloud Service Account. Here are the steps to follow :
+1. Create a GCloud Service Account:
+    - Go to [Google Cloud Console](https://console.cloud.google.com/)
+    - Either create a new project or use an existing one (when using Firebase, a GCloud project is created)
+    - Go to *IAM & Admin / Service Account* and create a new service account.
+    - Store the created `client-secret.json` (in a password manager for example)
+2. Enable Google Spreadsheet API for the project
+    - Go to *API / Library* and enable the **Google Spreadsheet API** there.
+3. Add the service account to a spreadsheet.
     - In *IAM & Admin / Service Account*, the service account's email is listed. Invite it to the spreadsheet to export.
-      
+
 ```
 $ GCLOUD_CLIENT_SECRET=$(cat <path-to-client-secrets>) ad_localize -k # one way
 $ GCLOUD_CLIENT_SECRET=$(cat <path-to-client-secrets>) ad_localize -k <your-spreadsheet-drive-key> -s <comma-separated-sheet-id-list> # another way
@@ -119,11 +124,11 @@ $ ad_localize -k <your-spreadsheet-drive-key> -s <comma-separated-sheet-id-list>
 - 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"`).
 
-### Comments 
+### Comments
 
 _Only for Android and iOS_
 
-To add comments for iOS or Android, simply add a comment column using the naming convention `comment <locale>`.  
+To add comments for iOS or Android, simply add a comment column using the naming convention `comment <locale>`.
 Comments are available in `strings.xml`, `Localizable.strings`, `Localizable.stringsdict`, `InfoPlist.strings`. Here is an example for `InfoPlist.strings` :
 
 | key | en | comment en |
@@ -172,21 +177,22 @@ _Only for iOS._
 
 Every key that matches the following formats will be added to the `InfoPlist.strings` file instead of `Localizable.strings`:
 * `NS...UsageDescription`
+* `NFCReaderUsageDescription`
 * `CF...Name`
 
 ### Nested wording
 
 _Only for YAML and JSON_
 
-For these two platforms it is common to have nested wording files, either to handle plural or to group wording by sections. To handle this behavior in a simple way you should use dots in the key to separate the different levels. For example :  
- 
+For these two platforms it is common to have nested wording files, either to handle plural or to group wording by sections. To handle this behavior in a simple way you should use dots in the key to separate the different levels. For example :
+
 | key | fr |
 | --- | --- |
 | login.password | mot de passe |
 | login.email | email |
 
 ```json
-{"login":{"password":"mot de passe","email":"email"}} 
+{"login":{"password":"mot de passe","email":"email"}}
 ```
 
 ```yaml
@@ -194,14 +200,14 @@ fr:
   login:
     password: "mot de passe"
     email: "email"
-```  
+```
 
 
 ## Output
 
-The default output folder name is `exports`.  
-If your export is for multiple platforms there will be an intermediate folder for each platform, otherwise the wording files (and folders) will directly be generated in the export folder.  
-Any existing file will be overriden. 
+The default output folder name is `exports`.
+If your export is for multiple platforms there will be an intermediate folder for each platform, otherwise the wording files (and folders) will directly be generated in the export folder.
+Any existing file will be overriden.
 You can see examples of generated files in `test/fixtures/export_references/`
 
 Here an export tree example for all supported platforms in `fr` and `en`:

data/ad_localize.gemspec

@@ -46,11 +46,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters', '~> 1.3'
   spec.add_development_dependency 'diffy', '~> 3.3'
 
-  spec.add_dependency 'activesupport', '>= 5.2', '< 7.0'
+  spec.add_dependency 'activesupport', '>= 6.1.3.2', '< 7.0'
   spec.add_dependency 'nokogiri', '~> 1.10'
   spec.add_dependency 'colorize', '~> 0.8'
   spec.add_dependency 'google-api-client', '~> 0.34'
   spec.add_dependency 'googleauth', '~> 0.12'
 
-  spec.required_ruby_version = '~> 2.3'
+  spec.required_ruby_version = '>= 2.3'
 end

data/lib/ad_localize/ad_logger.rb

@@ -18,7 +18,7 @@ module AdLocalize
     end
 
     def debug(text)
-      log(level: Logger::DEBUG, text: text.black)
+      log(level: Logger::DEBUG, text: text)
     end
 
     def info!

data/lib/ad_localize/entities/key.rb

@@ -4,7 +4,7 @@ module AdLocalize
       PLURAL_KEY_REGEXP = /\#\#\{([A-Za-z]+)\}/.freeze
       ADAPTIVE_KEY_REGEXP = /\#\#\{(\d+)\}/.freeze
       # see https://developer.apple.com/documentation/bundleresources/information_property_list
-      INFO_PLIST_KEY_REGEXP = /(NS.+UsageDescription)|(CF.+Name)/.freeze
+      INFO_PLIST_KEY_REGEXP = /(NS.+UsageDescription)|(CF.+Name)|NFCReaderUsageDescription/.freeze
 
       def initialize(label:)
         @label = label

data/lib/ad_localize/mappers/android_translation_mapper.rb

@@ -5,12 +5,16 @@ module AdLocalize
 
       def sanitize_value(value:)
         return if value.blank?
-        processedValue = value.gsub(/(?<!\\)'/, "\\\\'") # match ' unless there is a \ before
-        processedValue = processedValue.gsub(/(?<!\\)\"/, "\\\"") # match " unless there is a \ before
+        processedValue = value.gsub(/(?<!\\)'/, '&#39;') # match ' unless there is a \ before
+        processedValue = processedValue.gsub(/(?<!\\)\"/, '&#34;') # match " unless there is a \ before
+        processedValue = processedValue.gsub(">", '&gt;')
+        processedValue = processedValue.gsub("<", '&lt;')
         processedValue = processedValue.gsub(/(%(\d+\$)?@)/, '%\2s') # should match values like %1$s and %s
         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 %
         processedValue = processedValue.gsub("\\U", "\\u")
+        processedValue = processedValue.gsub(/&(?!((#\d+)|(\w+));)/, '&#38;')
+        processedValue = processedValue.gsub(/&/) { |match| match.replace('\&') }
         "\"#{processedValue}\""
       end
     end

data/lib/ad_localize/mappers/options_to_export_request.rb

@@ -3,7 +3,7 @@ module AdLocalize
     class OptionsToExportRequest
       def map(options:)
         Requests::ExportRequest.new(
-          platform_codes: options[:only],
+          platforms: options[:only],
           g_spreadsheet_options: map_g_spreadsheet_options(options: options),
           verbose: options[:debug],
           output_path: options[:'target-dir'],

data/lib/ad_localize/repositories/g_sheets_repository.rb

@@ -19,7 +19,7 @@ module AdLocalize
           spreadsheet.sheets[0..0].map { |sheet| get_sheet_values(spreadsheet_id: g_spreadsheet_options.spreadsheet_id, sheet: sheet) }
         else
           spreadsheet.sheets.select do |sheet|
-            g_spreadsheet_options.sheet_ids.include?(sheet.properties.sheet_id)
+            g_spreadsheet_options.sheet_ids.include?(sheet.properties.sheet_id.to_s)
           end.map do |sheet|
             get_sheet_values(spreadsheet_id: g_spreadsheet_options.spreadsheet_id, sheet: sheet)
           end

data/lib/ad_localize/requests/export_request.rb

@@ -3,7 +3,7 @@ module AdLocalize
     class ExportRequest
       SUPPORTED_PLATFORMS = %w(ios android yml json properties).freeze
       DEFAULT_EXPORT_FOLDER = 'exports'.freeze
-      CSV_CONTENT_TYPES = %w(text/csv text/plain).freeze
+      CSV_CONTENT_TYPES = %w(text/csv text/plain application/csv).freeze
 
       def initialize(**args)
         @locales = Array(args[:locales].presence)
@@ -61,7 +61,7 @@ module AdLocalize
       end
 
       def is_csv?(path:)
-        CSV_CONTENT_TYPES.include?(`file --brief --mime-type #{path}`.strip)
+        CSV_CONTENT_TYPES.include?(`file --brief --mime-type "#{path}"`.strip)
       end
 
       def valid_g_spreadsheet_options?

data/lib/ad_localize/serializers/json_serializer.rb

@@ -10,4 +10,4 @@ module AdLocalize
       end
     end
   end
-end
+end

data/lib/ad_localize/version.rb

@@ -1,3 +1,3 @@
 module AdLocalize
-  VERSION = "4.0.3"
+  VERSION = "4.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.8
 platform: ruby
 authors:
 - Edouard Siegel
@@ -118,7 +118,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.1.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -128,7 +128,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.1.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
@@ -274,7 +274,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: AdLocalize helps with mobile and web applications wording