merb_app_config 1.0.6 → 1.0.7

data/Rakefile

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

data/lib/application_config/config_builder.rb

@@ -1,7 +1,6 @@
 require 'ostruct'
 require 'yaml'
 require 'erb'
-require 'deep_merge'
 
 module ApplicationConfig
   # == Summary
@@ -129,5 +128,34 @@ module ApplicationConfig
       return new_config.uniq
     end
     
+    # Cycles through the array of single element hashes
+    # and deep merges any duplicates it finds
+    # 
+    # This is needed so you can define stylesheet keys
+    # in multiple config files
+    def self.merge_assets(list)
+      assets = Array(list).map do |i|
+        if i.is_a?(OpenStruct)
+          i.marshal_dump
+        else
+          i
+        end
+      end
+      
+      # filter out the duplicate single hash keys
+      hash_keys = assets.select{|i| i.is_a?(Hash) and i.keys.size == 1}.group_by{|i| i.keys[0]}
+      hash_keys.each do |key, value|
+        if Array(value).size > 1
+          merged = value.inject({}){|merged, v| DeepMerge.deep_merge!(v,merged)}
+          value[0].replace(merged)
+          value[1..-1].each do |v|
+            v.clear
+          end
+        end
+      end
+      
+      assets.select{|i| !i.blank? }
+    end
+    
   end
 end

data/lib/application_config/view_helpers.rb

@@ -4,11 +4,8 @@ module ApplicationConfig
       html = ""
       only = [options.delete(:only)].flatten.compact.map{|i| i.to_s}
       if defined?(AppConfig) and AppConfig.javascripts
-        AppConfig.javascripts.each do |javascript|
-          if javascript.is_a?(OpenStruct)
-            javascript = javascript.marshal_dump
-          end
-          
+        
+        ConfigBuilder.merge_assets(AppConfig.javascripts).each do |javascript|
           if javascript.is_a? Hash
             javascript.each do |key, val|
               next unless only.empty? || only.include?(key.to_s)
@@ -43,11 +40,7 @@ module ApplicationConfig
       html = ""
       only = [options.delete(:only)].flatten.compact.map{|i| i.to_s}
       if defined?(AppConfig) and AppConfig.stylesheets
-        AppConfig.stylesheets.each do |stylesheet|
-          if stylesheet.is_a?(OpenStruct)
-            stylesheet = stylesheet.marshal_dump
-          end
-          
+        ConfigBuilder.merge_assets(AppConfig.stylesheets).each do |stylesheet|
           if stylesheet.is_a? Hash
             stylesheet.each do |key, val|
               next unless only.empty? || only.include?(key.to_s)

data/lib/merb_app_config.rb

@@ -1,3 +1,4 @@
+require 'application_config/deep_merge' unless defined?(DeepMerge)
 require 'application_config/config_builder'
 require 'application_config/view_helpers'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_app_config
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-30 00:00:00 -07:00
+date: 2009-07-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency