Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Define the constant on Object instead of Kernel #227

Merged
merged 10 commits into from
Jun 20, 2019
Merged

Define the constant on Object instead of Kernel #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a26864
Updated to dry-schema 1.0
Jun 18, 2019
1887514
Removed jruby from the travis matrix since it was failing with someth…
Jun 18, 2019
fbd440b
Merge branch 'master' into upgrade-dry-validations
pkuczynski Jun 19, 2019
88aea7c
Cleaned up some files/comments that were no longer needed since raisi…
Jun 20, 2019
d5135a6
Removed some conditionals checking for ruby versions below 2.1 since …
Jun 20, 2019
9c645e4
Moved the settings object to be defined on Object instead of Kernel (…
Jun 20, 2019
4a1954e
Merge branch 'master' into const-location
pkuczynski Jun 20, 2019
080b798
Updated changelog with changes from master
Jun 20, 2019
98c35d3
Update CHANGELOG.md
pkuczynski Jun 20, 2019
591bb83
Update CHANGELOG.md
pkuczynski Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
### Changes

* Upgraded dry-validation dependency to dry-schema 1.0 ([#224](https://github.com/railsconfig/config/pull/224))
* Moved constant to be defined on `Object` instead of `Kernel` ([#227](https://github.com/railsconfig/config/issues/227))

## 1.7.2

Expand Down
7 changes: 4 additions & 3 deletions lib/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,9 @@ def self.load_files(*files)

# Loads and sets the settings constant!
def self.load_and_set_settings(*files)
Kernel.send(:remove_const, Config.const_name) if Kernel.const_defined?(Config.const_name)
Kernel.const_set(Config.const_name, Config.load_files(files))
name = Config.const_name
Object.send(:remove_const, name) if Object.const_defined?(name)
Object.const_set(name, Config.load_files(files))
end

def self.setting_files(config_root, env)
Expand All @@ -70,7 +71,7 @@ def self.setting_files(config_root, env)
end

def self.reload!
Kernel.const_get(Config.const_name).reload!
Object.const_get(Config.const_name).reload!
end
end

Expand Down