compass 1.1.0.alpha.0 → 1.1.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0e11394a4a7495a64db83a9afc00ce06f99ba4
-  data.tar.gz: 263711a8362fc18ef3dae40ec5d4a3b1b23dcb36
+  metadata.gz: c34f4a9522411d067ced24bf4e65aacd01b161b0
+  data.tar.gz: 9062ad628caa3eca0c7625a4c024a567cb65ca9a
 SHA512:
-  metadata.gz: 2dbd35310a0b37c7f63328dda852aad3bd30d92a67f51359136ce2484d985b49fa31dd14a8bfd8c0e0e98ffbd55ac2a886338bbc1e6c3c812a8a61a9f318dbdf
-  data.tar.gz: 214cd21fe3ff5245f4c9cff5a48ff0bf8db05bc447efccf0d83aa9d0a45a13ceeea2f32ed6510269d4bec5d4dce2ed9e767262f95be90cd6001c1ec125f14ce5
+  metadata.gz: 2aae0a4826987f8add3ba159a8d7d4f7243e180904c1e848f75b34d0b8f22481d61186c29bb23529b05568ce4f88de9173162925cfa995af75b0b851bb1f6534
+  data.tar.gz: b6eb04af255592ee36ead5c97df32a142ee03908985c088caceb6bb4fe83c85554d8d950c82c017b465fd6fa33cc217293e2154def054df42d106a19cefdc71e

data/lib/compass/configuration/helpers.rb

@@ -47,11 +47,11 @@ module Compass
           else
             Sass::Plugin.on_updating_stylesheet(&on_saved)
           end
-          
+
           Sass::Plugin.on_compilation_error do |e, filename, css|
             Compass.configuration.run_stylesheet_error(filename, e.message)
           end
-          
+
           @callbacks_loaded = true
         end
       end
@@ -66,7 +66,7 @@ module Compass
         configuration_file_path = args.shift || detect_configuration_file
 
         raise ArgumentError, "Too many arguments" if args.any?
-        if AppIntegration.default? && data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
+        if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
           if data.raw_project_type
             add_configuration(data.raw_project_type.to_sym)
           elsif options[:project_type]
@@ -75,7 +75,7 @@ module Compass
             add_configuration(:stand_alone)
           end
           add_configuration(data)
-        else
+        elsif !AppIntegration.default?
           add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
         end
       end

data/lib/compass/generated_version.rb

@@ -1,4 +1,4 @@
 module Compass
-  VERSION = "1.1.0.alpha.0"
+  VERSION = "1.1.0.alpha.2"
   VERSION_NAME = "Polaris"
 end

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

@@ -120,9 +120,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, "sprite")
     verify_sprite(sprite)
     if image = map.image_for(sprite.value)
-      image_path = Pathname.new(File.expand_path(image.file))
-      images_path = Pathname.new(File.expand_path(Compass.configuration.images_path))
-      quoted_string(image_path.relative_path_from(images_path).to_s)
+      quoted_string(Compass.configuration.sprite_resolver.relative_path(:image, image.file))
     else
       missing_image!(map, sprite)
     end

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

@@ -30,12 +30,7 @@ module Compass
         end
 
         def find_file
-          Compass.configuration.sprite_load_path.compact.each do |path|
-            f = File.join(path, relative_file)
-            if File.exists?(f)
-              return f
-            end
-          end
+          Compass.configuration.sprite_resolver.find_asset(:image, relative_file)
         end
 
         # Width of the image

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

@@ -24,14 +24,7 @@ module Compass
         end
         
         def self.relative_name(sprite)
-          sprite = File.expand_path(sprite)
-          Compass.configuration.sprite_load_path.each do |path|
-            path_with_slash = "#{File.expand_path(path)}/"
-            
-            if sprite.include?(path_with_slash)
-              return sprite.gsub(path_with_slash, '')
-            end
-          end
+          Compass.configuration.sprite_resolver.relative_path(:image, sprite)
         end
 
         def initialize(sprites, path, name, context, kwargs)

data/lib/compass/sprite_importer.rb

@@ -5,35 +5,33 @@ module Compass
     VAILD_FILE_NAME       = /\A#{Sass::SCSS::RX::IDENT}\Z/
     SPRITE_IMPORTER_REGEX = %r{((.+/)?([^\*.]+))/(.+?)\.png}
     VALID_EXTENSIONS      = ['.png']
-    
+
     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))
 
-
-
     # finds all sprite files
     def self.find_all_sprite_map_files(path)
       hex = "[0-9a-f]"
       glob = "*-s#{hex*10}{#{VALID_EXTENSIONS.join(",")}}"
       Sass::Util.glob(File.join(path, "**", glob))
     end
-    
+
     def find(uri, options)
       if uri =~ SPRITE_IMPORTER_REGEX
         return self.class.sass_engine(uri, self.class.sprite_name(uri), self, options)
       end
       nil
     end
-    
+
     def find_relative(uri, base, options)
       nil
     end
-    
+
     def to_s
       self.class.name
     end
-    
+
     def hash
       self.class.name.hash
     end
@@ -41,13 +39,13 @@ module Compass
     def eql?(other)
       other.class == self.class
     end
-    
+
     def mtime(uri, options)
       self.class.files(uri).sort.inject(Time.at(0)) do |max_time, file|
         (t = File.mtime(file)) > max_time ? t : max_time
       end
     end
-    
+
     def key(uri, options={})
       [self.class.name + ":sprite:" + File.dirname(File.expand_path(uri)), File.basename(uri)]
     end
@@ -56,8 +54,7 @@ module Compass
       nil
     end
 
-    
-    def self.path_and_name(uri)
+   def self.path_and_name(uri)
       if uri =~ SPRITE_IMPORTER_REGEX
         [$1, $3]
       else
@@ -76,17 +73,22 @@ module Compass
       path, _ = path_and_name(uri)
       path
     end
-    
+
     # Returns the Glob of image files for the uri
     def self.files(uri)
-      Compass.configuration.sprite_load_path.compact.each do |folder|
-        files = Sass::Util.glob(File.join(folder, uri)).sort
-        next if files.empty?
-        return files
-      end
-
-      path = Compass.configuration.sprite_load_path.to_a.join(', ')
-      raise Compass::SpriteException, %Q{No files were found in the load path matching "#{uri}". Your current load paths are: #{path}}
+      resolved_files = Compass.configuration.sprite_resolver.glob(:image, uri, :match_all => true)
+      resolved_files = resolved_files.inject({}) do |basenames, file|
+        basename = File.basename(file, '.png')
+        unless basenames.has_key?(basename)
+          basenames[basename] = true
+          basenames[:files] ||= []
+          basenames[:files] << file
+        end
+        basenames
+      end[:files]
+      return resolved_files.sort if resolved_files.any?
+      path = Compass.configuration.sprite_resolver.asset_collections.map{|ac| ac.images_path }.join(", ")
+      raise Compass::SpriteException, %Q{No images were found in the sprite path matching "#{uri}". Your current load paths are: #{path}}
     end
 
     # Returns an Array of image names without the file extension
@@ -95,12 +97,12 @@ module Compass
         File.basename(file, '.png')
       end
     end
-    
+
     # Returns the sass_options for this sprite
     def self.sass_options(uri, importer, options)
       options.merge!(:filename => uri.gsub(%r{\*/},"*\\/"), :syntax => :scss, :importer => importer)
     end
-    
+
     # Returns a Sass::Engine for this sprite object
     def self.sass_engine(uri, name, importer, options)
       content = content_for_images(uri, name, options[:skip_overrides])

data/lib/compass.rb

@@ -33,6 +33,7 @@ end
    configuration/file_data
    app_integration
    compiler
+   sass_compiler
    sprite_importer
 ).each do |lib|
   require "compass/#{lib}"

data/test/units/sprites/sprite_map_test.rb

@@ -162,7 +162,7 @@ class SpriteMapTest < Test::Unit::TestCase
     config.sprite_load_path = [@images_tmp_path, other_folder]
     Compass.add_configuration(config, "sprite_config")
     image = Compass::SassExtensions::Sprites::Image.new(@base, "foo/my.png", {})
-    assert_equal File.join(other_folder, 'foo/my.png'), image.file
+    assert_equal File.expand_path(File.join(other_folder, 'foo/my.png')), image.file
     assert_equal 0, image.size
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass
 version: !ruby/object:Gem::Version
-  version: 1.1.0.alpha.0
+  version: 1.1.0.alpha.2
 platform: ruby
 authors:
 - Chris Eppstein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -40,14 +40,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.alpha.0
+        version: 1.1.0.alpha.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.alpha.0
+        version: 1.1.0.alpha.2
 - !ruby/object:Gem::Dependency
   name: compass-import-once
   requirement: !ruby/object:Gem::Requirement