merb_app_config 1.0.7 → 1.1

data/Rakefile

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

data/lib/application_config/config_builder.rb

@@ -21,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)
@@ -34,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)
         

data/lib/application_config/deep_merge.rb

@@ -62,17 +62,17 @@ module DeepMerge
     merge_debug = options[:merge_debug] || false
     overwrite_unmergeable = !options[:preserve_unmergeables]
     knockout_prefix = options[:knockout_prefix] || nil
-    if knockout_prefix == "" : raise InvalidParameter, "knockout_prefix cannot be an empty string in deep_merge!"; end
-    if knockout_prefix && !overwrite_unmergeable : raise InvalidParameter, "overwrite_unmergeable must be true if knockout_prefix is specified in deep_merge!"; end
+    if knockout_prefix == ""; raise InvalidParameter, "knockout_prefix cannot be an empty string in deep_merge!"; end
+    if knockout_prefix && !overwrite_unmergeable; raise InvalidParameter, "overwrite_unmergeable must be true if knockout_prefix is specified in deep_merge!"; end
     # if present: we will split and join arrays on this char before merging
     array_split_char = options[:unpack_arrays] || false
     # request that we sort together any arrays when they are merged
     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 || (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) && 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)
@@ -106,10 +106,10 @@ module DeepMerge
       if array_split_char
         puts "#{di} split/join on source: #{source.inspect}" if merge_debug
         source = source.join(array_split_char).split(array_split_char)
-        if dest.kind_of?(Array) : dest = dest.join(array_split_char).split(array_split_char); end
+        if dest.kind_of?(Array); dest = dest.join(array_split_char).split(array_split_char); end
       end
       # if there's a naked knockout_prefix in source, that means we are to truncate dest
-      if source.index(knockout_prefix) : dest = clear_or_nil(dest); source.delete(knockout_prefix); end
+      if source.index(knockout_prefix); dest = clear_or_nil(dest); source.delete(knockout_prefix); end
       if dest.kind_of?(Array)
         if knockout_prefix
           print "#{di} knocking out: " if merge_debug
@@ -129,7 +129,7 @@ module DeepMerge
         end
         puts "#{di} merging arrays: #{source.inspect} :: #{dest.inspect}" if merge_debug
         dest = dest | source
-        if sort_merged_arrays : dest.sort!; end
+        if sort_merged_arrays; dest.sort!; end
       elsif overwrite_unmergeable
         puts "#{di} overwriting dest: #{source.inspect} -over-> #{dest.inspect}" if merge_debug
         dest = overwrite_unmergeables(source, dest, options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_app_config
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: "1.1"
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 -07:00
+date: 2009-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Merb plugin that provides easy to use Application Configurations via YAML