compass 0.11.2 → 0.11.3

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

@@ -91,9 +91,7 @@ module Compass::SassExtensions::Functions::Urls
       if cache_buster.is_a?(Sass::Script::String)
         path += "?#{cache_buster.value}"
       else
-        if buster = compute_cache_buster(path, real_path)
-          path += "?#{buster}"
-        end
+        path = cache_busted_path(path, real_path)
       end
     end
 
@@ -137,6 +135,23 @@ module Compass::SassExtensions::Functions::Urls
     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]
+      "%s?%s" % [path, cache_buster[:query]]
+    else
+      path
+    end
+  end
+
   def compute_cache_buster(path, real_path)
     if Compass.configuration.asset_cache_buster
       args = [path]

data/lib/compass/sass_extensions/sprites.rb

@@ -1,14 +1,16 @@
 require 'digest/md5'
-require 'compass/sass_extensions/sprites/sprites'
-require 'compass/sass_extensions/sprites/sprite_map'
-require 'compass/sass_extensions/sprites/image'
-require 'compass/sass_extensions/sprites/base'
-require 'compass/sass_extensions/sprites/engines'
+require 'compass/sprite_importer'
 
 module Compass
   module SassExtensions
     module Sprites
-      
     end
   end
-end
+end
+
+require 'compass/sass_extensions/sprites/image'
+require 'compass/sass_extensions/sprites/sprite_methods'
+require 'compass/sass_extensions/sprites/image_methods'
+require 'compass/sass_extensions/sprites/sprite_map'
+require 'compass/sass_extensions/sprites/engines'
+

data/lib/compass/sass_extensions/sprites.rbc

@@ -9,7 +9,7 @@ x
 10
 __script__
 i
-82
+73
 5
 7
 0
@@ -28,27 +28,35 @@ i
 1
 1
 15
-5
+99
 7
 3
-64
-47
+65
 49
-1
-1
-15
+4
+2
+13
+99
+12
+7
 5
+12
+7
+6
+12
+65
+12
+49
 7
 4
-64
-47
+15
 49
-1
-1
+5
+0
 15
 5
 7
-5
+8
 64
 47
 49
@@ -57,38 +65,21 @@ i
 15
 5
 7
-6
+9
 64
 47
 49
 1
 1
 15
-99
-7
-7
-65
-49
-8
-2
-13
-99
-12
-7
-9
-12
+5
 7
 10
-12
-65
-12
-49
-11
-4
-15
+64
+47
 49
-9
-0
+1
+1
 15
 2
 11
@@ -102,7 +93,7 @@ I
 0
 n
 p
-12
+11
 s
 10
 digest/md5
@@ -110,20 +101,8 @@ x
 7
 require
 s
-39
-compass/sass_extensions/sprites/sprites
-s
-42
-compass/sass_extensions/sprites/sprite_map
-s
-37
-compass/sass_extensions/sprites/image
-s
-36
-compass/sass_extensions/sprites/base
-s
-39
-compass/sass_extensions/sprites/engines
+23
+compass/sprite_importer
 x
 7
 Compass
@@ -233,7 +212,7 @@ p
 I
 2
 I
-a
+6
 I
 c
 x
@@ -249,7 +228,7 @@ p
 I
 2
 I
-9
+5
 I
 1c
 x
@@ -260,8 +239,17 @@ p
 x
 13
 attach_method
+s
+37
+compass/sass_extensions/sprites/image
+s
+42
+compass/sass_extensions/sprites/sprite_map
+s
+39
+compass/sass_extensions/sprites/engines
 p
-15
+13
 I
 0
 I
@@ -273,25 +261,21 @@ I
 I
 12
 I
-3
-I
-1b
-I
 4
 I
-24
+2c
 I
-5
+b
 I
-2d
+35
 I
-6
+c
 I
-36
+3e
 I
-8
+d
 I
-52
+49
 x
 68
 /Users/chris/Projects/compass/lib/compass/sass_extensions/sprites.rb

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

@@ -1 +1,25 @@
+module Compass
+  module SassExtensions
+    module Sprites
+      class Engine
+        attr_accessor :width, :height, :images, :canvas
+        def initialize(width, height, images)
+          @width, @height, @images = width, height, images
+          @canvas = nil
+        end
+        
+        def construct_sprite
+          raise ::Compass::Error, "You must impliment construct_sprite"
+        end
+        
+        def save(filename)
+          raise ::Compass::Error, "You must impliment save(filename)"
+        end
+        
+      end
+    end
+  end
+end
+
+
 require 'compass/sass_extensions/sprites/engines/chunky_png_engine'

data/lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rb

@@ -7,20 +7,19 @@ end
 module Compass
   module SassExtensions
     module Sprites
-      module ChunkyPngEngine
-        
-        # Returns a PNG object
+      class ChunkyPngEngine < Compass::SassExtensions::Sprites::Engine
+
         def construct_sprite
-          output_png = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
+          @canvas = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
           images.each do |image|
             input_png  = ChunkyPNG::Image.from_file(image.file)
             if image.repeat == "no-repeat"
-              output_png.replace! input_png, image.left, image.top
+              canvas.replace! input_png, image.left, image.top
             else
               x = image.left - (image.left / image.width).ceil * image.width
               while x < width do
                 begin
-                  output_png.replace! input_png, x, image.top
+                  canvas.replace! input_png, x, image.top
                   x += image.width 
                 rescue ChunkyPNG::OutOfBounds
                   break;
@@ -28,8 +27,15 @@ module Compass
               end
             end
           end
-          output_png
+        end    
+        
+        def save(filename)
+          if canvas.nil?
+            construct_sprite
+          end
+          canvas.save(filename, :best_compression)
         end
+        
       end
     end
   end

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

@@ -0,0 +1,32 @@
+module Compass
+  module SassExtensions
+    module Sprites
+      module ImageMethods
+        # Fetches the Sprite::Image object for the supplied name
+         def image_for(name)
+           @images.detect { |img| img.name == name}
+         end
+
+         # Returns true if the image name has a hover selector image
+         def has_hover?(name)
+           !image_for("#{name}_hover").nil?
+         end
+
+         # Returns true if the image name has a target selector image
+         def has_target?(name)
+           !image_for("#{name}_target").nil?
+         end
+
+         # Returns true if the image name has an active selector image
+         def has_active?(name)
+           !image_for("#{name}_active").nil?
+         end
+
+         # Return and array of image names that make up this sprite
+         def sprite_names
+           image_names.map { |f| File.basename(f, '.png') }
+         end
+      end
+    end
+  end
+end

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

@@ -1,154 +1,66 @@
 module Compass
-  class SpriteMap
-    attr_reader :uri, :options
-    VAILD_FILE_NAME = /\A#{Sass::SCSS::RX::IDENT}\Z/
-
-    def find_relative(*args)
-      nil
-    end
-
-    def initialize(uri, options)
-      @uri, @options = uri, options
-    end
-
-    # Name of this spite
-    def name
-      ensure_path_and_name!
-      @name
-    end
-
-    # The on-disk location of this sprite
-    def path
-      ensure_path_and_name!
-      @path
-    end
-    
-    # Returns the Glob of image files for this sprite
-    def files
-      @files ||= Dir[File.join(Compass.configuration.images_path, uri)].sort
-    end
-
-    # Returns an Array of image names without the file extension
-    def sprite_names
-      @sprite_names ||= files.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)}"
+  module SassExtensions
+    module Sprites
+      class SpriteMap < Sass::Script::Literal
+        attr_accessor :image_names, :path, :name, :map, :kwargs
+        attr_accessor :images, :width, :height, :engine
+
+        include SpriteMethods
+        include ImageMethods
+
+
+        # Initialize a new sprite object from a relative file path
+        # the path is relative to the <tt>images_path</tt> confguration option
+        def self.from_uri(uri, context, kwargs)
+          importer = ::Compass::SpriteImporter.new(:uri => uri.value, :options => {})
+          sprites = importer.files.map do |sprite|
+            sprite.gsub(Compass.configuration.images_path+"/", "")
+          end
+          new(sprites, importer.path, importer.name, context, kwargs)
         end
-        filename
-      end
-    end
-    
-    # Returns the sass options for this sprite
-    def sass_options
-      @sass_options ||= options.merge(:filename => name, :syntax => :scss, :importer => self)
-    end
-    
-    # Returns a Sass::Engine for this sprite object
-    def sass_engine
-      Sass::Engine.new(content_for_images, sass_options)
-    end
-    
-    def ensure_path_and_name!
-      @path ||= get_path
-      @name ||= get_name
-    end  
-    
-    def get_name
-      _, name = Compass::Sprites.path_and_name(uri)
-      name
-    end
-    
-    def get_path
-      path, _ = Compass::Sprites.path_and_name(uri)
-      path
-    end
-    
-    def key(uri, options)
-      Compass::Sprites.key(uri)
-    end
-
-    def mtime(uri, options)
-      Compass::Sprites.mtime(uri, options)
-    end
 
-    # Generates the Sass for this sprite file
-    def content_for_images(skip_overrides = false)
-      <<-SCSS
-@import "compass/utilities/sprites/base";
-
-// 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;
-
-#{skip_overrides ? "$#{name}-sprites: sprite-map(\"#{uri}\", $cleanup: $#{name}-clean-up);" : generate_overrides }
+        def initialize(sprites, path, name, context, kwargs)
+          @image_names = sprites
+          @path = path
+          @name = name
+          @kwargs = kwargs
+          @kwargs['cleanup'] ||= Sass::Script::Bool.new(true)
+          @images = nil
+          @width = nil
+          @height = nil
+          @engine = nil
+          @evaluation_context = context
+          validate!
+          compute_image_metadata!
+        end
 
-// All sprites should extend this class
-// The #{name}-sprite mixin will do so for you.
-\#{$#{name}-sprite-base-class} {
-  background: $#{name}-sprites no-repeat;
-}
+        def inspect
+          to_s
+        end
 
-// Use this to set the dimensions of an element
-// based on the size of the original image.
-@mixin #{name}-sprite-dimensions($name) {
-  @include sprite-dimensions($#{name}-sprites, $name)
-}
+        def to_s(kwargs = self.kwargs)
+          sprite_url(self).value
+        end
 
-// 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)
-}
+        def respond_to?(meth)
+          super || @evaluation_context.respond_to?(meth)
+        end
 
-// 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) {
-  @extend \#{$#{name}-sprite-base-class};
-  @include sprite($#{name}-sprites, $name, $dimensions, $offset-x, $offset-y)
-}
+        def method_missing(meth, *args, &block)
+          if @evaluation_context.respond_to?(meth)
+            @evaluation_context.send(meth, *args, &block)
+          else
+            super
+          end
+        end
 
-@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) {
-  @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions, $prefix)
-}
+        private 
 
-// Generates a class for each sprited image.
-@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) {
-  @include #{name}-sprites(#{sprite_names.join(" ")}, $dimensions, $prefix);
-}
-SCSS
-    end
-    
-    # Generates the override defaults for this Sprite
-    # <tt>$#{name}-#{sprite_name}-position </tt>
-    # <tt> $#{name}-#{sprite_name}-spacing </tt>
-    # <tt> #{name}-#{sprite_name}-repeat: </tt>
-    def generate_overrides
-      content = <<-TXT
-// These variables control the generated sprite output
-// You can override them selectively before you import this file.
-      TXT
-      sprite_names.map do |sprite_name| 
-        content += <<-SCSS
-$#{name}-#{sprite_name}-position: $#{name}-position !default;
-$#{name}-#{sprite_name}-spacing: $#{name}-spacing !default;
-$#{name}-#{sprite_name}-repeat: $#{name}-repeat !default;
-        SCSS
-      end.join
+        def modulize
+          @modulize ||= Compass::configuration.sprite_engine.to_s.scan(/([^_.]+)/).flatten.map {|chunk| "#{chunk[0].chr.upcase}#{chunk[1..-1]}" }.join
+        end
 
-      content += "\n$#{name}-sprites: sprite-map(\"#{uri}\", \n$cleanup: $#{name}-clean-up,\n"
-      content += sprite_names.map do |sprite_name| 
-%Q{  $#{sprite_name}-position: $#{name}-#{sprite_name}-position,
-  $#{sprite_name}-spacing: $#{name}-#{sprite_name}-spacing,
-  $#{sprite_name}-repeat: $#{name}-#{sprite_name}-repeat}
-      end.join(",\n")
-      content += ");"
+      end
     end
   end
-end
-
+end