Rubocop updates (#1118)

* Minimal code style enforcement

* Formatting and lint code updates (no change in functionality)

app/controllers/account/entries_controller.rb

@@ -2,7 +2,7 @@ class Account::EntriesController < ApplicationController
   layout :with_sidebar
 
   before_action :set_account
-  before_action :set_entry, only: %i[ edit update show destroy ]
+  before_action :set_entry, only: %i[edit update show destroy]
 
   def edit
     render entryable_view_path(:edit)

app/controllers/account/trades_controller.rb

@@ -8,7 +8,7 @@ class Account::TradesController < ApplicationController
   end
 
   def index
-    @entries = @account.entries.reverse_chronological.where(entryable_type: %w[ Account::Trade Account::Transaction ])
+    @entries = @account.entries.reverse_chronological.where(entryable_type: %w[Account::Trade Account::Transaction])
   end
 
   def create

app/controllers/accounts_controller.rb

@@ -2,7 +2,7 @@ class AccountsController < ApplicationController
   layout :with_sidebar
 
   include Filterable
-  before_action :set_account, only: %i[ edit show destroy sync update ]
+  before_action :set_account, only: %i[edit show destroy sync update]
 
   def index
     @institutions = Current.family.institutions

app/controllers/categories_controller.rb

@@ -1,7 +1,7 @@
 class CategoriesController < ApplicationController
   layout :with_sidebar
 
-  before_action :set_category, only: %i[ edit update ]
+  before_action :set_category, only: %i[edit update]
   before_action :set_transaction, only: :create
 
   def index

app/controllers/category/dropdowns_controller.rb

@@ -6,17 +6,17 @@ class Category::DropdownsController < ApplicationController
   end
 
   private
-  def set_from_params
-    if params[:category_id]
-      @selected_category = categories_scope.find(params[:category_id])
+    def set_from_params
+      if params[:category_id]
+        @selected_category = categories_scope.find(params[:category_id])
+      end
+
+      if params[:transaction_id]
+        @transaction = Current.family.transactions.find(params[:transaction_id])
+      end
     end
 
-    if params[:transaction_id]
-      @transaction = Current.family.transactions.find(params[:transaction_id])
+    def categories_scope
+      Current.family.categories.alphabetically
     end
-  end
-
-  def categories_scope
-    Current.family.categories.alphabetically
-  end
 end

app/controllers/concerns/authentication.rb

@@ -13,27 +13,27 @@ module Authentication
 
   private
 
-  def authenticate_user!
-    if user = User.find_by(id: session[:user_id])
-      Current.user = user
-    else
-      redirect_to new_session_url
+    def authenticate_user!
+      if user = User.find_by(id: session[:user_id])
+        Current.user = user
+      else
+        redirect_to new_session_url
+      end
     end
-  end
 
-  def login(user)
-    Current.user = user
-    reset_session
-    session[:user_id] = user.id
-    set_last_login_at
-  end
+    def login(user)
+      Current.user = user
+      reset_session
+      session[:user_id] = user.id
+      set_last_login_at
+    end
 
-  def logout
-    Current.user = nil
-    reset_session
-  end
+    def logout
+      Current.user = nil
+      reset_session
+    end
 
-  def set_last_login_at
-    Current.user.update(last_login_at: DateTime.now)
-  end
+    def set_last_login_at
+      Current.user.update(last_login_at: DateTime.now)
+    end
 end

app/controllers/concerns/filterable.rb

@@ -1,9 +1,9 @@
 module Filterable
-    extend ActiveSupport::Concern
+  extend ActiveSupport::Concern
 
-    included do
-        before_action :set_period
-    end
+  included do
+    before_action :set_period
+  end
 
     private
 

app/controllers/imports_controller.rb

@@ -1,7 +1,7 @@
 require "ostruct"
 
 class ImportsController < ApplicationController
-  before_action :set_import, except: %i[ index new create ]
+  before_action :set_import, except: %i[index new create]
 
   def index
     @imports = Current.family.imports

app/controllers/institutions_controller.rb

@@ -1,5 +1,5 @@
 class InstitutionsController < ApplicationController
-  before_action :set_institution, except: %i[ new create ]
+  before_action :set_institution, except: %i[new create]
 
   def new
     @institution = Institution.new

app/controllers/merchants_controller.rb

@@ -1,7 +1,7 @@
 class MerchantsController < ApplicationController
   layout :with_sidebar
 
-  before_action :set_merchant, only: %i[ edit update destroy ]
+  before_action :set_merchant, only: %i[edit update destroy]
 
   def index
     @merchants = Current.family.merchants.alphabetically
@@ -31,11 +31,11 @@ class MerchantsController < ApplicationController
 
   private
 
-  def set_merchant
-    @merchant = Current.family.merchants.find(params[:id])
-  end
+    def set_merchant
+      @merchant = Current.family.merchants.find(params[:id])
+    end
 
-  def merchant_params
-    params.require(:merchant).permit(:name, :color)
-  end
+    def merchant_params
+      params.require(:merchant).permit(:name, :color)
+    end
 end

app/controllers/password_resets_controller.rb

@@ -3,7 +3,7 @@ class PasswordResetsController < ApplicationController
 
   layout "auth"
 
-  before_action :set_user_by_token, only: %i[ edit update ]
+  before_action :set_user_by_token, only: %i[edit update]
 
   def new
   end
@@ -33,12 +33,12 @@ class PasswordResetsController < ApplicationController
 
   private
 
-  def set_user_by_token
-    @user = User.find_by_token_for(:password_reset, params[:token])
-    redirect_to new_password_reset_path, alert: t("password_resets.update.invalid_token") unless @user.present?
-  end
+    def set_user_by_token
+      @user = User.find_by_token_for(:password_reset, params[:token])
+      redirect_to new_password_reset_path, alert: t("password_resets.update.invalid_token") unless @user.present?
+    end
 
-  def password_params
-    params.require(:user).permit(:password, :password_confirmation)
-  end
+    def password_params
+      params.require(:user).permit(:password, :password_confirmation)
+    end
 end

app/controllers/passwords_controller.rb

@@ -12,7 +12,7 @@ class PasswordsController < ApplicationController
 
   private
 
-  def password_params
-    params.require(:user).permit(:password, :password_confirmation, :password_challenge).with_defaults(password_challenge: "")
-  end
+    def password_params
+      params.require(:user).permit(:password, :password_confirmation, :password_challenge).with_defaults(password_challenge: "")
+    end
 end

app/controllers/registrations_controller.rb

@@ -28,17 +28,17 @@ class RegistrationsController < ApplicationController
 
   private
 
-  def set_user
-    @user = User.new user_params.except(:invite_code)
-  end
-
-  def user_params
-    params.require(:user).permit(:name, :email, :password, :password_confirmation, :invite_code)
-  end
-
-  def claim_invite_code
-    unless InviteCode.claim! params[:user][:invite_code]
-      redirect_to new_registration_path, alert: t("registrations.create.invalid_invite_code")
+    def set_user
+      @user = User.new user_params.except(:invite_code)
+    end
+
+    def user_params
+      params.require(:user).permit(:name, :email, :password, :password_confirmation, :invite_code)
+    end
+
+    def claim_invite_code
+      unless InviteCode.claim! params[:user][:invite_code]
+        redirect_to new_registration_path, alert: t("registrations.create.invalid_invite_code")
+      end
     end
-  end
 end

app/controllers/settings/profiles_controller.rb

@@ -32,8 +32,8 @@ class Settings::ProfilesController < SettingsController
 
   private
 
-  def user_params
-    params.require(:user).permit(:first_name, :last_name, :profile_image,
-                                 family_attributes: [ :name, :id ])
-  end
+    def user_params
+      params.require(:user).permit(:first_name, :last_name, :profile_image,
+                                   family_attributes: [ :name, :id ])
+    end
 end

app/controllers/tags_controller.rb

@@ -1,7 +1,7 @@
 class TagsController < ApplicationController
   layout :with_sidebar
 
-  before_action :set_tag, only: %i[ edit update ]
+  before_action :set_tag, only: %i[edit update]
 
   def index
     @tags = Current.family.tags.alphabetically

app/mailers/application_mailer.rb

@@ -5,12 +5,12 @@ class ApplicationMailer < ActionMailer::Base
 
   private
 
-  def set_self_host_settings
-    mail.from = Setting.email_sender
-    mail.delivery_method.settings.merge!({ address: Setting.smtp_host,
-                                           port: Setting.smtp_port,
-                                           user_name: Setting.smtp_username,
-                                           password: Setting.smtp_password,
-                                           tls: ENV.fetch("SMTP_TLS_ENABLED", "true") == "true" })
-  end
+    def set_self_host_settings
+      mail.from = Setting.email_sender
+      mail.delivery_method.settings.merge!({ address: Setting.smtp_host,
+                                             port: Setting.smtp_port,
+                                             user_name: Setting.smtp_username,
+                                             password: Setting.smtp_password,
+                                             tls: ENV.fetch("SMTP_TLS_ENABLED", "true") == "true" })
+    end
 end

app/models/account/balance.rb

@@ -1,9 +1,9 @@
 class Account::Balance < ApplicationRecord
-    include Monetizable
+  include Monetizable
 
-    belongs_to :account
-    validates :account, :date, :balance, presence: true
-    monetize :balance
-    scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
-    scope :chronological, -> { order(:date) }
+  belongs_to :account
+  validates :account, :date, :balance, presence: true
+  monetize :balance
+  scope :in_period, ->(period) { period.date_range.nil? ? all : where(date: period.date_range) }
+  scope :chronological, -> { order(:date) }
 end

app/models/account/entry_builder.rb

@@ -1,7 +1,7 @@
 class Account::EntryBuilder
   include ActiveModel::Model
 
-  TYPES = %w[ income expense buy sell interest transfer_in transfer_out ].freeze
+  TYPES = %w[income expense buy sell interest transfer_in transfer_out].freeze
 
   attr_accessor :type, :date, :qty, :ticker, :price, :amount, :currency, :account, :transfer_account_id
 

app/models/account/entryable.rb

@@ -1,7 +1,7 @@
 module Account::Entryable
   extend ActiveSupport::Concern
 
-  TYPES = %w[ Account::Valuation Account::Transaction Account::Trade ]
+  TYPES = %w[Account::Valuation Account::Transaction Account::Trade]
 
   def self.from_type(entryable_type)
     entryable_type.presence_in(TYPES).constantize

app/models/account/trade_builder.rb

@@ -1,7 +1,7 @@
 class Account::TradeBuilder < Account::EntryBuilder
   include ActiveModel::Model
 
-  TYPES = %w[ buy sell ].freeze
+  TYPES = %w[buy sell].freeze
 
   attr_accessor :type, :qty, :price, :ticker, :date, :account
 

app/models/account/transaction.rb

@@ -25,7 +25,7 @@ class Account::Transaction < ApplicationRecord
     private
 
       def searchable_keys
-        %i[ categories merchants ]
+        %i[categories merchants]
       end
   end
 

app/models/account/transaction_builder.rb

@@ -1,7 +1,7 @@
 class Account::TransactionBuilder
   include ActiveModel::Model
 
-  TYPES = %w[ income expense interest transfer_in transfer_out ].freeze
+  TYPES = %w[income expense interest transfer_in transfer_out].freeze
 
   attr_accessor :type, :amount, :date, :account, :transfer_account_id
 

app/models/category.rb

@@ -47,7 +47,7 @@ class Category < ApplicationRecord
 
   private
 
-  def clear_internal_category
-    self.internal_category = nil
-  end
+    def clear_internal_category
+      self.internal_category = nil
+    end
 end

app/models/concerns/accountable.rb

@@ -1,8 +1,8 @@
 module Accountable
   extend ActiveSupport::Concern
 
-  ASSET_TYPES = %w[ Depository Investment Crypto Property Vehicle OtherAsset ]
-  LIABILITY_TYPES = %w[ CreditCard Loan OtherLiability ]
+  ASSET_TYPES = %w[Depository Investment Crypto Property Vehicle OtherAsset]
+  LIABILITY_TYPES = %w[CreditCard Loan OtherLiability]
   TYPES = ASSET_TYPES + LIABILITY_TYPES
 
   def self.from_type(type)

app/models/concerns/monetizable.rb

@@ -1,14 +1,14 @@
 module Monetizable
-    extend ActiveSupport::Concern
+  extend ActiveSupport::Concern
 
-    class_methods do
-      def monetize(*fields)
-        fields.each do |field|
-          define_method("#{field}_money") do
-            value = self.send(field)
-            value.nil? ? nil : Money.new(value, currency || Money.default_currency)
-          end
+  class_methods do
+    def monetize(*fields)
+      fields.each do |field|
+        define_method("#{field}_money") do
+          value = self.send(field)
+          value.nil? ? nil : Money.new(value, currency || Money.default_currency)
         end
       end
     end
+  end
 end

app/models/invite_code.rb

@@ -16,10 +16,10 @@ class InviteCode < ApplicationRecord
 
   private
 
-  def generate_token
-    loop do
-      self.token = SecureRandom.hex(4)
-      break token unless self.class.exists?(token: token)
+    def generate_token
+      loop do
+        self.token = SecureRandom.hex(4)
+        break token unless self.class.exists?(token: token)
+      end
     end
-  end
 end

app/models/period.rb

@@ -1,35 +1,35 @@
 class Period
-    attr_reader :name, :date_range
+  attr_reader :name, :date_range
 
-    def self.find_by_name(name)
-        INDEX[name]
-    end
-
-    def self.names
-        INDEX.keys.sort
-    end
-
-    def initialize(name: "custom", date_range:)
-        @name = name
-        @date_range = date_range
-    end
-
-    def extend_backward(duration)
-        Period.new(name: name + "_extended", date_range: (date_range.first - duration)..date_range.last)
-    end
-
-    BUILTIN = [
-        new(name: "all", date_range: nil..Date.current),
-        new(name: "last_7_days", date_range: 7.days.ago.to_date..Date.current),
-        new(name: "last_30_days", date_range: 30.days.ago.to_date..Date.current),
-        new(name: "last_365_days", date_range: 365.days.ago.to_date..Date.current)
-    ]
-
-    INDEX = BUILTIN.index_by(&:name)
-
-    BUILTIN.each do |period|
-        define_singleton_method(period.name) do
-            period
-        end
+  def self.find_by_name(name)
+    INDEX[name]
+  end
+
+  def self.names
+    INDEX.keys.sort
+  end
+
+  def initialize(name: "custom", date_range:)
+    @name = name
+    @date_range = date_range
+  end
+
+  def extend_backward(duration)
+    Period.new(name: name + "_extended", date_range: (date_range.first - duration)..date_range.last)
+  end
+
+  BUILTIN = [
+      new(name: "all", date_range: nil..Date.current),
+      new(name: "last_7_days", date_range: 7.days.ago.to_date..Date.current),
+      new(name: "last_30_days", date_range: 30.days.ago.to_date..Date.current),
+      new(name: "last_365_days", date_range: 365.days.ago.to_date..Date.current)
+  ]
+
+  INDEX = BUILTIN.index_by(&:name)
+
+  BUILTIN.each do |period|
+    define_singleton_method(period.name) do
+      period
     end
+  end
 end

app/models/provider/github.rb

@@ -16,11 +16,11 @@ class Provider::Github
         latest_commit = Octokit.branch(repo, branch)
 
         release_info = if latest_release
-                        {
-                          version: latest_version,
-                          url: latest_release.html_url,
-                          commit_sha: Octokit.commit(repo, latest_release.tag_name).sha
-                        }
+          {
+            version: latest_version,
+            url: latest_release.html_url,
+            commit_sha: Octokit.commit(repo, latest_release.tag_name).sha
+          }
         end
 
         commit_info = {

app/models/time_series.rb

@@ -1,5 +1,5 @@
 class TimeSeries
-  DIRECTIONS = %w[ up down ].freeze
+  DIRECTIONS = %w[up down].freeze
 
   attr_reader :values, :favorable_direction
 

app/models/user.rb

@@ -74,18 +74,18 @@ class User < ApplicationRecord
 
   private
 
-  def last_user_in_family?
-    family.users.count == 1
-  end
-
-  def deactivated_email
-    email.gsub(/@/, "-deactivated-#{SecureRandom.uuid}@")
-  end
-
-  def profile_image_size
-    if profile_image.attached? && profile_image.byte_size > 5.megabytes
-      # i18n-tasks-use t('activerecord.errors.models.user.attributes.profile_image.invalid_file_size')
-      errors.add(:profile_image, :invalid_file_size, max_megabytes: 5)
+    def last_user_in_family?
+      family.users.count == 1
+    end
+
+    def deactivated_email
+      email.gsub(/@/, "-deactivated-#{SecureRandom.uuid}@")
+    end
+
+    def profile_image_size
+      if profile_image.attached? && profile_image.byte_size > 5.megabytes
+        # i18n-tasks-use t('activerecord.errors.models.user.attributes.profile_image.invalid_file_size')
+        errors.add(:profile_image, :invalid_file_size, max_megabytes: 5)
+      end
     end
-  end
 end

app/models/value_group.rb

@@ -3,100 +3,100 @@
     attr_reader :name, :children, :value, :currency
 
     def initialize(name, currency = Money.default_currency)
-        @name = name
-        @currency = Money::Currency.new(currency)
-        @children = []
+      @name = name
+      @currency = Money::Currency.new(currency)
+      @children = []
     end
 
     def sum
-        return value if is_value_node?
-        return Money.new(0, currency) if children.empty? && value.nil?
-        children.sum(&:sum)
+      return value if is_value_node?
+      return Money.new(0, currency) if children.empty? && value.nil?
+      children.sum(&:sum)
     end
 
     def avg
-        return value if is_value_node?
-        return Money.new(0, currency) if children.empty? && value.nil?
-        leaf_values = value_nodes.map(&:value)
-        leaf_values.compact.sum / leaf_values.compact.size
+      return value if is_value_node?
+      return Money.new(0, currency) if children.empty? && value.nil?
+      leaf_values = value_nodes.map(&:value)
+      leaf_values.compact.sum / leaf_values.compact.size
     end
 
     def series
-        return @series if is_value_node?
+      return @series if is_value_node?
 
-        summed_by_date = children.each_with_object(Hash.new(0)) do |child, acc|
-            child.series.values.each do |series_value|
-                acc[series_value.date] += series_value.value
-            end
+      summed_by_date = children.each_with_object(Hash.new(0)) do |child, acc|
+        child.series.values.each do |series_value|
+          acc[series_value.date] += series_value.value
         end
+      end
 
-        summed_series = summed_by_date.map { |date, value| { date: date, value: value } }
+      summed_series = summed_by_date.map { |date, value| { date: date, value: value } }
 
-        TimeSeries.new(summed_series)
+      TimeSeries.new(summed_series)
     end
 
     def series=(series)
-        raise "Cannot set series on a non-leaf node" unless is_value_node?
+      raise "Cannot set series on a non-leaf node" unless is_value_node?
 
-        _series = series || TimeSeries.new([])
+      _series = series || TimeSeries.new([])
 
-        raise "Series must be an instance of TimeSeries" unless _series.is_a?(TimeSeries)
-        raise "Series must contain money values in the node's currency" unless _series.values.all? { |v| v.value.currency == currency }
-        @series = _series
+      raise "Series must be an instance of TimeSeries" unless _series.is_a?(TimeSeries)
+      raise "Series must contain money values in the node's currency" unless _series.values.all? { |v| v.value.currency == currency }
+      @series = _series
     end
 
     def value_nodes
-        return [ self ] unless value.nil?
-        children.flat_map { |child| child.value_nodes }
+      return [ self ] unless value.nil?
+      children.flat_map { |child| child.value_nodes }
     end
 
     def empty?
-        value_nodes.empty?
+      value_nodes.empty?
     end
 
     def percent_of_total
-        return 100 if parent.nil? || parent.sum.zero?
+      return 100 if parent.nil? || parent.sum.zero?
 
-        ((sum / parent.sum) * 100).round(1)
+      ((sum / parent.sum) * 100).round(1)
     end
 
     def add_child_group(name, currency = Money.default_currency)
-        raise "Cannot add subgroup to node with a value" if is_value_node?
-        child = self.class.new(name, currency)
-        child.parent = self
-        @children << child
-        child
+      raise "Cannot add subgroup to node with a value" if is_value_node?
+      child = self.class.new(name, currency)
+      child.parent = self
+      @children << child
+      child
     end
 
     def add_value_node(original, value, series = nil)
-        raise "Cannot add value node to a non-leaf node" unless can_add_value_node?
-        child = self.class.new(original.name)
-        child.original = original
-        child.value = value
-        child.series = series
-        child.parent = self
-        @children << child
-        child
+      raise "Cannot add value node to a non-leaf node" unless can_add_value_node?
+      child = self.class.new(original.name)
+      child.original = original
+      child.value = value
+      child.series = series
+      child.parent = self
+      @children << child
+      child
     end
 
     def value=(value)
-        raise "Cannot set value on a non-leaf node" unless is_leaf_node?
-        raise "Value must be an instance of Money" unless value.is_a?(Money)
-        @value = value
-        @currency = value.currency
+      raise "Cannot set value on a non-leaf node" unless is_leaf_node?
+      raise "Value must be an instance of Money" unless value.is_a?(Money)
+      @value = value
+      @currency = value.currency
     end
 
     def is_leaf_node?
-        children.empty?
+      children.empty?
     end
 
     def is_value_node?
-        value.present?
+      value.present?
     end
 
     private
-        def can_add_value_node?
-            return false if is_value_node?
-            children.empty? || children.all?(&:is_value_node?)
-        end
+      def can_add_value_node?
+        return false if is_value_node?
+        children.empty? || children.all?(&:is_value_node?)
+      end
   end