rubustrings 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbbadb6f88015382d88dbce31f356de8db8f8730
-  data.tar.gz: 8b3bd9483ee694595ad3c047e66a2890d468d95c
+  metadata.gz: fa19cca952b74543bed45a486114d63af4233bcc
+  data.tar.gz: 23d3c792e54fb1b3876dc532ff5a665c6ff5023c
 SHA512:
-  metadata.gz: 6d8eeac3b005bfaf6d7133aed1c574fd97cb652bd51619b37a48663e330a53aeb92804cec8955fce07b48b3817788e0d8ee691c4a21532391df5d9eef2d154f9
-  data.tar.gz: d76e61a91ea79bba6924838422b7ebfcce9c1f120d072ddde0a1db048f9eb7298b18cab34bd959157b1a304aa6bb6cc1fa78d1ea2907bf795f0ce22c05f16cf3
+  metadata.gz: 969982b6ac0dc93ac4b7093d0de9d823765ae828b66e48cb508363c40fbf5c3a24bcdfd77dd26a1deba87a1bb7cd6e0d498003d8694dc61b096547f24ea7729d
+  data.tar.gz: 9b9ef14a267ca556cfb6e157287e9f63ccbe8bb740690dd8f8b9fd357d7ebd550f43eb0cd3524c063f89445031ee6c9834cc8ff5fdee6eb9acddb99adbb06661

data/lib/rubustrings/action.rb

@@ -12,10 +12,8 @@ module Rubustrings
 
         if result
           log_output(:result_success, file_name, 0, 'Strings file validated succesfully')
-          exit 0
         else
           log_output(:result_error, file_name, 0, 'Some errors detected')
-          exit 1
         end
       end
     end
@@ -84,11 +82,43 @@ module Rubustrings
     end
 
     def validate_special_characters(translation_key, translation_value)
-      variables_regex = /%[hlqLztj]?[@%dDuUxXoOfeEgGcCsSpaAF]/
-      key_variables = translation_key.scan(variables_regex)
-      value_variables = translation_value.scan(variables_regex)
+      # Remove %% to avoid ambiguous scenarios with adjacent formats like "%s%%s"
+      translation_key = translation_key.gsub("%%", " ")
+      translation_value = translation_value.gsub("%%", " ")
+
+      variables_regex = /\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?(hh|ll|[hlLzjt])?([b-fiosuxX@])/
+      position_index = 0
+      length_index = 7
+      format_index = 8
+
+      # sort by according to parameter field, if specified
+      key_variables = translation_key.scan(variables_regex).stable_sort_by{ |r| r[position_index].to_i }
+      value_variables = translation_value.scan(variables_regex).stable_sort_by{ |r| r[position_index].to_i }
+
+      return true unless key_variables.any? || value_variables.any?
+      return false unless key_variables.count == value_variables.count
+
+      # we should not have any parameter fields in the keys
+      return false unless key_variables.last[position_index] == nil
+
+      # if we do have parameter fields, we need to include all of them
+      if value_variables[0][position_index] != nil
+        return false unless value_variables.last[position_index] != nil
+        validation_result = true
+        value_variables.each_with_index { |v, idx|
+          if v[position_index].to_i != idx + 1
+            validation_result = false
+          end
+        }
+        return false unless validation_result
+      else
+        return false unless value_variables.last[position_index] == nil
+      end
 
-      key_variables.sort == value_variables.sort
+      # remove parameter field
+      key_variables = key_variables.map{ |v| [v[length_index], v[format_index]] }
+      value_variables = value_variables.map{ |v| [v[length_index], v[format_index]] }
+      key_variables == value_variables
     end
 
     def validate_special_beginning(translation_key, translation_value)
@@ -133,7 +163,7 @@ module Rubustrings
       log_output(:warning, file_name, line_number, "translation significantly large: #{line}") unless check_translation_length match_key, match_value
 
       validation_special_characters = validate_special_characters match_key, match_value
-      log_output(:error, file_name, line_number, "number of variables mismatch: #{line}") unless validation_special_characters
+      log_output(:error, file_name, line_number, "variables mismatch: #{line}") unless validation_special_characters
 
       validation_special_beginning = validate_special_beginning match_key, match_value
       log_output(:error, file_name, line_number, "beginning mismatch: #{line}") unless validation_special_beginning
@@ -145,3 +175,13 @@ module Rubustrings
     end
   end
 end
+
+module Enumerable
+  def stable_sort
+    sort_by.with_index { |x, idx| [x, idx] }
+  end
+
+  def stable_sort_by
+    sort_by.with_index { |x, idx| [yield(x), idx] }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubustrings
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - David Cordero