ad_localize 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67ba9ff725d7fbf76fd0d680b07573648ee51966fdbb8429e6a26a764fc5563
-  data.tar.gz: 7ce5a08e27d50cbedd1ca1f4ffac9af1817ee8c38e97eb088d6dd7bc6d8ec5d0
+  metadata.gz: 7b8f651b78afaf45c264c489854182f16644ce5e6b633f65a0f35ea5c3b51782
+  data.tar.gz: 32760e7c15e78ebe5f874e1a763023ec315effb651b5e07bc1144314d1fe3a9a
 SHA512:
-  metadata.gz: 0eb0c873e0d27062cc4291baab1c330224997ef3085b7474424c50d0dff8f089c40ae9f668e91f5769ce6d7c69431892435ee65a5a3073815ddbbe9bcde539be
-  data.tar.gz: 7998404ef9a406c7421117d666fae0c3aa8bfa0f55a5fe4e5a207a7c6bc01d370de3158a47910d47205d73a266a35109ca819cf114b572fe848061454e5fad29
+  metadata.gz: b67bcb815f92a4e17ad8ebc88dbf2f65115a43e43fa2e6fbe83755b409167c24201d06d4cacccc5ff7c2be42366a21abca3603f07f50fef5c4af92cbab5b17a6
+  data.tar.gz: 7ea60174aabe27f2146396cf573d1ac0dd90f09b26dc7b8fb5c3158d88d178df0be7bf283438b7ac8b5870c81a30950d985ad724f1a8a71b63421400d9189875

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    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

data/README.md

@@ -177,6 +177,41 @@ Every key that matches the following formats will be added to the `InfoPlist.str
 
 Source: https://developer.apple.com/documentation/bundleresources/information_property_list
 
+## Adaptive strings
+
+_Only for iOS._
+
+Syntax for adaptive keys in the CSV file:
+
+       key##{20}
+       key##{25}
+       key##{50}
+       …
+
+Sample of iOS output in .stringsdict
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<plist>
+    <dict>
+        <key>start_countdown</key>
+        <dict>
+            <key>NSStringVariableWidthRuleType</key>
+            <dict>
+                <key>20</key>
+                <string>Start</string>
+                <key>25</key>
+                <string>Start countdown</string>
+                <key>50</key>
+                <string>Start countdown</string>
+            </dict>
+        </dict>
+    </dict>
+</plist>
+```
+
+Source: https://developer.apple.com/documentation/foundation/nsstring/1413104-variantfittingpresentationwidth
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/ad_localize.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters', '~> 1.3'
   spec.add_development_dependency 'diffy', '~> 3.3'
 
-  spec.add_dependency 'activesupport', '~> 4.2' ,'>= 4.2.10' # Fastlane does not support activesupport 5
+  spec.add_dependency 'activesupport', '>= 4.2.10'
   spec.add_dependency 'nokogiri', '~> 1.8', '>= 1.8.2'
   spec.add_dependency 'colorize', '~> 0.8'
 

data/lib/ad_localize/csv_file_manager.rb

@@ -9,7 +9,7 @@ module AdLocalize
 
       # Returns the downloaded file name (it is located in the current directory)
       def download_from_drive(key, sheet)
-        LOGGER.log(:info, :black, "Downloading file from google drive...")
+        LOGGER.log(:info, :green, "Downloading file from google drive...")
         download_string_path = "./#{key}.csv"
         begin
           File.open(download_string_path, "wb") do |saved_file|

data/lib/ad_localize/csv_parser.rb

@@ -58,7 +58,7 @@ module AdLocalize
       if locales.empty?
         raise 'NO DETECTED LOCALES'
       else
-        LOGGER.log(:debug, :black, "DETECTED LOCALES : #{locales.join(', ')}")
+        LOGGER.log(:debug, :green, "DETECTED LOCALES : #{locales.join(', ')}")
       end
     end
 
@@ -137,7 +137,7 @@ module AdLocalize
 
     def trace_wording(wording, present_message, missing_message)
       if wording
-        LOGGER.log(:debug, :black, present_message)
+        LOGGER.log(:debug, :green, present_message)
       else
         LOGGER.log(:debug, :yellow, missing_message)
       end

data/lib/ad_localize/platform/android_formatter.rb

@@ -67,4 +67,4 @@ module AdLocalize::Platform
       )
     end
   end
-end
+end

data/lib/ad_localize/platform/ios_formatter.rb

@@ -15,7 +15,7 @@ module AdLocalize::Platform
       all_symbols.each do |numeral_key|
         numeral_data = data.select {|key, wording| wording.dig(locale.to_sym)&.key? numeral_key}
         if numeral_data.empty?
-          AdLocalize::LOGGER.log(:info, :black, "[#{locale.upcase}] no #{numeral_key.to_s} keys were found to generate the file")
+          AdLocalize::LOGGER.log(:info, :green, "[#{locale.upcase}] no #{numeral_key.to_s} keys were found to generate the file")
         else
           send("write_#{numeral_key}", locale, numeral_data)
         end
@@ -65,7 +65,7 @@ module AdLocalize::Platform
           }
         end
       end
-      AdLocalize::LOGGER.log(:debug, :black, "iOS plural [#{locale}] ---> DONE!")
+      AdLocalize::LOGGER.log(:debug, :green, "iOS plural [#{locale}] ---> DONE!")
     end
 
     def write_adaptive(locale, adaptives)
@@ -108,7 +108,7 @@ module AdLocalize::Platform
           file.puts line
         end
       end
-      AdLocalize::LOGGER.log(:debug, :black, "iOS #{wording_type} [#{locale}] ---> DONE!")
+      AdLocalize::LOGGER.log(:debug, :green, "iOS #{wording_type} [#{locale}] ---> DONE!")
     end
 
     def append_to_localizable_plist(locale)
@@ -135,4 +135,4 @@ module AdLocalize::Platform
       end
     end
   end
-end
+end

data/lib/ad_localize/platform/json_formatter.rb

@@ -4,15 +4,45 @@ module AdLocalize::Platform
       :json
     end
 
-    def export(locale, data, export_extension = "json", substitution_format = "angular")
-      super(locale, data, export_extension, substitution_format) do |json_data, file|
+    def export(locale, data, export_extension = "json", substitution_format = "react")
+      locale = locale.to_sym
+      json_data = data.each_with_object({}) do |(key, wording), hash_acc|
+        hash_acc[locale.to_s] = {} unless hash_acc.key? locale.to_s
+        keys = key.to_s.split('.')
+        hash = hash_acc[locale.to_s]
+        keys.each_with_index do |inner_key, index|
+          if index === keys.count - 1
+            fill_hash(wording, locale, hash, inner_key)
+          else
+            if hash[inner_key].nil?
+              hash[inner_key] = {}
+            end
+            hash = hash[inner_key]
+          end
+        end
+      end
+
+      platform_dir.join("#{locale.to_s}.#{export_extension}").open("w") do |file|
         file.puts json_data.to_json
       end
+
+      AdLocalize::LOGGER.log(:debug, :green, "JSON [#{locale}] ---> DONE!")
     end
 
     protected
-    def ios_converter(value)
-      value.gsub(/(%(?!)?(\d+\$)?[@isd])/, "VARIABLE_TO_SET")
+
+    def fill_hash(wording, locale, hash, key)
+      if wording.dig(locale)&.key? :singular
+        value = wording.dig(locale, :singular)
+        hash[key.to_s] = value
+      end
+      if wording.dig(locale)&.key? :plural
+        hash[key.to_s] = {}
+        wording.dig(locale, :plural).each do |plural_type, plural_text|
+          value = plural_text
+          hash[key.to_s][plural_type.to_s] = value
+        end
+      end
     end
   end
-end
+end

data/lib/ad_localize/platform/platform_formatter.rb

@@ -39,7 +39,7 @@ module AdLocalize::Platform
         yield(formatted_data, file)
       end
 
-      AdLocalize::LOGGER.log(:debug, :black, "#{platform.to_s.upcase} [#{locale}] ---> DONE!")
+      AdLocalize::LOGGER.log(:debug, :green, "#{platform.to_s.upcase} [#{locale}] ---> DONE!")
     end
 
     protected

data/lib/ad_localize/runner.rb

@@ -7,7 +7,7 @@ module AdLocalize
     end
 
     def run(args = ARGV)
-      LOGGER.log(:info, :black, "OPTIONS : #{options}")
+      LOGGER.log(:info, :green, "OPTIONS : #{options}")
       input_files = (args + [options.dig(:drive_key)]).compact # drive_key can be nil
       if input_files.length.zero?
         LOGGER.log(:error, :red, "No CSV to parse. Use option -h to see how to use this script")
@@ -24,9 +24,10 @@ module AdLocalize
     end
 
     private
+
     def export(file)
-      LOGGER.log(:info, :black, "********* PARSING #{file} *********")
-      LOGGER.log(:info, :black, "Extracting data from file...")
+      LOGGER.log(:info, :green, "********* PARSING #{file} *********")
+      LOGGER.log(:info, :green, "Extracting data from file...")
       parser = CsvParser.new
       data = parser.extract_data(file)
       if data.empty?
@@ -42,4 +43,4 @@ module AdLocalize
       end
     end
   end
-end
+end

data/lib/ad_localize/version.rb

@@ -1,3 +1,3 @@
 module AdLocalize
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Edouard Siegel
@@ -114,9 +114,6 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.10
@@ -124,9 +121,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.10
@@ -176,6 +170,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md