merb_app_config 1.1 → 1.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_app_config"
-GEM_VERSION = "1.1"
+GEM_VERSION = "1.2"
 AUTHOR = "Jacques Crocker"
 EMAIL = "merbjedi@gmail.com"
 HOMEPAGE = "http://www.merbjedi.com/"

data/lib/application_config/config_builder.rb

@@ -25,7 +25,13 @@ module ApplicationConfig
         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)
-          DeepMerge.deep_merge!(file_conf, conf) if file_conf
+          next unless file_conf
+
+          if conf.size > 0
+            DeepMerge.deep_merge!(file_conf, conf, :preserve_unmergeables => false)
+          else
+            conf = file_conf
+          end
         end
         
         # expand the javascripts config to handle *.* paths

data/lib/application_config/deep_merge.rb

@@ -70,9 +70,9 @@ module DeepMerge
     sort_merged_arrays = options[:sort_merged_arrays] || false
     di = options[:debug_indent] || ''
     # do nothing if source is nil
-    if !source || (source.respond_to?(:blank?) && source.blank?); return dest; end
+    if source.nil? || (!source.is_a?(FalseClass) && source.respond_to?(:blank?) && source.blank?); return dest; end
     # if dest doesn't exist, then simply copy source to it
-    if !(dest) && overwrite_unmergeable; dest = source; return dest; end
+    if dest.nil? && overwrite_unmergeable; dest = source; return dest; end
 
     puts "#{di}Source class: #{source.class.inspect} :: Dest class: #{dest.class.inspect}" if merge_debug
     if source.kind_of?(Hash)
@@ -80,7 +80,7 @@ module DeepMerge
       source.each do |src_key, src_value|
         if dest.kind_of?(Hash)
           puts "#{di} looping: #{src_key.inspect} => #{src_value.inspect} :: #{dest.inspect}" if merge_debug
-          if dest[src_key]
+          if !dest[src_key].nil?
             puts "#{di} ==>merging: #{src_key.inspect} => #{src_value.inspect} :: #{dest[src_key].inspect}" if merge_debug
             dest[src_key] = deep_merge!(src_value, dest[src_key], options.merge(:debug_indent => di + '  '))
           else # dest[src_key] doesn't exist so we want to create and overwrite it (but we do this via deep_merge!)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_app_config
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-27 00:00:00 -07:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency