Better support for excluded_from?/included_in? predicates (close #483)

Co-Authored-By: Erik Lövmo <[email protected]>

changelog.yml

@@ -1,6 +1,8 @@
 ---
 - version: 1.14.0
   date: 2025-01-03
+  added:
+  - 'Better support for sets in `excluded_from?` and `included_in?` predicates (via #480) (@flash-gordon)'
   changed:
   - "Set minimum Ruby version to 3.1 (@flash-gordon)"
 - version: 1.13.4

lib/dry/schema/message_compiler.rb

@@ -209,7 +209,7 @@ def message_text(template, tokens, options)
       def message_tokens(args)
         tokens = args.each_with_object({}) do |arg, hash|
           case arg[1]
-          when ::Array
+          when ::Array, ::Set
             hash[arg[0]] = arg[1].join(LIST_SEPARATOR)
           when ::Range
             hash[:"#{arg[0]}_left"] = arg[1].first

spec/integration/params/predicates/excluded_from_spec.rb

@@ -2,9 +2,13 @@
 
 RSpec.describe "Predicates: Excluded From" do
   context "with required" do
+    let(:list) { %w[1 3 5] }
+
     subject(:schema) do
+      list = self.list
+
       Dry::Schema.Params do
-        required(:foo).value(:string) { excluded_from?(%w[1 3 5]) }
+        required(:foo).value(:string) { excluded_from?(list) }
       end
     end
 
@@ -22,6 +26,14 @@
       it "is not successful" do
         expect(result).to be_failing ["is missing", "must be a string", "must not be one of: 1, 3, 5"]
       end
+
+      context "when list is a set" do
+        let(:list) { Set.new(%w[1 3 5]) }
+
+        it "is not successful" do
+          expect(result).to be_failing ["is missing", "must be a string", "must not be one of: 1, 3, 5"]
+        end
+      end
     end
 
     context "with nil input" do

spec/integration/params/predicates/included_in_spec.rb

@@ -2,9 +2,13 @@
 
 RSpec.describe "Predicates: Included In" do
   context "with required" do
+    let(:list) { %w[1 3 5] }
+
     subject(:schema) do
+      list = self.list
+
       Dry::Schema.Params do
-        required(:foo) { included_in?(%w[1 3 5]) }
+        required(:foo) { included_in?(list) }
       end
     end
 
@@ -22,6 +26,14 @@
       it "is not successful" do
         expect(result).to be_failing ["is missing", "must be one of: 1, 3, 5"]
       end
+
+      context "when list is a set" do
+        let(:list) { Set.new(%w[1 3 5]) }
+
+        it "is not successful" do
+          expect(result).to be_failing ["is missing", "must be one of: 1, 3, 5"]
+        end
+      end
     end
 
     context "with nil input" do