The personal finance app for everyone
Rubocop updates (#1118)
Zach Gollwitzereef4c2643bc2
diff --git a/.editorconfig b/.editorconfignew file mode 100644index 00000000..6a87a800--- /dev/null+++ b/.editorconfig@@ -0,0 +1,7 @@+root = true++[*]+charset = utf-8+end_of_line = lf+indent_style = space+indent_size = 2\ No newline at end of filediff --git a/.rubocop.yml b/.rubocop.ymlindex 990e2b9c..1d234168 100644--- a/.rubocop.yml+++ b/.rubocop.yml@@ -1,12 +1,15 @@-# Omakase Ruby styling for Rails-inherit_gem: { rubocop-rails-omakase: rubocop.yml }+inherit_gem:+ rubocop-rails-omakase: rubocop.yml++Layout/IndentationWidth:+ Enabled: true-# Overwrite or add rules to create your own house style-#-# # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`-# Layout/SpaceInsideArrayLiteralBrackets:-# Enabled: false-Layout/ElseAlignment:- Enabled: false-Layout/EndAlignment:- Enabled: false\ No newline at end of file+Layout/IndentationStyle:+ EnforcedStyle: spaces+ IndentationWidth: 2++Layout/IndentationConsistency:+ Enabled: true++Layout/SpaceInsidePercentLiteralDelimiters:+ Enabled: true\ No newline at end of filediff --git a/Gemfile b/Gemfileindex bba655aa..5ae59df2 100644--- a/Gemfile+++ b/Gemfile@@ -42,12 +42,12 @@ gem "inline_svg"gem "octokit"gem "pagy"gem "rails-settings-cached"-gem "tzinfo-data", platforms: %i[ windows jruby ]+gem "tzinfo-data", platforms: %i[windows jruby]gem "csv"gem "redcarpet"group :development, :test do- gem "debug", platforms: %i[ mri windows ]+ gem "debug", platforms: %i[mri windows]gem "brakeman", require: falsegem "rubocop-rails-omakase", require: falsegem "i18n-tasks"diff --git a/app/controllers/account/entries_controller.rb b/app/controllers/account/entries_controller.rbindex 1d81d1e5..fb02ffa8 100644--- a/app/controllers/account/entries_controller.rb+++ b/app/controllers/account/entries_controller.rb@@ -2,7 +2,7 @@ class Account::EntriesController < ApplicationControllerlayout :with_sidebarbefore_action :set_account- before_action :set_entry, only: %i[ edit update show destroy ]+ before_action :set_entry, only: %i[edit update show destroy]def editrender entryable_view_path(:edit)diff --git a/app/controllers/account/trades_controller.rb b/app/controllers/account/trades_controller.rbindex 9d4ba9a2..26f370e7 100644--- a/app/controllers/account/trades_controller.rb+++ b/app/controllers/account/trades_controller.rb@@ -8,7 +8,7 @@ class Account::TradesController < ApplicationControllerenddef 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])enddef creatediff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rbindex d2455152..db54d17c 100644--- a/app/controllers/accounts_controller.rb+++ b/app/controllers/accounts_controller.rb@@ -2,7 +2,7 @@ class AccountsController < ApplicationControllerlayout :with_sidebarinclude 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.institutionsdiff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rbindex 219a6973..443770fe 100644--- a/app/controllers/categories_controller.rb+++ b/app/controllers/categories_controller.rb@@ -1,7 +1,7 @@class CategoriesController < ApplicationControllerlayout :with_sidebar- before_action :set_category, only: %i[ edit update ]+ before_action :set_category, only: %i[edit update]before_action :set_transaction, only: :createdef indexdiff --git a/app/controllers/category/dropdowns_controller.rb b/app/controllers/category/dropdowns_controller.rbindex ef2322e4..b8d8e69a 100644--- a/app/controllers/category/dropdowns_controller.rb+++ b/app/controllers/category/dropdowns_controller.rb@@ -6,17 +6,17 @@ class Category::DropdownsController < ApplicationControllerendprivate- def set_from_params- if params[:category_id]- @selected_category = categories_scope.find(params[:category_id])- end+ 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])+ if params[:transaction_id]+ @transaction = Current.family.transactions.find(params[:transaction_id])+ endend- end- def categories_scope- Current.family.categories.alphabetically- end+ def categories_scope+ Current.family.categories.alphabetically+ endenddiff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rbindex 0f1c6913..d1a70299 100644--- a/app/controllers/concerns/authentication.rb+++ b/app/controllers/concerns/authentication.rb@@ -13,27 +13,27 @@ module Authenticationprivate- 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+ endend- 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)+ endenddiff --git a/app/controllers/concerns/filterable.rb b/app/controllers/concerns/filterable.rbindex 65ed8eed..4fe42f45 100644--- a/app/controllers/concerns/filterable.rb+++ b/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+ endprivatediff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rbindex 233a9bd8..c2268eec 100644--- a/app/controllers/imports_controller.rb+++ b/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.importsdiff --git a/app/controllers/institutions_controller.rb b/app/controllers/institutions_controller.rbindex 92e9e63d..d87d551e 100644--- a/app/controllers/institutions_controller.rb+++ b/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.newdiff --git a/app/controllers/merchants_controller.rb b/app/controllers/merchants_controller.rbindex 055f3da8..33fe156c 100644--- a/app/controllers/merchants_controller.rb+++ b/app/controllers/merchants_controller.rb@@ -1,7 +1,7 @@class MerchantsController < ApplicationControllerlayout :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 < ApplicationControllerprivate- 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)+ endenddiff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rbindex 6e86eb9d..9185d6bf 100644--- a/app/controllers/password_resets_controller.rb+++ b/app/controllers/password_resets_controller.rb@@ -3,7 +3,7 @@ class PasswordResetsController < ApplicationControllerlayout "auth"- before_action :set_user_by_token, only: %i[ edit update ]+ before_action :set_user_by_token, only: %i[edit update]def newend@@ -33,12 +33,12 @@ class PasswordResetsController < ApplicationControllerprivate- 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)+ endenddiff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rbindex eac86a07..83bc6cbe 100644--- a/app/controllers/passwords_controller.rb+++ b/app/controllers/passwords_controller.rb@@ -12,7 +12,7 @@ class PasswordsController < ApplicationControllerprivate- 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: "")+ endenddiff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rbindex 3a18477d..af628048 100644--- a/app/controllers/registrations_controller.rb+++ b/app/controllers/registrations_controller.rb@@ -28,17 +28,17 @@ class RegistrationsController < ApplicationControllerprivate- def set_user- @user = User.new user_params.except(:invite_code)- end+ 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 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 claim_invite_code+ unless InviteCode.claim! params[:user][:invite_code]+ redirect_to new_registration_path, alert: t("registrations.create.invalid_invite_code")+ endend- endenddiff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rbindex a2c6b219..e8f135ba 100644--- a/app/controllers/settings/profiles_controller.rb+++ b/app/controllers/settings/profiles_controller.rb@@ -32,8 +32,8 @@ class Settings::ProfilesController < SettingsControllerprivate- 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 ])+ endenddiff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rbindex 64b4a6e7..c2feb537 100644--- a/app/controllers/tags_controller.rb+++ b/app/controllers/tags_controller.rb@@ -1,7 +1,7 @@class TagsController < ApplicationControllerlayout :with_sidebar- before_action :set_tag, only: %i[ edit update ]+ before_action :set_tag, only: %i[edit update]def index@tags = Current.family.tags.alphabeticallydiff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rbindex 3c23f0d4..adc394b4 100644--- a/app/mailers/application_mailer.rb+++ b/app/mailers/application_mailer.rb@@ -5,12 +5,12 @@ class ApplicationMailer < ActionMailer::Baseprivate- 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" })+ endenddiff --git a/app/models/account/balance.rb b/app/models/account/balance.rbindex 1f2ace10..cd361269 100644--- a/app/models/account/balance.rb+++ b/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) }enddiff --git a/app/models/account/entry_builder.rb b/app/models/account/entry_builder.rbindex e818ac92..0cfa3189 100644--- a/app/models/account/entry_builder.rb+++ b/app/models/account/entry_builder.rb@@ -1,7 +1,7 @@class Account::EntryBuilderinclude 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].freezeattr_accessor :type, :date, :qty, :ticker, :price, :amount, :currency, :account, :transfer_account_iddiff --git a/app/models/account/entryable.rb b/app/models/account/entryable.rbindex 7c3b3ef9..79a47849 100644--- a/app/models/account/entryable.rb+++ b/app/models/account/entryable.rb@@ -1,7 +1,7 @@module Account::Entryableextend 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).constantizediff --git a/app/models/account/trade_builder.rb b/app/models/account/trade_builder.rbindex bc567944..1dfad971 100644--- a/app/models/account/trade_builder.rb+++ b/app/models/account/trade_builder.rb@@ -1,7 +1,7 @@class Account::TradeBuilder < Account::EntryBuilderinclude ActiveModel::Model- TYPES = %w[ buy sell ].freeze+ TYPES = %w[buy sell].freezeattr_accessor :type, :qty, :price, :ticker, :date, :accountdiff --git a/app/models/account/transaction.rb b/app/models/account/transaction.rbindex bda2a2f4..e8e83d2d 100644--- a/app/models/account/transaction.rb+++ b/app/models/account/transaction.rb@@ -25,7 +25,7 @@ class Account::Transaction < ApplicationRecordprivatedef searchable_keys- %i[ categories merchants ]+ %i[categories merchants]endenddiff --git a/app/models/account/transaction_builder.rb b/app/models/account/transaction_builder.rbindex 4c202373..457170f6 100644--- a/app/models/account/transaction_builder.rb+++ b/app/models/account/transaction_builder.rb@@ -1,7 +1,7 @@class Account::TransactionBuilderinclude ActiveModel::Model- TYPES = %w[ income expense interest transfer_in transfer_out ].freeze+ TYPES = %w[income expense interest transfer_in transfer_out].freezeattr_accessor :type, :amount, :date, :account, :transfer_account_iddiff --git a/app/models/category.rb b/app/models/category.rbindex cfcab4ef..516b7631 100644--- a/app/models/category.rb+++ b/app/models/category.rb@@ -47,7 +47,7 @@ class Category < ApplicationRecordprivate- def clear_internal_category- self.internal_category = nil- end+ def clear_internal_category+ self.internal_category = nil+ endenddiff --git a/app/models/concerns/accountable.rb b/app/models/concerns/accountable.rbindex 9579929e..7e146312 100644--- a/app/models/concerns/accountable.rb+++ b/app/models/concerns/accountable.rb@@ -1,8 +1,8 @@module Accountableextend 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_TYPESdef self.from_type(type)diff --git a/app/models/concerns/monetizable.rb b/app/models/concerns/monetizable.rbindex 3b363147..8179271b 100644--- a/app/models/concerns/monetizable.rb+++ b/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)endendend+ endenddiff --git a/app/models/invite_code.rb b/app/models/invite_code.rbindex 59ebf855..f2cbcd7e 100644--- a/app/models/invite_code.rb+++ b/app/models/invite_code.rb@@ -16,10 +16,10 @@ class InviteCode < ApplicationRecordprivate- 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)+ endend- endenddiff --git a/app/models/period.rb b/app/models/period.rbindex 3a10f15e..4a8a3ffa 100644--- a/app/models/period.rb+++ b/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.find_by_name(name)+ INDEX[name]+ end- def self.names- INDEX.keys.sort- end+ def self.names+ INDEX.keys.sort+ end- def initialize(name: "custom", date_range:)- @name = name- @date_range = date_range- 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+ 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)- ]+ 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)+ INDEX = BUILTIN.index_by(&:name)- BUILTIN.each do |period|- define_singleton_method(period.name) do- period- end+ BUILTIN.each do |period|+ define_singleton_method(period.name) do+ periodend+ endenddiff --git a/app/models/provider/github.rb b/app/models/provider/github.rbindex 4cb19cbf..570c558e 100644--- a/app/models/provider/github.rb+++ b/app/models/provider/github.rb@@ -16,11 +16,11 @@ class Provider::Githublatest_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+ }endcommit_info = {diff --git a/app/models/time_series.rb b/app/models/time_series.rbindex 9610eb5d..70d5aa4e 100644--- a/app/models/time_series.rb+++ b/app/models/time_series.rb@@ -1,5 +1,5 @@class TimeSeries- DIRECTIONS = %w[ up down ].freeze+ DIRECTIONS = %w[up down].freezeattr_reader :values, :favorable_directiondiff --git a/app/models/user.rb b/app/models/user.rbindex 62f5209c..a4a9dd04 100644--- a/app/models/user.rb+++ b/app/models/user.rb@@ -74,18 +74,18 @@ class User < ApplicationRecordprivate- def last_user_in_family?- family.users.count == 1- end+ def last_user_in_family?+ family.users.count == 1+ end- def deactivated_email- email.gsub(/@/, "-deactivated-#{SecureRandom.uuid}@")- 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 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)+ endend- endenddiff --git a/app/models/value_group.rb b/app/models/value_group.rbindex e9d2d5b8..147f7cac 100644--- a/app/models/value_group.rb+++ b/app/models/value_group.rb@@ -3,100 +3,100 @@attr_reader :name, :children, :value, :currencydef initialize(name, currency = Money.default_currency)- @name = name- @currency = Money::Currency.new(currency)- @children = []+ @name = name+ @currency = Money::Currency.new(currency)+ @children = []enddef 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)enddef 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.sizeenddef 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.valueend+ 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)enddef 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 = _seriesenddef 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 }enddef empty?- value_nodes.empty?+ value_nodes.empty?enddef 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)enddef 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+ childenddef 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+ childenddef 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.currencyenddef is_leaf_node?- children.empty?+ children.empty?enddef is_value_node?- value.present?+ value.present?endprivate- 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?)+ endenddiff --git a/config/environments/test.rb b/config/environments/test.rbindex 501daafe..c9918cbc 100644--- a/config/environments/test.rb+++ b/config/environments/test.rb@@ -63,5 +63,5 @@ Rails.application.configure do# Raise error when a before_action's only/except options reference missing actionsconfig.action_controller.raise_on_missing_callback_actions = true- config.autoload_paths += %w[ test/support ]+ config.autoload_paths += %w[test/support]enddiff --git a/config/routes.rb b/config/routes.rbindex 4ffc2e66..c6eff485 100644--- a/config/routes.rb+++ b/config/routes.rb@@ -42,8 +42,8 @@ Rails.application.routes.draw doendend- resources :tags, except: %i[ show destroy ] do- resources :deletions, only: %i[ new create ], module: :tag+ resources :tags, except: %i[show destroy] do+ resources :deletions, only: %i[new create], module: :tagendnamespace :category do@@ -51,16 +51,16 @@ Rails.application.routes.draw doendresources :categories do- resources :deletions, only: %i[ new create ], module: :category+ resources :deletions, only: %i[new create], module: :categoryend- resources :merchants, only: %i[ index new create edit update destroy ]+ resources :merchants, only: %i[index new create edit update destroy]namespace :account do- resources :transfers, only: %i[ new create destroy ]+ resources :transfers, only: %i[new create destroy]namespace :transaction do- resources :rules, only: %i[ index ]+ resources :rules, only: %i[index]endend@@ -78,21 +78,21 @@ Rails.application.routes.draw doscope module: :account doresource :logo, only: :show- resources :holdings, only: %i[ index new show ]+ resources :holdings, only: %i[index new show]resources :cashes, only: :index- resources :transactions, only: %i[ index update ]- resources :valuations, only: %i[ index new create ]- resources :trades, only: %i[ index new create ]+ resources :transactions, only: %i[index update]+ resources :valuations, only: %i[index new create]+ resources :trades, only: %i[index new create]- resources :entries, only: %i[ edit update show destroy ]+ resources :entries, only: %i[edit update show destroy]endend- resources :properties, only: %i[ create update ]- resources :vehicles, only: %i[ create update ]+ resources :properties, only: %i[create update]+ resources :vehicles, only: %i[create update]- resources :transactions, only: %i[ index new create ] do+ resources :transactions, only: %i[index new create] docollection dopost "bulk_delete"get "bulk_edit"@@ -103,7 +103,7 @@ Rails.application.routes.draw doendend- resources :institutions, except: %i[ index show ]+ resources :institutions, except: %i[index show]resources :issues, only: :showdiff --git a/lib/money/arithmetic.rb b/lib/money/arithmetic.rbindex dc48abfd..99000066 100644--- a/lib/money/arithmetic.rb+++ b/lib/money/arithmetic.rb@@ -1,62 +1,62 @@module Money::Arithmetic- CoercedNumeric = Struct.new(:value)-- def +(other)- if other.is_a?(Money)- self.class.new(amount + other.amount, currency)- else- value = other.is_a?(CoercedNumeric) ? other.value : other- self.class.new(amount + value, currency)- end- end-- def -(other)- if other.is_a?(Money)- self.class.new(amount - other.amount, currency)- else- value = other.is_a?(CoercedNumeric) ? other.value : other- self.class.new(amount - value, currency)- end- end-- def -@- self.class.new(-amount, currency)- end-- def *(other)- raise TypeError, "Can't multiply Money by Money, use Numeric instead" if other.is_a?(self.class)- value = other.is_a?(CoercedNumeric) ? other.value : other- self.class.new(amount * value, currency)- end-- def /(other)- if other.is_a?(self.class)- amount / other.amount- else- raise TypeError, "can't divide Numeric by Money" if other.is_a?(CoercedNumeric)- self.class.new(amount / other, currency)- end- end-- def abs- self.class.new(amount.abs, currency)- end-- def zero?- amount.zero?- end-- def negative?- amount.negative?- end-- def positive?- amount.positive?- end-- # Override Ruby's coerce method so the order of operands doesn't matter- # Wrap in Coerced so we can distinguish between Money and other types- def coerce(other)- [ self, CoercedNumeric.new(other) ]- end+ CoercedNumeric = Struct.new(:value)++ def +(other)+ if other.is_a?(Money)+ self.class.new(amount + other.amount, currency)+ else+ value = other.is_a?(CoercedNumeric) ? other.value : other+ self.class.new(amount + value, currency)+ end+ end++ def -(other)+ if other.is_a?(Money)+ self.class.new(amount - other.amount, currency)+ else+ value = other.is_a?(CoercedNumeric) ? other.value : other+ self.class.new(amount - value, currency)+ end+ end++ def -@+ self.class.new(-amount, currency)+ end++ def *(other)+ raise TypeError, "Can't multiply Money by Money, use Numeric instead" if other.is_a?(self.class)+ value = other.is_a?(CoercedNumeric) ? other.value : other+ self.class.new(amount * value, currency)+ end++ def /(other)+ if other.is_a?(self.class)+ amount / other.amount+ else+ raise TypeError, "can't divide Numeric by Money" if other.is_a?(CoercedNumeric)+ self.class.new(amount / other, currency)+ end+ end++ def abs+ self.class.new(amount.abs, currency)+ end++ def zero?+ amount.zero?+ end++ def negative?+ amount.negative?+ end++ def positive?+ amount.positive?+ end++ # Override Ruby's coerce method so the order of operands doesn't matter+ # Wrap in Coerced so we can distinguish between Money and other types+ def coerce(other)+ [ self, CoercedNumeric.new(other) ]+ endenddiff --git a/lib/money/currency.rb b/lib/money/currency.rbindex b35e2b3f..47dbc077 100644--- a/lib/money/currency.rb+++ b/lib/money/currency.rb@@ -1,69 +1,69 @@class Money::Currency- include Comparable+ include Comparable- class UnknownCurrencyError < ArgumentError; end+ class UnknownCurrencyError < ArgumentError; end- CURRENCIES_FILE_PATH = Rails.root.join("config", "currencies.yml")+ CURRENCIES_FILE_PATH = Rails.root.join("config", "currencies.yml")- # Cached instances by iso code- @@instances = {}+ # Cached instances by iso code+ @@instances = {}- class << self- def new(object)- iso_code = case object- when String, Symbol- object.to_s.downcase- when Money::Currency- object.iso_code.downcase- else- raise ArgumentError, "Invalid argument type"- end+ class << self+ def new(object)+ iso_code = case object+ when String, Symbol+ object.to_s.downcase+ when Money::Currency+ object.iso_code.downcase+ else+ raise ArgumentError, "Invalid argument type"+ end- @@instances[iso_code] ||= super(iso_code)- end+ @@instances[iso_code] ||= super(iso_code)+ end- def all- @all ||= YAML.load_file(CURRENCIES_FILE_PATH)- end+ def all+ @all ||= YAML.load_file(CURRENCIES_FILE_PATH)+ end- def all_instances- all.values.map { |currency_data| new(currency_data["iso_code"]) }- end+ def all_instances+ all.values.map { |currency_data| new(currency_data["iso_code"]) }+ end- def popular- all.values.sort_by { |currency| currency["priority"] }.first(12).map { |currency_data| new(currency_data["iso_code"]) }- end+ def popular+ all.values.sort_by { |currency| currency["priority"] }.first(12).map { |currency_data| new(currency_data["iso_code"]) }end+ end- attr_reader :name, :priority, :iso_code, :iso_numeric, :html_code,- :symbol, :minor_unit, :minor_unit_conversion, :smallest_denomination,- :separator, :delimiter, :default_format, :default_precision+ attr_reader :name, :priority, :iso_code, :iso_numeric, :html_code,+ :symbol, :minor_unit, :minor_unit_conversion, :smallest_denomination,+ :separator, :delimiter, :default_format, :default_precision- def initialize(iso_code)- currency_data = self.class.all[iso_code]- raise UnknownCurrencyError if currency_data.nil?+ def initialize(iso_code)+ currency_data = self.class.all[iso_code]+ raise UnknownCurrencyError if currency_data.nil?- @name = currency_data["name"]- @priority = currency_data["priority"]- @iso_code = currency_data["iso_code"]- @iso_numeric = currency_data["iso_numeric"]- @html_code = currency_data["html_code"]- @symbol = currency_data["symbol"]- @minor_unit = currency_data["minor_unit"]- @minor_unit_conversion = currency_data["minor_unit_conversion"]- @smallest_denomination = currency_data["smallest_denomination"]- @separator = currency_data["separator"]- @delimiter = currency_data["delimiter"]- @default_format = currency_data["default_format"]- @default_precision = currency_data["default_precision"]- end+ @name = currency_data["name"]+ @priority = currency_data["priority"]+ @iso_code = currency_data["iso_code"]+ @iso_numeric = currency_data["iso_numeric"]+ @html_code = currency_data["html_code"]+ @symbol = currency_data["symbol"]+ @minor_unit = currency_data["minor_unit"]+ @minor_unit_conversion = currency_data["minor_unit_conversion"]+ @smallest_denomination = currency_data["smallest_denomination"]+ @separator = currency_data["separator"]+ @delimiter = currency_data["delimiter"]+ @default_format = currency_data["default_format"]+ @default_precision = currency_data["default_precision"]+ end- def step- (1.0/10**default_precision)- end+ def step+ (1.0/10**default_precision)+ end- def <=>(other)- return nil unless other.is_a?(Money::Currency)- @iso_code <=> other.iso_code- end+ def <=>(other)+ return nil unless other.is_a?(Money::Currency)+ @iso_code <=> other.iso_code+ endenddiff --git a/test/lib/money/currency_test.rb b/test/lib/money/currency_test.rbindex 3b94ccc6..bc5d9f7a 100644--- a/test/lib/money/currency_test.rb+++ b/test/lib/money/currency_test.rb@@ -1,53 +1,53 @@require "test_helper"class Money::CurrencyTest < ActiveSupport::TestCase- setup do- @currency = Money::Currency.new(:usd)- end-- test "has many currencies" do- assert_operator Money::Currency.all.count, :>, 100- end-- test "can test equality of currencies" do- assert_equal Money::Currency.new(:usd), Money::Currency.new(:usd)- assert_not_equal Money::Currency.new(:usd), Money::Currency.new(:eur)- end-- test "can get metadata about a currency" do- assert_equal "USD", @currency.iso_code- assert_equal "United States Dollar", @currency.name- assert_equal "$", @currency.symbol- assert_equal 1, @currency.priority- assert_equal "Cent", @currency.minor_unit- assert_equal 100, @currency.minor_unit_conversion- assert_equal 1, @currency.smallest_denomination- assert_equal ".", @currency.separator- assert_equal ",", @currency.delimiter- assert_equal "%u%n", @currency.default_format- assert_equal 2, @currency.default_precision- end-- test "can extract cents string from amount" do- value1 = Money.new(100)- value2 = Money.new(100.1)- value3 = Money.new(100.12)- value4 = Money.new(100.123)- value5 = Money.new(200, :jpy)-- assert_equal "00", value1.cents_str- assert_equal "10", value2.cents_str- assert_equal "12", value3.cents_str- assert_equal "12", value4.cents_str- assert_equal "", value5.cents_str-- assert_equal "", value4.cents_str(0)- assert_equal "1", value4.cents_str(1)- assert_equal "12", value4.cents_str(2)- assert_equal "123", value4.cents_str(3)- end-- test "step returns the smallest value of the currency" do- assert_equal 0.01, @currency.step- end+ setup do+ @currency = Money::Currency.new(:usd)+ end++ test "has many currencies" do+ assert_operator Money::Currency.all.count, :>, 100+ end++ test "can test equality of currencies" do+ assert_equal Money::Currency.new(:usd), Money::Currency.new(:usd)+ assert_not_equal Money::Currency.new(:usd), Money::Currency.new(:eur)+ end++ test "can get metadata about a currency" do+ assert_equal "USD", @currency.iso_code+ assert_equal "United States Dollar", @currency.name+ assert_equal "$", @currency.symbol+ assert_equal 1, @currency.priority+ assert_equal "Cent", @currency.minor_unit+ assert_equal 100, @currency.minor_unit_conversion+ assert_equal 1, @currency.smallest_denomination+ assert_equal ".", @currency.separator+ assert_equal ",", @currency.delimiter+ assert_equal "%u%n", @currency.default_format+ assert_equal 2, @currency.default_precision+ end++ test "can extract cents string from amount" do+ value1 = Money.new(100)+ value2 = Money.new(100.1)+ value3 = Money.new(100.12)+ value4 = Money.new(100.123)+ value5 = Money.new(200, :jpy)++ assert_equal "00", value1.cents_str+ assert_equal "10", value2.cents_str+ assert_equal "12", value3.cents_str+ assert_equal "12", value4.cents_str+ assert_equal "", value5.cents_str++ assert_equal "", value4.cents_str(0)+ assert_equal "1", value4.cents_str(1)+ assert_equal "12", value4.cents_str(2)+ assert_equal "123", value4.cents_str(3)+ end++ test "step returns the smallest value of the currency" do+ assert_equal 0.01, @currency.step+ endenddiff --git a/test/models/import/csv_test.rb b/test/models/import/csv_test.rbindex 83978bee..64600102 100644--- a/test/models/import/csv_test.rb+++ b/test/models/import/csv_test.rb@@ -39,7 +39,7 @@ class Import::CsvTest < ActiveSupport::TestCasetest "CSV with semicolon column separator" docsv = Import::Csv.new(valid_csv_str_with_semicolon_separator, col_sep: ";")- assert_equal %w[ date name category tags amount ], csv.table.headers+ assert_equal %w[date name category tags amount], csv.table.headersassert_equal 4, csv.table.sizeassert_equal "Paycheck", csv.table[3][1]end@@ -84,7 +84,7 @@ class Import::CsvTest < ActiveSupport::TestCasecsv = Import::Csv.create_with_field_mappings(raw_file_str, fields, mappings)- assert_equal %w[ date name ], csv.table.headers+ assert_equal %w[date name], csv.table.headersassert_equal 2, csv.table.sizeassert_equal "Amazon stuff", csv.table[1][1]end@@ -113,7 +113,7 @@ class Import::CsvTest < ActiveSupport::TestCasecsv = Import::Csv.create_with_field_mappings(raw_file_str, fields, mappings, ";")- assert_equal %w[ date name ], csv.table.headers+ assert_equal %w[date name], csv.table.headersassert_equal 2, csv.table.sizeassert_equal "Amazon stuff", csv.table[1][1]enddiff --git a/test/models/value_group_test.rb b/test/models/value_group_test.rbindex e27010a1..5c9e2bbf 100644--- a/test/models/value_group_test.rb+++ b/test/models/value_group_test.rb@@ -1,141 +1,141 @@require "test_helper"require "ostruct"class ValueGroupTest < ActiveSupport::TestCase- setup do- # Level 1- @assets = ValueGroup.new("Assets", :usd)-- # Level 2- @depositories = @assets.add_child_group("Depositories", :usd)- @other_assets = @assets.add_child_group("Other Assets", :usd)-- # Level 3 (leaf/value nodes)- @checking_node = @depositories.add_value_node(OpenStruct.new({ name: "Checking", value: Money.new(5000) }), Money.new(5000))- @savings_node = @depositories.add_value_node(OpenStruct.new({ name: "Savings", value: Money.new(20000) }), Money.new(20000))- @collectable_node = @other_assets.add_value_node(OpenStruct.new({ name: "Collectable", value: Money.new(550) }), Money.new(550))+ setup do+ # Level 1+ @assets = ValueGroup.new("Assets", :usd)++ # Level 2+ @depositories = @assets.add_child_group("Depositories", :usd)+ @other_assets = @assets.add_child_group("Other Assets", :usd)++ # Level 3 (leaf/value nodes)+ @checking_node = @depositories.add_value_node(OpenStruct.new({ name: "Checking", value: Money.new(5000) }), Money.new(5000))+ @savings_node = @depositories.add_value_node(OpenStruct.new({ name: "Savings", value: Money.new(20000) }), Money.new(20000))+ @collectable_node = @other_assets.add_value_node(OpenStruct.new({ name: "Collectable", value: Money.new(550) }), Money.new(550))+ end++ test "empty group works" do+ group = ValueGroup.new("Root", :usd)++ assert_equal "Root", group.name+ assert_equal [], group.children+ assert_equal 0, group.sum+ assert_equal 0, group.avg+ assert_equal 100, group.percent_of_total+ assert_nil group.parent+ end++ test "group without value nodes has no value" do+ assets = ValueGroup.new("Assets")+ depositories = assets.add_child_group("Depositories")++ assert_equal 0, assets.sum+ assert_equal 0, depositories.sum+ end++ test "sum equals value at leaf level" do+ assert_equal @checking_node.value, @checking_node.sum+ assert_equal @savings_node.value, @savings_node.sum+ assert_equal @collectable_node.value, @collectable_node.sum+ end++ test "value is nil at rollup levels" do+ assert_not_equal @depositories.value, @depositories.sum+ assert_nil @depositories.value+ assert_nil @other_assets.value+ end++ test "generates list of value nodes regardless of level in hierarchy" do+ assert_equal [ @checking_node, @savings_node, @collectable_node ], @assets.value_nodes+ assert_equal [ @checking_node, @savings_node ], @depositories.value_nodes+ assert_equal [ @collectable_node ], @other_assets.value_nodes+ end++ test "group with value nodes aggregates totals correctly" do+ assert_equal Money.new(5000), @checking_node.sum+ assert_equal Money.new(20000), @savings_node.sum+ assert_equal Money.new(550), @collectable_node.sum++ assert_equal Money.new(25000), @depositories.sum+ assert_equal Money.new(550), @other_assets.sum++ assert_equal Money.new(25550), @assets.sum+ end++ test "group averages leaf nodes" do+ assert_equal Money.new(5000), @checking_node.avg+ assert_equal Money.new(20000), @savings_node.avg+ assert_equal Money.new(550), @collectable_node.avg++ assert_in_delta 12500, @depositories.avg.amount, 0.01+ assert_in_delta 550, @other_assets.avg.amount, 0.01+ assert_in_delta 8516.67, @assets.avg.amount, 0.01+ end++ # Percentage of parent group (i.e. collectable is 100% of "Other Assets" group)+ test "group calculates percent of parent total" do+ assert_equal 100, @assets.percent_of_total+ assert_in_delta 97.85, @depositories.percent_of_total, 0.1+ assert_in_delta 2.15, @other_assets.percent_of_total, 0.1+ assert_in_delta 80.0, @savings_node.percent_of_total, 0.1+ assert_in_delta 20.0, @checking_node.percent_of_total, 0.1+ assert_equal 100, @collectable_node.percent_of_total+ end++ test "handles unbalanced tree" do+ vehicles = @assets.add_child_group("Vehicles")++ # Since we didn't add any value nodes to vehicles, shouldn't affect rollups+ assert_equal Money.new(25550), @assets.sum+ end+++ test "can attach and aggregate time series" do+ checking_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(4000) }, { date: Date.current, value: Money.new(5000) } ])+ savings_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(19000) }, { date: Date.current, value: Money.new(20000) } ])++ @checking_node.series = checking_series+ @savings_node.series = savings_series++ assert_not_nil @checking_node.series+ assert_not_nil @savings_node.series++ assert_equal @checking_node.sum, @checking_node.series.last.value+ assert_equal @savings_node.sum, @savings_node.series.last.value++ aggregated_depository_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(23000) }, { date: Date.current, value: Money.new(25000) } ])+ aggregated_assets_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(23000) }, { date: Date.current, value: Money.new(25000) } ])++ assert_equal aggregated_depository_series.values, @depositories.series.values+ assert_equal aggregated_assets_series.values, @assets.series.values+ end++ test "attached series must be a TimeSeries" do+ assert_raises(RuntimeError) do+ @checking_node.series = []end+ end- test "empty group works" do- group = ValueGroup.new("Root", :usd)-- assert_equal "Root", group.name- assert_equal [], group.children- assert_equal 0, group.sum- assert_equal 0, group.avg- assert_equal 100, group.percent_of_total- assert_nil group.parent+ test "cannot add time series to non-leaf node" do+ assert_raises(RuntimeError) do+ @assets.series = TimeSeries.new([])end+ end- test "group without value nodes has no value" do- assets = ValueGroup.new("Assets")- depositories = assets.add_child_group("Depositories")+ test "can only add value node at leaf level of tree" do+ root = ValueGroup.new("Root Level")+ grandparent = root.add_child_group("Grandparent")+ parent = grandparent.add_child_group("Parent")- assert_equal 0, assets.sum- assert_equal 0, depositories.sum- end+ value_node = parent.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))- test "sum equals value at leaf level" do- assert_equal @checking_node.value, @checking_node.sum- assert_equal @savings_node.value, @savings_node.sum- assert_equal @collectable_node.value, @collectable_node.sum+ assert_raises(RuntimeError) do+ value_node.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))end- test "value is nil at rollup levels" do- assert_not_equal @depositories.value, @depositories.sum- assert_nil @depositories.value- assert_nil @other_assets.value- end-- test "generates list of value nodes regardless of level in hierarchy" do- assert_equal [ @checking_node, @savings_node, @collectable_node ], @assets.value_nodes- assert_equal [ @checking_node, @savings_node ], @depositories.value_nodes- assert_equal [ @collectable_node ], @other_assets.value_nodes- end-- test "group with value nodes aggregates totals correctly" do- assert_equal Money.new(5000), @checking_node.sum- assert_equal Money.new(20000), @savings_node.sum- assert_equal Money.new(550), @collectable_node.sum-- assert_equal Money.new(25000), @depositories.sum- assert_equal Money.new(550), @other_assets.sum-- assert_equal Money.new(25550), @assets.sum- end-- test "group averages leaf nodes" do- assert_equal Money.new(5000), @checking_node.avg- assert_equal Money.new(20000), @savings_node.avg- assert_equal Money.new(550), @collectable_node.avg-- assert_in_delta 12500, @depositories.avg.amount, 0.01- assert_in_delta 550, @other_assets.avg.amount, 0.01- assert_in_delta 8516.67, @assets.avg.amount, 0.01- end-- # Percentage of parent group (i.e. collectable is 100% of "Other Assets" group)- test "group calculates percent of parent total" do- assert_equal 100, @assets.percent_of_total- assert_in_delta 97.85, @depositories.percent_of_total, 0.1- assert_in_delta 2.15, @other_assets.percent_of_total, 0.1- assert_in_delta 80.0, @savings_node.percent_of_total, 0.1- assert_in_delta 20.0, @checking_node.percent_of_total, 0.1- assert_equal 100, @collectable_node.percent_of_total- end-- test "handles unbalanced tree" do- vehicles = @assets.add_child_group("Vehicles")-- # Since we didn't add any value nodes to vehicles, shouldn't affect rollups- assert_equal Money.new(25550), @assets.sum- end--- test "can attach and aggregate time series" do- checking_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(4000) }, { date: Date.current, value: Money.new(5000) } ])- savings_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(19000) }, { date: Date.current, value: Money.new(20000) } ])-- @checking_node.series = checking_series- @savings_node.series = savings_series-- assert_not_nil @checking_node.series- assert_not_nil @savings_node.series-- assert_equal @checking_node.sum, @checking_node.series.last.value- assert_equal @savings_node.sum, @savings_node.series.last.value-- aggregated_depository_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(23000) }, { date: Date.current, value: Money.new(25000) } ])- aggregated_assets_series = TimeSeries.new([ { date: 1.day.ago.to_date, value: Money.new(23000) }, { date: Date.current, value: Money.new(25000) } ])-- assert_equal aggregated_depository_series.values, @depositories.series.values- assert_equal aggregated_assets_series.values, @assets.series.values- end-- test "attached series must be a TimeSeries" do- assert_raises(RuntimeError) do- @checking_node.series = []- end- end-- test "cannot add time series to non-leaf node" do- assert_raises(RuntimeError) do- @assets.series = TimeSeries.new([])- end- end-- test "can only add value node at leaf level of tree" do- root = ValueGroup.new("Root Level")- grandparent = root.add_child_group("Grandparent")- parent = grandparent.add_child_group("Parent")-- value_node = parent.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))-- assert_raises(RuntimeError) do- value_node.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))- end-- assert_raises(RuntimeError) do- grandparent.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))- end+ assert_raises(RuntimeError) do+ grandparent.add_value_node(OpenStruct.new({ name: "Value Node", value: Money.new(100) }), Money.new(100))end+ endend