slight refactor

ruby-grape · Jul 23, 2013 · 01f3b81 · 01f3b81
1 parent ac72a48
commit 01f3b81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/lib/grape/validations.rb b/lib/grape/validations.rb
@@ -101,8 +101,10 @@ def initialize(opts, &block)
         configure_declared_params
       end
 
-      def optional?
-        @optional
+      def should_validate?(parameters)
+        return false if @optional && params(parameters).blank?
+        return true if parent.nil?
+        parent.should_validate?(parameters)
       end
 
       def requires(*attrs, &block)

diff --git a/lib/grape/validations/presence.rb b/lib/grape/validations/presence.rb
@@ -2,13 +2,7 @@ module Grape
   module Validations
     class PresenceValidator < Validator
       def validate!(params)
-        # If this validator is for a parameter inside an optional group
-        # for which params is blank, then we should skip validation
-        scope = @scope
-        while scope
-          return if scope.optional? && scope.params(params).blank?
-          scope = scope.parent
-        end
+        return unless @scope.should_validate?(params)
         super
       end