easyconf-rails 0.0.2 → 0.0.3

data/lib/easyconf-rails.rb

@@ -12,12 +12,48 @@ class EasyConfRails < Rails::Railtie
 		hash.is_a?(Array) ? hash : OpenStruct.new(hash)
 	end
 
-	# Load the configuration file at the root of our Rails directory.
+	# Merge two hashes recursively, with precedence going to the earliest Hash
+	# with that value defined. For example,
+	# 	merge_hashes( {a: {b: 1}, c: 2}, {a: {d: 3}, c: {e: 4}} )
+	# will return
+	# 	{a: {b: 1, d: 3}, c: 2}
+	def merge_hashes(*hashes)
+		merged = {}
+
+		hashes.each do |hash|
+			hash.each do |key, val|
+				if merged.has_key?(key) and merged[key].is_a?(Hash) and val.is_a?(Hash)
+					merged[key] = merge_hashes(merged[key], val)
+				elsif not merged.has_key?(key)
+					merged[key] = val
+				else
+					# merged[key] and val are not both Hashes, and therefore can't be
+					# merged. merged[key] takes precedence over val, and we do nothing.
+				end
+			end
+		end
+
+		merged
+	end
+
+	# Load the configuration file at Rails.root/config.yml and the defaults file
+	# at Rails.root/config/defaults.yml.
 	def load_config()
 		config_location = Rails.root + 'config.yml'
-		hash = YAML.load_file(config_location)
+		if File.exists?(config_location)
+			config_hash = YAML.load_file(config_location)
+		else
+			config_hash = {}
+		end
+
+		defaults_location = Rails.root + 'config' + 'defaults.yml'
+		if File.exists?(defaults_location)
+			defaults_hash = YAML.load_file(defaults_location)
+		else
+			defaults_hash = {}
+		end
 
-		hash_to_openstruct(hash)
+		hash_to_openstruct(merge_hashes(config_hash, defaults_hash))
 	end
 
 	config.before_initialize do

data.tar.gz.sig

@@ -1,5 +1,2 @@
-
-<��m[G=����ӯ�>���Y�%sxuv��+�"v�t��U�a�6�:Vs���pR�<T4!�q;�d5���R�-H��`��l�1
��cv����EB*r��>ۆGU�]�RL�w�R�U�9���BՓ1�	U�Kڊh��!Җ�f,b�F�J�9��:���j�^�lm5�b��]�%-��/VU�$|��
-�.��
--�`11{��{��َ��
-�S���Ϛ��;�Q!�Efq)�0�8�̖�}�
+�W}��ǝ�G��h��XS��S�:���[e��|z���
2~?�P8��x����k&s�D��˚�F����:�a
_��e�c�N�UF�B�2�㏳Ӆ��
+�!��3���}|\'Ԑ>�R�ȟ���Z��]G������>:�R�J�a	����L�6>�6Iy�Dg����Y�4��h3J0rMê�i3���̌6��·�s���;��M��gK(7+dF��#�A��~����a���g6��kd�] +��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyconf-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -50,11 +50,11 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-12-02 00:00:00.000000000 Z
+date: 2011-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72611620 !ruby/object:Gem::Requirement
+  requirement: &73151190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,7 +62,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72611620
+  version_requirements: *73151190
 description: Configure Rails apps with a simple YAML file.
 email: the.magical.kat@gmail.com
 executables: []