Skip to content

Commit

Permalink
Clean up Setting model and remove dead code (#28661)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire committed Jan 9, 2024
1 parent 4e02838 commit 10203bd
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 106 deletions.
79 changes: 0 additions & 79 deletions app/lib/settings/scoped_settings.rb

This file was deleted.

12 changes: 3 additions & 9 deletions app/models/setting.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ def method_missing(method, *args)
end
# rubocop:enable Style/MissingRespondToMissing

def object(var_name)
find_by(var: var_name.to_s)
end

def cache_prefix_by_startup
@cache_prefix_by_startup ||= Digest::MD5.hexdigest(default_settings.to_s)
end
Expand All @@ -81,16 +77,14 @@ def cache_key(var_name)

def [](key)
Rails.cache.fetch(cache_key(key)) do
db_val = object(key)
db_val = find_by(var: key)
db_val ? db_val.value : default_settings[key]
end
end

# set a setting value by [] notation
def []=(var_name, value)
var_name = var_name.to_s

record = object(var_name) || new(var: var_name)
record = find_or_initialize_by(var: var_name.to_s)
record.value = value
record.save!
end
Expand All @@ -100,7 +94,7 @@ def default_settings

content = Rails.root.join('config', 'settings.yml').read
hash = content.empty? ? {} : YAML.safe_load(ERB.new(content).result, aliases: true).to_hash
@default_settings = hash[Rails.env] || {}
@default_settings = (hash[Rails.env] || {}).freeze
end
end

Expand Down
30 changes: 12 additions & 18 deletions spec/models/setting_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,32 @@

context 'when Rails.cache does not exists' do
before do
allow(described_class).to receive(:object).with(key).and_return(object)
allow(described_class).to receive(:default_settings).and_return(default_settings)

Fabricate(:setting, var: key, value: nil)
Fabricate(:setting, var: key, value: 42) if save_setting

Rails.cache.delete(cache_key)
end

let(:object) { nil }
let(:default_value) { 'default_value' }
let(:default_settings) { { key => default_value } }
let(:save_setting) { true }

it 'calls Setting.object' do
allow(described_class).to receive(:object).with(key)
context 'when the setting has been saved to database' do
it 'returns the value from database' do
callback = double
allow(callback).to receive(:call)

described_class[key]
ActiveSupport::Notifications.subscribed callback, 'sql.active_record' do
expect(described_class[key]).to eq 42
end

expect(described_class).to have_received(:object).with(key)
end

context 'when Setting.object returns truthy' do
let(:object) { db_val }
let(:db_val) { instance_double(described_class, value: 'db_val') }
let(:default_value) { 'default_value' }

it 'returns db_val.value' do
expect(described_class[key]).to be db_val.value
expect(callback).to have_received(:call)
end
end

context 'when Setting.object returns falsey' do
let(:object) { nil }
context 'when the setting has not been saved to database' do
let(:save_setting) { false }

it 'returns default_settings[key]' do
expect(described_class[key]).to be default_settings[key]
Expand Down

0 comments on commit 10203bd

Please sign in to comment.