merb-plugins-app-config 0.4 → 0.5

data/README

@@ -36,20 +36,29 @@ You can also define your javascripts and stylesheets using AppConfig
 Merb.root/config/javascripts.yml
 Merb.root/config/stylesheets.yml
 
-prototype:
+- prototype-bundle:
   - prototype
   - scriptaculous
   
-jquery:
+- jquery-bundle:
   - jquery
   - jquery.ui/tabs
   
-components:
+- components-bundle:
   - components/blah
   - components/blah2
 
 This will include all the javasciprt files listed when running the helper "javascripts", and on prod, it will bundle them up by key (prototype-bundle.js, jquery-bundle.js, components-bundle.js)
 
+If you want to see something really awesome, try this:
+- jquery-bundle:
+  - jquery
+  - jquery.ui/*
+  - jquery.plugins/*
+
+On the first request this will grab *ALL* the files from these folders (using Dir[path]), 
+and bundle them on. On subsequent requests, it will use the bundle directly
+
 In your application layout, just include the calls to
 <%= stylesheets %>
 <%= javascripts %>

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb-plugins-app-config"
-GEM_VERSION = "0.4"
+GEM_VERSION = "0.5"
 AUTHOR = "Jacques Crocker"
 EMAIL = "merbjedi@gmail.com"
 HOMEPAGE = "http://www.merbjedi.com/"

data/lib/application_config/view_helpers.rb

@@ -1,27 +1,87 @@
 module ApplicationConfig
   module ViewHelpers
+    
+    # Collects all javascripts found in the app_configs and outputs them as script tags
     def javascripts
-      js_hash = AppConfigJavascripts.marshal_dump
+      asset_list = []
       if AppConfig.javascripts
-        js_hash.merge!(AppConfig.javascripts.marshal_dump)
+        asset_list << AppConfig.javascripts.to_a
       end
-      js_hash.reject{|key, val| key.to_s == "load_paths"}.each do |key, val|
-        require_js val, :bundle => key.to_sym
+      asset_list << AppConfigJavascripts.javascripts.to_a
+      
+      html = []
+      asset_list.flatten.compact.each do |bundle_list|
+        if bundle_list.is_a? String
+          html << js_include_tag(bundle_list)
+        else
+          bundle_list = bundle_list.marshal_dump if bundle_list.is_a? OpenStruct
+          bundle_list.each do |key, path_list|
+            path_list = [path_list].flatten
+          
+            scripts = []
+            path_list.each do |path|
+              if path.to_s.include?("*")
+                if Merb::Assets::JavascriptAssetBundler.cached_bundle?(key.to_sym)
+                  scripts << key.to_s
+                else
+                  Dir["#{Merb.root}/public/javascripts/#{path}"].each do |item|
+                    scripts << item.gsub("#{Merb.root}/public/javascripts/", "")
+                  end
+                end
+              else
+                scripts << path
+              end
+            end
+            scripts << {:bundle => key.to_sym}
+            html << js_include_tag(*scripts)
+          end
+        end
       end
-      include_required_js
+      
+      html << include_required_js
+      html.join("\n")
     end
-  
+    
+    # Collects all stylesheets found in the app_configs and outputs them as link tags
     def stylesheets
-      css_hash = AppConfigStylesheets.marshal_dump
+      asset_list = []
       if AppConfig.stylesheets
-        css_hash.merge!(AppConfig.stylesheets.marshal_dump)
+        asset_list << AppConfig.stylesheets.to_a
       end
-
-      css_hash.reject{|key, val| key.to_s == "load_paths"}.each do |key, val|
-        require_css val, :bundle => key.to_sym
+      asset_list << AppConfigStylesheets.stylesheets.to_a
+      
+      html = []
+      asset_list.flatten.compact.each do |bundle_list|
+        if bundle_list.is_a? String
+          html << css_include_tag(bundle_list)
+        else
+          bundle_list = bundle_list.marshal_dump if bundle_list.is_a? OpenStruct
+          bundle_list.each do |key, path_list|
+            path_list = [path_list].flatten
+          
+            scripts = []
+            path_list.each do |path|
+              if path.to_s.include?("*")
+                if Merb::Assets::StylesheetAssetBundler.cached_bundle?(key.to_sym)
+                  scripts << key.to_s
+                else
+                  Dir["#{Merb.root}/public/stylesheets/#{path}"].each do |item|
+                    scripts << item.gsub("#{Merb.root}/public/stylesheets/", "")
+                  end
+                end
+              else
+                scripts << path
+              end
+            end
+            scripts << {:bundle => key.to_sym}
+            html << css_include_tag(*scripts)
+          end
+        end
       end
       
-      include_required_css
+      html << include_required_css
+      html.join("\n")
     end
+  
   end
 end

data/lib/merb-plugins-app-config.rb

@@ -22,14 +22,18 @@ if defined?(Merb::Plugins)
         AppConfigStylesheets.reload!
       else
         ::AppConfigStylesheets = ApplicationConfig::ConfigBuilder.load_files("#{Merb.root}/config/stylesheets.yml",
-                                                                             "#{Merb.root}/config/app_config/stylesheets.yml")
+                                                                             "#{Merb.root}/config/app_config/stylesheets.yml",
+                                                                             "#{Merb.root}/config/assets.yml",
+                                                                             "#{Merb.root}/config/app_config/assets.yml")
       end
 
       if defined?(::AppConfigJavascripts)
         AppConfigJavascripts.reload!
       else
         ::AppConfigJavascripts = ApplicationConfig::ConfigBuilder.load_files("#{Merb.root}/config/javascripts.yml",
-                                                                             "#{Merb.root}/config/app_config/javascripts.yml")
+                                                                             "#{Merb.root}/config/app_config/javascripts.yml",
+                                                                             "#{Merb.root}/config/assets.yml",
+                                                                             "#{Merb.root}/config/app_config/assets.yml")
       end
       
       Merb::Controller.send(:include, ApplicationConfig::ViewHelpers)
@@ -38,7 +42,8 @@ if defined?(Merb::Plugins)
   
   Merb::BootLoader.after_app_loads do
     if Merb::Plugins.config[:app_config][:auto_reload]
-      Merb.logger.info "Auto reloading AppConfig on *every request*. Set via Merb::Plugins.config[:app_config][:auto_reload]"
+      Merb.logger.info "[AppConfig] Auto reloading AppConfig on *every request*."
+      Merb.logger.info "[AppConfig] Set via Merb::Plugins.config[:app_config][:auto_reload]"
       Merb::Controller.before do 
         AppConfig.reload!
         if Merb::Plugins.config[:app_config][:include_viewhelpers]

data/spec/test_configs/ordered_hash_array.yml

@@ -0,0 +1,18 @@
+javascripts:
+  - prototype: 
+    - prototype
+    - scriptaculous/scriptaculous
+
+  - jquery:
+    - jquery
+    - jquery.ext/*
+
+  - libraries:
+    - libraries/*
+  
+  - components:
+    - components/*
+
+  - application:
+    - application
+    - behaviors

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-plugins-app-config
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -57,6 +57,7 @@ files:
 - spec/test_configs/development.yml
 - spec/test_configs/empty1.yml
 - spec/test_configs/empty2.yml
+- spec/test_configs/ordered_hash_array.yml
 has_rdoc: true
 homepage: http://www.merbjedi.com/
 post_install_message: