ad_localize 4.0.2 → 4.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c6349d3a9f83d2c431e93485ee9f34760162b74ed83ed3cc19393f15fd333b
-  data.tar.gz: 8c270d4d06df0f8d8bbc4699702d6c27a23730578d9c3d196de607369a358539
+  metadata.gz: 7c430461018f65ed97a0eee0978989c7f051df7228dccede2282417cfd70b837
+  data.tar.gz: 38b0d8ddbd9493e3d1ba4d483bc28f943141cc7f60f4bd5d3812a5a2c715ff17
 SHA512:
-  metadata.gz: 4f4db75c29aec05862c0e51b6a080c5a6e11dd487819942da9c8dad1ce066844e0b9a9311cb463d276fdbdb643649e4f94fe68b4fd3556c22dcf167ccba67b67
-  data.tar.gz: 7b9fb85b7b3b076715b55d01cf65e6dd37d5b62103d1a46320f972a4e852797448d10dce9eaf18a38e5bad8288f5fa4e5192c44e9797493d7da73b665d08cde3
+  metadata.gz: 18b47316425537c6bc79f9b1db9eb828a82d380dcab2f90eb8e9ba17875e03d5cdcd4d1024f99a813090a0c477b728991fc7c94751df8bb58f3455d2d4813884
+  data.tar.gz: e96d73dde24bec5f84951fb880a6a1809256ab3581e51d9fc68b3e5bd9011ffb50d2173ebf5ef0ac80b8ff89387c4d2a98d6817ac799a5f58234d37948cee053

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,31 @@ 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.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
+  - 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)

data/Gemfile.lock

@@ -1,46 +1,63 @@
 PATH
   remote: .
   specs:
-    ad_localize (4.0.2)
-      activesupport (>= 5.2, < 7.0)
+    ad_localize (4.0.7)
+      activesupport (>= 6.1.3.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.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.1)
+      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-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.2.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)
@@ -48,16 +65,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)
-    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)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.1)
+    minitest (5.14.4)
     minitest-reporters (1.4.2)
       ansi
       builder
@@ -65,29 +79,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.4)
+      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
@@ -102,4 +120,4 @@ DEPENDENCIES
   rake (~> 12.3)
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/README.md

@@ -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,6 +41,11 @@ $ ad_localize -k <your-spreadsheet-drive-key>
 $ ad_localize -k <your-spreadsheet-drive-key> -s <comma-separated-sheet-id-list>
 ```
 
+* 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

data/ad_localize.gemspec

@@ -46,12 +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.add_dependency 'mime-types', '~> 3.3'
 
-  spec.required_ruby_version = '~> 2.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/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'],
@@ -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/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:)
-        (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/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.2"
+  VERSION = "4.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.7
 platform: ruby
 authors:
 - Edouard Siegel
@@ -17,7 +17,7 @@ authors:
 - Claire Dufetrelle
 - Pierre Felgines
 - Satyan Jacquens
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2018-04-18 00:00:00.000000000 Z
@@ -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'
@@ -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
@@ -282,13 +268,13 @@ homepage: https://github.com/applidium/ad_localize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 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
@@ -297,8 +283,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: AdLocalize helps with mobile and web applications wording
 test_files: []