Style/CaseLikeIf-20221003233959 (#795)

* 🚓 regenerate rubocop todo * 🚓 Style/CaseLikeIf * 🚓 regenerate rubocop todo Co-authored-by: Rubocop Challenger <rubocop@payrollhero.com> Co-authored-by: Mathieu Jobin <mathieujobin@users.noreply.github.com>
Apipie · Jan 16, 2023 · bbbe5d3 · bbbe5d3
1 parent 43bb78e
commit bbbe5d3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 21 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1323,15 +1323,6 @@ Style/CaseEquality:
   Exclude:
     - 'lib/apipie/validator.rb'
 
-# Offense count: 5
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/CaseLikeIf:
-  Exclude:
-    - 'lib/apipie/dsl_definition.rb'
-    - 'lib/apipie/extractor/writer.rb'
-    - 'lib/apipie/response_description_adapter.rb'
-    - 'spec/controllers/users_controller_spec.rb'
-
 # Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -1508,13 +1499,12 @@ Style/For:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 36
+# Offense count: 35
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Exclude:
     - 'app/controllers/apipie/apipies_controller.rb'
     - 'lib/apipie/application.rb'
-    - 'lib/apipie/dsl_definition.rb'
     - 'lib/apipie/extractor.rb'
     - 'lib/apipie/extractor/collector.rb'
     - 'lib/apipie/extractor/writer.rb'

diff --git a/lib/apipie/dsl_definition.rb b/lib/apipie/dsl_definition.rb
@@ -293,9 +293,10 @@ def _apipie_define_validators(description)
       end
 
       def _apipie_handle_validate_key_error params, param
-        if Apipie.configuration.action_on_non_validated_keys == :raise
+        case Apipie.configuration.action_on_non_validated_keys
+        when :raise
           raise UnknownParam, param
-        elsif Apipie.configuration.action_on_non_validated_keys == :skip
+        when :skip
           params.delete(param)
           Rails.logger.warn(UnknownParam.new(param).to_s)
         end

diff --git a/lib/apipie/extractor/writer.rb b/lib/apipie/extractor/writer.rb
@@ -116,9 +116,10 @@ def ordered_call(call)
 
       def convert_file_value hash
         hash.each do |k, v|
-          if v.is_a?(Rack::Test::UploadedFile) || v.is_a?(ActionDispatch::Http::UploadedFile)
+          case v
+          when Rack::Test::UploadedFile, ActionDispatch::Http::UploadedFile
             hash[k] = "<FILE CONTENT '#{v.original_filename}'>"
-          elsif v.is_a?(Hash)
+          when Hash
             hash[k] = convert_file_value(v)
           end
         end

diff --git a/lib/apipie/response_description_adapter.rb b/lib/apipie/response_description_adapter.rb
@@ -107,9 +107,10 @@ def [](key)
 
       def add_sub_property(prop_desc)
         raise "Only properties with expected_type 'object' can have sub-properties" unless @expected_type == 'object'
-        if prop_desc.is_a? PropDesc
+        case prop_desc
+        when PropDesc
           @sub_properties << prop_desc
-        elsif prop_desc.is_a? Modifier
+        when Modifier
           prop_desc.apply(self)
         else
           raise "Unrecognized prop_desc type (#{prop_desc.class})"
@@ -170,9 +171,10 @@ def to_json
     end
 
     def add(prop_desc)
-      if prop_desc.is_a? PropDesc
+      case prop_desc
+      when PropDesc
         @property_descs << prop_desc
-      elsif prop_desc.is_a? Modifier
+      when Modifier
         prop_desc.apply(self)
       else
         raise "Unrecognized prop_desc type (#{prop_desc.class})"

diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
@@ -5,9 +5,10 @@ def compare_hashes(h1, h2)
     expect(h1).to eq(h2)
   else
     h1.each do |key, val|
-      if val.is_a? Hash
+      case val
+      when Hash
         compare_hashes val, h2[key]
-      elsif val.is_a? Array
+      when Array
         val.each_with_index do |v, i|
           compare_hashes val[i], h2[key][i]
         end