compass-core 1.0.3 → 1.1.0.alpha.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc443885f23b14cbf53e402b2be7524191e37c5
-  data.tar.gz: 0a77182ae5551affb04aae0a73569ec2c8b10b8e
+  metadata.gz: 37fdc459e4eb96443065947423224cb16de88158
+  data.tar.gz: 09edd8d021b0ea190429518c8faf7bdfaa0f5bd7
 SHA512:
-  metadata.gz: f10425d639ac0785927fbfa9aeece35d6586a23e296404b518a31c165ba5b801b5f8987288ee39014b3e9c7b3466e6354698bc54cd62f509694311d83fb70db4
-  data.tar.gz: d0499181e5dfebcae9b9f61d2b6f25cb6b1c7bf76cdbb8bad42e732dff532b3e7f218c38109df049ada90014c7332b6ac8d8ce49ed15c2fd0a6048befc5299d5
+  metadata.gz: 80091874627dab8a8dbb53e5fdf472972c0892263d64a629a56a700dd24a3b54fc36b9355d066c3e27f0b93b20488ea57c145b8c47a2d0d70cd651709c945017
+  data.tar.gz: 2c14c31cbb5dc2da31b517347e76dfa33acfc88ed78f8f7125bd0d9eae7531cbb150cb17b6fb885a1ca358866bb2a59720d54ac7b9d814b606e6b9f2f02c0c64

data/lib/compass/configuration.rb

@@ -85,7 +85,8 @@ module Compass
       :sprite_load_path,
       :required_libraries,
       :loaded_frameworks,
-      :framework_path
+      :framework_path,
+      :asset_collections
     ]
 
     ARRAY_ATTRIBUTE_OPTIONS = {
@@ -93,6 +94,7 @@ module Compass
     }
 
     RUNTIME_READONLY_ATTRIBUTES = [
+      :additional_import_paths,
       :cache,
       attributes_for_directory(:cache, nil),
       :chunky_png_options,
@@ -170,6 +172,6 @@ module Compass
   end
 end
 
-%w(defaults inheritance paths data watch adapters).each do |lib|
+%w(defaults inheritance paths data watch adapters asset_collection).each do |lib|
   require "compass/configuration/#{lib}"
 end

data/lib/compass/configuration/adapters.rb

@@ -51,7 +51,10 @@ module Compass
           else
             path
           end
-        end
+        end +
+        (asset_collections || []).map do |asset_collection|
+          asset_collection.sass_path
+        end.compact
       end
 
       def absolute_path?(path)
@@ -79,7 +82,7 @@ module Compass
 
       def sass_load_paths
         load_paths = []
-        load_paths << sass_path if sass_path && File.directory?(sass_path)
+        load_paths << sass_path if sass_path
         Compass::Frameworks::ALL.each do |f|
           load_paths << f.stylesheets_directory if File.directory?(f.stylesheets_directory)
         end

data/lib/compass/configuration/asset_collection.rb

@@ -0,0 +1,260 @@
+class Compass::Configuration::AbstractAssetCollection
+  include Compass::Core::HTTPUtil
+
+  attr_writer :configuration
+
+  def configuration
+    @configuration || Compass.configuration
+  end
+
+  def as_filesystem_path(url_path)
+    if File::SEPARATOR == '/'
+      url_path
+    else
+      relative_path = url_path.gsub(%r{/}, File::SEPARATOR)
+    end
+  end
+
+  def includes_image?(relative_path)
+    # Treat root relative urls (without a protocol) like normal if they start with  the images path.
+    if relative_path.start_with?("#{http_images_path}/")
+      relative_path = relative_path[(http_images_path.size + 1)..-1]
+    end
+    fs_relative_path = as_filesystem_path(relative_path)
+    absolute_path = File.join(images_path, fs_relative_path)
+    if File.exists?(absolute_path)
+      [relative_path, absolute_path]
+    else
+      nil
+    end
+  end
+
+  def includes_font?(relative_path)
+    # Treat root relative urls (without a protocol) like normal if they start with  the fonts path.
+    if relative_path.start_with?("#{http_fonts_path}/")
+      relative_path = relative_path[(http_fonts_path.size + 1)..-1]
+    end
+    fs_relative_path = as_filesystem_path(relative_path)
+    absolute_path = File.join(fonts_path, fs_relative_path)
+    if File.exists?(absolute_path)
+      [relative_path, absolute_path]
+    end
+  end
+
+  def includes_generated_image?(relative_path)
+    nil
+  end
+
+  def root_path
+    Sass::Util.abstract!
+  end
+
+  def http_path
+    Sass::Util.abstract!
+  end
+
+  def sass_path
+    Sass::Util.abstract!
+  end
+
+  def images_path
+    Sass::Util.abstract!
+  end
+
+  def http_images_path
+    Sass::Util.abstract!
+  end
+
+  def fonts_path
+    Sass::Util.abstract!
+  end
+
+  def http_fonts_path
+    Sass::Util.abstract!
+  end
+
+  def asset_host
+    Sass::Util.abstract!
+  end
+
+  def asset_cache_buster
+    Sass::Util.abstract!
+  end
+end
+
+class Compass::Configuration::AssetCollection < Compass::Configuration::AbstractAssetCollection
+  include Compass::Util
+
+  attr_reader :options
+
+  # @param options The paths to the asset collection.
+  # @option :root_path The absolute path to the asset collection
+  # @option :root_dir A relative path to the asset collection from the project path.
+  # @option :http_path Web root location of assets in this collection.
+  #   Starts with '/'.
+  # @option :http_dir Web root location of assets in this collection.
+  #   Relative to the project's `http_path`.
+  # @option :sass_dir Sass directory to be added to the Sass import paths.
+  #   Relative to the :root_path or :root_dir. Defaults to `sass`.
+  # @option :fonts_dir Directory of fonts to be added to the font look up path.
+  #   Relative to the :root_path or :root_dir. Defaults to `fonts`.
+  # @option :http_fonts_dir Where to find fonts on the webserver relative to
+  #   the http_path or http_dir. Defaults to <http_path>/<fonts_dir>.
+  #   Can be overridden by setting :http_fonts_path.
+  # @option :http_fonts_path Where to find fonts on the webserver.
+  # @option :images_dir Directory of images to be added to the image look up path.
+  #   Relative to the :root_path or :root_dir. Defaults to `images`.
+  # @option :http_images_dir Where to find images on the webserver relative to
+  #   the http_path or http_dir. Defaults to <http_path>/<images_dir>.
+  #   Can be overridden by setting :http_images_path.
+  # @option :http_images_path Where to find images on the webserver.
+  # @option :asset_host A string starting with 'http://' for a single host,
+  #   or a lambda or proc that will compute the asset host for assets in this collection.
+  #   If :http_dir is set instead of http_path, this defaults to the project's asset_host.
+  # @option :asset_cache_buster A string, :none, or
+  #   or a lambda or proc that will compute the cache_buster for assets in this collection.
+  #   If :http_dir is set instead of http_path, this defaults to the project's asset_cache_buster.
+  def initialize(options, configuration = nil)
+    assert_valid_keys(options, :root_path, :root_dir, :http_path, :http_dir, :sass_dir,
+                               :fonts_dir, :http_fonts_dir, :http_fonts_path,
+                               :images_dir, :http_images_dir, :http_images_path,
+                               :asset_host, :asset_cache_buster)
+    symbolize_keys!(options)
+    unless options.has_key?(:root_path) || options.has_key?(:root_dir)
+      raise ArgumentError, "Either :root_path or :root_dir must be specified."
+    end
+    unless options.has_key?(:http_path) || options.has_key?(:http_dir)
+      raise ArgumentError, "Either :http_path or :http_dir must be specified."
+    end
+    @options = options
+    @configuration = configuration
+  end
+
+  def root_path
+    return @root_path if defined?(@root_path)
+    @root_path = @options[:root_path] || File.join(configuration.project_path, @options[:root_dir])
+  end
+
+  def http_path
+    return @http_path if defined?(@http_path)
+    @http_path = @options[:http_path] || url_join(configuration.http_path, @options[:http_dir])
+  end
+
+  def sass_path
+    return @sass_path if defined?(@sass_path)
+    @sass_path = if options[:sass_dir]
+      File.join(root_path, options[:sass_dir])
+    end
+  end
+
+  def images_path
+    return @images_path if defined?(@images_path)
+    @images_path = if options[:images_dir]
+      File.join(root_path, options[:images_dir])
+    end
+  end
+
+  def http_images_path
+    return @http_images_path if defined?(@http_images_path)
+    @http_images_path = if options[:http_images_path]
+                          options[:http_images_path]
+                        elsif options[:http_images_dir]
+                          url_join(http_path, options[:http_images_dir])
+                        elsif options[:images_dir]
+                          url_join(http_path, options[:images_dir])
+                        end
+  end
+
+
+  def fonts_path
+    return @fonts_path if defined?(@fonts_path)
+    @fonts_path = if options[:fonts_dir]
+      File.join(root_path, options[:fonts_dir])
+    end
+  end
+
+  def http_fonts_path
+    return @http_fonts_path if defined?(@http_fonts_path)
+    @http_fonts_path = if options[:http_fonts_path]
+                         options[:http_fonts_path]
+                       elsif options[:http_fonts_dir]
+                         url_join(http_path, options[:http_fonts_dir])
+                       elsif options[:fonts_dir]
+                         url_join(http_path, options[:fonts_dir])
+                       end
+  end
+
+  def asset_host
+    return options[:asset_host] if options.has_key?(:asset_host)
+    if options[:http_dir]
+      configuration.asset_host
+    end
+  end
+
+  def asset_cache_buster
+    return options[:asset_cache_buster] if options.has_key?(:asset_cache_buster)
+    if options[:http_dir]
+      configuration.asset_cache_buster
+    end
+  end
+end
+
+class Compass::Configuration::DefaultAssetCollection < Compass::Configuration::AbstractAssetCollection
+  def includes_generated_image?(relative_path)
+    # Treat root relative urls (without a protocol) like normal if they start with  the images path.
+    if relative_path.start_with?("#{http_generated_images_path}/")
+      relative_path = relative_path[(http_generated_images_path.size + 1)..-1]
+    end
+    fs_relative_path = as_filesystem_path(relative_path)
+    absolute_path = File.join(generated_images_path, fs_relative_path)
+    if File.exists?(absolute_path)
+      [relative_path, absolute_path]
+    else
+      nil
+    end
+  end
+
+  def root_path
+    configuration.project_path
+  end
+
+  def http_path
+    configuration.http_path
+  end
+
+  def sass_path
+    configuration.sass_path
+  end
+
+  def images_path
+    configuration.images_path
+  end
+
+  def http_images_path
+    configuration.http_images_path
+  end
+
+  def generated_images_path
+    configuration.generated_images_path
+  end
+
+  def http_generated_images_path
+    configuration.http_generated_images_path
+  end
+
+  def fonts_path
+    configuration.fonts_path
+  end
+
+  def http_fonts_path
+    configuration.http_fonts_path
+  end
+
+  def asset_host
+    configuration.asset_host
+  end
+
+  def asset_cache_buster
+    configuration.asset_cache_buster
+  end
+end

data/lib/compass/configuration/data.rb

@@ -81,7 +81,7 @@ module Compass
       end
 
       def initialize(name, attr_hash = nil)
-        raise "I need a name!" unless name
+        raise "I need a name!" unless name && (name.is_a?(String) || name.is_a?(Symbol))
         @name = name
         set_all(attr_hash) if attr_hash
         self.top_level = self
@@ -95,6 +95,14 @@ module Compass
         end
       end
 
+      alias http_path_without_error= http_path=
+      def http_path=(path)
+        if path == :relative
+          raise ArgumentError, ":relative is no longer a valid value for http_path. Please set relative_assets = true instead."
+        end
+        self.http_path_without_error = path
+      end
+
       def add_import_path(*paths)
         paths.map!{|p| defined?(Pathname) && Pathname === p ? p.to_s : p}
         # The @added_import_paths variable works around an issue where
@@ -106,6 +114,15 @@ module Compass
         end
       end
 
+
+      # Add a location where sass, image, and font assets can be found.
+      # @see AssetCollection#initialize for options
+      def add_asset_collection(options)
+        @url_resolver = nil
+        @asset_collections ||= []
+        @asset_collections << AssetCollection.new(options)
+      end
+
       # When called with a block, defines the asset host url to be used.
       # The block must return a string that starts with a protocol (E.g. http).
       # The block will be passed the root-relative url of the asset.
@@ -192,7 +209,15 @@ module Compass
 
       def relative_assets?
         # the http_images_path is deprecated, but here for backwards compatibility.
-        relative_assets || http_images_path == :relative
+        relative_assets
+      end
+
+      def url_resolver
+        if top_level == self
+          @url_resolver = Compass::Core::AssetUrlResolver.new(asset_collections.to_a, self)
+        else
+          top_level.url_resolver
+        end
       end
     end
   end

data/lib/compass/core.rb

@@ -65,6 +65,8 @@ require "sass/plugin"
 require 'compass/util'
 require "compass/frameworks"
 require "compass/core/caniuse"
+require "compass/core/http_util"
+require "compass/core/asset_url_resolver"
 require 'compass/core/sass_extensions'
 require 'compass/error'
 require 'compass/browser_support'

data/lib/compass/core/asset_url_resolver.rb

@@ -0,0 +1,130 @@
+class Compass::Core::AssetUrlResolver
+  include Compass::Core::HTTPUtil
+
+  class AssetNotFound < Sass::SyntaxError
+    def initialize(type, path, asset_collections)
+      asset_search_paths = asset_collections.map{|ac| ac.send(:"#{type}s_path") }
+      super("Could not find #{path} in #{ asset_search_paths.join(", ")}")
+    end
+  end
+
+  attr_accessor :asset_collections
+  attr_accessor :configuration
+
+  def initialize(asset_collections, configuration = nil)
+    @configuration = configuration || Compass.configuration
+    @asset_collections = asset_collections.dup
+    unless @asset_collections.find {|ac| Compass::Configuration::DefaultAssetCollection === ac }
+      @asset_collections.unshift(Compass::Configuration::DefaultAssetCollection.new)
+    end
+    if configuration
+      @asset_collections.each {|ac| ac.configuration = configuration }
+    end
+  end
+
+  # Compute a url for a given asset type (:image or :font)
+  def compute_url(type, relative_path, relative_to_css_url = nil, use_cache_buster = true)
+    # pass through fully specified urls
+    return relative_path if relative_path.start_with?("http://")
+
+    # If the image has an target reference, remove it (Common with SVG)
+    clean_relative_path, target = relative_path.split("#", 2)
+
+    # If the image has a query, remove it
+    clean_relative_path, query = clean_relative_path.split("?", 2)
+
+    # Get rid of silliness in the url
+    clean_relative_path = expand_url_path(clean_relative_path)
+
+    # Find the asset collection that includes this asset
+    asset_collection, clean_relative_path, real_path = find_collection(type, clean_relative_path)
+
+    # Didn't find the asset, but it's a full url so just return it.
+    return relative_path if asset_collection.nil? && relative_path.start_with?("/")
+
+    # Raise an error for relative paths if we didn't find it on the search path.
+    raise AssetNotFound.new(type, relative_path, @asset_collections) unless asset_collection
+
+    # Make a root-relative url (starting with /)
+    asset_url = url_join(asset_collection.send(:"http_#{type}s_path"), clean_relative_path)
+
+    # Compute asset cache buster
+    busted_path, busted_query = cache_buster(asset_collection, asset_url, real_path) if use_cache_buster
+    asset_url = busted_path if busted_path
+    query = [query, busted_query].compact.join("&") if busted_query
+
+    # Convert path to a relative url if a css file is specified.
+    relative_url = compute_relative_path(relative_to_css_url, asset_url) if relative_to_css_url
+
+    # Compute asset host when not relative and one is provided
+    asset_host = if asset_collection.asset_host && relative_url.nil?
+                   asset_collection.asset_host.call(asset_url) 
+                 end
+
+    # build the full url
+    url = url_join(asset_host || "", relative_url || asset_url)
+    url << "?" if query
+    url << query if query
+    url << "#" if target
+    url << target if target
+    return url
+  end
+
+  protected
+
+  def find_collection(type, relative_path)
+    asset_collection = nil
+    clean_relative_path = nil
+    absolute_path = nil
+    @asset_collections.each do |ac|
+      cp, ap = ac.send(:"includes_#{type}?", relative_path)
+      if ap 
+        asset_collection = ac
+        absolute_path = ap
+        clean_relative_path = cp
+        break
+      end
+    end
+    [asset_collection, clean_relative_path, absolute_path]
+  end
+
+  def absolute_path?(path)
+    path[0..0] == "/" || path[0..3] == "http"
+  end
+
+  def cache_buster(asset_collection, path, real_path)
+    cache_buster = compute_cache_buster(asset_collection, path, real_path)
+    return [path, nil] if cache_buster.nil?
+    cache_buster = {:query => cache_buster} if cache_buster.is_a?(String)
+    [cache_buster[:path] || path, cache_buster[:query]]
+  end
+  
+
+  def compute_cache_buster(asset_collection, path, real_path)
+    file = nil
+    if asset_collection.asset_cache_buster == :none
+      nil
+    elsif asset_collection.asset_cache_buster
+      args = [path]
+      if asset_collection.asset_cache_buster.arity > 1
+        file = File.new(real_path)
+        args << file
+      end
+      asset_collection.asset_cache_buster.call(*args)
+    else
+      default_cache_buster(path, real_path)
+    end
+  ensure
+    file.close if file
+  end
+
+  def default_cache_buster(path, real_path)
+    if File.readable?(real_path)
+      File.mtime(real_path).to_i.to_s
+    else
+      Compass::Util.compass_warn("WARNING: '#{real_path}' cannot be read.")
+      nil
+    end
+  end
+
+end

data/lib/compass/core/caniuse.rb

@@ -69,7 +69,7 @@ class Compass::Core::CanIUse
   end
 
   # returns the prefixes needed by the list of browsers given
-  def prefixes(browsers = browsers())
+  def prefixes(browsers = browsers)
     result = browsers.map{|b| all_prefixes(b) }
     result.flatten!
     result.uniq!

data/lib/compass/core/generated_version.rb

@@ -1,6 +1,5 @@
 module Compass
   module Core
-    # This file intentionally does nothing.
-    # The build process will generate a VERSION constant here.
+    VERSION = "1.1.0.alpha.0"
   end
 end

data/lib/compass/core/http_util.rb

@@ -0,0 +1,57 @@
+module Compass::Core::HTTPUtil
+  # like File#join, but always uses '/' instead of File::SEPARATOR
+  def url_join(*args)
+    args.inject("") do |m, a|
+      m << "/" unless m.end_with?('/') || a.start_with?('/') if m.length > 0
+      m.gsub!(%r{/+$}, '') if a.start_with?('/')
+      m << a
+    end
+  end
+
+  # Eliminates parent directory references (E.g. "..") and
+  # self directory references references (E.g. ".") from urls.
+  # Removes any duplicated separators (E.g. //)
+  # path should not include the protol, host, query param or target.
+  def expand_url_path(url)
+    # We remove the leading path otherwise we think there's an extra segment that can be removed
+    prefix = "/" if url.start_with?("/")
+    segments = url.gsub(%r{//+}, '/').split("/")
+    segments.shift if prefix
+    segments.push("") if url.end_with?("/")
+    segments.reverse!
+    result_segments = []
+    parent_count = 0
+    segments.each do |segment|
+      if segment == ".."
+        parent_count += 1
+      elsif segment == "."
+        # skip it
+      elsif parent_count > 0
+        parent_count -= 1
+      else
+        result_segments << segment
+      end
+    end
+    if parent_count > 0
+      raise ArgumentError, "Invalid URL: #{url} (not enough parent directories)"
+    end
+    result_segments.reverse!
+    prefix.to_s + result_segments.join("/")
+  end
+
+  # Compute a relative path from one url to another
+  # the urls should be only the path component (no host, query, or target)
+  def compute_relative_path(from_url, to_url)
+    from_components = expand_url_path(from_url).split("/")
+    from_components.pop # drop the filename from the source
+    to_components = expand_url_path(to_url).split("/")
+    to_base = to_components.pop
+    while from_components.first == to_components.first
+      break if from_components.empty?
+      from_components.shift
+      to_components.shift
+    end
+
+    ([".."] * from_components.size + to_components + [to_base]).join("/")
+  end
+end

data/lib/compass/core/sass_extensions/functions/configuration.rb

@@ -83,8 +83,7 @@ module Compass::Core::SassExtensions::Functions::Configuration
   end
   declare :add_sass_configuration, [:project_path]
 
-  OPTION_TRANSFORMER = Hash.new() {|h, k| proc {|v, ctx| v.value } }
-  OPTION_TRANSFORMER[:asset_cache_buster] = proc do |v, ctx|
+  def self.make_cache_buster_proc(v, ctx)
     proc do |url, file|
       if ctx.environment.function(v.value) || Sass::Script::Functions.callable?(v.value.tr('-', '_'))
         result = ctx.call(v, ctx.quoted_string(url),
@@ -108,7 +107,8 @@ module Compass::Core::SassExtensions::Functions::Configuration
       end
     end
   end
-  OPTION_TRANSFORMER[:asset_host] = proc do |v, ctx|
+
+  def self.make_asset_host_proc(v, ctx)
     proc do |file|
       if ctx.environment.function(v.value) || Sass::Script::Functions.callable?(v.value.tr('-', '_'))
         result = ctx.call(v, ctx.quoted_string(file))
@@ -122,6 +122,39 @@ module Compass::Core::SassExtensions::Functions::Configuration
         raise ArgumentError, "#{v.value} is not a function."
       end
     end
+
+  end
+
+  OPTION_TRANSFORMER = Hash.new() {|h, k| proc {|v, ctx| v.value } }
+  OPTION_TRANSFORMER[:asset_cache_buster] = proc {|v, ctx| make_cache_buster_proc(v, ctx) }
+  OPTION_TRANSFORMER[:asset_host] = proc {|v, ctx| make_asset_host_proc(v, ctx) }
+
+  OPTION_TRANSFORMER[:asset_collections] = proc do |v, ctx|
+    v = list([v], :comma) if v.is_a?(Sass::Script::Value::Map)
+    ctx.assert_type(v, :List)
+
+    asset_collections = []
+
+    v.value.each do |map|
+      ctx.assert_type(map, :Map)
+      asset_collection = {}
+      map.value.keys.each do |key|
+        ctx.assert_type key, :String
+        ctx.assert_type map.value[key], :String unless map.value[key].value.nil?
+        underscored = key.value.tr("-", "_")
+        case underscored
+        when "asset_host"
+          asset_collection[underscored] = make_asset_host_proc(map.value[key], ctx)
+        when "asset_cache_buster"
+          asset_collection[underscored] = make_cache_buster_proc(map.value[key], ctx)
+        else
+          asset_collection[underscored] = map.value[key].value
+        end
+      end
+      asset_collections << Compass::Configuration::AssetCollection.new(asset_collection)
+    end
+
+    asset_collections
   end
 
   def add_configuration(options)
@@ -144,7 +177,8 @@ module Compass::Core::SassExtensions::Functions::Configuration
   private
 
   def runtime_writable_attributes
-    Compass::Configuration::ATTRIBUTES - Compass::Configuration::RUNTIME_READONLY_ATTRIBUTES
+    (Compass::Configuration::ATTRIBUTES + Compass::Configuration::ARRAY_ATTRIBUTES) -
+      Compass::Configuration::RUNTIME_READONLY_ATTRIBUTES
   end
 
   def common_parent_directory(directory1, directory2)

data/lib/compass/core/sass_extensions/functions/urls.rb

@@ -20,21 +20,15 @@ module Compass::Core::SassExtensions::Functions::Urls
       end
     end
     def stylesheet_url(path, only_path = bool(false))
-      # Compute the path to the stylesheet, either root relative or stylesheet relative
-      # or nil if the http_images_path is not set in the configuration.
-      http_stylesheets_path = if relative?
-        compute_relative_path(Compass.configuration.css_path)
-      elsif Compass.configuration.http_stylesheets_path
-        Compass.configuration.http_stylesheets_path
-      else
-        Compass.configuration.http_root_relative(Compass.configuration.css_dir)
+      url = url_join(Compass.configuration.http_stylesheets_path, path.value)
+      if Compass.configuration.relative_assets?
+        url = compute_relative_path(current_css_url_path, url)
       end
 
-      path = "#{http_stylesheets_path}/#{path.value}"
       if only_path.to_bool
-        unquoted_string(clean_path(path))
+        unquoted_string(expand_url_path(url))
       else
-        clean_url(path)
+        unquoted_string("url('#{expand_url_path(url)}')")
       end
     end
   end
@@ -48,60 +42,12 @@ module Compass::Core::SassExtensions::Functions::Urls
       end
     end
     def font_url(path, only_path = bool(false), cache_buster = bool(true))
-      path = path.value # get to the string value of the literal.
-
-      # Short curcuit if they have provided an absolute url.
-      if absolute_path?(path)
-        return unquoted_string("url(#{path})")
-      end
-
-      # Compute the path to the font file, either root relative or stylesheet relative
-      # or nil if the http_fonts_path cannot be determined from the configuration.
-      http_fonts_path = if relative?
-                          compute_relative_path(Compass.configuration.fonts_path)
-                        else
-                          Compass.configuration.http_fonts_path
-                        end
-
-      # Compute the real path to the font on the file system if the fonts_dir is set.
-      real_path = if Compass.configuration.fonts_dir
-        File.join(Compass.configuration.fonts_path, path.gsub(/[?#].*$/,""))
-      end
-
-      # prepend the path to the font if there's one
-      if http_fonts_path
-        http_fonts_path = "#{http_fonts_path}/" unless http_fonts_path[-1..-1] == "/"
-        path = "#{http_fonts_path}#{path}"
-      end
-
-      # Compute the asset host unless in relative mode.
-      asset_host = if !relative? && Compass.configuration.asset_host
-        Compass.configuration.asset_host.call(path)
-      end
-
-      # Compute and append the cache buster if there is one.
-      if cache_buster.to_bool
-        path, anchor = path.split("#", 2)
-        if cache_buster.is_a?(Sass::Script::Value::String)
-          path += "#{path["?"] ? "&" : "?"}#{cache_buster.value}"
-        else
-          path = cache_busted_path(path, real_path)
-        end
-        path = "#{path}#{"#" if anchor}#{anchor}"
-      end
-
-      # prepend the asset host if there is one.
-      path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
-
-      if only_path.to_bool
-        unquoted_string(clean_path(path))
-      else
-        clean_url(path)
-      end
+      resolve_asset_url(:font, path, only_path, cache_buster)
     end
   end
 
   module ImageUrl
+    include Compass::Core::HTTPUtil
     def self.included(base)
       if base.respond_to?(:declare)
         base.declare :image_url,      [:path]
@@ -110,64 +56,7 @@ module Compass::Core::SassExtensions::Functions::Urls
       end
     end
     def image_url(path, only_path = bool(false), cache_buster = bool(true))
-      path = path.value # get to the string value of the literal.
-
-      if path =~ %r{^#{Regexp.escape(Compass.configuration.http_images_path)}/(.*)}
-        # Treat root relative urls (without a protocol) like normal if they start with
-        # the images path.
-        path = $1
-      elsif absolute_path?(path)
-        # Short curcuit if they have provided an absolute url.
-        return unquoted_string("url(#{path})")
-      end
-
-      # Compute the path to the image, either root relative or stylesheet relative
-      # or nil if the http_images_path is not set in the configuration.
-      http_images_path = if relative?
-        compute_relative_path(Compass.configuration.images_path)
-      elsif Compass.configuration.http_images_path
-        Compass.configuration.http_images_path
-      else
-        Compass.configuration.http_root_relative(Compass.configuration.images_dir)
-      end
-
-      # Compute the real path to the image on the file stystem if the images_dir is set.
-      real_path = if Compass.configuration.images_path
-        File.join(Compass.configuration.images_path, path.gsub(/#.*$/,""))
-      else
-        File.join(Compass.configuration.project_path, path.gsub(/#.*$/,""))
-      end
-
-      # prepend the path to the image if there's one
-      if http_images_path
-        http_images_path = "#{http_images_path}/" unless http_images_path[-1..-1] == "/"
-        path = "#{http_images_path}#{path}"
-      end
-
-      # Compute the asset host unless in relative mode.
-      asset_host = if !relative? && Compass.configuration.asset_host
-        Compass.configuration.asset_host.call(path)
-      end
-
-      # Compute and append the cache buster if there is one.
-      if cache_buster.to_bool
-        path, anchor = path.split("#", 2)
-        if cache_buster.is_a?(Sass::Script::Value::String)
-          path += "#{path["?"] ? "&" : "?"}#{cache_buster.value}"
-        else
-          path = cache_busted_path(path, real_path)
-        end
-        path = "#{path}#{"#" if anchor}#{anchor}"
-      end
-
-      # prepend the asset host if there is one.
-      path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
-
-      if only_path.to_bool
-        unquoted_string(clean_path(path))
-      else
-        clean_url(path)
-      end
+      resolve_asset_url(:image, path, only_path, cache_buster)
     end
   end
 
@@ -179,135 +68,26 @@ module Compass::Core::SassExtensions::Functions::Urls
       end
     end
     def generated_image_url(path, cache_buster = bool(false))
-      path = path.value # get to the string value of the literal.
-
-      if path =~ %r{^#{Regexp.escape(Compass.configuration.http_generated_images_path)}/(.*)}
-        # Treat root relative urls (without a protocol) like normal if they start with
-        # the generated_images path.
-        path = $1
-      elsif absolute_path?(path)
-        # Short curcuit if they have provided an absolute url.
-        return unquoted_string("url(#{path})")
-      end
-
-      # Compute the path to the image, either root relative or stylesheet relative
-      # or nil if the http_generated_images_path is not set in the configuration.
-      http_generated_images_path = if relative?
-        compute_relative_path(Compass.configuration.generated_images_path)
-      elsif Compass.configuration.http_generated_images_path
-        Compass.configuration.http_generated_images_path
-      else
-        Compass.configuration.http_root_relative(Compass.configuration.generated_images_dir)
-      end
-
-      # Compute the real path to the image on the file stystem if the generated_images_dir is set.
-      real_path = if Compass.configuration.generated_images_path
-        File.join(Compass.configuration.generated_images_path, path.gsub(/#.*$/,""))
-      else
-        File.join(Compass.configuration.project_path, path.gsub(/#.*$/,""))
-      end
-
-      # prepend the path to the image if there's one
-      if http_generated_images_path
-        http_generated_images_path = "#{http_generated_images_path}/" unless http_generated_images_path[-1..-1] == "/"
-        path = "#{http_generated_images_path}#{path}"
-      end
-
-      # Compute the asset host unless in relative mode.
-      asset_host = if !relative? && Compass.configuration.asset_host
-        Compass.configuration.asset_host.call(path)
-      end
-
-      # Compute and append the cache buster if there is one.
-      if cache_buster.to_bool
-        path, anchor = path.split("#", 2)
-        if cache_buster.is_a?(Sass::Script::Value::String)
-          path += "#{path["?"] ? "&" : "?"}#{cache_buster.value}"
-        else
-          path = cache_busted_path(path, real_path)
-        end
-        path = "#{path}#{"#" if anchor}#{anchor}"
-      end
-
-      # prepend the asset host if there is one.
-      path = "#{asset_host}#{'/' unless path[0..0] == "/"}#{path}" if asset_host
-
-      clean_url(path)
+      resolve_asset_url(:generated_image, path, bool(false), cache_buster)
     end
   end
 
   private
 
-  # Emits a path, taking off any leading "./"
-  def clean_path(url)
-    url = url.to_s
-    url = url[0..1] == "./" ? url[2..-1] : url
-  end
-
-  # Emits a url, taking off any leading "./"
-  def clean_url(url)
-    unquoted_string("url('#{clean_path(url)}')")
-  end
-
-  def relative?
-    Compass.configuration.relative_assets?
-  end
-
-  def absolute_path?(path)
-    path[0..0] == "/" || path[0..3] == "http"
-  end
-
-  def compute_relative_path(path)
-    if (target_css_file = options[:css_filename])
-      target_path = Pathname.new(File.expand_path(path))
-      source_path = Pathname.new(File.dirname(File.expand_path(target_css_file)))
-      target_path.relative_path_from(source_path).to_s
+  def current_css_url_path
+    if options[:css_filename] && options[:css_filename].start_with?("#{Compass.configuration.css_path}/")
+      url_join(Compass.configuration.http_stylesheets_path, options[:css_filename][(Compass.configuration.css_path.size + 1)..-1])
     end
   end
 
-  def cache_busted_path(path, real_path)
-    cache_buster = compute_cache_buster(path, real_path)
-    if cache_buster.nil?
-      return path
-    elsif cache_buster.is_a?(String)
-      cache_buster = {:query => cache_buster}
-    else
-      path = cache_buster[:path] if cache_buster[:path]
-    end
-    
-    if cache_buster[:query]
-      "#{path}#{path["?"] ? "&" : "?"}#{cache_buster[:query]}"
+  def resolve_asset_url(type, path, only_path, cache_buster)
+    path = path.value # get to the string value of the literal.
+    css_file = current_css_url_path if Compass.configuration.relative_assets?
+    url = Compass.configuration.url_resolver.compute_url(type, path, css_file, cache_buster.to_bool)
+    if only_path.to_bool
+      unquoted_string(url)
     else
-      path
+      unquoted_string("url('#{url}')")
     end
   end
-
-  def compute_cache_buster(path, real_path)
-    file = nil
-    if Compass.configuration.asset_cache_buster
-      args = [path]
-      if Compass.configuration.asset_cache_buster.arity > 1
-        begin
-          file = File.new(real_path) if real_path
-        rescue Errno::ENOENT
-          # pass
-        end
-        args << file
-      end
-      Compass.configuration.asset_cache_buster.call(*args)
-    elsif real_path
-      default_cache_buster(path, real_path)
-    end
-  ensure
-    file.close if file
-  end
-
-  def default_cache_buster(path, real_path)
-    if File.readable?(real_path)
-      File.mtime(real_path).to_i.to_s
-    else
-      $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
-    end
-  end
-
 end

data/lib/compass/util.rb

@@ -16,4 +16,19 @@ module Compass::Util
     end
   end
 
+  def assert_valid_keys(hash, *keys)
+    keys = keys.inject([]) {|m, k| m << k; m << k.to_s if k.is_a?(Symbol); m}
+    invalid_keys = hash.keys - keys
+    if invalid_keys.any?
+      raise ArgumentError, "Invalid key#{'s' if invalid_keys.size > 1} found: #{invalid_keys.map{|k| k.inspect}.join(", ")}"
+    end
+  end
+
+  def symbolize_keys!(hash)
+    hash.keys.select {|k| k.is_a?(String)}.each do |k|
+      hash[k.to_sym] = hash.delete(k)
+    end
+    nil
+  end
+
 end

data/stylesheets/compass/_support.scss

@@ -275,9 +275,9 @@ $css-sel2-support-threshold: $critical-usage-threshold !default;
     $old-range: map-get($ranges, $browser);
     @if $old-range {
       $old-min: nth($old-range, 1);
-      $old-max: if(length($old-range) == 1, $old-min, nth($old-range, 2));
+      $old-max: nth($old-range, 2);
       $new-min: nth($new-range, 1);
-      $new-max: if(length($new-range) == 1, $new-min, nth($new-range, 2));
+      $new-max: nth($new-range, 2);
       $maximin: if(compare-browser-versions($browser, $old-min, $new-min) > 0,
                    $old-min, $new-min);
       $minimax: if(compare-browser-versions($browser, $old-max, $new-max) < 0,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-core
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0.alpha.0
 platform: ruby
 authors:
 - Chris Eppstein
@@ -11,68 +11,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.3.0
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The Compass core stylesheet library and minimum required ruby extensions.
@@ -84,22 +84,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
-- VERSION
 - data/caniuse.json
 - data/caniuse_extras/css-placeholder.json
 - lib/compass-core.rb
 - lib/compass/browser_support.rb
 - lib/compass/configuration.rb
 - lib/compass/configuration/adapters.rb
+- lib/compass/configuration/asset_collection.rb
 - lib/compass/configuration/data.rb
 - lib/compass/configuration/defaults.rb
 - lib/compass/configuration/inheritance.rb
 - lib/compass/configuration/paths.rb
 - lib/compass/configuration/watch.rb
 - lib/compass/core.rb
+- lib/compass/core/asset_url_resolver.rb
 - lib/compass/core/caniuse.rb
 - lib/compass/core/generated_version.rb
+- lib/compass/core/http_util.rb
 - lib/compass/core/sass_extensions.rb
 - lib/compass/core/sass_extensions/functions.rb
 - lib/compass/core/sass_extensions/functions/colors.rb
@@ -229,6 +230,7 @@ files:
 - templates/project/manifest.rb
 - templates/project/print.sass
 - templates/project/screen.sass
+- LICENSE.txt
 homepage: http://compass-style.org/reference/compass/
 licenses:
 - MIT
@@ -239,17 +241,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: The Compass core stylesheet library

data/VERSION

@@ -1 +0,0 @@
-1.0.3