missing_translation 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c45b827695eff0dec6447bd5eb42a2e52a7796fd55c1ad70d65825a536a3ba0
-  data.tar.gz: b18c56a5647d1b68939e5a542f461314aaf35fabe214fba9149e03bf965957ab
+  metadata.gz: a13074eb2d7b2c22ace7a15de282c480769412b37eebb599d914ad1f963b4177
+  data.tar.gz: 481a55cb94f2f837b9bb5aa32f2b3ea41b91e67bb7d5ba6d7d423cbd566a2a27
 SHA512:
-  metadata.gz: bc298f0e829a78ae4f3df5fc38282e07e0a508e96b6f294594bea671e49923efbcaeef3623e022d11ba250304c6a15033e3cbca08741aca8e9fe4440734eb02a
-  data.tar.gz: 755e0c279bb3b7ab8062c3fd687f7d023e78dd77084ece3285fbed59fe885f7c0857dcaf8b9c4a1f64626fe7f18324f693b0aa5356a8a06d4243f81bee676616
+  metadata.gz: d208bce285cfab32f9435c2305fae703ce8afff13d7382166b197c28b299f6d2600ff0d2c504ae5d506aee8278e0f6d41bd5d74094e214baa4e01c01cf398975
+  data.tar.gz: 1b441d38d2d51ae804999bf24b19f825bd9fd3b53badd2a11ad601c3dd5591c467f40e967c818919634773929099eefb6cf04db523b14ff7352d64b8684d370a

data/lib/missing_translation/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'missing_translation/configuration'
 require 'missing_translation/translation_file'
+require 'missing_translation/util'
 require 'missing_translation_api'
 
 module MissingTranslation
@@ -35,6 +36,9 @@ module MissingTranslation
 
     desc "download", "Download all file from missing translation"
     def download
+      MissingTranslation::Cli.new().sort
+      return if MissingTranslation::Util.uncommitted_changes?
+
       directory = "./config/locales"
       configuration = Configuration.new
       api = MissingTranslationApi.new(configuration.config[:key])
@@ -48,6 +52,15 @@ module MissingTranslation
       end
     end
 
+    desc "sort", "Sort all yaml translations"
+    def sort
+      return if MissingTranslation::Util.uncommitted_changes?
+
+      config_folder = "./config/locales/*.yml"
+      MissingTranslation::Util.sort(config_folder)
+      MissingTranslation::Util.commit_all_changes("locale: Sort yml files")
+    end
+
   end
 
 end

data/lib/missing_translation/translation_file.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'psych'
+require 'missing_translation/translation_file'
 
 module MissingTranslation
   class TranslationFile
@@ -17,8 +18,11 @@ module MissingTranslation
 
     def to_json
       return nil unless @content
-
-      @content.to_hash
+      
+      hash_content = @content.to_hash
+      return hash_content[language] if hash_content.has_key?(language)
+      
+      hash_content
     end
 
     def group
@@ -38,24 +42,11 @@ module MissingTranslation
 
     def write(directory)
       return nil unless translations
-
-      result = Psych.parse_stream translations.to_yaml
-      result.grep(Psych::Nodes::Scalar).each do |node|
-        node.plain  = false
-        node.quoted = true
-        node.style = Psych::Nodes::Scalar::DOUBLE_QUOTED
-      end
-      result.grep(Psych::Nodes::Mapping).each do |node|
-        node.children.each_slice(2) do |k, _|
-          k.plain  = true
-          k.quoted = false
-          k.style  = Psych::Nodes::Scalar::ANY
-        end
-      end
       filename = [group, language, "yml"].compact.reject{|s| s.size <= 0}.join('.')
-
-      p "Writing file #{directory}/#{filename}..."
-      File.write("#{directory}/#{filename}", result.yaml)
+      filepath = "#{directory}/#{filename}"
+      p "Writing file #{filepath}..."
+      File.write(filepath, translations.to_yaml)
+      MissingTranslation::Util.sort_file(filepath)
     end
 
   end

data/lib/missing_translation/util.rb

@@ -0,0 +1,42 @@
+require 'yaml'
+require 'missing_translation/yaml_processor'
+
+module MissingTranslation
+  class Util
+
+    def self.uncommitted_changes?
+      status = `git status --porcelain`
+      return false if $CHILD_STATUS.success? && status.empty?
+
+      error = if $CHILD_STATUS.success?
+                "You have uncommitted code. Please commit or stash your changes before continuing"
+              else
+                "You do not have Git installed. Please install Git, and commit your changes before continuing"
+              end
+      p error
+      true
+    end
+
+    def self.commit_all_changes(message)
+      status = `git add .`
+      status = system "git commit -m \"#{message}\""
+    end
+
+    def self.sort_file(filepath)
+      content = YAML.load_file(filepath)
+      hash = MissingTranslation::YamlProcessor.denormalize_translations_hash(content)
+      translations = MissingTranslation::YamlProcessor.normalize_translations_hash(hash)
+
+      File.write(filepath, translations.to_yaml)
+    end
+
+    def self.sort(file_pattern = "./config/locales/#{file_extension}/*.yml")
+      file_pathnames = Dir[file_pattern]
+      return unless file_pathnames && file_pathnames.size > 0
+
+      file_pathnames.each do |filepath|
+        sort_file(filepath)
+      end
+    end
+  end
+end

data/lib/missing_translation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MissingTranslation
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/missing_translation/yaml_processor.rb

@@ -0,0 +1,38 @@
+require 'yaml'
+module MissingTranslation
+  class YamlProcessor
+    def self.denormalize_translations_hash(translations, parent_key='')
+      ans = {}
+      translations.each do |key, val|
+        if val.is_a? Hash
+          aux = denormalize_translations_hash(val, "#{parent_key}#{key}.")
+          aux.each do |k, v|
+            ans[k] = v
+          end
+        else
+          ans["#{parent_key}#{key}"] = val
+        end
+      end
+      ans
+    end
+
+    def self.dig_set(obj, keys, value)
+      key = keys.first
+      if keys.length == 1
+        obj[key] = value
+      else
+        obj[key] = {} unless obj[key]
+        dig_set(obj[key], keys.slice(1..-1), value)
+      end
+    end
+
+    def self.normalize_translations_hash(hash)
+      result = {}
+      hash.keys.sort.each do |key|
+        dig_set(result, key.split("."), hash[key])
+      end
+      result
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: missing_translation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kevin Clercin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -74,7 +74,9 @@ files:
 - lib/missing_translation/cli.rb
 - lib/missing_translation/configuration.rb
 - lib/missing_translation/translation_file.rb
+- lib/missing_translation/util.rb
 - lib/missing_translation/version.rb
+- lib/missing_translation/yaml_processor.rb
 - lib/missing_translation_api.rb
 - sig/missing_translation.rbs
 homepage: https://github.com/9troisquarts/missing_translation