jeremyboles-smart-asset-helper 0.1.3 → 0.1.4

data/lib/asset_manager.rb

@@ -27,15 +27,7 @@ class AssetManager
   
   # Automaticly add assets based the controller/action params, if they exsist
   def auto_add(asset_type, request_params)
-    files, prefix = [], ''
-    (request_params[:controller] + '/' + request_params[:action]).split('/').each do |path|
-      path = prefix + path
-      asset_path = "#{path}.#{asset_type}"
-      file_path = "#{ASSET_DIR[asset_type]}/#{asset_path}"
-      
-      files << path if File.exists?(file_path)
-      prefix = path + '/'
-    end
+    files = self.auto_find(asset_type, request_params)
     self.add(asset_type, files)
   end
   
@@ -51,7 +43,7 @@ class AssetManager
     files
   end
   
-  def required_with_extra(asset_type, extra)
+  def required_with_extra(asset_type, extra, auto, request_params = nil)
     files = []
     self.required(asset_type).each do |file|
       path = "#{file}-#{extra}"
@@ -59,11 +51,26 @@ class AssetManager
       file_path = "#{ASSET_DIR[asset_type]}/#{asset_path}"
       files << path if File.exists?(file_path)
     end
+    files += self.auto_find(asset_type, request_params) if auto
     files
   end
 
 private
 
+  def auto_find(asset_type, request_params, 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 << path if File.exists?(file_path)
+      prefix = path + '/'
+    end
+    files
+  end
+  
   # Extracts the required files, unique and honoring denied assets
   def extract(asset_type)
     seen_files = @denied[asset_type].flatten

data/lib/smart_asset_helper.rb

@@ -2,6 +2,10 @@ require 'asset_manager'
 
 module SmartAssetHelper
   
+  def conditional_comment(text, version)
+    "<!--[if IE #{version}]>#{text}<![endif]-->"
+  end
+  
   # Prevent a javscript file from being required
   def deny_javascript(*javascripts)
     @_asset_manager.deny(:js, javascripts)
@@ -24,7 +28,7 @@ module SmartAssetHelper
   def include_stylesheets(*args)
     options = extract_options(args)
     stylesheets = stylesheet_link_tag(*include_assets(:css, args, options))
-    stylesheets += ie_assets(:css, args) if options[:ie]
+    stylesheets += ie_assets(:css, args, options[:auto], params) if options[:ie]
     stylesheets.gsub("\n", '')
   end
   
@@ -45,20 +49,16 @@ module SmartAssetHelper
   end
   
 private
-
-  def conditional_comment(text, version)
-    "<!--[if IE #{version}]>#{text}<![endif]-->"
-  end
   
   def extract_options(args)
     options = args.delete(args.last) if args.last.is_a?(Hash)
     options || {}
   end
   
-  def ie_assets(asset_type, args)
+  def ie_assets(asset_type, args, auto)
     ie_assets = ''
     %w{ 6 7 8 }.each do |v|
-      assets = @_asset_manager.required_with_extra(asset_type, "ie#{v}")
+      assets = @_asset_manager.required_with_extra(asset_type, "ie#{v}", auto)
       
       unless assets.blank?
         assets = case asset_type

data/rails/init.rb

@@ -1 +1,2 @@
-require 'smart_asset_helper'
+require 'smart_asset_helper'
+require 'smarter_asset_tag_helper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremyboles-smart-asset-helper
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeremy Boles