From c893172fbf5fd036073046cc7ceb92e8b9eb6551 Mon Sep 17 00:00:00 2001 From: Sijawusz Pur Rahnama Date: Fri, 30 Aug 2019 13:32:23 +0200 Subject: [PATCH] Cleanup ameba warnings (#551) --- .ameba.yml | 31 +------------------------------ spec/helpers_spec.cr | 2 +- spec/run_spec.cr | 8 +++----- src/kemal/ext/response.cr | 1 + src/kemal/static_file_handler.cr | 1 + 5 files changed, 7 insertions(+), 36 deletions(-) diff --git a/.ameba.yml b/.ameba.yml index cf5dbb2..9cc083d 100644 --- a/.ameba.yml +++ b/.ameba.yml @@ -1,5 +1,5 @@ # This configuration file was generated by `ameba --gen-config` -# on 2019-06-14 15:05:57 UTC using Ameba version 0.10.0. +# on 2019-08-25 09:29:24 UTC using Ameba version 0.10.0. # The point is for the user to remove these configuration records # one by one as the reported problems are removed from the code base. @@ -11,32 +11,3 @@ Lint/UselessAssign: Severity: Warning Excluded: - spec/view_spec.cr - -# Problems found: 1 -# Run `ameba --only Lint/ShadowingOuterLocalVar` for details -Lint/ShadowingOuterLocalVar: - Description: Disallows the usage of the same name as outer local variables for block - or proc arguments. - Enabled: true - Severity: Warning - Excluded: - - spec/run_spec.cr - -# Problems found: 1 -# Run `ameba --only Style/NegatedConditionsInUnless` for details -Style/NegatedConditionsInUnless: - Description: Disallows negated conditions in unless - Enabled: true - Severity: Convention - Excluded: - - src/kemal/ext/response.cr - -# Problems found: 1 -# Run `ameba --only Metrics/CyclomaticComplexity` for details -Metrics/CyclomaticComplexity: - Description: Disallows methods with a cyclomatic complexity higher than `MaxComplexity` - MaxComplexity: 10 - Enabled: true - Severity: Convention - Excluded: - - src/kemal/static_file_handler.cr diff --git a/spec/helpers_spec.cr b/spec/helpers_spec.cr index 76fc318..4d45a66 100644 --- a/spec/helpers_spec.cr +++ b/spec/helpers_spec.cr @@ -70,7 +70,7 @@ describe "Macros" do halt env, status_code: 400, response: "Missing origin." end - get "/" do |env| + get "/" do |_env| "Hello world" end diff --git a/spec/run_spec.cr b/spec/run_spec.cr index 2553455..818cbe9 100644 --- a/spec/run_spec.cr +++ b/spec/run_spec.cr @@ -6,12 +6,10 @@ private def run(code) #{code} CR String.build do |stdout| - stderr = String.build do |stderr| - Process.new("crystal", ["eval"], input: IO::Memory.new(code), output: stdout, error: stderr).wait - end - unless stderr.empty? - fail(stderr) + stderr = String.build do |io| + Process.new("crystal", ["eval"], input: IO::Memory.new(code), output: stdout, error: io).wait end + fail(stderr) unless stderr.empty? end end diff --git a/src/kemal/ext/response.cr b/src/kemal/ext/response.cr index 1f0a8fd..faf9db1 100644 --- a/src/kemal/ext/response.cr +++ b/src/kemal/ext/response.cr @@ -1,6 +1,7 @@ class HTTP::Server::Response class Output def close + # ameba:disable Style/NegatedConditionsInUnless unless response.wrote_headers? && !response.headers.has_key?("Content-Range") response.content_length = @out_count end diff --git a/src/kemal/static_file_handler.cr b/src/kemal/static_file_handler.cr index cd83749..7f3e061 100644 --- a/src/kemal/static_file_handler.cr +++ b/src/kemal/static_file_handler.cr @@ -4,6 +4,7 @@ module Kemal class StaticFileHandler < HTTP::StaticFileHandler + # ameba:disable Metrics/CyclomaticComplexity def call(context : HTTP::Server::Context) return call_next(context) if context.request.path.not_nil! == "/"