missing_translation 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5935fba9f02fe6b32f835ce25ce5bd32ff8d477ccfa292ffa77ffac437568cb3
-  data.tar.gz: eedafc5365f8cf312326cf9afaeb05d5d28a1eb10c92fe780472a1b0004859f3
+  metadata.gz: f1a151aecd35d65f11f3bddfd9446dc2313cd4e5e9adbc1bff580f18ad0369f5
+  data.tar.gz: bc3e5294a08640a74d2c7db601e7cc81007b05e5e9ef7f97fc92afe82c7dc44a
 SHA512:
-  metadata.gz: 10a5418ce724f2a5fbf289eee0056a1916fbdf1db0f2a81952525c05484fa6d70dd8a45c5c3cb5f1bd453c2001917341544d589e0f207c061ad16e426afcf2bc
-  data.tar.gz: 59fb636dfce9eeb21a1b105100b8dac67874119651952aae124eb61afe4b486137f7e450f79b6f3834fa44bd90fc918b515c7a195c9d87967522d3d4bb4a6207
+  metadata.gz: ed75fa219082540942650895c32274aa05bead3250820f2363d9047f543b2875655654158fa4dc4e8cee8d6298edfea390593809e17132e9a556eb6075bfefd0
+  data.tar.gz: 758eab57f048daa7b974f596a8cb89f2c7e5b1bf6f8cb20107cbb88ba0f7b89afd44d932a28724cee4532ae6d721c12674be62195d3c69e5fbb4c8b5b2fce767

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    missing_translation (0.1.0)
+    missing_translation (0.4.0)
       httparty (~> 0.18)
-      net-sftp (~> 3.0.0)
       thor (~> 1.1)
 
 GEM
@@ -11,17 +10,12 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     json (2.6.2)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mini_mime (1.1.5)
     multi_xml (0.6.0)
-    net-sftp (3.0.0)
-      net-ssh (>= 5.0.0, < 7.0.0)
-    net-ssh (6.1.0)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
@@ -55,7 +49,7 @@ GEM
     rubocop-ast (1.22.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    thor (1.2.1)
+    thor (1.2.2)
     unicode-display_width (2.3.0)
 
 PLATFORMS

data/README.md

@@ -29,6 +29,11 @@ bundle exec missing_translation upload
 ```
 bundle exec missing_translation download
 ```
+
+### Sort yaml files
+```
+bundle exec missing_translation sort
+```
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

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/configuration.rb

@@ -14,7 +14,7 @@ module MissingTranslation
       File.open(FILE_NAME, 'w+') do |f|
         f.flock(File::LOCK_EX)
         f.rewind
-        f.write({ key: nil }.to_yaml)
+        f.write({ key: nil, locale_prefix: true }.to_yaml)
         f.flush
       end
     end

data/lib/missing_translation/translation_file.rb

@@ -1,9 +1,10 @@
 require 'yaml'
 require 'psych'
+require 'missing_translation/translation_file'
 
 module MissingTranslation
   class TranslationFile
-    attr_accessor :pathname, :content, :group, :language, :translations
+    attr_accessor :pathname, :content, :group, :language, :translations, :locale_prefix
 
     def initialize(pathname = nil)
       return unless pathname
@@ -41,24 +42,12 @@ 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.1"
+  VERSION = "0.4.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.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kevin Clercin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,21 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-description:
+description: 
 email:
 - kevin@9troisquarts.com
 executables:
@@ -74,7 +60,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
@@ -84,7 +72,7 @@ metadata:
   homepage_uri: https://github.com/9troisquarts/missing_translation
   source_code_uri: https://github.com/9troisquarts/missing_translation
   changelog_uri: https://github.com/9troisquarts/missing_translation/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -100,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Upload and download your I18n to missing translation
 test_files: []