From 58201f7d2e9d4ba7e36c89fe6988c4b3e1a635d6 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 13 Nov 2016 11:23:45 +0100 Subject: [PATCH] revises style in recent code (of mine) This alternative case expressions read better for my taste, and look more uniform in a file where other similar case expressions are used (without dynamic clauses). --- .../lib/action_controller/metal/strong_parameters.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 1977632c4e..b398d24b59 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -807,11 +807,12 @@ def hash_filter(params, filter) def permit_any_in_parameters(params) self.class.new.tap do |sanitized| params.each do |key, value| - if permitted_scalar?(value) + case value + when ->(v) { permitted_scalar?(v) } sanitized[key] = value - elsif value.is_a?(Array) + when Array sanitized[key] = permit_any_in_array(value) - elsif value.is_a?(Parameters) + when Parameters sanitized[key] = permit_any_in_parameters(value) else # Filter this one out. @@ -824,9 +825,10 @@ def permit_any_in_parameters(params) def permit_any_in_array(array) [].tap do |sanitized| array.each do |element| - if permitted_scalar?(element) + case element + when ->(e) { permitted_scalar?(e) } sanitized << element - elsif element.is_a?(Parameters) + when Parameters sanitized << permit_any_in_parameters(element) else # Filter this one out. -- GitLab