compass-core 1.1.0.alpha.0 → 1.1.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37fdc459e4eb96443065947423224cb16de88158
-  data.tar.gz: 09edd8d021b0ea190429518c8faf7bdfaa0f5bd7
+  metadata.gz: 39fe1bff283296d62d1ca7a575267824e215d55d
+  data.tar.gz: 481f3e327a3cb8c9546af10492e4df3b462246ba
 SHA512:
-  metadata.gz: 80091874627dab8a8dbb53e5fdf472972c0892263d64a629a56a700dd24a3b54fc36b9355d066c3e27f0b93b20488ea57c145b8c47a2d0d70cd651709c945017
-  data.tar.gz: 2c14c31cbb5dc2da31b517347e76dfa33acfc88ed78f8f7125bd0d9eae7531cbb150cb17b6fb885a1ca358866bb2a59720d54ac7b9d814b606e6b9f2f02c0c64
+  metadata.gz: 67949447377bda52e913fd3767bbed88ca4e2ca551fd85324f0e9d4dd565b69a7e6fcbec82f071772d44d32f661740b1ed4d4af1a24f778b84e2ca0e745549b3
+  data.tar.gz: d52eacba7f2beaa525c26ae4a569ab8c1836a0254421bb54ea8727b703bb3b34cfbfdc4250068a061cc2c03fa3263773517d81f44199c98def55aa638aa07032

data/lib/compass/configuration/asset_collection.rb

@@ -15,6 +15,23 @@ class Compass::Configuration::AbstractAssetCollection
     end
   end
 
+  def globs?(type, glob)
+    # Treat root relative urls (without a protocol) like normal if they start with  the images path.
+    asset_http_path = send(:"http_#{type}s_path")
+    if glob.start_with?("#{asset_http_path}/")
+      glob = glob[(asset_http_path.size + 1)..-1]
+    end
+    fs_glob = as_filesystem_path(glob)
+    absolute_glob = File.join(send(:"#{type}s_path"), fs_glob)
+    resolved_files = Dir.glob(absolute_glob)
+    if resolved_files.any?
+      [glob, resolved_files]
+    else
+      nil
+    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}/")
@@ -133,6 +150,7 @@ class Compass::Configuration::AssetCollection < Compass::Configuration::Abstract
   def root_path
     return @root_path if defined?(@root_path)
     @root_path = @options[:root_path] || File.join(configuration.project_path, @options[:root_dir])
+    @root_path = File.expand_path(@root_path)
   end
 
   def http_path
@@ -143,14 +161,14 @@ class Compass::Configuration::AssetCollection < Compass::Configuration::Abstract
   def sass_path
     return @sass_path if defined?(@sass_path)
     @sass_path = if options[:sass_dir]
-      File.join(root_path, options[:sass_dir])
+      File.expand_path 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])
+      File.expand_path File.join(root_path, options[:images_dir])
     end
   end
 
@@ -169,7 +187,7 @@ class Compass::Configuration::AssetCollection < Compass::Configuration::Abstract
   def fonts_path
     return @fonts_path if defined?(@fonts_path)
     @fonts_path = if options[:fonts_dir]
-      File.join(root_path, options[:fonts_dir])
+      File.expand_path File.join(root_path, options[:fonts_dir])
     end
   end
 

data/lib/compass/configuration/data.rb

@@ -213,12 +213,30 @@ module Compass
       end
 
       def url_resolver
+        return @url_resolver if @url_resolver
         if top_level == self
           @url_resolver = Compass::Core::AssetUrlResolver.new(asset_collections.to_a, self)
         else
           top_level.url_resolver
         end
       end
+
+      def sprite_resolver
+        return @sprite_resolver if @sprite_resolver
+        if top_level == self
+          sprite_collections = asset_collections.to_a
+          sprite_collections += sprite_load_path.to_a.map do |slp|
+            AssetCollection.new(
+              :root_path => slp,
+              :http_path => http_images_path,
+              :images_dir => "."
+            )
+          end
+          @sprite_resolver = Compass::Core::AssetUrlResolver.new(sprite_collections, self)
+        else
+          top_level.url_resolver
+        end
+      end
     end
   end
 end

data/lib/compass/core/asset_url_resolver.rb

@@ -27,14 +27,7 @@ class Compass::Core::AssetUrlResolver
     # 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)
+    clean_relative_path, query, target = clean_path(relative_path)
 
     # Find the asset collection that includes this asset
     asset_collection, clean_relative_path, real_path = find_collection(type, clean_relative_path)
@@ -70,8 +63,50 @@ class Compass::Core::AssetUrlResolver
     return url
   end
 
+  # Find the real path to a relative asset path
+  def find_asset(type, relative_path)
+    clean_relative_path, _, _ = clean_path(relative_path)
+    _, _, real_path = find_collection(type, clean_relative_path)
+    return real_path
+  end
+
+  def relative_path(type, absolute_path)
+    absolute_path = File.expand_path(absolute_path)
+    @asset_collections.find do |ac|
+      asset_path = File.expand_path(ac.send(:"#{type}s_path"))
+      if absolute_path.start_with?(asset_path+File::SEPARATOR)
+        return absolute_path[(asset_path+File::SEPARATOR).size..-1]
+      end
+    end
+    nil
+  end
+
+  def glob(type, glob_expression, options = {})
+    match_all = options.fetch(:match_all, false)
+    resolved_files = []
+    @asset_collections.each do |ac|
+      _, some_resolved_files = ac.globs?(type, glob_expression)
+      resolved_files += some_resolved_files if some_resolved_files
+      return resolved_files if resolved_files.any? and !match_all
+    end
+    resolved_files
+  end
+
   protected
 
+  def clean_path(relative_path)
+    # 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)
+
+    [clean_relative_path, query, target]
+  end
+
   def find_collection(type, relative_path)
     asset_collection = nil
     clean_relative_path = nil
@@ -98,7 +133,6 @@ class Compass::Core::AssetUrlResolver
     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
@@ -126,5 +160,4 @@ class Compass::Core::AssetUrlResolver
       nil
     end
   end
-
 end

data/lib/compass/core/generated_version.rb

@@ -1,5 +1,5 @@
 module Compass
   module Core
-    VERSION = "1.1.0.alpha.0"
+    VERSION = "1.1.0.alpha.1"
   end
 end

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

@@ -62,12 +62,7 @@ private
   end
 
   def real_path(image_file)
-    # Compute the real path to the image on the file stystem if the images_dir is set.
-    if Compass.configuration.images_path
-      File.join(Compass.configuration.images_path, image_file)
-    else
-      File.join(Compass.configuration.project_path, image_file)
-    end
+    Compass.configuration.url_resolver.find_asset(:image, image_file)
   end
 
   class JPEG

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

@@ -2,7 +2,7 @@ module Compass::Core::SassExtensions::Functions::InlineImage
 
   def inline_image(path, mime_type = nil)
     path = path.value
-    real_path = File.join(Compass.configuration.images_path, path)
+    real_path = Compass.configuration.url_resolver.find_asset(:image, path)
     inline_image_string(data(real_path), compute_mime_type(path, mime_type))
   end
 
@@ -10,7 +10,7 @@ module Compass::Core::SassExtensions::Functions::InlineImage
     files = []
     with_each_font_file(*args) do |path, type|
       path = path.value
-      real_path = File.join(Compass.configuration.fonts_path, path)
+      real_path = Compass.configuration.url_resolver.find_asset(:font, path)
       data = inline_image_string(data(real_path), compute_mime_type(path))
       files << list(data, unquoted_string("format('#{type}')"), :space)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha.0
+  version: 1.1.0.alpha.1
 platform: ruby
 authors:
 - Chris Eppstein
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass