Correct Naming/PredicateMethod

Author: movermeyer

lib/cldr/export/deep_validate_keys.rb

@@ -7,7 +7,7 @@ def validate(hash, component, key_path = [])
       hash.each do |key, value|
         full_path = key_path + [key]
         raise ArgumentError, "Invalid key: #{full_path} in #{component}" unless key.to_s == key.to_s.underscore ||
-          SNAKE_CASE_EXCEPTIONS.fetch(component, []).any? { |exception| paths_match(exception, full_path) }
+          SNAKE_CASE_EXCEPTIONS.fetch(component, []).any? { |exception| paths_match?(exception, full_path) }
 
         validate(value, component, full_path) if value.is_a?(Hash)
       end
@@ -46,7 +46,7 @@ def validate(hash, component, key_path = [])
       ],
     }
 
-    def paths_match(pattern, key)
+    def paths_match?(pattern, key)
       raise NotImplementedError, "Multiple * in pattern is unsupported" if pattern.count { |element| element == "*" } > 1
 
       pattern_index = 0

test/export/deep_validate_keys_test.rb

@@ -5,44 +5,44 @@
 require File.expand_path(File.join(File.dirname(__FILE__) + "/../../lib/cldr/export/deep_validate_keys"))
 
 class TestDeepValidateKeys < Test::Unit::TestCase
-  test "#paths_match with empty pattern matches only empty key" do
-    assert DeepValidateKeys.send(:paths_match, [], [])
-    refute DeepValidateKeys.send(:paths_match, [], ["foo", "bar", "baz", "qux"])
+  test "#paths_match? with empty pattern matches only empty key" do
+    assert DeepValidateKeys.send(:"paths_match?", [], [])
+    refute DeepValidateKeys.send(:"paths_match?", [], ["foo", "bar", "baz", "qux"])
   end
 
-  test "#paths_match matches with exact match" do
-    assert DeepValidateKeys.send(:paths_match, ["foo", "bar"], ["foo", "bar"])
+  test "#paths_match? matches with exact match" do
+    assert DeepValidateKeys.send(:"paths_match?", ["foo", "bar"], ["foo", "bar"])
 
-    refute DeepValidateKeys.send(:paths_match, ["foo"], ["foo", "bar", "baz", "qux"])
-    refute DeepValidateKeys.send(:paths_match, ["foo"], ["bar", "baz", "qux"])
-    refute DeepValidateKeys.send(:paths_match, ["foo", "bar"], ["foo"])
-    refute DeepValidateKeys.send(:paths_match, ["foo", "baz"], ["foo", "bar", "baz", "qux"])
+    refute DeepValidateKeys.send(:"paths_match?", ["foo"], ["foo", "bar", "baz", "qux"])
+    refute DeepValidateKeys.send(:"paths_match?", ["foo"], ["bar", "baz", "qux"])
+    refute DeepValidateKeys.send(:"paths_match?", ["foo", "bar"], ["foo"])
+    refute DeepValidateKeys.send(:"paths_match?", ["foo", "baz"], ["foo", "bar", "baz", "qux"])
   end
 
-  test "#paths_match with . matches single element" do
-    assert DeepValidateKeys.send(:paths_match, ["foo", ".", "baz"], ["foo", "bar", "baz"])
-    assert DeepValidateKeys.send(:paths_match, ["foo", ".", ".", "qux"], ["foo", "bar", "baz", "qux"])
-    assert DeepValidateKeys.send(:paths_match, ["."], ["foo"])
-    assert DeepValidateKeys.send(:paths_match, [".", "bar"], ["foo", "bar"])
+  test "#paths_match? with . matches single element" do
+    assert DeepValidateKeys.send(:"paths_match?", ["foo", ".", "baz"], ["foo", "bar", "baz"])
+    assert DeepValidateKeys.send(:"paths_match?", ["foo", ".", ".", "qux"], ["foo", "bar", "baz", "qux"])
+    assert DeepValidateKeys.send(:"paths_match?", ["."], ["foo"])
+    assert DeepValidateKeys.send(:"paths_match?", [".", "bar"], ["foo", "bar"])
 
-    refute DeepValidateKeys.send(:paths_match, ["."], [])
+    refute DeepValidateKeys.send(:"paths_match?", ["."], [])
   end
 
-  test "#paths_match with trailing * matches anything after the star" do
-    assert DeepValidateKeys.send(:paths_match, ["foo", "*"], ["foo", "bar", "baz", "qux"])
-    assert DeepValidateKeys.send(:paths_match, ["*"], [])
-    assert DeepValidateKeys.send(:paths_match, ["*"], ["foo", "bar", "baz", "qux"])
+  test "#paths_match? with trailing * matches anything after the star" do
+    assert DeepValidateKeys.send(:"paths_match?", ["foo", "*"], ["foo", "bar", "baz", "qux"])
+    assert DeepValidateKeys.send(:"paths_match?", ["*"], [])
+    assert DeepValidateKeys.send(:"paths_match?", ["*"], ["foo", "bar", "baz", "qux"])
   end
 
-  test "#paths_match with * greedy matches up to the last match of the next element" do
-    assert DeepValidateKeys.send(:paths_match, ["foo", "*", "baz", "quxx"], ["foo", "bar", "baz", "qux", "baz", "quxx"])
+  test "#paths_match? with * greedy matches up to the last match of the next element" do
+    assert DeepValidateKeys.send(:"paths_match?", ["foo", "*", "baz", "quxx"], ["foo", "bar", "baz", "qux", "baz", "quxx"])
 
-    refute DeepValidateKeys.send(:paths_match, ["foo", "*", "baz", "quxx"], ["foo", "bar", "baz", "qux"])
+    refute DeepValidateKeys.send(:"paths_match?", ["foo", "*", "baz", "quxx"], ["foo", "bar", "baz", "qux"])
   end
 
-  test "#paths_match raise when given a pattern with multiple *" do
+  test "#paths_match? raise when given a pattern with multiple *" do
     exc = assert_raises(NotImplementedError) do
-      DeepValidateKeys.send(:paths_match, ["foo", "*", "baz", "*"], ["foo", "bar", "baz", "qux", "baz", "quxx"])
+      DeepValidateKeys.send(:"paths_match?", ["foo", "*", "baz", "*"], ["foo", "bar", "baz", "qux", "baz", "quxx"])
     end
     assert_equal "Multiple * in pattern is unsupported", exc.message
   end