lib/apstrings/strings_validator.rb in apstrings-0.2.7 vs lib/apstrings/strings_validator.rb in apstrings-0.3.0

- old
+ new

@@ -5,11 +5,11 @@ class Validator def self.validate(file,masterFile) @master = nil - puts "apstrings: start validate strings file ..." + # puts "apstrings: start validate strings file ..." if nil == masterFile Log::warn("No master file provided, validating file format for #{file} only ...") else @master = Validator::paredFile(masterFile) end @@ -21,21 +21,21 @@ valid_master = Validator::validate_format(masterFile) no_missing_key = Validator::validate_missing(file,masterFile) end if valid_master && valid_file && no_missing_key - Log::info("Yeah! 🍻 🍻 ") + # Log::info("Yeah! 🍻 🍻 ") return true else Log::error("Oh no! Invalid file.") return false end end def self.validate_format(file) is_valid = true - puts "apstrings: start validate format for #{file} ..." + # puts "apstrings: start validate format for #{file} ..." dup_keys_in_file = Validator::validate_duplicates(file) mismatchs_in_file = Validator::validate_special_characters(file) if nil != dup_keys_in_file && !dup_keys_in_file.empty? Log::warn("Dup-keys found in #{file}: \n `#{dup_keys_in_file}`.") else @@ -54,11 +54,11 @@ end is_valid end def self.validate_missing(file,masterFile) - puts "apstrings: checking missing keys for #{file}..." + # puts "apstrings: checking missing keys for #{file}..." sf = Validator::paredFile(file) sf_masterFile = Validator::paredFile(masterFile) no_missing = true missing_keys = sf_masterFile.keys - sf.keys if !missing_keys.empty? @@ -69,19 +69,19 @@ end no_missing end def self.validate_duplicates(file) - puts "apstrings: checking dup-keys for #{file}..." + # puts "apstrings: checking dup-keys for #{file}..." sf = Validator::paredFile(file) sf.keys.detect { |e| sf.keys.count(e) > 1 } end def self.validate_special_characters(file) - puts "apstrings: checking syntax for #{file}..." + # puts "apstrings: checking syntax for #{file}..." sf = Validator::paredFile(file) variables_regex = /%[hlqLztj]?[@%dDuUxXoOfeEgGcCsSpaAF]/ mismatchs = [] sf.key_values.each { |e| e.each_pair {