compass-sourcemaps 0.12.3.sourcemaps.a4836f1 → 0.12.4.sourcemaps.a4836f1

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

@@ -1,92 +1,92 @@
-require 'forwardable'
-
-module Compass
-  module SassExtensions
-    module Sprites
-      class RowFitter
-        extend Forwardable
-
-        attr_reader :images, :rows
-        def_delegators :rows, :[]
-
-        def initialize(images)
-          @images = images.sort do |a,b|
-            if a.height == b.height
-              b.width <=> a.width
-            else
-              a.height <=> b.height
-            end
-          end
-          @rows = []
-        end
-
-        def fit!(style = :scan)
-          send("#{style}_fit")
-          @rows
-        end
-
-        def width
-          @width ||= @images.collect(&:width).max
-        end
-        
-        def height
-          @height ||= @rows.inject(0) {|sum, row| sum += row.height}
-        end
-
-        def efficiency
-          @rows.inject(0) { |sum, row| sum += row.efficiency } ** @rows.length
-        end
-
-        private
-        def new_row(image = nil)
-          row = Compass::SassExtensions::Sprites::ImageRow.new(width)
-          row.add(image) if image
-          row
-        end
-
-        def fast_fit
-          row = new_row
-          @images.each do |image|
-            if !row.add(image)
-              @rows << row
-              row = new_row(image)
-            end
-          end
-
-          @rows << row
-        end
-
-        def scan_fit
-          fast_fit
-
-          moved_images = []
-
-          begin
-            removed = false
-
-            catch :done do
-              @rows.each do |row|
-                (@rows - [ row ]).each do |other_row|
-                  other_row.images.each do |image|
-                    if !moved_images.include?(image)
-                      if row.will_fit?(image)
-                        other_row.delete(image)
-                        row << image
-
-                        @rows.delete(other_row) if other_row.empty?
-                        removed = true
-
-                        moved_images << image
-                        throw :done
-                      end
-                    end
-                  end
-                end
-              end
-            end
-          end while removed
-        end
-      end
-    end
-  end
+require 'forwardable'
+
+module Compass
+  module SassExtensions
+    module Sprites
+      class RowFitter
+        extend Forwardable
+
+        attr_reader :images, :rows
+        def_delegators :rows, :[]
+
+        def initialize(images)
+          @images = images.sort do |a,b|
+            if a.height == b.height
+              b.width <=> a.width
+            else
+              a.height <=> b.height
+            end
+          end
+          @rows = []
+        end
+
+        def fit!(style = :scan)
+          send("#{style}_fit")
+          @rows
+        end
+
+        def width
+          @width ||= @images.collect(&:width).max
+        end
+        
+        def height
+          @height ||= @rows.inject(0) {|sum, row| sum += row.height}
+        end
+
+        def efficiency
+          @rows.inject(0) { |sum, row| sum += row.efficiency } ** @rows.length
+        end
+
+        private
+        def new_row(image = nil)
+          row = Compass::SassExtensions::Sprites::ImageRow.new(width)
+          row.add(image) if image
+          row
+        end
+
+        def fast_fit
+          row = new_row
+          @images.each do |image|
+            if !row.add(image)
+              @rows << row
+              row = new_row(image)
+            end
+          end
+
+          @rows << row
+        end
+
+        def scan_fit
+          fast_fit
+
+          moved_images = []
+
+          begin
+            removed = false
+
+            catch :done do
+              @rows.each do |row|
+                (@rows - [ row ]).each do |other_row|
+                  other_row.images.each do |image|
+                    if !moved_images.include?(image)
+                      if row.will_fit?(image)
+                        other_row.delete(image)
+                        row << image
+
+                        @rows.delete(other_row) if other_row.empty?
+                        removed = true
+
+                        moved_images << image
+                        throw :done
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end while removed
+        end
+      end
+    end
+  end
 end

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

@@ -1,87 +1,87 @@
-module Compass
-  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
-        include LayoutMethods
-
-
-        # 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)
-          uri = uri.value
-          path, name = Compass::SpriteImporter.path_and_name(uri)
-          files = Compass::SpriteImporter.files(uri)
-          sprites = files.map do |sprite|
-            relative_name(sprite)
-          end
-          new(sprites, path, name, context, kwargs)
-        end
-        
-        def self.relative_name(sprite)
-          sprite = File.expand_path(sprite)
-          Compass.configuration.sprite_load_path.each do |path|
-            path = File.expand_path(path)
-            if sprite.include?(path)
-              return sprite.gsub("#{path}/", "")
-            end
-          end
-        end
-
-        def initialize(sprites, path, name, context, kwargs)
-          @image_names = sprites
-          @path = path
-          @name = name
-          @kwargs = kwargs
-          @kwargs['cleanup'] ||= Sass::Script::Bool.new(true)
-          @kwargs['layout'] ||= Sass::Script::String.new('vertical')
-          @images = nil
-          @width = nil
-          @height = nil
-          @engine = nil
-          @evaluation_context = context
-          validate!
-          compute_image_metadata!
-        end
-
-        def inspect
-          puts 'images'
-          @images.each do |img|
-            puts img.file
-          end
-          puts "options"
-          @kwargs.each do |k,v|
-            puts "#{k}:#{v}"
-          end
-        end
-
-        def to_s(kwargs = self.kwargs)
-          sprite_url(self).value
-        end
-
-        def respond_to?(meth)
-          super || @evaluation_context.respond_to?(meth)
-        end
-
-        def method_missing(meth, *args, &block)
-          if @evaluation_context.respond_to?(meth)
-            @evaluation_context.send(meth, *args, &block)
-          else
-            super
-          end
-        end
-
-        private 
-
-        def modulize
-          @modulize ||= Compass::configuration.sprite_engine.to_s.scan(/([^_.]+)/).flatten.map {|chunk| "#{chunk[0].chr.upcase}#{chunk[1..-1]}" }.join
-        end
-
-      end
-    end
-  end
+module Compass
+  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
+        include LayoutMethods
+
+
+        # 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)
+          uri = uri.value
+          path, name = Compass::SpriteImporter.path_and_name(uri)
+          files = Compass::SpriteImporter.files(uri)
+          sprites = files.map do |sprite|
+            relative_name(sprite)
+          end
+          new(sprites, path, name, context, kwargs)
+        end
+        
+        def self.relative_name(sprite)
+          sprite = File.expand_path(sprite)
+          Compass.configuration.sprite_load_path.each do |path|
+            path = File.expand_path(path)
+            if sprite.include?(path)
+              return sprite.gsub("#{path}/", "")
+            end
+          end
+        end
+
+        def initialize(sprites, path, name, context, kwargs)
+          @image_names = sprites
+          @path = path
+          @name = name
+          @kwargs = kwargs
+          @kwargs['cleanup'] ||= Sass::Script::Bool.new(true)
+          @kwargs['layout'] ||= Sass::Script::String.new('vertical')
+          @images = nil
+          @width = nil
+          @height = nil
+          @engine = nil
+          @evaluation_context = context
+          validate!
+          compute_image_metadata!
+        end
+
+        def inspect
+          puts 'images'
+          @images.each do |img|
+            puts img.file
+          end
+          puts "options"
+          @kwargs.each do |k,v|
+            puts "#{k}:#{v}"
+          end
+        end
+
+        def to_s(kwargs = self.kwargs)
+          sprite_url(self).value
+        end
+
+        def respond_to?(meth)
+          super || @evaluation_context.respond_to?(meth)
+        end
+
+        def method_missing(meth, *args, &block)
+          if @evaluation_context.respond_to?(meth)
+            @evaluation_context.send(meth, *args, &block)
+          else
+            super
+          end
+        end
+
+        private 
+
+        def modulize
+          @modulize ||= Compass::configuration.sprite_engine.to_s.scan(/([^_.]+)/).flatten.map {|chunk| "#{chunk[0].chr.upcase}#{chunk[1..-1]}" }.join
+        end
+
+      end
+    end
+  end
 end

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

@@ -1,141 +1,141 @@
-module Compass
-  module SassExtensions
-    module Sprites
-      module SpriteMethods
-        
-        # Changing this string will invalidate all previously generated sprite images.
-        # We should do so only when the packing algorithm changes
-        SPRITE_VERSION = "2"
-        
-        # Calculates the overal image dimensions
-        # collects image sizes and input parameters for each sprite
-        # Calculates the height
-        def compute_image_metadata!
-          @width = 0
-          init_images
-          compute_image_positions!
-          init_engine
-        end
-        
-        def init_engine
-          @engine = eval("::Compass::SassExtensions::Sprites::#{modulize}Engine.new(nil, nil, nil)")
-          @engine.width = @width
-          @engine.height = @height
-          @engine.images = @images
-        end
-        
-        # 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)
-          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
-          end
-        end
-        
-        def name_and_hash
-          "#{path}-s#{uniqueness_hash}.png"
-        end
-
-        # The on-the-disk filename of the sprite
-        def filename
-          File.join(Compass.configuration.generated_images_path, name_and_hash)
-        end
-
-        def relativize(path)
-          Pathname.new(path).relative_path_from(Pathname.new(Dir.pwd)).to_s rescue path
-        end
-
-        # Generate a sprite image if necessary
-        def generate
-          if generation_required?
-            if kwargs.get_var('cleanup').value
-              cleanup_old_sprites
-            end
-            engine.construct_sprite
-            Compass.configuration.run_sprite_generated(engine.canvas)
-            save!
-          else
-            log :unchanged, filename
-          end
-        end
-        
-        def cleanup_old_sprites
-          Dir[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)
-          end
-        end
-        
-        # Does this sprite need to be generated
-        def generation_required?
-          !File.exists?(filename) || outdated? ||  options[:force]
-        end
-
-        # Returns the uniqueness hash for this sprite object
-        def uniqueness_hash
-          @uniqueness_hash ||= begin
-            sum = Digest::MD5.new
-            sum << SPRITE_VERSION
-            sum << path
-            sum << layout
-            images.each do |image|
-              [:relative_file, :height, :width, :repeat, :spacing, :position, :digest].each do |attr|
-                sum << image.send(attr).to_s
-              end
-            end
-            sum.hexdigest[0...10]
-          end
-          @uniqueness_hash
-        end
-
-        # Saves the sprite engine
-        def save!
-          FileUtils.mkdir_p(File.dirname(filename))
-          saved = engine.save(filename)
-          log :create, filename
-          Compass.configuration.run_sprite_saved(filename)
-          @mtime = nil if saved
-          saved
-        end
-
-        # All the full-path filenames involved in this sprite
-        def image_filenames
-          @images.map(&:file)
-        end
-
-        # Checks whether this sprite is outdated
-        def outdated?
-          if File.exists?(filename)
-            return @images.any? {|image| image.mtime.to_i > self.mtime.to_i }
-          end
-          true
-        end
-
-        # Mtime of the sprite file
-        def mtime
-          @mtime ||= File.mtime(filename)
-        end
-        
-       # Calculate the size of the sprite
-        def size
-          [width, height]
-        end
-
-        def log(action, filename, *extra)
-          if options[:compass] && options[:compass][:logger] && !options[:quiet]
-            options[:compass][:logger].record(action, relativize(filename), *extra)
-          end
-        end
-      end
-    end
-  end
-end
+module Compass
+  module SassExtensions
+    module Sprites
+      module SpriteMethods
+        
+        # Changing this string will invalidate all previously generated sprite images.
+        # We should do so only when the packing algorithm changes
+        SPRITE_VERSION = "2"
+        
+        # Calculates the overal image dimensions
+        # collects image sizes and input parameters for each sprite
+        # Calculates the height
+        def compute_image_metadata!
+          @width = 0
+          init_images
+          compute_image_positions!
+          init_engine
+        end
+        
+        def init_engine
+          @engine = eval("::Compass::SassExtensions::Sprites::#{modulize}Engine.new(nil, nil, nil)")
+          @engine.width = @width
+          @engine.height = @height
+          @engine.images = @images
+        end
+        
+        # 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)
+          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
+          end
+        end
+        
+        def name_and_hash
+          "#{path}-s#{uniqueness_hash}.png"
+        end
+
+        # The on-the-disk filename of the sprite
+        def filename
+          File.join(Compass.configuration.generated_images_path, name_and_hash)
+        end
+
+        def relativize(path)
+          Pathname.new(path).relative_path_from(Pathname.new(Dir.pwd)).to_s rescue path
+        end
+
+        # Generate a sprite image if necessary
+        def generate
+          if generation_required?
+            if kwargs.get_var('cleanup').value
+              cleanup_old_sprites
+            end
+            engine.construct_sprite
+            Compass.configuration.run_sprite_generated(engine.canvas)
+            save!
+          else
+            log :unchanged, filename
+          end
+        end
+        
+        def cleanup_old_sprites
+          Dir[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)
+          end
+        end
+        
+        # Does this sprite need to be generated
+        def generation_required?
+          !File.exists?(filename) || outdated? ||  options[:force]
+        end
+
+        # Returns the uniqueness hash for this sprite object
+        def uniqueness_hash
+          @uniqueness_hash ||= begin
+            sum = Digest::MD5.new
+            sum << SPRITE_VERSION
+            sum << path
+            sum << layout
+            images.each do |image|
+              [:relative_file, :height, :width, :repeat, :spacing, :position, :digest].each do |attr|
+                sum << image.send(attr).to_s
+              end
+            end
+            sum.hexdigest[0...10]
+          end
+          @uniqueness_hash
+        end
+
+        # Saves the sprite engine
+        def save!
+          FileUtils.mkdir_p(File.dirname(filename))
+          saved = engine.save(filename)
+          log :create, filename
+          Compass.configuration.run_sprite_saved(filename)
+          @mtime = nil if saved
+          saved
+        end
+
+        # All the full-path filenames involved in this sprite
+        def image_filenames
+          @images.map(&:file)
+        end
+
+        # Checks whether this sprite is outdated
+        def outdated?
+          if File.exists?(filename)
+            return @images.any? {|image| image.mtime.to_i > self.mtime.to_i }
+          end
+          true
+        end
+
+        # Mtime of the sprite file
+        def mtime
+          @mtime ||= File.mtime(filename)
+        end
+        
+       # Calculate the size of the sprite
+        def size
+          [width, height]
+        end
+
+        def log(action, filename, *extra)
+          if options[:compass] && options[:compass][:logger] && !options[:quiet]
+            options[:compass][:logger].record(action, relativize(filename), *extra)
+          end
+        end
+      end
+    end
+  end
+end