From c558f1c69ce9498564161d8cef3fcb8213103498 Mon Sep 17 00:00:00 2001 From: Adam Cooke Date: Sat, 10 Feb 2024 22:59:30 +0000 Subject: [PATCH] style(rubocop): Style/NumericPredicate --- app/models/concerns/has_message.rb | 2 +- app/models/server.rb | 4 ++-- lib/postal/http.rb | 2 +- lib/postal/http_sender.rb | 2 +- lib/postal/message_db/database.rb | 4 ++-- lib/postal/message_db/suppression_list.rb | 2 +- lib/postal/message_parser.rb | 2 +- lib/postal/smtp_server/server.rb | 2 +- lib/postal/worker.rb | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/concerns/has_message.rb b/app/models/concerns/has_message.rb index 16fca60..99d4897 100644 --- a/app/models/concerns/has_message.rb +++ b/app/models/concerns/has_message.rb @@ -20,7 +20,7 @@ module HasMessage def include_message queued_messages = all.to_a server_ids = queued_messages.map(&:server_id).uniq - if server_ids.size == 0 + if server_ids.empty? return [] elsif server_ids.size > 1 raise Postal::Error, "'include_message' can only be used on collections of messages from the same server" diff --git a/app/models/server.rb b/app/models/server.rb index e14b53c..557cdff 100644 --- a/app/models/server.rb +++ b/app/models/server.rb @@ -160,7 +160,7 @@ class Server < ApplicationRecord total_outgoing += stat[:outgoing] total_bounces += stat[:bounces] end - total_outgoing == 0 ? 0 : (total_bounces / total_outgoing) * 100 + total_outgoing.zero? ? 0 : (total_bounces / total_outgoing) * 100 end end @@ -221,7 +221,7 @@ class Server < ApplicationRecord # Return the domain which can be used to authenticate emails sent from the given e-mail address. # - # @param address [String] an e-mail address + #  @param address [String] an e-mail address # @return [Domain, nil] the domain to use for authentication def authenticated_domain_for_address(address) return nil if address.blank? diff --git a/lib/postal/http.rb b/lib/postal/http.rb index f5524a1..9f1dbb8 100644 --- a/lib/postal/http.rb +++ b/lib/postal/http.rb @@ -17,7 +17,7 @@ module Postal def self.request(method, url, options = {}) options[:headers] ||= {} uri = URI.parse(url) - request = method.new((uri.path.length == 0 ? "/" : uri.path) + (uri.query ? "?" + uri.query : "")) + request = method.new((uri.path.empty? ? "/" : uri.path) + (uri.query ? "?" + uri.query : "")) options[:headers].each { |k, v| request.add_field k, v } if options[:username] || uri.user diff --git a/lib/postal/http_sender.rb b/lib/postal/http_sender.rb index 686c06e..3bd7cc5 100644 --- a/lib/postal/http_sender.rb +++ b/lib/postal/http_sender.rb @@ -40,7 +40,7 @@ module Postal # This is temporary. They might fix their server so it should soft fail. result.type = "SoftFail" result.retry = true - elsif response[:code] < 0 + elsif response[:code].negative? # Connection/SSL etc... errors result.type = "SoftFail" result.retry = true diff --git a/lib/postal/message_db/database.rb b/lib/postal/message_db/database.rb index 68073dd..a968993 100644 --- a/lib/postal/message_db/database.rb +++ b/lib/postal/message_db/database.rb @@ -196,7 +196,7 @@ module Postal result[:records] = select(table, options.merge(limit: per_page, offset: offset)) result[:per_page] = per_page result[:total_pages], remainder = result[:total].divmod(per_page) - result[:total_pages] += 1 if remainder > 0 + result[:total_pages] += 1 if remainder.positive? result[:page] = page result end @@ -308,7 +308,7 @@ module Postal "0" elsif value.nil? "NULL" - elsif value.to_s.length == 0 + elsif value.to_s.empty? "NULL" else "'" + mysql.escape(value.to_s) + "'" diff --git a/lib/postal/message_db/suppression_list.rb b/lib/postal/message_db/suppression_list.rb index 51f91d1..9858a07 100644 --- a/lib/postal/message_db/suppression_list.rb +++ b/lib/postal/message_db/suppression_list.rb @@ -28,7 +28,7 @@ module Postal end def remove(type, address) - @database.delete("suppressions", where: { type: type, address: address }) > 0 + @database.delete("suppressions", where: { type: type, address: address }).positive? end def prune diff --git a/lib/postal/message_parser.rb b/lib/postal/message_parser.rb index 7b9055b..fbf939c 100644 --- a/lib/postal/message_parser.rb +++ b/lib/postal/message_parser.rb @@ -21,7 +21,7 @@ module Postal attr_reader :tracked_images def actioned? - @actioned || @tracked_links > 0 || @tracked_images > 0 + @actioned || @tracked_links.positive? || @tracked_images.positive? end def new_body diff --git a/lib/postal/smtp_server/server.rb b/lib/postal/smtp_server/server.rb index 47ccbd3..17fb2e1 100644 --- a/lib/postal/smtp_server/server.rb +++ b/lib/postal/smtp_server/server.rb @@ -163,7 +163,7 @@ module Postal case io when OpenSSL::SSL::SSLSocket buffers[io] << io.readpartial(10_240) - buffers[io] << io.readpartial(10_240) while io.pending > 0 + buffers[io] << io.readpartial(10_240) while io.pending.positive? else buffers[io] << io.readpartial(10_240) end diff --git a/lib/postal/worker.rb b/lib/postal/worker.rb index caaa8c0..2d425a2 100644 --- a/lib/postal/worker.rb +++ b/lib/postal/worker.rb @@ -35,7 +35,7 @@ module Postal logger.info "Job did not finish in a timely manner. Exiting" exit 0 end - if exit_checks == 0 + if exit_checks.zero? logger.info "Exit requested but job is running. Waiting for job to finish." end sleep 60