ad_localize 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8f651b78afaf45c264c489854182f16644ce5e6b633f65a0f35ea5c3b51782
-  data.tar.gz: 32760e7c15e78ebe5f874e1a763023ec315effb651b5e07bc1144314d1fe3a9a
+  metadata.gz: a4a46683de0e489838b53aae0ddd3a4e7e52a0089013fac5b49a07a558bfd322
+  data.tar.gz: 11523ebff556f015ae9e0a7ec76bf50f75d9317b9fd272e2f0b28e84ae0a070d
 SHA512:
-  metadata.gz: b67bcb815f92a4e17ad8ebc88dbf2f65115a43e43fa2e6fbe83755b409167c24201d06d4cacccc5ff7c2be42366a21abca3603f07f50fef5c4af92cbab5b17a6
-  data.tar.gz: 7ea60174aabe27f2146396cf573d1ac0dd90f09b26dc7b8fb5c3158d88d178df0be7bf283438b7ac8b5870c81a30950d985ad724f1a8a71b63421400d9189875
+  metadata.gz: 7432f6a5dd72d4635b3c07215ffb2d7afe357a5f93aca0d04635c20c15494571d580af9572ce38b0805afb1762d714dc73ef71ae8f5bd855ebfdfb8dbe9eef0d
+  data.tar.gz: 5e726801cb6f26bf2c58787297a1e0639cd403f7d9d22c3a8ce82d04fb65a8e3d8cd3b6a94cf1057f9d0b32ebcab9d79ba00867f50d3add3815cd450b945b097

data/CHANGELOG.md

@@ -4,6 +4,14 @@ 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).
 
+## [3.4.0] - 2019-02-10
+### Added
+  - Rails folks, [@epaillous](https://github.com/epaillous) has improved the YAML support. You can now have multi-level wording.
+
+## [3.3.0] - 2019-02-10
+### Added
+  - improve React support using keys with dots to generate nested JSON files by [@epaillous](https://github.com/epaillous)
+
 ## [3.2.0] - 2019-12-10
 ### Added
   - Add tests to compare reference exports by [@felginep](https://github.com/felginep)

data/lib/ad_localize/platform/json_formatter.rb

@@ -6,43 +6,12 @@ module AdLocalize::Platform
 
     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
-
+      json_data = build_platform_data_splitting_on_dots(locale, data)
       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 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

data/lib/ad_localize/platform/platform_formatter.rb

@@ -72,5 +72,37 @@ module AdLocalize::Platform
         export_dir(locale).mkdir
       end
     end
+
+    def build_platform_data_splitting_on_dots(locale, 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
+    end
+
+    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

data/lib/ad_localize/platform/yml_formatter.rb

@@ -5,14 +5,15 @@ module AdLocalize::Platform
     end
 
     def export(locale, data, export_extension = "yml", substitution_format = "yml")
-      super(locale, data, export_extension, substitution_format) do |yml_data, file|
+      locale = locale.to_sym
+      yml_data = build_platform_data_splitting_on_dots(locale, data)
+
+      platform_dir.join("#{locale.to_s}.#{export_extension}").open("w") do |file|
         file.puts yml_data.to_yaml
       end
-    end
 
-    protected
-    def ios_converter(value)
-      value.gsub(/(%(?!)?(\d+\$)?[@isd])/, "VARIABLE_TO_SET")
+      AdLocalize::LOGGER.log(:debug, :green, "YAML [#{locale}] ---> DONE!")
     end
+
   end
 end

data/lib/ad_localize/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Edouard Siegel