lib/sprockets/railtie.rb in sprockets-rails-2.1.3 vs lib/sprockets/railtie.rb in sprockets-rails-2.1.4

@@ -64,20 +64,20 @@
     end
 
     config.after_initialize do |app|
       config = app.config
 
-      manifest_path = config.assets.manifest || File.join(config.paths['public'].first, config.assets.prefix)
+      manifest_assets_path = File.join(config.paths['public'].first, config.assets.prefix)
 
       # Configuration options that should invalidate
       # the Sprockets cache when changed.
       app.assets.version = [
         app.assets.version,
         config.assets.version,
         config.action_controller.relative_url_root,
-        config.action_controller.asset_host,
-        Sprockets::Rails::VERSION,
+        (config.action_controller.asset_host unless config.action_controller.asset_host.respond_to?(:call)),
+        Sprockets::Rails::VERSION
       ].compact.join('-')
 
       # Copy config.assets.paths to Sprockets
       config.assets.paths.each do |path|
         app.assets.append_path path
@@ -97,12 +97,12 @@
         context.digest_assets = config.assets.digest
         context.config        = config.action_controller
 
         if config.assets.compile
           self.assets_environment = app.assets
-          self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_path)
+          self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_assets_path, config.assets.manifest)
         else
-          self.assets_manifest = Sprockets::Manifest.new(manifest_path)
+          self.assets_manifest = Sprockets::Manifest.new(manifest_assets_path, config.assets.manifest)
         end
       end
 
       app.assets.js_compressor  = config.assets.js_compressor
       app.assets.css_compressor = config.assets.css_compressor