Changes from PR feedback

Author: chiliburger

lib/graphiti/errors.rb

@@ -840,7 +840,7 @@ def initialize(resource, filter_names, required)
 
       def message
         <<-MSG.gsub(/\s+/, " ").strip
-          #{@required_label} of the following filters must be provided on resource #{@resource.class}:
+          #{@required_label} of the following filters must be provided on resource #{@resource.type}:
           #{@filter_names.join(", ")}
         MSG
       end

lib/graphiti/resource/dsl.rb

@@ -46,6 +46,9 @@ def filter(name, *args, &blk)
 
         def filter_group(filter_names, *args)
           opts = args.extract_options!
+
+          Scoping::FilterGroupValidator.raise_unless_filter_group_requirement_valid!(self, opts[:required])
+
           config[:grouped_filters] = {
             names: filter_names,
             required: opts[:required]

lib/graphiti/scoping/filter_group_validator.rb

@@ -1,6 +1,17 @@
 module Graphiti
   class Scoping::FilterGroupValidator
-    VALID_FILTER_GROUP_REQUIRED_VALUES = %i[all any]
+    VALID_REQUIRED_VALUES = %i[all any]
+
+    def self.raise_unless_filter_group_requirement_valid!(resource, requirement)
+      unless VALID_REQUIRED_VALUES.include?(requirement)
+        raise Errors::FilterGroupInvalidRequirement.new(
+          resource,
+          VALID_REQUIRED_VALUES
+        )
+      end
+
+      true
+    end
 
     def initialize(resource, query_hash)
       @resource = resource
@@ -15,11 +26,6 @@ def raise_unless_filter_group_requirements_met!
         raise_unless_all_requirements_met!
       when :any
         raise_unless_any_requirements_met!
-      else
-        raise Errors::FilterGroupInvalidRequirement.new(
-          resource,
-          VALID_FILTER_GROUP_REQUIRED_VALUES
-        )
       end
 
       true
@@ -53,9 +59,6 @@ def raise_unless_any_requirements_met!
       end
     end
 
-    def filter_group_requirement_valid?
-      VALID_FILTER_GROUP_REQUIRED_VALUES.include?(filter_group_requirement)
-    end
 
     def filter_group_names
       grouped_filters.fetch(:names, [])

spec/filter_group_validator_spec.rb

@@ -5,29 +5,11 @@
   let(:query_hash) { {} }
   let(:validator) { described_class.new(resource, query_hash) }
 
-  subject { validator.raise_unless_filter_group_requirements_met! }
-
-  describe "#raise_unless_filter_group_requirements_met!" do
-    before do
-      allow(resource).to receive(:grouped_filters).and_return(grouped_filters)
-    end
+  describe ".raise_unless_filter_group_requirement_valid!" do
+    subject { described_class.raise_unless_filter_group_requirement_valid!(resource, required) }
 
     context "when required invalid" do
-      let(:query_hash) do
-        {
-          filter: {
-            first_name: {},
-            last_name: {}
-          }
-        }
-      end
-
-      let(:grouped_filters) do
-        {
-          names: [:first_name, :last_name],
-          required: :foo
-        }
-      end
+      let(:required) { :invalid }
 
       it "raises an error" do
         expect {
@@ -36,6 +18,22 @@
       end
     end
 
+    context "when required valid" do
+      let(:required) { :all }
+
+      it "works" do
+        expect(subject).to be true
+      end
+    end
+  end
+
+  describe "#raise_unless_filter_group_requirements_met!" do
+    subject { validator.raise_unless_filter_group_requirements_met! }
+
+    before do
+      allow(resource).to receive(:grouped_filters).and_return(grouped_filters)
+    end
+
     context "when all are required" do
       let(:grouped_filters) do
         {

spec/filtering_spec.rb

@@ -1786,13 +1786,9 @@ def after_filtering(scope)
 
   context "with filter group" do
     context "when required invalid" do
-      before do
-        resource.filter_group [:first_name, :last_name], required: :foo
-      end
-
       it "raises an error" do
         expect {
-          records
+          resource.filter_group [:first_name, :last_name], required: :foo
         }.to raise_error(/The filter group required: value on resource .+ must be one of the following:/)
       end
     end