ad_localize 4.0.0 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1581d41a8d5a3f41dc91cf69f4b8abfdf8c2121695cf116a46c738825818cbd9
-  data.tar.gz: 64af1cc80f9e9247514c334e13f6252e267283e3c38ade2d3111a4deb252164b
+  metadata.gz: 9b804cc7ea11e917f21e49070d5677aac22f642445906825735cccc7f651d167
+  data.tar.gz: 6e78a8ac87a098836436bff04fadf77da9e979cb2a665da30fe8e708a7f3acf0
 SHA512:
-  metadata.gz: 0ebfdd0a7746acdaa06b713c6f129b04b7a81fb0441bf5975a47b415b892dd135b87c3e99e0610a98584adb2317f4d170a64230f932db3a3c0c3ecf8d00eabee
-  data.tar.gz: bd9a7140d68dc5f76c6c9e0dc19342180083205079d6d4e6022c0039176ae36f9e8c50441dec84bd5ea89f6596812c998be246163c3a9942e5fd9661379c3c30
+  metadata.gz: 7f7d5c2d82c023bce6ea8309fcdcf3cfb3e29878585cec31fecbc35db3c264cccf474c12cf58847297874684304537e35c469ea401b7eb4dd623e1baedff8db5
+  data.tar.gz: 0ceca200f147a4cf93231a4e8bf846c32ee909e199008c512671f1c12d3653e621e70d4417b12de648758ffcecd3a67dd58d8854292c3b7c50069f649a376e7b

data/CHANGELOG.md

@@ -4,12 +4,37 @@ 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.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
+  - Fix drive key detection in options
+
+## [4.0.2] - 2020-10-26
+### Fixed
+  - 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
+### Fixed
+  - delete downloaded files even when any of them is a CSV file
+
 ## [4.0.0] - 2020-10-19
 ### 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)
- 
+
 ### Changed
   - it is now possible to provide an output path path that does not exist
   - if a service account configuration is provided, there won't be any files downloaded
@@ -20,8 +45,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - tests for ad_localize class are restricted to the minimum
   - No more file generated when there are no data to export
   - Less verbose logs. Now, they only describe the different steps of the export process
-  - do not add `InfoPlist` translations to android `strings.xml` 
-  
+  - do not add `InfoPlist` translations to android `strings.xml`
+
 ### Added
   - -e, -export_all_sheets option export all sheets from a spreadsheet by [@sjcqs](https://github.com/sjcqs)
   - -m, --merge-option to select the merge policy (`keep` or `replace`) by [@sjcqs](https://github.com/sjcqs)
@@ -33,7 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - dedicated folder for fixture files
   - add ability to use AdLocalize in a Ruby program
   - add documentation for JSON and YAML support. Fixes [#23](https://github.com/applidium/ad_localize/issues/23)
-  
+
 ### Fixed
   - comments will now be added to iOS and Android plural files
   - do not remove existing files in export output folder. Fixes [#40](https://github.com/applidium/ad_localize/issues/40)
@@ -42,8 +67,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - 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 
-  
+  - no more check for ordered interpolation variables in translations
+
 ## [3.6.0] - 2020-06-23
 ### Added
   - add documentation for service account usage by [@sjcqs](https://github.com/sjcqs)

data/Gemfile.lock

@@ -1,18 +1,17 @@
 PATH
   remote: .
   specs:
-    ad_localize (4.0.0)
+    ad_localize (4.0.5)
       activesupport (>= 5.2, < 7.0)
       colorize (~> 0.8)
       google-api-client (~> 0.34)
       googleauth (~> 0.12)
-      mime-types (~> 3.3)
       nokogiri (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.3)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,17 +27,19 @@ GEM
     declarative (0.0.20)
     declarative-option (0.1.0)
     diffy (3.3.0)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.44.1)
+      ruby2_keywords
+    google-api-client (0.46.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
+      rexml
       signet (~> 0.12)
-    googleauth (0.13.1)
+    googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -50,9 +51,6 @@ GEM
       concurrent-ruby (~> 1.0)
     jwt (2.2.2)
     memoist (0.16.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -73,7 +71,9 @@ GEM
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.4)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     signet (0.14.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)

data/README.md

@@ -91,7 +91,7 @@ To use a private google spreasheet you need to use a Google Cloud Service Accoun
     - 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 **Drive API** there.  
+    - 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.
       

data/ad_localize.gemspec

@@ -51,7 +51,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize', '~> 0.8'
   spec.add_dependency 'google-api-client', '~> 0.34'
   spec.add_dependency 'googleauth', '~> 0.12'
-  spec.add_dependency 'mime-types', '~> 3.3'
 
   spec.required_ruby_version = '~> 2.3'
 end

data/lib/ad_localize.rb

@@ -9,7 +9,6 @@ require 'logger'
 require 'colorize'
 require 'optparse'
 require 'nokogiri'
-require 'mime/types'
 require 'erb'
 require 'googleauth'
 require 'google/apis/sheets_v4'

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/interactors/export_g_spreadsheet.rb

@@ -33,13 +33,13 @@ module AdLocalize
         export_request.csv_paths = downloaded_files.map(&:path)
         if export_request.has_csv_files?
           ExportCSVFiles.new.call(export_request: export_request)
-          downloaded_files.select { |downloaded_file| File.exist?(downloaded_file.path) }.each do |downloaded_file|
-            downloaded_file.close
-            downloaded_file.unlink
-          end
         else
           LOGGER.error("invalid export request. check the spreadsheet share configuration")
         end
+        downloaded_files.select { |downloaded_file| File.exist?(downloaded_file.path) }.each do |downloaded_file|
+          downloaded_file.close
+          downloaded_file.unlink
+        end
       end
 
       def download_public_sheet(url:)

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)))/, '%%') # negative lookahead: identifies when user really wants to display a %
+        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'],
@@ -15,7 +15,7 @@ module AdLocalize
       private
 
       def map_g_spreadsheet_options(options:)
-        return unless options[:drive_key]
+        return unless options[:'drive-key']
         Requests::GSpreadsheetOptions.new(
           spreadsheet_id: options[:'drive-key'],
           sheet_ids: options[:'sheets'],

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:)
-        (MIME::Types.of(path).map(&:content_type) & CSV_CONTENT_TYPES).present?
+        CSV_CONTENT_TYPES.include?(`file --brief --mime-type "#{path}"`.strip)
       end
 
       def valid_g_spreadsheet_options?

data/lib/ad_localize/version.rb

@@ -1,3 +1,3 @@
 module AdLocalize
-  VERSION = "4.0.0"
+  VERSION = "4.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.5
 platform: ruby
 authors:
 - Edouard Siegel
@@ -188,20 +188,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
 description: |-
   AdLocalize produces localization files from platform agnostic wording.
                             Supported wording format : CSV. Supported export format: iOS, Android, JSON and YAML