compass 0.11.beta.3 → 0.11.beta.4

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :state: beta
-:build: 3
+:build: 4

data/features/extensions.feature

@@ -20,3 +20,10 @@ Feature: Extensions
     When I run: compass frameworks
     Then the list of frameworks includes "testing"
 
+  @listframeworks
+  Scenario: Shared extensions directory
+    Given I am using the existing project in test/fixtures/stylesheets/compass
+    And the "~/.compass/extensions" directory exists
+    And and I have a fake extension at ~/.compass/extensions/testing
+    When I run: compass frameworks
+    Then the list of frameworks includes "testing"

data/frameworks/compass/stylesheets/compass/css3/_transform.scss

@@ -198,10 +198,10 @@ $default-skew-y      : 5deg                  !default;
 //
 //      @include transform-style( [ style ] )
 //
-// where `style` can be either `flat` or `preserves-3d`
-// browsers default to `flat`, mixin defaults to `preserves-3d`
-@mixin transform-style($style: preserves-3d) {
-  @include experimental(perspective-origin, $style,
+// where `style` can be either `flat` or `preserve-3d`
+// browsers default to `flat`, mixin defaults to `preserve-3d`
+@mixin transform-style($style: preserve-3d) {
+  @include experimental(transform-style, $style,
     not -moz, -webkit, not -o, not -ms, not -khtml, official
   );
 }

data/lib/compass.rb

@@ -1,7 +1,7 @@
 module Compass
 end
 
-%w(dependencies util browser_support sass_extensions core_ext version errors quick_cache).each do |lib|
+%w(dependencies util browser_support sass_extensions version errors quick_cache).each do |lib|
   require "compass/#{lib}"
 end
 
@@ -14,10 +14,13 @@ module Compass
   def lib_directory
     File.expand_path(File.join(File.dirname(__FILE__)))
   end
-  module_function :base_directory, :lib_directory
+  def shared_extension_paths
+    [File.expand_path("~/.compass/extensions")]
+  end
+  module_function :base_directory, :lib_directory, :shared_extension_paths
   extend QuickCache
 end
 
-%w(configuration frameworks app_integration actions compiler sprites).each do |lib|
+%w(configuration frameworks app_integration actions compiler).each do |lib|
   require "compass/#{lib}"
 end

data/lib/compass/app_integration/rails/templates/compass-install-rails.rb

@@ -47,18 +47,18 @@ css_framework = ask("What CSS Framework install do you want to use with Compass?
 
 # sass storage prompt
 sass_dir = ask("Where would you like to keep your sass files within your project? (default: 'app/stylesheets')")
-sass_dir = "app/stylesheets" if sass_dir.blank?
+sass_dir = "app/stylesheets" if Compass::Util.blank?(sass_dir)
 
 # compiled css storage prompt
 css_dir = ask("Where would you like Compass to store your compiled css files? (default: 'public/stylesheets/compiled')")
-css_dir = "public/stylesheets/compiled" if css_dir.blank?
+css_dir = "public/stylesheets/compiled" if Compass::Util.blank?(css_dir)
 
 # use sudo for gem commands?
 use_sudo = nil
 if sudo_is_an_option? # dont give them the option if they are on a system that can't use sudo (aka windows)
   use_sudo = yes?("Use sudo for the gem commands? (the default for your system is #{sudo_is_an_option? ? 'yes' : 'no'})")
 end
-use_sudo = sudo_is_an_option? if use_sudo.blank?
+use_sudo = sudo_is_an_option? if Compass::Util.blank?(use_sudo)
 
 # define dependencies
 gem "haml", :version => ">=3.0.0"
@@ -71,7 +71,7 @@ rake "gems:unpack GEM=compass --trace"
 
 # build out compass command
 compass_command = "compass init rails . --css-dir=#{css_dir} --sass-dir=#{sass_dir} "
-compass_command << "--using #{css_framework} " unless css_framework.blank?
+compass_command << "--using #{css_framework} " unless Compass::Util.blank?(css_framework)
 
 # integrate it!
 run "haml --rails ."

data/lib/compass/configuration.rb

@@ -37,7 +37,8 @@ module Compass
       :line_comments,
       :color_output,
       :preferred_syntax,
-      :disable_warnings
+      :disable_warnings,
+      :sprite_engine
     ].flatten
 
   end

data/lib/compass/configuration/defaults.rb

@@ -128,6 +128,11 @@ module Compass
       def default_preferred_syntax
         :scss
       end
+      
+      def default_sprite_engine
+        :chunky_png
+      end
+      
       # helper functions
 
       def http_join(*segments)

data/lib/compass/configuration/helpers.rb

@@ -65,11 +65,14 @@ module Compass
             Sass::Plugin.add_template_location sass_dir, css_dir
           end
         end
-        Sass::Plugin.on_updating_stylesheet do |sass_file, css_file|
-          Compass.configuration.run_callback(:stylesheet_saved, css_file)
-        end
-        Sass::Plugin.on_compilation_error do |e, filename, css|
-          Compass.configuration.run_callback(:stylesheet_error, filename, e.message)
+        unless defined?(CallbacksSetup)
+          Sass::Plugin.on_updating_stylesheet do |sass_file, css_file|
+            Compass.configuration.run_callback(:stylesheet_saved, css_file)
+          end
+          Sass::Plugin.on_compilation_error do |e, filename, css|
+            Compass.configuration.run_callback(:stylesheet_error, filename, e.message)
+          end
+          const_set('CallbacksSetup', true)
         end
       end
 
@@ -98,7 +101,12 @@ module Compass
       end
 
       def discover_extensions!
-        if File.exists?(configuration.extensions_path)
+        Compass.shared_extension_paths.each do |extensions_path|
+          if File.directory?(extensions_path)
+            Compass::Frameworks.discover(extensions_path)
+          end
+        end
+        if File.directory?(configuration.extensions_path)
           Compass::Frameworks.discover(configuration.extensions_path)
         end
       end

data/lib/compass/sass_extensions.rb

@@ -3,3 +3,4 @@ end
 
 require 'compass/sass_extensions/functions'
 require 'compass/sass_extensions/monkey_patches'
+require 'compass/sass_extensions/sprites'

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

@@ -1,5 +1,3 @@
-require 'digest/md5'
-
 module Compass::SassExtensions::Functions::Sprites
   ZERO = Sass::Script::Number::new(0)
 
@@ -12,224 +10,7 @@ module Compass::SassExtensions::Functions::Sprites
     end
   end
 
-  class SpriteMap < Sass::Script::Literal
-
-    # Changing this string will invalidate all previously generated sprite images.
-    # We should do so only when the packing algorithm changes
-    SPRITE_VERSION = "1"
-
-    attr_accessor :image_names, :path, :name, :options
-    attr_accessor :images, :width, :height
-
-    def self.from_uri(uri, context, kwargs)
-      path, name = Compass::Sprites.path_and_name(uri.value)
-      sprites = Compass::Sprites.discover_sprites(uri.value).map do |sprite|
-        sprite.gsub(Compass.configuration.images_path+"/", "")
-      end
-      new(sprites, path, name, context, kwargs)
-    end
-
-    def initialize(image_names, path, name, context, options)
-      @image_names, @path, @name, @options = image_names, path, name, options
-      @images = nil
-      @width = nil
-      @height = nil
-      @evaluation_context = context
-      validate!
-      compute_image_metadata!
-    end
-
-    def sprite_names
-      image_names.map{|f| Compass::Sprites.sprite_name(f) }
-    end
-
-    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
-
-    # Calculates the overal image dimensions
-    # collects image sizes and input parameters for each sprite
-    def compute_image_metadata!
-      @images = []
-      @width = 0
-      image_names.each do |relative_file|
-        file = File.join(Compass.configuration.images_path, relative_file)
-        width, height = Compass::SassExtensions::Functions::ImageSize::ImageProperties.new(file).size
-        sprite_name = Compass::Sprites.sprite_name(relative_file)
-        position = position_for(sprite_name)
-        offset = (position.unitless? || position.unit_str == "px") ? position.value : 0
-        @images << {
-          :name => sprite_name,
-          :file => file,
-          :relative_file => relative_file,
-          :height => height,
-          :width => width,
-          :repeat => repeat_for(sprite_name),
-          :spacing => spacing_for(sprite_name),
-          :position => position,
-          :digest => Digest::MD5.file(file).hexdigest
-        }
-        @width = [@width, width + offset].max
-      end
-      @images.each_with_index do |image, index|
-        if index == 0
-          image[:top] = 0
-        else
-          last_image = @images[index-1]
-          image[:top] = last_image[:top] + last_image[:height] + [image[:spacing],  last_image[:spacing]].max
-        end
-        if image[:position].unit_str == "%"
-          image[:left] = (@width - image[:width]) * (image[:position].value / 100)
-        else
-          image[:left] = image[:position].value
-        end
-      end
-      @height = @images.last[:top] + @images.last[:height]
-    end
-
-    def position_for(name)
-      options.get_var("#{name}-position") || options.get_var("position") || Sass::Script::Number.new(0, ["px"])
-    end
-
-    def repeat_for(name)
-      if (var = options.get_var("#{name}-repeat"))
-        var.value
-      elsif (var = options.get_var("repeat"))
-        var.value
-      else
-        "no-repeat"
-      end
-    end
-
-    def spacing_for(name)
-      (options.get_var("#{name}-spacing") ||
-       options.get_var("spacing") ||
-       ZERO).value
-    end
-
-    def image_for(name)
-      @images.detect{|img| img[:name] == name}
-    end
-
-    # Calculate the size of the sprite
-    def size
-      [width, height]
-    end
-
-    # Generate a sprite image if necessary
-    def generate
-      if generation_required?
-        sprite_data = construct_sprite
-        save!(sprite_data)
-        Compass.configuration.run_callback(:sprite_generated, sprite_data)
-      end
-    end
-
-    def generation_required?
-      !File.exists?(filename) || outdated?
-    end
-
-    def require_png_library!
-      begin
-        require 'oily_png'
-      rescue LoadError
-        require 'chunky_png'
-      end
-    end
-
-    # Returns a PNG object
-    def construct_sprite
-      require_png_library!
-      output_png = 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]
-        else
-          x = image[:left] - (image[:left] / image[:width]).ceil * image[:width]
-          while x < width do
-            output_png.replace input_png, x, image[:top]
-            x += image[:width]
-          end
-        end
-      end
-      output_png
-    end
-
-    # The on-the-disk filename of the sprite
-    def filename
-      File.join(Compass.configuration.images_path, "#{path}-#{uniqueness_hash}.png")
-    end
-
-    def uniqueness_hash
-      @uniqueness_hash ||= begin
-        sum = Digest::MD5.new
-        sum << SPRITE_VERSION
-        sum << path
-        images.each do |image|
-          [:relative_file, :height, :width, :repeat, :spacing, :position, :digest].each do |attr|
-            sum << image[attr].to_s
-          end
-        end
-        sum.hexdigest[0...10]
-      end
-      @uniqueness_hash
-    end
-
-    # saves the sprite for later retrieval
-    def save!(output_png)
-      saved = output_png.save filename
-      Compass.configuration.run_callback(:sprite_saved, filename)
-      saved
-    end
-
-    # All the full-path filenames involved in this sprite
-    def image_filenames
-      image_names.map do |image_name|
-        File.join(Compass.configuration.images_path, image_name)
-      end
-    end
-
-    # Checks whether this sprite is outdated
-    def outdated?
-      last_update = self.mtime
-      image_filenames.each do |image|
-        return true if File.mtime(image) > last_update
-      end
-      false
-    end
-
-    def mtime
-      File.mtime(filename)
-    end
-
-    def inspect
-      to_s
-    end
-
-    def to_s(options = self.options)
-      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
-
-  end
-
-  # Creates a SpriteMap object. A sprite map, when used in a property is the same
+  # Creates a Compass::SassExtensions::Sprites::Base object. A sprite map, when used in a property is the same
   # as calling sprite-url. So the following background properties are equivalent:
   #
   #     $icons: sprite-map("icons/*.png");
@@ -240,7 +21,7 @@ module Compass::SassExtensions::Functions::Sprites
   # the first time it is converted to a url. Simply constructing it has no side-effects.
   def sprite_map(glob, kwargs = {})
     kwargs.extend VariableReader
-    SpriteMap.from_uri(glob, self, kwargs)
+    Compass::SassExtensions::Sprites::Base.from_uri(glob, self, kwargs)
   end
   Sass::Script::Functions.declare :sprite_map, [:glob], :var_kwargs => true
 
@@ -253,7 +34,7 @@ module Compass::SassExtensions::Functions::Sprites
   #
   #     background: url('/images/icons.png?12345678') 0 -24px no-repeat;
   def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO)
-    unless map.is_a?(SpriteMap)
+    unless map.is_a?(Compass::SassExtensions::Sprites::Base)
       missing_sprite!("sprite")
     end
     unless sprite.is_a?(Sass::Script::String)
@@ -270,7 +51,7 @@ module Compass::SassExtensions::Functions::Sprites
   # Returns the name of a sprite map
   # The name is derived from the folder than contains the sprites.
   def sprite_map_name(map)
-    unless map.is_a?(SpriteMap)
+    unless map.is_a?(Compass::SassExtensions::Sprites::Base)
       missing_sprite!("sprite-map-name")
     end
     Sass::Script::String.new(map.name)
@@ -279,11 +60,11 @@ module Compass::SassExtensions::Functions::Sprites
 
   # Returns the path to the original image file for the sprite with the given name
   def sprite_file(map, sprite)
-    unless map.is_a?(SpriteMap)
+    unless map.is_a?(Compass::SassExtensions::Sprites::Base)
       missing_sprite!("sprite-file")
     end
     if image = map.image_for(sprite.value)
-      Sass::Script::String.new(image[:relative_file])
+      Sass::Script::String.new(image.relative_file)
     else
       missing_image!(map, sprite)
     end
@@ -292,7 +73,7 @@ module Compass::SassExtensions::Functions::Sprites
 
   # Returns a url to the sprite image.
   def sprite_url(map)
-    unless map.is_a?(SpriteMap)
+    unless map.is_a?(Compass::SassExtensions::Sprites::Base)
       missing_sprite!("sprite-url")
     end
     map.generate
@@ -322,7 +103,7 @@ module Compass::SassExtensions::Functions::Sprites
   #
   #     background-position: 3px -36px;
   def sprite_position(map, sprite = nil, offset_x = ZERO, offset_y = ZERO)
-    unless map.is_a?(SpriteMap)
+    unless map.is_a?(Compass::SassExtensions::Sprites::Base)
       missing_sprite!("sprite-position")
     end
     unless sprite && sprite.is_a?(Sass::Script::String)
@@ -335,10 +116,10 @@ module Compass::SassExtensions::Functions::Sprites
     if offset_x.unit_str == "%"
       x = offset_x # CE: Shouldn't this be a percentage of the total width?
     else
-      x = offset_x.value - image[:left]
+      x = offset_x.value - image.left
       x = Sass::Script::Number.new(x, x == 0 ? [] : ["px"])
     end
-    y = offset_y.value - image[:top]
+    y = offset_y.value - image.top
     y = Sass::Script::Number.new(y, y == 0 ? [] : ["px"])
     Sass::Script::List.new([x, y],:space)
   end