correct the validator

2025-02-25 18:55:32 -06:00 · 2018-08-15 14:56:24 +10:00
parent 91e0a77a60
commit 38c10a3dc2
2 changed files with 12 additions and 3 deletions
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -17,14 +17,20 @@ class TopicQuery
        Integer === x && x >= 0
      end

-      array_int = lambda do |x|
-        Array === x && x.length > 0 && x.all? { |i| Integer === i || i.match?(/^-?[0-9]+$/) }
+      int = lambda do |x|
+        Integer === x || (String === x && x.match?(/^-?[0-9]+$/))
+      end
+
+      array_int_or_int = lambda do |x|
+        int.call(x) || (
+          Array === x && x.length > 0 && x.all?(&int)
+        )
      end

      {
        max_posts: zero_or_more,
        min_posts: zero_or_more,
-        exclude_category_ids: array_int
+        exclude_category_ids: array_int_or_int
      }
    end
  end