application_configuration 1.1.0 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -108,8 +108,7 @@ module Application
108
108
 
109
109
  def reload
110
110
  puts "Loading Configuration Settings!"
111
- settings = {:reload_settings_every => 1.minute} # default reload time
112
- @final_configuration_settings = {} # reset the configuration
111
+ @final_configuration_settings = {:reload_settings_every => 1.minute} # reset the configuration
113
112
 
114
113
  self.loaded_files.each do |lf|
115
114
  puts "Loading Configuration Settings from file: #{lf.file_location}"
@@ -150,7 +149,7 @@ module Application
150
149
  end
151
150
 
152
151
  def handle_settings(settings, path_to_file)
153
- @final_configuration_settings.merge!(settings)
152
+ @final_configuration_settings.merge!(settings || {})
154
153
 
155
154
  self.final_configuration_settings.each_pair do |k,v|
156
155
  k = k.to_s.downcase
@@ -2,4 +2,4 @@
2
2
  gem_name: application_configuration
3
3
  package: application_configuration
4
4
  project: magrathea
5
- version: 1.1.0
5
+ version: 1.1.3
metadata CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
3
3
  specification_version: 1
4
4
  name: application_configuration
5
5
  version: !ruby/object:Gem::Version
6
- version: 1.1.0
7
- date: 2007-09-18 00:00:00 -04:00
6
+ version: 1.1.3
7
+ date: 2007-09-24 00:00:00 -04:00
8
8
  summary: application_configuration
9
9
  require_paths:
10
10
  - lib