From f7177c74410d70d38d17ee7c932332e05dc855fb Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 21 Jun 2021 11:29:35 -0300 Subject: [PATCH] Extract default values into constants (#89) --- lib/active_model/one_time_password.rb | 33 +++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/lib/active_model/one_time_password.rb b/lib/active_model/one_time_password.rb index e26c5cf..107fa16 100644 --- a/lib/active_model/one_time_password.rb +++ b/lib/active_model/one_time_password.rb @@ -2,6 +2,14 @@ module ActiveModel module OneTimePassword extend ActiveSupport::Concern + OTP_DEFAULT_COLUMN_NAME = 'otp_secret_key'.freeze + OTP_DEFAULT_COUNTER_COLUMN_NAME = 'otp_counter'.freeze + OTP_DEFAULT_BACKUP_CODES_COLUMN_NAME = 'otp_backup_codes'.freeze + OTP_DEFAULT_DIGITS = 6 + OTP_DEFAULT_BACKUP_CODES_COUNT = 12 + OTP_COUNTER_ENABLED_BY_DEFAULT = false + OTP_BACKUP_CODES_ENABLED_BY_DEFAULT = false + module ClassMethods def has_one_time_password(options = {}) cattr_accessor :otp_column_name, :otp_counter_column_name, @@ -10,19 +18,26 @@ def has_one_time_password(options = {}) :otp_backup_codes_count, :otp_one_time_backup_codes, :otp_interval - self.otp_column_name = (options[:column_name] || "otp_secret_key").to_s - self.otp_digits = options[:length] || 6 - - self.otp_counter_based = (options[:counter_based] || false) - self.otp_counter_column_name = (options[:counter_column_name] || "otp_counter").to_s + self.otp_column_name = ( + options[:column_name] || OTP_DEFAULT_COLUMN_NAME + ).to_s + self.otp_digits = options[:length] || OTP_DEFAULT_DIGITS + self.otp_counter_based = ( + options[:counter_based] || OTP_COUNTER_ENABLED_BY_DEFAULT + ) + self.otp_counter_column_name = ( + options[:counter_column_name] || OTP_DEFAULT_COUNTER_COLUMN_NAME + ).to_s self.otp_interval = options[:interval] - self.otp_backup_codes_column_name = ( - options[:backup_codes_column_name] || 'otp_backup_codes' + options[:backup_codes_column_name] || + OTP_DEFAULT_BACKUP_CODES_COLUMN_NAME ).to_s - self.otp_backup_codes_count = options[:backup_codes_count] || 12 + self.otp_backup_codes_count = ( + options[:backup_codes_count] || OTP_DEFAULT_BACKUP_CODES_COUNT + ) self.otp_one_time_backup_codes = ( - options[:one_time_backup_codes] || false + options[:one_time_backup_codes] || OTP_BACKUP_CODES_ENABLED_BY_DEFAULT ) include InstanceMethodsOnActivation