Change option validator to use sanitized options

Author: mcelicalderon

lib/graphql_devise/mount_method/option_validators/provided_operations_validator.rb

@@ -4,40 +4,20 @@ module GraphqlDevise
   module MountMethod
     module OptionValidators
       class ProvidedOperationsValidator
-        def initialize(options: {}, supported_operations: {})
-          @options              = options || {}
+        def initialize(options:, supported_operations:)
+          @options              = options
           @supported_operations = supported_operations
         end
 
         def validate!
-          skipped        = @options.fetch(:skip, [])
-          only           = @options.fetch(:only, [])
-          operations     = @options.fetch(:operations, {})
           supported_keys = @supported_operations.keys
 
-          raise_on_invalid_option_type!(:skip, skipped, Array)
-          raise_on_invalid_option_type!(:only, only, Array)
-          raise_on_invalid_option_type!(:operations, operations, Hash)
-
-          custom = operations.keys
-
           [
-            SupportedOperationsValidator.new(provided_operations: skipped, key: :skip, supported_operations: supported_keys),
-            SupportedOperationsValidator.new(provided_operations: only, key: :only, supported_operations: supported_keys),
-            SupportedOperationsValidator.new(provided_operations: custom, key: :operations, supported_operations: supported_keys)
+            SupportedOperationsValidator.new(provided_operations: @options.skip, key: :skip, supported_operations: supported_keys),
+            SupportedOperationsValidator.new(provided_operations: @options.only, key: :only, supported_operations: supported_keys),
+            SupportedOperationsValidator.new(provided_operations: @options.operations.keys, key: :operations, supported_operations: supported_keys)
           ].each(&:validate!)
         end
-
-        private
-
-        def raise_on_invalid_option_type!(key, value, expected_class)
-          unless value.is_a?(expected_class)
-            raise(
-              GraphqlDevise::InvalidMountOptionsError,
-              "#{key} option contains value of invalid value. Value must be #{expected_class.name}."
-            )
-          end
-        end
       end
     end
   end

lib/graphql_devise/mount_method/option_validators/skip_only_validator.rb

@@ -2,12 +2,12 @@ module GraphqlDevise
   module MountMethod
     module OptionValidators
       class SkipOnlyValidator
-        def initialize(options: {})
-          @options = options || {}
+        def initialize(options:)
+          @options = options
         end
 
         def validate!
-          if [@options[:skip], @options[:only]].all?(&:present?)
+          if [@options.skip, @options.only].all?(&:present?)
             raise(
               GraphqlDevise::InvalidMountOptionsError,
               "Can't specify both `skip` and `only` options when mounting the route."

lib/graphql_devise/rails/routes.rb

@@ -16,9 +16,9 @@ def mount_graphql_devise_for(resource, options = {})
 
       GraphqlDevise::MountMethod::OptionsValidator.new(
         [
-          GraphqlDevise::MountMethod::OptionValidators::SkipOnlyValidator.new(options: options),
+          GraphqlDevise::MountMethod::OptionValidators::SkipOnlyValidator.new(options: clean_options),
           GraphqlDevise::MountMethod::OptionValidators::ProvidedOperationsValidator.new(
-            options: options, supported_operations: default_operations
+            options: clean_options, supported_operations: default_operations
           )
         ]
       ).validate!

spec/services/mount_method/option_validators/provided_operations_validator_spec.rb

@@ -7,7 +7,7 @@
     let(:supported_operations) { { operation1: 'irrelevant', operation2: 'irrelevant', operation3: 'irrelevant' } }
 
     context 'when skip option is provided' do
-      let(:provided_operations) { { skip: skipped } }
+      let(:provided_operations) { double(:clean_options, only: [], skip: skipped, operations: {}) }
 
       context 'when all skipped are supported' do
         let(:skipped) { [:operation2, :operation3] }
@@ -20,16 +20,10 @@
 
         it { is_expected.to raise_error(GraphqlDevise::InvalidMountOptionsError, 'skip option contains unsupported operations: "invalid". Check for typos.') }
       end
-
-      context 'when provided skip value is not an array' do
-        let(:skipped) { 'Invalid value' }
-
-        it { is_expected.to raise_error(GraphqlDevise::InvalidMountOptionsError, 'skip option contains value of invalid value. Value must be Array.') }
-      end
     end
 
     context 'when only option is provided' do
-      let(:provided_operations) { { only: only } }
+      let(:provided_operations) { double(:clean_options, skip: [], only: only, operations: {}) }
 
       context 'when all only are supported' do
         let(:only) { [:operation2, :operation3] }
@@ -42,16 +36,10 @@
 
         it { is_expected.to raise_error(GraphqlDevise::InvalidMountOptionsError, 'only option contains unsupported operations: "invalid". Check for typos.') }
       end
-
-      context 'when provided only value is not an array' do
-        let(:only) { 'Invalid value' }
-
-        it { is_expected.to raise_error(GraphqlDevise::InvalidMountOptionsError, 'only option contains value of invalid value. Value must be Array.') }
-      end
     end
 
     context 'when operations option is provided' do
-      let(:provided_operations) { { operations: operations } }
+      let(:provided_operations) { double(:clean_options, only: [], skip: [], operations: operations) }
 
       context 'when all operations are supported' do
         let(:operations) { { operation2: 'irrelevant', operation3: 'irrelevant' } }
@@ -64,12 +52,6 @@
 
         it { is_expected.to raise_error(GraphqlDevise::InvalidMountOptionsError, 'operations option contains unsupported operations: "invalid". Check for typos.') }
       end
-
-      context 'when provided operations value is not a hash' do
-        let(:operations) { [:one, :two, :three] }
-
-        it { is_expected.to raise_error(GraphqlDevise::InvalidMountOptionsError, 'operations option contains value of invalid value. Value must be Hash.') }
-      end
     end
   end
 end

spec/services/mount_method/option_validators/skip_only_validator_spec.rb

@@ -5,25 +5,25 @@
     subject { -> { described_class.new(options: options).validate! } }
 
     context 'when only `only` key is set' do
-      let(:options) { { only: 'Irrelevant value' } }
+      let(:options) { double(:clean_options, only: [:irrelevant], skip: []) }
 
       it { is_expected.not_to raise_error }
     end
 
     context 'when only `skip` key is set' do
-      let(:options) { { skip: 'Irrelevant value' } }
+      let(:options) { double(:clean_options, skip: [:irrelevant], only: []) }
 
       it { is_expected.not_to raise_error }
     end
 
     context 'when `skip` and `only` keys are set' do
-      let(:options) { { only: 'Irrelevant value', skip: 'irrelevant for specs' } }
+      let(:options) { double(:clean_options, only: [:irrelevant], skip: [:irrelevant]) }
 
       it { is_expected.to raise_error(GraphqlDevise::InvalidMountOptionsError, "Can't specify both `skip` and `only` options when mounting the route.") }
     end
 
     context 'when neither `skip` nor `only are set`' do
-      let(:options) { { irrelevant_option: 'Irrelevant value', another_option: 'irrelevant for specs' } }
+      let(:options) { double(:clean_options, skip: [], only: []) }
 
       it { is_expected.not_to raise_error }
     end