style: dry up rule extraction code when parsing pact

gmolki · Jul 12, 2018 · 325a21b · 325a21b
1 parent 50d5f6d
commit 325a21b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/pact/matching_rules/merge.rb b/lib/pact/matching_rules/merge.rb
@@ -47,14 +47,14 @@ def recurse_hash hash, path
       end
 
       def recurse_array array, path
-        parent_match_rule = @matching_rules[path] && @matching_rules[path]['match']
+        parent_match_rule = find_rule(path, 'match')
         log_used_rule(path, 'match', parent_match_rule) if parent_match_rule
 
         array_like_children_path = "#{path}[*]*"
-        children_match_rule = @matching_rules[array_like_children_path] && @matching_rules[array_like_children_path]['match']
+        children_match_rule = find_rule(array_like_children_path, 'match')
         log_used_rule(array_like_children_path, 'match', children_match_rule) if children_match_rule
 
-        min = @matching_rules[path] && @matching_rules[path]['min']
+        min = find_rule(path, 'min')
         log_used_rule(path, 'min', min) if min
 
         if min && (children_match_rule == 'type' || (children_match_rule.nil? && parent_match_rule == 'type'))
@@ -114,6 +114,10 @@ def log_ignored_rules
         end
       end
 
+      def find_rule(path, key)
+        @matching_rules[path] && @matching_rules[path][key]
+      end
+
       def log_used_rule path, key, value
         @used_rules << [path, key, value]
       end