lost_in_translation 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cc2c96a1dd7b0b6b434b4b986c921dad70df608
-  data.tar.gz: f3f18bb07a228b47d66301363f650b6ca08c5a70
+  metadata.gz: 070feed0b28c42b519ad16f3b90b40236e2be6f7
+  data.tar.gz: 918e49b028b84dce8f84cb450e0dad92367e1602
 SHA512:
-  metadata.gz: ed1bdf9ab6a228601091397ae1b7377a32fa703de10adcaf69f3a8811117f1b970ea54efe1d2abdd70a4e0784e7371618b2ac69dfdcc28caf844ab5025682f36
-  data.tar.gz: 7ef6afd2517dc7a4f9f9428cae98d2d1983a6a1b7de284782a0c5f6e21c312cca4f718c9b1f39c90779b5e6ead345c93a1b4456f6b551fa412b80ca9a165c9df
+  metadata.gz: dd7d97c00384a3517e2275dfe8e76aae3a33f482130d59b5c6ad916b163532c40ae72e3779950c4221e23c0404b53eda330fea3fb82f749294558ce469541839
+  data.tar.gz: afe55294df201e9cd9452e655ec5910333a79381e2b367d30ab737e9c65ad7143c4bee467efd6128aa84502e4ccf2bd1657a1b5d77d1868d63f3af058bbb96c6

data/.gitignore

@@ -6,4 +6,4 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+/tmp/*

data/lib/lost_in_translation/difference.rb

@@ -2,7 +2,7 @@
 
 #
 module LostInTranslation
-  def diff(root, compared, lang1, lang2, structure = [], _max_count = 0, new_array = [])
+  def self.diff(root, compared, lang1, lang2, structure = [], _max_count = 0, new_array = [])
     count = 0
     root.each_pair do |key, value|
       next_root     = root[key]
@@ -20,11 +20,11 @@ module LostInTranslation
     new_array
   end
 
-  def get_locale(path)
+  def self.get_locale(path)
     path.split('/').last.split('.').first unless path.empty?
   end
 
-  def clean(root, compared, structure = [], new_array = [])
+  def self.clean(root, compared, structure = [], new_array = [])
     root.each_pair do |key, value|
       next_root     = root[key]
       next_compared = compared.nil? ? nil : compared[key]

data/lib/lost_in_translation/file_functions.rb

@@ -2,7 +2,7 @@
 
 #
 module LostInTranslation
-  def prepare_paths(path1, path2, post)
+  def self.prepare_paths(path1, path2, post)
     [path1, path2].each do |p|
       prepare_yaml(p, post)
     end
@@ -10,7 +10,7 @@ module LostInTranslation
 
   private
 
-  def prepare_yaml(path, post)
+  def self.prepare_yaml(path, post)
     text = File.read(path)
     snippets = define_snippets
 
@@ -19,13 +19,14 @@ module LostInTranslation
       snippet = snippet.reverse if post
       text = text.gsub(snippet.first, snippet.second)
     end
-
-    text = post ? postpare(variables, text) : prepare(variables, text)
+    text = post ? postpare(snippets, text) : prepare(snippets, text)
+    text = add_single_quotes(text) if post
+    text = text.gsub(': !,', ": '!,'") if post
 
     File.open(path, 'w') { |file| file.puts text }
   end
 
-  def postpare(variables, text)
+  def self.postpare(variables, text)
     variables = text.scan(/varyberryterry.*/)
     variables.each do |var|
       new_var = var.delete(':')
@@ -35,7 +36,7 @@ module LostInTranslation
     text
   end
 
-  def prepare(variables, text)
+  def self.prepare(variables, text)
     variables = text.scan(/: &.*/)
     variables.each do |var|
       new_var = var.gsub(': &', 'varyberryterry')
@@ -45,7 +46,27 @@ module LostInTranslation
     text
   end
 
-  def define_snippets
+  def self.add_single_quotes(text)
+    tmp = ''
+    text.each_line do |line|
+      tmp += edit_line(line)
+    end
+    tmp
+  end
+
+  def self.edit_line(line)
+    return line if line.match(/: .*%.*$/).blank?
+    arr = line.split(': ', 2)
+    return line if arr[1].blank?
+    arr[1] = arr[1].gsub("\'", '')
+    arr[1] = arr[1].gsub("\"", '')
+    arr[1] = "'" + arr[1] unless arr[1].start_with?("\'") || arr[1].start_with?("\"")
+    arr[1] = arr[1].squish + "'\n" unless arr[1].squish.end_with?("\'") || arr[1].squish.end_with?("\"")
+    arr[1] = arr[1].gsub("\'! ", "! \'")
+    return arr.join(': ')
+  end
+
+  def self.define_snippets
     snippets = []
     snippets << ['<<', 'a_greater_than_sign']
     snippets << ['*', 'an_asterik_sign']

data/lib/lost_in_translation/hash.rb

@@ -2,15 +2,16 @@
 
 #
 module LostInTranslation
-  def string_to_hash(string)
+  def self.string_to_hash(string)
     array = string.split('---')
     value = array.pop
     arr = array.reverse
     arr[1..-1].inject(arr[0] => value) { |memo, i| { i => memo } }
   end
 
-  def merge_hash(merge_from, merge_to)
+  def self.merge_hash(merge_from, merge_to)
     return if merge_from.is_a?(String) || merge_to.is_a?(String)
+    pp merge_to
     merged_hash = merge_to
     first_key = merge_from.keys.first
     merged_hash[first_key] = if merge_to.key?(first_key)
@@ -21,7 +22,7 @@ module LostInTranslation
     merged_hash
   end
 
-  def sort_hash(object)
+  def self.sort_hash(object)
     return object unless object.is_a?(Hash)
     hash = {}
     object.each { |k, v| hash[k] = sort_hash(v) }

data/lib/lost_in_translation/railtie.rb

@@ -3,6 +3,7 @@
 require 'lost_in_translation'
 require 'rails'
 module LostInTranslation
+  #
   class Railtie < Rails::Railtie
     railtie_name :lost_in_translation
 

data/lib/lost_in_translation/user_interface.rb

@@ -1,56 +1,67 @@
 # frozen_string_literal: true
 
+#
 module LostInTranslation
-  def ask_for_permission(lang1, lang2, app_name)
-    system 'clear'
-    puts 'Comparing Locales'
-    puts "Application: #{app_name}" unless app_name.nil?
-    puts "Master Locale: #{lang1}.yml"
-    puts "Slave Locale: #{lang2}.yml"
-    puts 'Is this ok?[y/n]'
-    a = STDIN.gets.chomp
-    a == 'y' || a == 'Y'
+  def self.ask_for_permission(lang1, lang2, app_name)
+    log
+    log 'Comparing Locales'
+    log "Application: #{app_name}" unless app_name.nil?
+    log "Master Locale: #{lang1}.yml"
+    log "Slave Locale: #{lang2}.yml"
+    a = [(print "# Is this ok?[Y/n]: "), STDIN.gets.chomp][1]
+    a == 'y' || a == 'Y' || a == ''
   end
 
-  def ask_for_languages
-    system 'clear'
-    puts 'What I18n-yaml files do you want to compare?'
-    lang1 = [(print "Master (e.g. 'en'): "), STDIN.gets.chomp][1]
-    lang2 = [(print "Slave: (e.g. 'de'): "), STDIN.gets.chomp][1]
+  def self.ask_for_languages
+    log
+    log 'What I18n-yaml files do you want to compare?'
+    lang1 = [(print "# Master (e.g. 'en'): "), STDIN.gets.chomp][1]
+    lang2 = [(print "# Slave: (e.g. 'de'): "), STDIN.gets.chomp][1]
     [lang1, lang2]
   end
 
-  def ask_for_max_count
-    system 'clear'
-    puts 'How many do you want to edit max?'
-    max_count = [(print 'Max. Count (default = 50000): '), STDIN.gets.chomp][1]
+  def self.ask_for_max_count
+    log
+    log 'How many do you want to edit max?'
+    max_count = [(print '# Max. Count (default = 50000): '), STDIN.gets.chomp][1]
     max_count
   end
 
-  def ask_for_paths
-    system 'clear'
-    puts 'Please type in the absolute paths to the I18n-yaml file you want to compare?'
-    puts 'e.g. /home/youruser/Documents/your-awesome-app/config/locales/en.yml'
-    path1 = [(print 'Master: '), STDIN.gets.chomp][1]
-    path2 = [(print 'Slave:: '), STDIN.gets.chomp][1]
+  def self.ask_for_paths
+    log
+    log 'Please type in the absolute paths to the I18n-yaml file you want to compare?'
+    log 'e.g. /home/youruser/Documents/your-awesome-app/config/locales/en.yml'
+    path1 = [(print '# Master: '), STDIN.gets.chomp][1]
+    path2 = [(print '# Slave:: '), STDIN.gets.chomp][1]
     [path1, path2]
   end
 
-  def ask_for_sorting(lang, _app_name)
-    system 'clear'
-    puts "Do you want the #{lang}.yml to be sorted?"
-    puts 'Alphabetically & Recursive (ASC)'
-    puts '[y/n]'
-    a = STDIN.gets.chomp
-    a == 'y' || a == 'Y'
+  def self.ask_for_sorting(lang, _app_name)
+    log
+    log "Do you want the #{lang}.yml to be sorted?"
+    log 'Alphabetically & Recursive (ASC)'
+    a = [(print "# [Y/n]: "), STDIN.gets.chomp][1]
+    a == 'y' || a == 'Y' || a == ''
   end
 
-  def ask_for_translation(value, new_structure, lang1, lang2)
-    system 'clear'
+  def self.ask_for_translation(value, new_structure, lang1, lang2)
+    log
     new_s = new_structure.join('---')
-    puts "#{new_s} is missing"
-    puts "in #{lang1}: #{value}"
-    new_val = [(print lang2 + ': '), STDIN.gets.chomp][1]
+    log "#{new_s} is missing"
+    log "in #{lang1}: #{value}"
+    new_val = [(print '# ' + lang2 + ': '), STDIN.gets.chomp][1]
     new_val == '' ? nil : (new_s + '---' + new_val)
   end
+
+  def self.log(text = '')
+    max_length = 70
+    outside = 4
+    puts '#' * max_length if text.blank?
+    arr = text.scan(/.{1,#{max_length - outside}}/)
+    arr.each do |str|
+      fill_length = max_length - str.length - outside
+      fill = ' ' * fill_length
+      puts '# ' + str + fill + ' #'
+    end
+  end
 end

data/lib/lost_in_translation/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+#
 module LostInTranslation
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/lib/lost_in_translation/z_cleanup.rb

@@ -2,7 +2,7 @@
 
 #
 module LostInTranslation
-  def cleanup
+  def self.cleanup
     if defined? Rails
       lang2, lang1 = LostInTranslation.ask_for_languages
       path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
@@ -16,6 +16,7 @@ module LostInTranslation
 
     abort('NOPE') unless File.exist?(path1) && File.exist?(path2)
 
+    prepare_paths(path1, path2, true)
     prepare_paths(path1, path2, false)
 
     first = YAML.load_file(path1)

data/lib/lost_in_translation/z_full_automatic.rb

@@ -1,5 +1,5 @@
 module LostInTranslation
-  def full_automatic
+  def self.full_automatic
     if defined? Rails
       lang2, lang1 = LostInTranslation.ask_for_languages
       path1 = "#{Rails.root}/config/locales/#{lang1}.yml"

data/lib/lost_in_translation/z_half_automatic.rb

@@ -2,7 +2,7 @@
 
 #
 module LostInTranslation
-  def half_automatic
+  def self.half_automatic
     if defined? Rails
       lang2, lang1 = LostInTranslation.ask_for_languages
       path1 = "#{Rails.root}/config/locales/#{lang1}.yml"

data/lib/lost_in_translation/z_interactive.rb

@@ -2,7 +2,8 @@
 
 #
 module LostInTranslation
-  def interactive
+  def self.interactive
+    system 'clear'
     if defined? Rails
       app_name = Rails.application.class.parent_name
       lang1, lang2 = LostInTranslation.ask_for_languages

data/lib/lost_in_translation/z_recent.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module LostInTranslation
-  def recent
+  def self.recent
     app_name = Rails.application.class.parent_name
     lang1, lang2 = LostInTranslation.ask_for_languages
     path1 = "#{Rails.root}/config/locales/#{lang1}.yml"
@@ -13,6 +13,7 @@ module LostInTranslation
     FileUtils.cp(path1, copy_path1)
     `git checkout "#{path1}"`
 
+    prepare_paths(path1, copy_path1, true)
     prepare_paths(path1, copy_path1, false)
 
     first = YAML.load_file(path1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lost_in_translation
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Datyv
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler