jeremyboles-smart-asset-helper 0.2.0 → 0.3.0

data/lib/asset_manager.rb

@@ -26,8 +26,8 @@ class AssetManager
   end
   
   # Automaticly add assets based the controller/action params, if they exsist
-  def auto_add(asset_type, request_params)
-    files = self.auto_find(asset_type, request_params)
+  def auto_add(asset_type, response)
+    files = self.auto_find(asset_type, response)
     self.add(asset_type, files)
   end
   
@@ -43,7 +43,7 @@ class AssetManager
     files
   end
   
-  def required_with_extra(asset_type, extra, auto, request_params = nil)
+  def required_with_extra(asset_type, extra, auto, response = nil)
     files = []
     self.required(asset_type).each do |file|
       path = "#{file}-#{extra}"
@@ -51,22 +51,26 @@ class AssetManager
       file_path = "#{ASSET_DIR[asset_type]}/#{asset_path}"
       files << path if File.exists?(file_path)
     end
-    files += auto_find(asset_type, request_params, extra) if auto
+    files += auto_find(asset_type, response, extra) if auto
     files
   end
 
 protected
 
-  def auto_find(asset_type, request_params, extra = '')
+  def auto_find(asset_type, response, extra = '')
     extra = '-' + extra unless extra.blank?
-    files, prefix = [], ''
-    (request_params[:controller] + '/' + request_params[:action]).split('/').each do |path|
-      path = prefix + path
-      asset_path = "#{path}#{extra}.#{asset_type}"
-      file_path = "#{ASSET_DIR[asset_type]}/#{asset_path}"
+    files = []
+    possible_assets_for_response(response).each do |asset|
+      prefix = ''
+      (asset).split('/').each do |path|
+        path = prefix + path.gsub(/^_/, '').dasherize
+        RAILS_DEFAULT_LOGGER.debug(path)
+        asset_path = "#{path}#{extra}.#{asset_type}"
+        file_path = "#{ASSET_DIR[asset_type]}/#{asset_path}"
       
-      files << path + extra if File.exists?(file_path)
-      prefix = path + '/'
+        files << path + extra if File.exists?(file_path)
+        prefix = path + '/'
+      end
     end
     files
   end
@@ -83,6 +87,19 @@ protected
     end.flatten
   end
   
+  def possible_assets_for_response(response)
+    assets = [
+      response.template.template, 
+      response.template.instance_variable_get(:@_first_render),
+      response.template.instance_variable_get(:@_memoized__pick_partial_template).try(:map, &:second)
+    ].flatten.compact
+    
+    assets.map do |t|
+      RAILS_DEFAULT_LOGGER.debug(t)
+      t.relative_path.gsub('.' + t.format.to_s, '').gsub('.' + t.extension.to_s, '').gsub('app/', '').gsub('views/', '')
+    end
+  end
+  
   # Processes the shortcuts
   def process_shortcuts(asset_type, files)
     files.flatten.map do |file|

data/lib/smart_asset_helper.rb

@@ -22,7 +22,7 @@ module SmartAssetHelper
     options = extract_options(args)
     assets = include_assets(:js, args, options)
     javascript = javascript_include_tag(*assets)
-    javascript += ie_assets(:js, args, options[:auto], params) if options[:ie]
+    javascript += ie_assets(:js, args, options[:auto], response) if options[:ie]
     javascript.gsub("\n", '')
   end
   
@@ -31,7 +31,7 @@ module SmartAssetHelper
     options = extract_options(args)
     assets = include_assets(:css, args, options)
     stylesheets = stylesheet_link_tag(*assets)
-    stylesheets += ie_assets(:css, args, options[:auto], params) if options[:ie]
+    stylesheets += ie_assets(:css, args, options[:auto], response) if options[:ie]
     stylesheets.gsub("\n", '')
   end
   
@@ -58,10 +58,10 @@ private
     options || {}
   end
   
-  def ie_assets(asset_type, args, auto, request_params)
+  def ie_assets(asset_type, args, auto, request_response)
     ie_assets = ''
     %w{ 6 7 8 }.each do |v|
-      assets = @_asset_manager.required_with_extra(asset_type, "ie#{v}", auto, request_params)
+      assets = @_asset_manager.required_with_extra(asset_type, "ie#{v}", auto, request_response)
       
       unless assets.blank?
         assets = case asset_type
@@ -77,7 +77,7 @@ private
   
   def include_assets(asset_type, args, options)
     @_asset_manager.append(asset_type, args) unless args.empty?
-    @_asset_manager.auto_add(asset_type, params) if options[:auto]
+    @_asset_manager.auto_add(asset_type, response) if options[:auto]
     @_asset_manager.required(asset_type)
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremyboles-smart-asset-helper
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeremy Boles
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -07:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency