@@ -1,7 +1,6 @@ require 'ostruct' require 'yaml' require 'erb' -require 'deep_merge' module ApplicationConfig # == Summary @@ -22,6 +21,7 @@ module ApplicationConfig # add singleton method to our AppConfig that reloads its settings from the load_paths options def config.reload! + conf = {} ConfigBuilder.load_paths.to_a.each do |path| file_conf = YAML.load(ERB.new(IO.read(path)).result) if path and File.exists?(path) @@ -35,7 +35,7 @@ module ApplicationConfig conf[expand_path] = ApplicationConfig::ConfigBuilder.expand(conf[expand_path], "#{ConfigBuilder.root_path}/public/#{expand_path}") end end - + # load all the new values into the openstruct marshal_load(ApplicationConfig::ConfigBuilder.convert(conf).marshal_dump) lib/application_config/config_builder.rb @@ -1,3 +1,4 @@ +require 'application_config/deep_merge' unless defined?(DeepMerge) require 'application_config/config_builder' require 'application_config/view_helpers' lib/merb_app_config.rb 40cd889fc9bca49cdc384de37fa7aec69cc29395 Jacques Crocker merbjedi@gmail.com http://github.com/merbjedi/app_config/commit/88553d4e18bf5efd1f94509b29be715b156c3b84 88553d4e18bf5efd1f94509b29be715b156c3b84 2009-08-04T03:06:12-07:00 2009-08-04T03:06:12-07:00 Updating requires 2bae8d4e5e92ecd33a7f5534a1b3a0e2be238124 Jacques Crocker merbjedi@gmail.com