From 8f320f973b94a1f88f23cb303d4526c26c2c3e98 Mon Sep 17 00:00:00 2001 From: Rob Sanheim Date: Mon, 24 Aug 2020 11:56:00 -0500 Subject: [PATCH] Update standard, apply fixes that can auto apply --- Gemfile.lock | 26 +++++++++++-------- app/jobs/anonymized_data_download_job.rb | 4 +-- .../my_facilities/missed_visits_query.rb | 4 +-- .../my_facilities/registrations_query.rb | 6 ++--- config/environments/production.rb | 2 +- lib/loggers/api_usage_logger.rb | 2 +- lib/tasks/dell_demo.rake | 2 +- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e0d938dd45..41159d032f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,7 +51,7 @@ GEM airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) arel (9.0.0) - ast (2.4.0) + ast (2.4.1) auto_strip_attributes (2.6.0) activerecord (>= 4.0) autoprefixer-rails (9.7.6) @@ -270,11 +270,11 @@ GEM nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - parallel (1.19.1) + parallel (1.19.2) parallel_tests (2.32.0) parallel - parser (2.7.1.2) - ast (~> 2.4.0) + parser (2.7.1.4) + ast (~> 2.4.1) passenger (6.0.4) rack rake (>= 0.8.1) @@ -419,15 +419,19 @@ GEM rswag-ui (1.6.0) actionpack (>= 3.1, < 6.0) railties (>= 3.1, < 6.0) - rubocop (0.83.0) + rubocop (0.89.1) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-performance (1.5.2) - rubocop (>= 0.71.0) + rubocop-ast (0.3.0) + parser (>= 2.7.1.4) + rubocop-performance (1.7.1) + rubocop (>= 0.82.0) ruby-graphviz (1.2.5) rexml ruby-progressbar (1.10.1) @@ -481,9 +485,9 @@ GEM net-ssh (>= 2.8.0) sshkit-interactive (0.3.0) sshkit (~> 1.12) - standard (0.4.2) - rubocop (~> 0.83.0) - rubocop-performance (~> 1.5.2) + standard (0.5.1) + rubocop (~> 0.89.1) + rubocop-performance (~> 1.7.1) strong_password (0.0.8) thor (0.20.3) thread_safe (0.3.6) diff --git a/app/jobs/anonymized_data_download_job.rb b/app/jobs/anonymized_data_download_job.rb index 31c6f7c6c6..37b8beebf0 100644 --- a/app/jobs/anonymized_data_download_job.rb +++ b/app/jobs/anonymized_data_download_job.rb @@ -4,12 +4,12 @@ class AnonymizedDataDownloadJob < ApplicationJob def perform(recipient_name, recipient_email, model_params_map, model_type) case model_type - when "district" then + when "district" AnonymizedData::DownloadService.new.run_for_district(recipient_name, recipient_email, model_params_map[:district_name], model_params_map[:organization_id]) - when "facility" then + when "facility" AnonymizedData::DownloadService.new.run_for_facility(recipient_name, recipient_email, model_params_map[:facility_id]) diff --git a/app/queries/my_facilities/missed_visits_query.rb b/app/queries/my_facilities/missed_visits_query.rb index 99be310331..471f61a7cf 100644 --- a/app/queries/my_facilities/missed_visits_query.rb +++ b/app/queries/my_facilities/missed_visits_query.rb @@ -85,9 +85,9 @@ def total_registrations def period_list(period, last_n) case period - when :quarter then + when :quarter last_n_quarters(n: last_n, inclusive: false) - when :month then + when :month last_n_months(n: last_n, inclusive: false) .map { |month| [month.year, month.month] } end diff --git a/app/queries/my_facilities/registrations_query.rb b/app/queries/my_facilities/registrations_query.rb index d852e84aba..6a301a7567 100644 --- a/app/queries/my_facilities/registrations_query.rb +++ b/app/queries/my_facilities/registrations_query.rb @@ -35,12 +35,12 @@ def total_registrations def period_list(period, last_n) case period - when :quarter then + when :quarter last_n_quarters(n: last_n, inclusive: true) - when :month then + when :month last_n_months(n: last_n, inclusive: true) .map { |month| [month.year, month.month] } - when :day then + when :day last_n_days(n: last_n) end end diff --git a/config/environments/production.rb b/config/environments/production.rb index fcd4982330..e4ff4e23eb 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -105,7 +105,7 @@ # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) + logger = ActiveSupport::Logger.new($stdout) logger.formatter = config.log_formatter config.logger = ActiveSupport::TaggedLogging.new(logger) end diff --git a/lib/loggers/api_usage_logger.rb b/lib/loggers/api_usage_logger.rb index a7860c9164..262b27e6ec 100644 --- a/lib/loggers/api_usage_logger.rb +++ b/lib/loggers/api_usage_logger.rb @@ -13,7 +13,7 @@ class Formatter < ActiveSupport::Logger::Formatter include ActiveSupport::TaggedLogging::Formatter end - def initialize(target = STDOUT) + def initialize(target = $stdout) super(target) self.formatter = Formatter.new end diff --git a/lib/tasks/dell_demo.rake b/lib/tasks/dell_demo.rake index 47b6c1a6e8..98ab08680d 100644 --- a/lib/tasks/dell_demo.rake +++ b/lib/tasks/dell_demo.rake @@ -10,7 +10,7 @@ namespace :dell_demo do # # Only print on console # - logger = Logger.new(STDOUT) + logger = Logger.new($stdout) # # Parse args