jeremyboles-smart-asset-helper 0.1.7 → 0.2.0

data/lib/asset_manager.rb

@@ -51,7 +51,7 @@ 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) if auto
+    files += auto_find(asset_type, request_params, extra) if auto
     files
   end
 
@@ -64,8 +64,8 @@ protected
       path = prefix + path
       asset_path = "#{path}#{extra}.#{asset_type}"
       file_path = "#{ASSET_DIR[asset_type]}/#{asset_path}"
-
-      files << path if File.exists?(file_path)
+      
+      files << path + extra if File.exists?(file_path)
       prefix = path + '/'
     end
     files

data/lib/smart_asset_helper.rb

@@ -1,4 +1,5 @@
 require 'asset_manager'
+require 'smarter_asset_tag_helper'
 
 module SmartAssetHelper
   
@@ -19,7 +20,8 @@ module SmartAssetHelper
   # Print required javascript
   def include_javascript(*args)
     options = extract_options(args)
-    javascript = javascript_include_tag(*include_assets(:js, args, options))
+    assets = include_assets(:js, args, options)
+    javascript = javascript_include_tag(*assets)
     javascript += ie_assets(:js, args, options[:auto], params) if options[:ie]
     javascript.gsub("\n", '')
   end
@@ -27,7 +29,8 @@ module SmartAssetHelper
   # Print required stylesheets
   def include_stylesheets(*args)
     options = extract_options(args)
-    stylesheets = stylesheet_link_tag(*include_assets(:css, args, options))
+    assets = include_assets(:css, args, options)
+    stylesheets = stylesheet_link_tag(*assets)
     stylesheets += ie_assets(:css, args, options[:auto], params) if options[:ie]
     stylesheets.gsub("\n", '')
   end

data/lib/smarter_asset_tag_helper.rb

@@ -17,7 +17,7 @@ module SmarterAssetTagHelper
     end
     
     def script_tag(*sources)
-      sources.map do |s|
+      sources.delete_if {|s| s.blank? }.map do |s|
         content_tag(:script, '', :src => s, :type => 'text/javascript')
       end.join
     end

metadata

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