compass 0.12.7 → 0.13.alpha.4

data/lib/compass/sass_extensions/sprites/layout_methods.rb

@@ -32,128 +32,22 @@ module Compass
         def compute_image_positions!
           case layout
           when SMART
-            calculate_smart_positions
+            require 'compass/sass_extensions/sprites/layout/smart'
+            @images, @width, @height = Layout::Smart.new(@images, @kwargs).properties
           when DIAGONAL
-            calculate_diagonal_dimensions
-            calculate_diagonal_positions
+            require 'compass/sass_extensions/sprites/layout/diagonal'
+            @images, @width, @height = Layout::Diagonal.new(@images, @kwargs).properties
           when HORIZONTAL
-            @height = height_for_horizontal_layout
-            calculate_horizontal_positions
-            @width = width_for_horizontal_layout
+            require 'compass/sass_extensions/sprites/layout/horizontal'
+            @images, @width, @height = Layout::Horizontal.new(@images, @kwargs).properties
           else
-            @images.sort! do |a,b| 
-              if (b.size <=> a.size) === 0
-                a.name <=> b.name
-              else
-                b.size <=> a.size
-              end
-            end
-
-            @width = width_for_vertical_layout
-            calulate_vertical_postions
-            @height = height_for_vertical_layout
-            if @images.any?(&:repeat_x?)
-              calculate_repeat_extra_width!
-              tile_images_that_repeat
-             end
-          end
-        end
-
-        def tile_images_that_repeat
-          @images.map {|img| img if img.repeat_x?}.compact.each do |image|
-            x = image.left - (image.left / image.width).ceil * image.width
-              while x < @width do
-                begin
-                  img = image.dup
-                  img.top = image.top
-                  img.left = x.to_i
-                  @images << img
-                  x += image.width 
-                end
-              end
-            end
-        end
-
-        def calculate_repeat_extra_width!
-          require 'rational' #for ruby 1.8.7
-          m = @images.inject(1) {|m,img| img.repeat_x? ? m.lcm(img.width) : m}
-          remainder = @width % m
-          @width += (m - remainder) unless remainder.zero?
-        end
-        
-        def calculate_smart_positions
-          fitter = ::Compass::SassExtensions::Sprites::RowFitter.new(@images)
-          current_y = 0
-          fitter.fit!.each do |row|
-            current_x = 0
-            row.images.each_with_index do |image, index|
-              image.left = current_x
-              image.top = current_y
-              current_x += image.width
-            end
-            current_y += row.height
-          end
-          @width = fitter.width
-          @height = fitter.height
-        end
-        
-        
-        def calculate_diagonal_dimensions
-          @width = @images.inject(0) {|sum, img| sum + img.width}
-          @height = @images.inject(0) {|sum, img| sum + img.height}
-        end
-        
-        def calculate_diagonal_positions
-          previous = nil
-          @images.each_with_index do |image, index|
-            if previous.nil?
-              previous = image
-              image.top = @height - image.height
-              image.left = 0
-              next
-            end
-            image.top = previous.top - image.height
-            image.left = previous.left + previous.width
-            previous = image
+            require 'compass/sass_extensions/sprites/layout/vertical'
+            @images, @width, @height = Layout::Vertical.new(@images, @kwargs).properties
           end
         end
         
-        def calculate_horizontal_positions
-          @images.each_with_index do |image, index|
-            image.top = image.position.unit_str == '%' ? (@height - image.height) * (image.position.value / 100.0) : image.position.value
-            next if index == 0
-            last_image = @images[index-1]
-            image.left = last_image.left + last_image.width + [image.spacing, last_image.spacing].max
-          end
-        end
-        
-        def calulate_vertical_postions
-          @images.each_with_index do |image, index|
-            image.left = (image.position.unit_str == "%" ? (@width - image.width) * (image.position.value / 100.0) : image.position.value).to_i
-            next if index == 0
-            last_image = @images[index-1]
-            image.top = last_image.top + last_image.height + [image.spacing,  last_image.spacing].max
-          end
-        end
-        
-        def height_for_vertical_layout
-          last = @images.last
-          last.top + last.height
-        end
-        
-        def height_for_horizontal_layout
-          @height = @images.map {|image| image.height + image.offset}.max
-        end
-        
-        def width_for_horizontal_layout
-          @images.inject(0) { |sum, image| sum += (image.width + image.spacing) }
-        end
-        
-        def width_for_vertical_layout
-          @images.map { |image| image.width + image.offset }.max
-        end
       end
     end
   end
 end
-  
+  

data/lib/compass/sass_extensions/sprites/sprite_map.rb

@@ -39,15 +39,19 @@ module Compass
           @kwargs = kwargs
           @kwargs['cleanup'] ||= Sass::Script::Bool.new(true)
           @kwargs['layout'] ||= Sass::Script::String.new('vertical')
+          @kwargs['sort_by'] ||= Sass::Script::String.new('none')
           @images = nil
           @width = nil
           @height = nil
           @engine = nil
           @evaluation_context = context
-          validate!
           compute_image_metadata!
         end
 
+        def sort_method
+          @kwargs['sort_by'].value
+        end
+
         def inspect
           puts 'images'
           @images.each do |img|

data/lib/compass/sass_extensions/sprites/sprite_methods.rb

@@ -26,20 +26,15 @@ module Compass
         
         # Creates the Sprite::Image objects for each image and calculates the width
         def init_images
-          @images = image_names.collect do |relative_file|
-            Image.new(self, relative_file, kwargs)
+          @images = Images.new
+          image_names.each do |relative_file|
+            @images << Image.new(self, relative_file, kwargs)
           end
-        end
-        
-        # Validates that the sprite_names are valid sass
-        def validate!
-          for sprite_name in sprite_names
-            unless sprite_name =~ /\A#{Sass::SCSS::RX::IDENT}\Z/
-              raise Sass::SyntaxError, "#{sprite_name} must be a legal css identifier"
-            end
+          unless sort_method == 'none'
+            @images.sort_by! sort_method
           end
         end
-        
+
         def name_and_hash
           "#{path}-s#{uniqueness_hash}.png"
         end
@@ -68,8 +63,7 @@ module Compass
         end
         
         def cleanup_old_sprites
-          Dir[File.join(Compass.configuration.generated_images_path, "#{path}-s*.png")].each do |file|
-            next if file[filename]
+          Sass::Util.glob(File.join(Compass.configuration.generated_images_path, "#{path}-s*.png")).each do |file|
             log :remove, file
             FileUtils.rm file
             Compass.configuration.run_sprite_removed(file)
@@ -78,7 +72,7 @@ module Compass
         
         # Does this sprite need to be generated
         def generation_required?
-          !File.exists?(filename) || outdated? ||  options[:force]
+          !File.exists?(filename) || outdated? || options[:force]
         end
 
         # Returns the uniqueness hash for this sprite object

data/lib/compass/sass_extensions/sprites.rb

@@ -8,6 +8,8 @@ module Compass
   end
 end
 
+require 'compass/sass_extensions/sprites/images'
+require 'compass/sass_extensions/sprites/layout'
 require 'compass/sass_extensions/sprites/image_row'
 require 'compass/sass_extensions/sprites/row_fitter'
 require 'compass/sass_extensions/sprites/image'

data/lib/compass/sprite_importer/content.erb

@@ -2,18 +2,20 @@
 
 // General Sprite Defaults
 // You can override them before you import this file.
-$<%= name %>-sprite-base-class: ".<%= name %>-sprite" !default;
-$<%= name %>-sprite-dimensions: false !default;
-$<%= name %>-position: 0% !default;
-$<%= name %>-spacing: 0 !default;
-$<%= name %>-repeat: no-repeat !default;
-$<%= name %>-prefix: '' !default;
-$<%= name %>-clean-up: true !default;
-$<%= name %>-layout:vertical !default;
-$<%= name %>-inline: false !default;
+$<%= name %>-sprite-base-class : ".<%= name %>-sprite" !default;
+$<%= name %>-sprite-dimensions : false !default;
+$<%= name %>-use-percentages   : false !default;
+$<%= name %>-position          : 0% !default;
+$<%= name %>-spacing           : 0 !default;
+$<%= name %>-repeat            : no-repeat !default;
+$<%= name %>-prefix            : '' !default;
+$<%= name %>-clean-up          : true !default;
+$<%= name %>-layout            : vertical !default;
+$<%= name %>-inline            : false !default;
+$<%= name %>-sort-by           : 'none' !default;
 
 <% if skip_overrides %> 
-  $<%= name %>-sprites: sprite-map("<%= uri %>", $layout: $<%= name %>-layout, $cleanup: $<%= name %>-clean-up);
+  $<%= name %>-sprites: sprite-map("<%= uri %>", $layout: $<%= name %>-layout, $cleanup: $<%= name %>-clean-up, $spacing: $<%= name %>-spacing, $position : $<%= name %>-position);
 <% else %>  
  // These variables control the generated sprite output
  // You can override them selectively before you import this file.
@@ -29,8 +31,11 @@ $<%= name %>-inline: false !default;
    $<%= name %>-<%= sprite_name %>-spacing:  $<%= name %>-<%= sprite_name %>-spacing, 
    $<%= name %>-<%= sprite_name %>-repeat:   $<%= name %>-<%= sprite_name %>-repeat,
  <% end %>
- $layout: $<%= name %>-layout,
- $cleanup: $<%= name %>-clean-up
+ $layout   : $<%= name %>-layout,
+ $cleanup  : $<%= name %>-clean-up,
+ $spacing  : $<%= name %>-spacing,
+ $position : $<%= name %>-position,
+ $sort-by  : $<%= name %>-sort-by
  );
 <% end %>
 
@@ -42,14 +47,14 @@ $<%= name %>-inline: false !default;
   } 
 } @else {
   #{$<%= name %>-sprite-base-class} {
-    background: $<%= name %>-sprites no-repeat;
+    background-image: $<%= name %>-sprites;
+    background-repeat: no-repeat;
   }
 }
 //sass functions to return the dimensions of a sprite image as units
 <% [:width, :height].each do |dimension| %>
   @function <%= name %>-sprite-<%= dimension %>($name) {
-    $file: sprite_file($<%= name %>-sprites, $name);
-    @return image-<%= dimension %>($file);
+    @return sprite-<%= dimension %>($<%= name %>-sprites, $name);
   }
 <% end %>
 
@@ -60,22 +65,22 @@ $<%= name %>-inline: false !default;
 }
 
 // Move the background position to display the sprite.
-@mixin <%= name %>-sprite-position($name, $offset-x: 0, $offset-y: 0) {
-  @include sprite-background-position($<%= name %>-sprites, $name, $offset-x, $offset-y)
+@mixin <%= name %>-sprite-position($name, $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
+  @include sprite-background-position($<%= name %>-sprites, $name, $offset-x, $offset-y, $use-percentages)
 }
 
 // Extends the sprite base class and set the background position for the desired sprite.
 // It will also apply the image dimensions if $dimensions is true.
-@mixin <%= name %>-sprite($name, $dimensions: $<%= name %>-sprite-dimensions, $offset-x: 0, $offset-y: 0) {
+@mixin <%= name %>-sprite($name, $dimensions: $<%= name %>-sprite-dimensions, $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
   @extend #{$<%= name %>-sprite-base-class};
-  @include sprite($<%= name %>-sprites, $name, $dimensions, $offset-x, $offset-y)
+  @include sprite($<%= name %>-sprites, $name, $dimensions, $offset-x, $offset-y, $use-percentages);
 }
 
-@mixin <%= name %>-sprites($sprite-names, $dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0) {
-  @include sprites($<%= name %>-sprites, $sprite-names, $<%= name %>-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y)
+@mixin <%= name %>-sprites($sprite-names, $dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
+  @include sprites($<%= name %>-sprites, $sprite-names, $<%= name %>-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y, $use-percentages)
 }
 
 // Generates a class for each sprited image.
-@mixin all-<%= name %>-sprites($dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0) {
-  @include <%= name %>-sprites(<%= sprite_names.join(" ") %>, $dimensions, $prefix, $offset-x, $offset-y);
-}
+@mixin all-<%= name %>-sprites($dimensions: $<%= name %>-sprite-dimensions, $prefix: sprite-map-name($<%= name %>-sprites), $offset-x: 0, $offset-y: 0, $use-percentages: $<%= name %>-use-percentages) {
+  @include <%= name %>-sprites(<%= sprite_names.join(" ") %>, $dimensions, $prefix, $offset-x, $offset-y, $use-percentages);
+}

data/lib/compass/sprite_importer.rb

@@ -2,13 +2,13 @@ require 'erb'
 require 'compass/sprite_importer/binding'
 module Compass
   class SpriteImporter < Sass::Importers::Base
-    VAILD_FILE_NAME = /\A#{Sass::SCSS::RX::IDENT}\Z/
+    VAILD_FILE_NAME       = /\A#{Sass::SCSS::RX::IDENT}\Z/
     SPRITE_IMPORTER_REGEX = %r{((.+/)?([^\*.]+))/(.+?)\.png}
-    VALID_EXTENSIONS = ['.png']
+    VALID_EXTENSIONS      = ['.png']
     
-    TEMPLATE_FOLDER = File.join(File.expand_path('../', __FILE__), 'sprite_importer')
+    TEMPLATE_FOLDER       = File.join(File.expand_path('../', __FILE__), 'sprite_importer')
     CONTENT_TEMPLATE_FILE = File.join(TEMPLATE_FOLDER, 'content.erb')
-    CONTENT_TEMPLATE = ERB.new(File.read(CONTENT_TEMPLATE_FILE))
+    CONTENT_TEMPLATE      = ERB.new(File.read(CONTENT_TEMPLATE_FILE))
 
 
 
@@ -16,7 +16,7 @@ module Compass
     def self.find_all_sprite_map_files(path)
       hex = "[0-9a-f]"
       glob = "*-s#{hex*10}{#{VALID_EXTENSIONS.join(",")}}"
-      Dir.glob(File.join(path, "**", glob))
+      Sass::Util.glob(File.join(path, "**", glob))
     end
     
     def find(uri, options)
@@ -75,7 +75,7 @@ module Compass
     # Returns the Glob of image files for the uri
     def self.files(uri)
       Compass.configuration.sprite_load_path.compact.each do |folder|
-        files = Dir[File.join(folder, uri)].sort
+        files = Sass::Util.glob(File.join(folder, uri)).sort
         next if files.empty?
         return files
       end
@@ -87,11 +87,7 @@ module Compass
     # Returns an Array of image names without the file extension
     def self.sprite_names(uri)
       files(uri).collect do |file|
-        filename = File.basename(file, '.png')
-        unless VAILD_FILE_NAME =~ filename
-          raise Compass::Error, "Sprite file names must be legal css identifiers. Please rename #{File.basename(file)}"
-        end
-        filename
+        File.basename(file, '.png')
       end
     end
     

data/lib/compass/version.rb

@@ -1,12 +1,5 @@
 module Compass
   module Version
-    VERSION_DETAILS = {
-      :major => 0,
-      :minor => 12,
-      :build => 7,
-      :name => "Alnilam"
-    }
-
     # Returns a hash representing the version.
     # The :major, :minor, and :teeny keys have their respective numbers.
     # The :string key contains a human-readable string representation of the version.
@@ -28,7 +21,8 @@ module Compass
     end
 
     def read_version
-      @version = VERSION_DETAILS.dup
+      require 'yaml'
+      @version = YAML::load(File.read(scope('VERSION.yml')))
       @version[:teeny]  = @version[:patch]
       @version[:string] = "#{@version[:major]}.#{@version[:minor]}"
       @version[:string] << ".#{@version[:patch]}" if @version[:patch]
@@ -51,13 +45,16 @@ module Compass
           `git rev-parse HEAD`
         end
       end
-    rescue
-      nil
     end
 
   end
-
   extend Compass::Version
-
-  VERSION = version[:string]
+  def self.const_missing(const)
+    # This avoid reading from disk unless the VERSION is requested.
+    if const == :VERSION
+      version[:string]
+    else
+      super
+    end
+  end
 end

data/lib/compass/watcher/compiler.rb

@@ -0,0 +1,59 @@
+module Compass
+  module Watcher
+   class Compiler
+      include Compass::Actions
+      attr_reader :working_path, :memory_store, :backing_store, :cache_store, :compiler_options, :compiler
+
+      def initialize(working_path, additional_options={})
+        @working_path       = working_path
+        @compiler_options   = create_compiler_options(additional_options)
+        @memory_store     ||= Sass::CacheStores::Memory.new
+        @backing_store    ||= compiler_options[:cache_store]
+        @backing_store    ||= Sass::CacheStores::Filesystem.new(determine_cache_location)
+        @cache_store      ||= Sass::CacheStores::Chain.new(@memory_store, @backing_store)
+        @compiler         ||= create_compiler
+      end
+
+      def compile
+        @memory_cache.reset! if @memory_cache
+        compiler.reset_staleness_checker!
+        if file = compiler.out_of_date?
+          begin
+            time = Time.now.strftime("%T")
+            log_action(:info, "Change detected at #{time} to: #{compiler.relative_stylesheet_name(file)}", compiler_options)
+            compiler.run
+            GC.start
+          rescue StandardError => e
+            ::Compass::Exec::Helpers.report_error(e, compiler_options)
+          end
+        end
+      end
+
+    private #=========================================================================================>
+
+      def create_compiler_options(additional_options)
+        compiler_opts = {:sass => Compass.sass_engine_options, :cache_store => @cache_store, :quiet => true, :loud => [:identical, :overwrite, :create]}.merge(additional_options)
+        compiler_opts[:cache_location] ||= determine_cache_location
+        if compiler_opts.include?(:debug_info)
+          compiler_opts[:sass][:debug_info] = compiler_opts.delete(:debug_info)
+        end
+        
+        compiler_opts
+      end
+
+      def create_compiler
+        @memory_store.reset!
+        Compass::Compiler.new(
+          working_path,
+          Compass.configuration.sass_path,
+          Compass.configuration.css_path,
+          compiler_options.dup
+        )
+      end
+
+      def determine_cache_location
+        Compass.configuration.cache_path || Sass::Plugin.options[:cache_location] || File.join(working_path, ".sass-cache")
+      end
+    end
+  end
+end

data/lib/compass/watcher/project_watcher.rb

@@ -0,0 +1,111 @@
+require 'listen'
+require 'forwardable'
+module Compass
+  module Watcher
+    class ProjectWatcher
+      include Compass::Actions
+      SASS_FILTER = '*.s[ac]ss'
+      ALL_CHILDREN_SASS_FILTER = File.join('**', SASS_FILTER)
+      POLLING_MESSAGE = 'Compass is polling for changes'
+
+      attr_reader :options, :project_path, :watcher_compiler, :listener, :poll, :css_dir, :sass_watchers
+
+      alias :working_path :project_path
+
+      extend Forwardable
+  
+      def_delegators :@watcher_compiler, :compiler, :compiler
+      def_delegators :@watcher_compiler, :compile, :compile
+
+      def initialize(project_path, watches=[], options={}, poll=false)
+        @poll             = poll
+        @options          = options
+        @project_path     = project_path
+        @css_dir          = Compass.configuration.css_dir
+        @sass_watchers    = create_sass_watchers + watches
+        @watcher_compiler = Compass::Watcher::Compiler.new(project_path, options)
+        setup_listener
+      end
+
+      def watch!
+        listener.start
+      rescue Interrupt
+        log_action(:info, "Good bye!", options)
+        listener.stop
+      end
+
+    private #============================================================================>
+
+      def setup_listener
+        @listener = Listen.to(@project_path, :relative_paths => true)
+        if poll
+          @listener = listener.force_polling(true)
+        end
+        @listener = listener.polling_fallback_message(POLLING_MESSAGE)
+        @listener = listener.ignore(/\.css$/)
+        @listener = listener.change(&method(:listen_callback))
+      end
+
+      def create_sass_watchers
+        watches = []
+        Compass.configuration.sass_load_paths.map do |load_path|
+          load_path = load_path.root if load_path.respond_to?(:root)
+          next unless load_path.is_a? String
+          next unless load_path.include? project_path
+          load_path = Pathname.new(load_path).relative_path_from(Pathname.new(project_path))
+          filter = File.join(load_path, SASS_FILTER)
+          children = File.join(load_path, ALL_CHILDREN_SASS_FILTER)
+          if filter.match(%r{^./})
+            watches << Watcher::Watch.new(SASS_FILTER, &method(:sass_callback))
+          end
+          watches << Watcher::Watch.new(filter, &method(:sass_callback))
+          watches << Watcher::Watch.new(children, &method(:sass_callback))
+        end
+        watches.compact
+      end
+
+      def listen_callback(modified_file, added_file, removed_file)
+        #log_action(:info, ">>> Listen Callback fired added: #{added_file}, mod: #{modified_file}, rem: #{removed_file}", {})
+        action = nil
+        action ||= :modified unless modified_file.empty?
+        action ||= :added unless added_file.empty?
+        action ||= :removed unless removed_file.empty?
+
+        files = modified_file + added_file + removed_file
+        # run watchers
+        sass_watchers.each do |watcher|
+          files.each do |file|
+            watcher.run_callback(project_path, file, action) if watcher.match?(file)
+          end
+        end
+      end
+
+      def sass_callback(base, file, action)
+        #log_action(:info, ">>> Sass Callback fired #{action}, #{file}", {})
+        sass_modified(file) if action == :modified
+        sass_added(file) if action == :added
+        sass_removed(file) if action == :removed
+      end
+
+      def sass_modified(file)
+        log_action(:info, "#{file} was modified", options)
+        compile
+      end
+
+      def sass_added(file)
+        log_action(:info, "#{file} was added", options)
+        compile
+      end
+
+      def sass_removed(file)
+        log_action(:info, "#{file} was removed", options)
+        css_file = compiler.corresponding_css_file(File.join(project_path, file))
+        compile
+        if File.exists?(css_file)
+          remove(css_file)
+        end
+      end
+
+    end
+  end
+end

data/lib/compass/watcher/watch.rb

@@ -0,0 +1,33 @@
+module Compass
+  module Watcher
+    class Watch
+      attr_reader :callback, :glob
+
+      def initialize(glob, &block)
+        @callback = block
+        @glob     = glob
+        verify!
+      end
+
+      def match?(changed_path)
+        File.fnmatch(glob, changed_path)
+      end
+
+      def run_callback(base, relative, action)
+        callback.call(base, relative, action)
+      end
+
+    private
+
+      def verify!
+        if Pathname.new(glob).absolute?
+          raise AbsolutePathError, "Only paths relative to the project can be watched"
+        end
+        if callback.nil?
+          raise NoCallbackError, "A Block must be supplied in order to be watched"
+        end
+      end
+
+    end
+  end
+end

data/lib/compass/watcher.rb

@@ -0,0 +1,11 @@
+require 'compass/watcher/watch'
+require 'compass/watcher/compiler'
+require 'compass/watcher/project_watcher'
+
+module Compass
+  module Watcher
+    class WatcherException < Compass::Error; end
+    class NoCallbackError < WatcherException; end
+    class AbsolutePathError < WatcherException; end
+  end
+end

data/lib/compass.rb

@@ -1,7 +1,7 @@
 module Compass
 end
 
-%w(dependencies util browser_support sass_extensions version errors quick_cache logger).each do |lib|
+%w(dependencies util browser_support sass_extensions version errors quick_cache logger actions).each do |lib|
   require "compass/#{lib}"
 end
 
@@ -29,7 +29,7 @@ module Compass
   extend QuickCache
 end
 
-%w(configuration frameworks app_integration actions compiler).each do |lib|
+%w(watcher configuration frameworks app_integration compiler).each do |lib|
   require "compass/#{lib}"
 end
 

data/test/fixtures/stylesheets/busted_font_urls/config.rb

@@ -0,0 +1,32 @@
+# Require any additional compass plugins here.
+project_type = :stand_alone
+css_dir = "tmp"
+sass_dir = "sass"
+fonts_dir = "fonts"
+output_style = :compact
+# To enable relative image paths using the images_url() function:
+# http_images_path = :relative
+http_fonts_path = "/fonts"
+line_comments = false
+
+asset_cache_buster do |path, file|
+  pathname = Pathname.new(path)
+  dirname = pathname.dirname
+  basename = pathname.basename(pathname.extname)
+  extname = pathname.extname
+
+  case pathname.basename(pathname.extname).to_s
+  when "grid"
+    new_path = "#{dirname}/#{basename}-BUSTED#{extname}"
+    {:path => new_path, :query => nil}
+  when "feed"
+    "query_string"
+  when "dk"
+    {:query => "query_string"}
+  end
+end
+
+
+asset_host do |path|
+  "http://assets%d.example.com" % (path.size % 4)
+end