compass 0.13.alpha.0 → 0.13.alpha.2

data/lib/compass/sass_extensions/sprites.rb

@@ -8,6 +8,8 @@ module Compass
   end
 end
 
+require 'compass/sass_extensions/sprites/images'
+require 'compass/sass_extensions/sprites/layout'
 require 'compass/sass_extensions/sprites/image_row'
 require 'compass/sass_extensions/sprites/row_fitter'
 require 'compass/sass_extensions/sprites/image'

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

@@ -12,7 +12,11 @@ module Compass
         def construct_sprite
           @canvas = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
           images.each do |image|
-            input_png  = ChunkyPNG::Image.from_file(image.file)
+            input_png = begin
+              ChunkyPNG::Image.from_file(image.file)
+            rescue ChunkyPNG::SignatureMismatch
+              raise Compass::SpriteException, "You have provided a file that does not have a PNG signature. Only PNG files are supported by the default sprite engine"
+            end
             canvas.replace! input_png, image.left, image.top
           end
         end    

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

@@ -8,9 +8,10 @@ module Compass
         PARENT = %r{(.+)[-_](.+)$}
 
         REPEAT_X = 'repeat-x'
+        REPEAT_Y = 'repeat-y'
         NO_REPEAT = 'no-repeat'
 
-        VALID_REPEATS = [REPEAT_X, NO_REPEAT]
+        VALID_REPEATS = [REPEAT_Y, REPEAT_X, NO_REPEAT]
         
         attr_reader :relative_file, :options, :base
         attr_accessor :top, :left
@@ -50,7 +51,7 @@ module Compass
         
         # Basename of the image
         def name
-          File.basename(relative_file, '.png')
+          @name ||= File.basename(relative_file, '.png')
         end
 
         def get_var_file(var)
@@ -73,6 +74,10 @@ module Compass
           repeat == REPEAT_X
         end
 
+        def repeat_y?
+          repeat == REPEAT_Y
+        end
+
         def no_repeat?
           repeat == NO_REPEAT
         end

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

@@ -4,8 +4,11 @@ module Compass
       module ImageMethods
         # Fetches the Sprite::Image object for the supplied name
          def image_for(name)
-           name = name.to_s
-           @images.detect { |img| img.name == name}
+          if name.is_a?(Sass::Script::String)
+            name = name.value
+          end
+          name = name.to_s
+          @images.detect { |img| img.name == name}
          end
 
          # Returns true if the image name has a hover selector image

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

@@ -0,0 +1,29 @@
+module Compass
+  module SassExtensions
+    module Sprites
+      class Images < Array
+
+        def sort_by!(method)
+          invert = false
+          if method.to_s[0] == '!'[0] # have todo this for 1.8.7 compat
+            method = method.to_s[1..-1]
+            invert = true
+          end
+          method = method.to_sym
+          self.sort! do |a, b|
+            unless a.send(method) == b.send(method)
+              a.send(method) <=> b.send(method)
+            else
+              other = ([:size, :name] - [method]).first
+              a.send(other) <=> b.send(other)
+            end
+          end
+          self.reverse! if invert
+        end
+
+
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'rational'
+module Compass
+  module SassExtensions
+    module Sprites
+      module Layout
+        class SpriteLayout
+
+          attr_reader :images, :options
+          attr_accessor :height, :width
+
+          def initialize(images, kwargs={})
+            @images  = images
+            @options = kwargs
+            @height  = 0
+            @width   = 0
+            
+            layout!
+          end
+
+          def layout!
+            raise Compass::SpriteException, "You must impliment layout!"
+          end
+
+          def properties
+            if @width.zero?
+              raise Compass::SpriteException, "You must set the width fetching the properties"
+            end
+            if @height.zero?
+              raise Compass::SpriteException, "You must set the height fetching the properties"
+            end
+
+            [@images, @width, @height]
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/compass/sass_extensions/sprites/layout/diagonal.rb

@@ -0,0 +1,42 @@
+module Compass
+  module SassExtensions
+    module Sprites
+      module Layout
+        class Diagonal < SpriteLayout
+
+          def layout!
+            calculate_width!
+            calculate_height!
+            calculate_positions!
+          end
+
+        private # ===========================================================================================>
+
+          def calculate_width!
+            @width = @images.inject(0) {|sum, img| sum + img.width}
+          end
+
+          def calculate_height!
+            @height = @images.inject(0) {|sum, img| sum + img.height}
+          end
+
+          def calculate_positions!
+            previous = nil
+            @images.each_with_index do |image, index|
+              if previous.nil?
+                previous = image
+                image.top = @height - image.height
+                image.left = 0
+                next
+              end
+              image.top = previous.top - image.height
+              image.left = previous.left + previous.width
+              previous = image
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/compass/sass_extensions/sprites/layout/horizontal.rb

@@ -0,0 +1,66 @@
+module Compass
+  module SassExtensions
+    module Sprites
+      module Layout
+        class Horizontal < SpriteLayout
+
+          def layout!
+            calculate_height!
+            calculate_width!
+            calculate_positions!
+            tile_images_that_repeat!
+          end
+
+        private # ===========================================================================================>
+
+          def calculate_height!
+            @height = @images.map {|image| image.height + image.offset}.max
+            if repeating_images?
+              calculate_repeat_extra_height!
+            end
+            @height
+          end
+
+          def calculate_width!
+            @width = @images.inject(0) { |sum, image| sum += (image.width + image.spacing) }
+          end
+
+          def repeating_images?
+            @repeating_images ||= @images.any?(&:repeat_y?)
+          end
+
+          def calculate_repeat_extra_height!
+            m = @images.inject(1) {|m,img| img.repeat_y? ? m.lcm(img.height) : m }
+            remainder = @height % m
+            @height += (m - remainder) unless remainder.zero?
+          end
+
+          def calculate_positions!
+            @images.each_with_index do |image, index|
+              image.top = image.position.unit_str == '%' ? (@height - image.height) * (image.position.value / 100.0) : image.position.value
+              next if index == 0
+              last_image = @images[index-1]
+              image.left = last_image.left + last_image.width + [image.spacing, last_image.spacing].max
+            end
+          end
+
+          def tile_images_that_repeat!
+            return unless repeating_images?
+            @images.map {|img| img if img.repeat_y?}.compact.each do |image|
+              y = (image.top + image.height)
+              while y < @height do
+                begin
+                  img = image.dup
+                  img.top = y.to_i
+                  @images << img
+                  y += image.height
+                end 
+              end #while
+            end 
+          end 
+
+        end
+      end
+    end
+  end
+end

data/lib/compass/sass_extensions/sprites/layout/smart.rb

@@ -0,0 +1,33 @@
+module Compass
+  module SassExtensions
+    module Sprites
+      module Layout
+        class Smart < SpriteLayout
+
+          def layout!
+            calculate_positions!
+          end
+
+        private # ===========================================================================================>
+
+          def calculate_positions!
+            fitter = ::Compass::SassExtensions::Sprites::RowFitter.new(@images)
+            current_y = 0
+            fitter.fit!.each do |row|
+              current_x = 0
+              row.images.each_with_index do |image, index|
+                image.left = current_x
+                image.top = current_y
+                current_x += image.width
+              end
+              current_y += row.height
+            end
+            @width = fitter.width
+            @height = fitter.height
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/compass/sass_extensions/sprites/layout/vertical.rb

@@ -0,0 +1,68 @@
+module Compass
+  module SassExtensions
+    module Sprites
+      module Layout
+        class Vertical < SpriteLayout
+
+          def layout!
+            calculate_width!
+            calculate_positions!
+            calculate_height!
+            tile_images_that_repeat!
+          end
+
+        private # ===========================================================================================>
+
+          def calculate_width!
+            @width = @images.map { |image| image.width + image.offset }.max
+            if repeating_images?
+              calculate_repeat_extra_width!
+            end
+
+            @width
+          end
+
+          def calculate_height!
+            last    = @images.last
+            @height = last.top + last.height
+          end
+
+          def repeating_images?
+            @repeating_images ||= @images.any?(&:repeat_x?)
+          end
+
+          def calculate_repeat_extra_width!
+            m = @images.inject(1) {|m,img| img.repeat_x? ? m.lcm(img.width) : m }
+            remainder = @width % m
+            @width += (m - remainder) unless remainder.zero?
+          end
+
+          def calculate_positions!
+            @images.each_with_index do |image, index|
+            image.left = (image.position.unit_str == "%" ? (@width - image.width) * (image.position.value / 100.0) : image.position.value).to_i
+            next if index == 0
+            last_image = @images[index-1]
+            image.top = last_image.top + last_image.height + [image.spacing,  last_image.spacing].max
+            end #each_with_index
+          end #method
+
+          def tile_images_that_repeat!
+            return unless repeating_images?
+            @images.map {|img| img if img.repeat_x?}.compact.each do |image|
+              x = image.left - (image.left / image.width).ceil * image.width
+              while x < @width do
+                begin
+                  img = image.dup
+                  img.top = image.top
+                  img.left = x.to_i
+                  @images << img
+                  x += image.width 
+                end #begin
+              end #while
+            end #map
+          end #method
+        end #Vertical
+      end #Layout
+    end #Sprites
+  end #SassExtensions
+end #Compass

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

@@ -32,128 +32,22 @@ module Compass
         def compute_image_positions!
           case layout
           when SMART
-            calculate_smart_positions
+            require 'compass/sass_extensions/sprites/layout/smart'
+            @images, @width, @height = Layout::Smart.new(@images, @kwargs).properties
           when DIAGONAL
-            calculate_diagonal_dimensions
-            calculate_diagonal_positions
+            require 'compass/sass_extensions/sprites/layout/diagonal'
+            @images, @width, @height = Layout::Diagonal.new(@images, @kwargs).properties
           when HORIZONTAL
-            @height = height_for_horizontal_layout
-            calculate_horizontal_positions
-            @width = width_for_horizontal_layout
+            require 'compass/sass_extensions/sprites/layout/horizontal'
+            @images, @width, @height = Layout::Horizontal.new(@images, @kwargs).properties
           else
-            @images.sort! do |a,b| 
-              if (b.size <=> a.size) === 0
-                a.name <=> b.name
-              else
-                b.size <=> a.size
-              end
-            end
-
-            @width = width_for_vertical_layout
-            calulate_vertical_postions
-            @height = height_for_vertical_layout
-            if @images.any?(&:repeat_x?)
-              calculate_repeat_extra_width!
-              tile_images_that_repeat
-             end
-          end
-        end
-
-        def tile_images_that_repeat
-          @images.map {|img| img if img.repeat_x?}.compact.each do |image|
-            x = image.left - (image.left / image.width).ceil * image.width
-              while x < @width do
-                begin
-                  img = image.dup
-                  img.top = image.top
-                  img.left = x.to_i
-                  @images << img
-                  x += image.width 
-                end
-              end
-            end
-        end
-
-        def calculate_repeat_extra_width!
-          require 'rational' #for ruby 1.8.7
-          m = @images.inject(1) {|m,img| img.repeat_x? ? m.lcm(img.width) : m}
-          remainder = @width % m
-          @width += (m - remainder) unless remainder.zero?
-        end
-        
-        def calculate_smart_positions
-          fitter = ::Compass::SassExtensions::Sprites::RowFitter.new(@images)
-          current_y = 0
-          fitter.fit!.each do |row|
-            current_x = 0
-            row.images.each_with_index do |image, index|
-              image.left = current_x
-              image.top = current_y
-              current_x += image.width
-            end
-            current_y += row.height
-          end
-          @width = fitter.width
-          @height = fitter.height
-        end
-        
-        
-        def calculate_diagonal_dimensions
-          @width = @images.inject(0) {|sum, img| sum + img.width}
-          @height = @images.inject(0) {|sum, img| sum + img.height}
-        end
-        
-        def calculate_diagonal_positions
-          previous = nil
-          @images.each_with_index do |image, index|
-            if previous.nil?
-              previous = image
-              image.top = @height - image.height
-              image.left = 0
-              next
-            end
-            image.top = previous.top - image.height
-            image.left = previous.left + previous.width
-            previous = image
+            require 'compass/sass_extensions/sprites/layout/vertical'
+            @images, @width, @height = Layout::Vertical.new(@images, @kwargs).properties
           end
         end
         
-        def calculate_horizontal_positions
-          @images.each_with_index do |image, index|
-            image.top = image.position.unit_str == '%' ? (@height - image.height) * (image.position.value / 100.0) : image.position.value
-            next if index == 0
-            last_image = @images[index-1]
-            image.left = last_image.left + last_image.width + [image.spacing, last_image.spacing].max
-          end
-        end
-        
-        def calulate_vertical_postions
-          @images.each_with_index do |image, index|
-            image.left = (image.position.unit_str == "%" ? (@width - image.width) * (image.position.value / 100.0) : image.position.value).to_i
-            next if index == 0
-            last_image = @images[index-1]
-            image.top = last_image.top + last_image.height + [image.spacing,  last_image.spacing].max
-          end
-        end
-        
-        def height_for_vertical_layout
-          last = @images.last
-          last.top + last.height
-        end
-        
-        def height_for_horizontal_layout
-          @height = @images.map {|image| image.height + image.offset}.max
-        end
-        
-        def width_for_horizontal_layout
-          @images.inject(0) { |sum, image| sum += (image.width + image.spacing) }
-        end
-        
-        def width_for_vertical_layout
-          @images.map { |image| image.width + image.offset }.max
-        end
       end
     end
   end
 end
-  
+