From 612dff62ad0b376de3bea1d5a00f70f7066e5fec Mon Sep 17 00:00:00 2001 From: Mathieu Jobin <99191+mathieujobin@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:55:23 +0900 Subject: [PATCH] rubocop fixes --- lib/apipie/dsl_definition.rb | 11 +++++------ .../swagger/resource_description_collection.rb | 4 ++-- lib/apipie/response_description_adapter.rb | 4 ++-- spec/lib/apipie/extractor/recorder_spec.rb | 2 +- spec/spec_helper.rb | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/apipie/dsl_definition.rb b/lib/apipie/dsl_definition.rb index ac9fc4c3..b8f2e436 100644 --- a/lib/apipie/dsl_definition.rb +++ b/lib/apipie/dsl_definition.rb @@ -267,12 +267,11 @@ def _apipie_define_validators(description) end end - if Apipie.configuration.process_value? - @api_params ||= {} - method_params.each do |_, param| - # params processing - @api_params[param.as] = param.process_value(params[:"#{param.name}"]) if params.key?(param.name) - end + return unless Apipie.configuration.process_value? + @api_params ||= {} + method_params.each do |_, param| + # params processing + @api_params[param.as] = param.process_value(params[:"#{param.name}"]) if params.key?(param.name) end end end diff --git a/lib/apipie/generator/swagger/resource_description_collection.rb b/lib/apipie/generator/swagger/resource_description_collection.rb index de60ca04..0b1ea7c6 100644 --- a/lib/apipie/generator/swagger/resource_description_collection.rb +++ b/lib/apipie/generator/swagger/resource_description_collection.rb @@ -19,9 +19,9 @@ def filter(version:, resource_id:, method_name: nil) if method_name.present? resources = resources.select do |resource_description| - resource_description._methods.select do |method_description_name, _| + resource_description._methods.any? do |method_description_name, _| method_description_name == method_name - end.present? + end end end diff --git a/lib/apipie/response_description_adapter.rb b/lib/apipie/response_description_adapter.rb index d3fc812b..519b0903 100644 --- a/lib/apipie/response_description_adapter.rb +++ b/lib/apipie/response_description_adapter.rb @@ -57,7 +57,7 @@ class Validator attr_reader :expected_type def [](key) - return self.send(key) if self.respond_to?(key.to_s) + self.send(key) if self.respond_to?(key.to_s) end def initialize(expected_type, enum_values = nil, sub_properties = nil) @@ -102,7 +102,7 @@ def initialize(name, expected_type, options = {}, sub_properties = []) end def [](key) - return self.send(key) if self.respond_to?(key.to_s) + self.send(key) if self.respond_to?(key.to_s) end def add_sub_property(prop_desc) diff --git a/spec/lib/apipie/extractor/recorder_spec.rb b/spec/lib/apipie/extractor/recorder_spec.rb index f5bfb5b8..b47b31dc 100644 --- a/spec/lib/apipie/extractor/recorder_spec.rb +++ b/spec/lib/apipie/extractor/recorder_spec.rb @@ -46,7 +46,7 @@ end let(:test_context) do - double(controller: controller, request: request, response: ActionDispatch::Response.new(200)) + instance_double(controller: controller, request: request, response: ActionDispatch::Response.new(200)) end let(:file) do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 50785d3a..4bec5290 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,7 +2,7 @@ require 'bundler/setup' require 'simplecov' -SimpleCov.minimum_coverage 89 +SimpleCov.minimum_coverage 91 SimpleCov.start ENV["RAILS_ENV"] ||= 'test'