jcnetdev-app_config 1.0 → 1.1

data/app_config.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'app_config'
-  s.version = '1.0'
-  s.date = '2008-07-04'
+  s.version = '1.1'
+  s.date = '2008-07-24'
   
   s.summary = "Application level configuration"
   s.description = "Allow application wide configuration settings via YML files"

data/lib/app_config.rb

@@ -4,21 +4,27 @@ require 'erb'
 
 # == Summary
 # This is API documentation, NOT documentation on how to use this plugin.  For that, see the README.
-module ApplicationConfig
+class ApplicationConfig
+  
+  cattr_accessor :conf_paths
   
   # Create a config object (OpenStruct) from a yaml file.  If a second yaml file is given, then the sections of that file will overwrite the sections
   # if the first file if they exist in the first file.
-  def self.load_files(conf_path_1, conf_path_2 = nil)
-  
-    conf1 = YAML.load(ERB.new(IO.read(conf_path_1)).result) if conf_path_1 and File.exists?(conf_path_1)
-    conf1 = {} if !conf1 or conf1.empty?
-    
-    conf2 = YAML.load(ERB.new(IO.read(conf_path_2)).result) if conf_path_2 and File.exists?(conf_path_2)
-    conf2 = {} if !conf2 or conf2.empty?
-    
-    conf = conf1.merge(conf2)
-    (!conf or conf.empty?) ? OpenStruct.new : convert(conf)
+  def self.load_files(*conf_load_paths)
+    self.conf_paths = []
+    self.conf_paths += conf_load_paths
+    self.conf_paths.uniq!
     
+    reload!
+  end
+  
+  def self.reload!
+    conf = {}
+    conf_paths.each do |path|
+      new_conf = YAML.load(ERB.new(IO.read(path)).result) if path and File.exists?(path)
+      conf.merge!(new_conf) if new_conf
+    end
+    return convert(conf)
   end
   
   # Recursively converts Hashes to OpenStructs (including Hashes inside Arrays)

data/test/app_config_test.rb

@@ -1,5 +1,7 @@
+require 'rubygems'
 require 'test/unit'
-require 'app_config'
+require 'active_support'
+require 'lib/app_config'
 
 class AppConfigTest < Test::Unit::TestCase
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jcnetdev-app_config
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: "1.1"
 platform: ruby
 authors: 
 - RailsJedi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-04 00:00:00 -07:00
+date: 2008-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency