lib/classy_assets.rb in classy_assets-0.4.0 vs lib/classy_assets.rb in classy_assets-0.4.1

@@ -2,33 +2,31 @@
 
 require 'compass'
 require 'sass'
 require 'coffee_script'
 require 'sprockets'
-require 'sprockets-sass'
 require 'sinatra/base'
 require 'classy_assets/configuration'
 require 'classy_assets/version'
 
 module ClassyAssets
   def self.asset_url_for(asset)
-    asset = asset.instance_of?(::Sprockets::BundledAsset) ? asset : Configuration.sprockets[asset].logical_path
-    asset = build_digest_filename(asset) if Configuration.asset_digest
+    asset = Configuration.sprockets[asset].send(determine_path_type)
     debug = (Configuration.debug_mode) ? '?body=1' : ''
     "#{Configuration.asset_host}/#{Configuration.asset_prefix}/#{asset}#{debug}"
   end
 
-  def self.build_digest_filename(asset)
-    filename = asset.split(".")
-    ext = filename.pop
-    "#{filename.join('.')}-#{Configuration.sprockets.digest}.#{ext}"
-  end
-
   def self.asset_tag_from(sources, ext)
     sources = [sources] unless sources.is_a? Array
     sources.map do |source|
       source = "#{source}.#{ext}" unless source =~ /\.#{ext}$/
       asset_url = (source =~ /\/|http/) ? source : ::ClassyAssets.asset_url_for(source)
       yield(asset_url)
     end.join('')
   end
+
+  def self.determine_path_type
+    (Configuration.asset_digest) ? :digest_path : :logical_path
+  end
 end
+
+require 'sass/script/functions'