compass 0.11.beta.7 → 0.11.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 11
-:state: beta
-:build: 7
+:build: 0
+:name: Antares

data/frameworks/compass/stylesheets/compass/layout/_grid-background.scss

@@ -2,27 +2,34 @@
 @import "compass/css3/background-size";
 
 // Set the color of your columns
-$grid-background-column-color     : rgba(100, 100, 225, 0.25)    !default;
+$grid-background-column-color     : rgba(100, 100, 225, 0.25)   !default;
 // Set the color of your gutters
-$grid-background-gutter-color     : rgba(0, 0, 0, 0)             !default;
+$grid-background-gutter-color     : rgba(0, 0, 0, 0)            !default;
 
 // Set the total number of columns in your grid
-$grid-background-total-columns    : 24                           !default;
+$grid-background-total-columns    : 24                          !default;
 // Set the width of your columns
-$grid-background-column-width     : 30px                         !default;
+$grid-background-column-width     : 30px                        !default;
 // Set the width of your gutters
-$grid-background-gutter-width     : 10px                         !default;
+$grid-background-gutter-width     : 10px                        !default;
 // Set the offset, if your columns are padded in from the container edge
-$grid-background-offset           : 0px                          !default;
+$grid-background-offset           : 0px                         !default;
 
 // Set the color of your baseline
-$grid-background-baseline-color   : rgba(0, 0, 0, 0.5)           !default;
+$grid-background-baseline-color   : rgba(0, 0, 0, 0.5)          !default;
 // Set the height of your baseline grid
-$grid-background-baseline-height  : 1.5em                        !default;
+$grid-background-baseline-height  : 1.5em                       !default;
+
+// toggle your columns grids on and off
+$show-column-grid-backgrounds     : true                        !default;
+// toggle your vertical grids on and off
+$show-baseline-grid-backgrounds   : true                        !default;
+// toggle all your grids on and off
+$show-grid-backgrounds            : true                        !default;
 
 // optionally force your grid-image to remain fluid
 // no matter what units you used to declared your grid.
-$grid-background-force-fluid      : false                        !default;
+$grid-background-force-fluid      : false                       !default;
 
 
 // Create the gradient needed for baseline grids
@@ -118,9 +125,11 @@ $grid-background-force-fluid      : false                        !default;
   $baseline : $grid-background-baseline-height,
   $color    : $grid-background-baseline-color
 ) {
-  @include background-image(get-baseline-gradient($color));
-  @include background-size(100% $baseline);
-  background-position: left top;
+  @if $show-grid-backgrounds and $show-baseline-grid-backgrounds {
+    @include background-image(get-baseline-gradient($color));
+    @include background-size(100% $baseline);
+    background-position: left top;
+  }
 }
 
 // Add just the horizontal grid to an element's background
@@ -133,10 +142,12 @@ $grid-background-force-fluid      : false                        !default;
   $gutter-color   : $grid-background-gutter-color,
   $force-fluid    : $grid-background-force-fluid
 ) {
-  @include background-image(
-    get-column-gradient($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid)
-  );
-  background-position: left top;
+  @if $show-grid-backgrounds and $show-column-grid-backgrounds {
+    @include background-image(
+      get-column-gradient($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid)
+    );
+    background-position: left top;
+  }
 }
 
 // Add both horizontal and baseline grids to an element's background
@@ -151,10 +162,17 @@ $grid-background-force-fluid      : false                        !default;
   $baseline-color : $grid-background-baseline-color,
   $force-fluid    : $grid-background-force-fluid
 ) {
-  @include background-image(
-    get-baseline-gradient($baseline-color),
-    get-column-gradient($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid)
-  );
-  @include background-size(100% $baseline, auto);
-  background-position: left top;
+  @if $show-grid-backgrounds {
+    @if $show-baseline-grid-backgrounds and $show-column-grid-backgrounds {
+      @include background-image(
+        get-baseline-gradient($baseline-color),
+        get-column-gradient($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid)
+      );
+      @include background-size(100% $baseline, auto);
+      background-position: left top;
+    } @else {
+      @include baseline-grid-background($baseline, $baseline-color);
+      @include column-grid-background($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid);
+    }
+  }
 }

data/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss

@@ -20,12 +20,17 @@ $sprite-selectors: hover, target, active !default;
 // class or you can specify the `sprite-url` explicitly like this:
 //
 //     background: $map no-repeat;
+
+$disable-magic-sprite-selectors:false !default;
+
 @mixin sprite($map, $sprite, $dimensions: false, $offset-x: 0, $offset-y: 0) {
   @include sprite-background-position($map, $sprite, $offset-x, $offset-y);
   @if $dimensions {
     @include sprite-dimensions($map, $sprite);
   }
-  @include sprite-selectors($map, $sprite, $sprite);
+  @if not $disable-magic-sprite-selectors {
+    @include sprite-selectors($map, $sprite, $sprite);
+  }
 }
 
 // Include the selectors for the `$sprite` given the `$map` and the 

data/frameworks/compass/templates/extension/manifest.rb

@@ -1,8 +1,14 @@
 description "Generate a compass extension."
 
-file 'stylesheets/main.sass', :to => "stylesheets/_#{File.basename(options[:pattern_name]||options[:project_name]||'main')}.sass"
+unless options.include?(:preferred_syntax)
+  options[:preferred_syntax] = 'sass'
+end
+
 file 'templates/project/manifest.rb'
-file 'templates/project/screen.sass'
+file "stylesheets/main.sass", :to => "stylesheets/_#{File.basename(options[:pattern_name]||options[:project_name]||'main')}.#{options[:preferred_syntax]}"
+
+file "templates/project/screen.sass", :to => "templates/project/screen.#{options[:preferred_syntax]}"
+
 
 help %Q{
   To generate a compass extension:

data/lib/compass/commands/print_version.rb

@@ -57,6 +57,9 @@ Options:
         def long_output_string
           lines = []
           lines << "Compass #{::Compass.version[:string]}"
+          if name = ::Compass.version[:name]
+            lines.last << " (#{name})"
+          end
           lines << "Copyright (c) 2008-#{Time.now.year} Chris Eppstein"
           lines << "Released under the MIT License."
           lines << "Compass is charityware."

data/lib/compass/commands/update_project.rb

@@ -49,17 +49,28 @@ module Compass
       end
 
       def new_compiler_instance(additional_options = {})
-        compiler_opts = Compass.sass_engine_options
-        compiler_opts.merge!(:force => options[:force],
-                             :sass_files => explicit_sass_files,
-                             :dry_run => options[:dry_run])
-        compiler_opts[:quiet] = options[:quiet] if options[:quiet]
-        compiler_opts[:time] = options[:time] if options[:time]
-        compiler_opts.merge!(additional_options)
-        Compass::Compiler.new(working_path,
+        @compiler_opts ||= begin
+          compiler_opts = Compass.sass_engine_options
+          compiler_opts.merge!(:force => options[:force],
+                               :sass_files => explicit_sass_files,
+                               :dry_run => options[:dry_run])
+          compiler_opts[:quiet] = options[:quiet] if options[:quiet]
+          compiler_opts[:time] = options[:time] if options[:time]
+          compiler_opts
+        end
+
+        @memory_store ||= Sass::CacheStores::Memory.new
+        @backing_store ||= compiler_opts[:cache_store]
+        @backing_store ||= Sass::CacheStores::Filesystem.new(determine_cache_location)
+        @cache_store ||= Sass::CacheStores::Chain.new(@memory_store, @backing_store)
+        @memory_store.reset!
+
+        Compass::Compiler.new(
+          working_path,
           Compass.configuration.sass_path,
           Compass.configuration.css_path,
-          compiler_opts)
+          @compiler_opts.merge(:cache_store => @cache_store).merge(additional_options)
+        )
       end
 
       def explicit_sass_files
@@ -73,6 +84,9 @@ module Compass
         end
       end
 
+      def determine_cache_location
+        Compass.configuration.cache_path || Sass::Plugin.options[:cache_location] || File.join(working_path, ".sass-cache")
+      end
 
       class << self
         def option_parser(arguments)

data/lib/compass/commands/watch_project.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'pathname'
 require 'compass/commands/base'
 require 'compass/commands/update_project'
+require 'sass/plugin'
 
 module Compass
   module Commands
@@ -24,12 +25,39 @@ module Compass
 
       end
     end
+    module MemoryDebugger
+      def report_on_instances(type, options = {})
+        @@runs ||= 0
+        @@runs += 1
+        @@object_id_tracker ||= {}
+        @@object_id_tracker[type] ||= []
+        GC.start
+        sleep options.fetch(:gc_pause, 1)
+        count = ObjectSpace.each_object(type) do |obj|
+          if options.fetch(:verbose, true)
+            if @@runs > 2
+              if !@@object_id_tracker[type].include?(obj.object_id)
+                begin
+                  puts obj.inspect
+                rescue
+                end
+                puts "#{obj.class.name}:#{obj.object_id}"
+              end
+            end
+            @@object_id_tracker[type] << obj.object_id
+          end
+        end
+        puts "#{type}: #{count} instances."
+      end
+    end
     class WatchProject < UpdateProject
 
       register :watch
 
       attr_accessor :last_update_time, :last_sass_files
 
+      include MemoryDebugger
+
       def perform
         Signal.trap("INT") do
           puts ""
@@ -39,12 +67,8 @@ module Compass
         check_for_sass_files!(new_compiler_instance)
         recompile
 
-        begin
-          require 'fssm'
-        rescue LoadError
-          $: << File.join(Compass.lib_directory, 'vendor', 'fssm')
-          retry
-        end
+        require 'fssm'
+
 
         if options[:poll]
           require "fssm/backends/polling"
@@ -58,8 +82,10 @@ module Compass
 
         puts ">>> Compass is #{action} for changes. Press Ctrl-C to Stop."
 
+        begin
         FSSM.monitor do |monitor|
           Compass.configuration.sass_load_paths.each do |load_path|
+            load_path = load_path.root if load_path.respond_to?(:root)
             next unless load_path.is_a? String
             monitor.path load_path do |path|
               path.glob '**/*.s[ac]ss'
@@ -88,7 +114,12 @@ module Compass
           end
 
         end
-        
+      rescue FSSM::CallbackError => e
+        # FSSM catches exit? WTF.
+        if e.message =~ /exit/
+          exit
+        end
+      end
       end
 
       def remove_obsolete_css(base = nil, relative = nil)
@@ -103,11 +134,13 @@ module Compass
       end
 
       def recompile(base = nil, relative = nil)
+        @memory_cache.reset! if @memory_cache
         compiler = new_compiler_instance(:quiet => true)
         if file = compiler.out_of_date?
           begin
-            puts ">>> Change detected to: #{file}"
+            puts ">>> Change detected to: #{relative || compiler.relative_stylesheet_name(file)}"
             compiler.run
+            GC.start
           rescue StandardError => e
             ::Compass::Exec::Helpers.report_error(e, options)
           end

data/lib/compass/compiler.rb

@@ -11,8 +11,7 @@ module Compass
       self.logger = options.delete(:logger)
       self.options = options
       self.options[:cache_location] ||= determine_cache_location
-      Compass.configure_sass_plugin!
-      self.importer = Sass::Importers::Filesystem.new(from)
+      options[:importer] = self.importer = Sass::Importers::Filesystem.new(from)
       self.staleness_checker = Sass::Plugin::StalenessChecker.new(options)
     end
 
@@ -58,7 +57,7 @@ module Compass
     end
 
     def needs_update?(css_filename, sass_filename)
-      staleness_checker.stylesheet_needs_update?(css_filename, relative_stylesheet_name(sass_filename), importer)
+      staleness_checker.stylesheet_needs_update?(css_filename, File.expand_path(sass_filename), importer)
     end
 
     # Determines if the configuration file is newer than any css file

data/lib/compass/configuration.rb

@@ -41,6 +41,40 @@ module Compass
       :sprite_engine
     ].flatten
 
+    # Registers a new configuration property.
+    # Extensions can use this to add new configuration options to compass.
+    #
+    # @param [Symbol] name The name of the property.
+    # @param [String] comment A comment for the property.
+    # @param [Proc] default A method to calculate the default value for the property.
+    #                       The proc is executed in the context of the project's configuration data.
+    def self.add_configuration_property(name, comment = nil, &default)
+      ATTRIBUTES << name
+      if comment.is_a?(String)
+        unless comment[0..0] == "#"
+          comment = "# #{comment}"
+        end
+        unless comment[-1..-1] == "\n"
+          comment = comment + "\n"
+        end
+        Data.class_eval <<-COMMENT
+          def comment_for_#{name}
+            #{comment.inspect}
+          end
+        COMMENT
+      end
+      Data.send(:define_method, :"default_#{name}", &default) if default
+      Data.inherited_accessor(name)
+      if name.to_s =~ /dir|path/
+        strip_trailing_separator(name)
+      end
+    end
+
+    # For testing purposes
+    def self.remove_configuration_property(name)
+      ATTRIBUTES.delete(name)
+    end
+
   end
 end
 

data/lib/compass/configuration/adapters.rb

@@ -55,10 +55,14 @@ module Compass
       def sass_load_paths
         load_paths = []
         load_paths << sass_path if sass_path
-        Compass::Frameworks::ALL.each do |framework|
-          load_paths << framework.stylesheets_directory if File.exists?(framework.stylesheets_directory)
+        Compass::Frameworks::ALL.each do |f|
+          load_paths << f.stylesheets_directory if File.directory?(f.stylesheets_directory)
         end
         load_paths += resolve_additional_import_paths
+        load_paths.map! do |p|
+          next p if p.respond_to?(:find_relative)
+          Sass::Importers::Filesystem.new(p.to_s)
+        end
         load_paths << Compass::Sprites.new
         load_paths
       end

data/lib/compass/configuration/data.rb

@@ -125,6 +125,7 @@ module Compass
         Compass::Frameworks.register_directory framework_dir
       end
 
+      # Finds all extensions within a directory and registers them.
       def discover(frameworks_dir)
         (self.framework_path ||= []) << frameworks_dir
         Compass::Frameworks.discover frameworks_dir

data/lib/compass/configuration/defaults.rb

@@ -30,7 +30,7 @@ module Compass
         if top_level.environment == :development
           :expanded
         else
-          :compact
+          :compressed
         end
       end
 

data/lib/compass/configuration/serialization.rb

@@ -50,6 +50,7 @@ module Compass
             $stderr.puts "WARNING: #{prop} is code and cannot be written to a file. You'll need to copy it yourself."
           end
           if respond_to?("comment_for_#{prop}")
+            contents << "\n"
             contents << send("comment_for_#{prop}")
           end
           if block_given? && (to_emit = yield(prop, value))

data/lib/compass/exec/project_options_parser.rb

@@ -37,14 +37,14 @@ module Compass::Exec::ProjectOptionsParser
     end
 
     opts.on('-e ENV', '--environment ENV', [:development, :production], 'Use sensible defaults for your current environment.',
-            '  One of: development, production (default)') do |env|
+            '  One of: development (default), production') do |env|
       self.options[:environment] = env
-            end
+    end
 
     opts.on('-s STYLE', '--output-style STYLE', [:nested, :expanded, :compact, :compressed], 'Select a CSS output mode.',
             '  One of: nested, expanded, compact, compressed') do |style|
       self.options[:output_style] = style
-            end
+    end
 
     opts.on('--relative-assets', :NONE, 'Make compass asset helpers generate relative urls to assets.') do
       self.options[:relative_assets] = true

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

@@ -33,82 +33,112 @@ module Compass::SassExtensions::Functions::GradientSupport
     end
   end
 
+  module Gradient
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def standardized_prefix(prefix)
+        class_eval %Q{
+          def to_#{prefix}(options = self.options)
+            Sass::Script::String.new("-#{prefix}-\#{to_s(options)}")
+          end
+        }
+      end
+    end
+
+    def inspect
+      to_s
+    end
+
+    def supports?(aspect)
+      GRADIENT_ASPECTS.include?(aspect)
+    end
+
+    def has_aspect?
+      true
+    end
+
+    def angle?(value)
+      value.is_a?(Sass::Script::Number) &&
+      value.numerator_units.size == 1 &&
+      value.numerator_units.first == "deg" &&
+      value.denominator_units.empty?
+    end
+
+  end
+
   class RadialGradient < Sass::Script::Literal
-    attr_accessor :position_or_angle, :shape_and_size, :color_stops
+    include Gradient
+
+    attr_accessor :position, :shape_and_size, :color_stops
+
     def children
-      [color_stops, position_or_angle, shape_and_size].compact
+      [color_stops, position, shape_and_size].compact
     end
-    def initialize(position_or_angle, shape_and_size, color_stops)
+
+    def initialize(position, shape_and_size, color_stops)
       unless color_stops.value.size >= 2
         raise Sass::SyntaxError, "At least two color stops are required for a radial-gradient"
       end
-      self.position_or_angle = position_or_angle
+      if angle?(position)
+        raise Sass::SyntaxError, "CSS no longer allows angles in radial-gradients."
+      end
+      self.position = position
       self.shape_and_size = shape_and_size
       self.color_stops = color_stops
     end
-    def inspect
-      to_s
-    end
+
     def to_s(options = self.options)
       s = "radial-gradient("
-      s << position_or_angle.to_s(options) << ", " if position_or_angle
+      s << position.to_s(options) << ", " if position
       s << shape_and_size.to_s(options) << ", " if shape_and_size
       s << color_stops.to_s(options)
       s << ")"
     end
-    def supports?(aspect)
-      if aspect == "svg"
-        if position_or_angle.nil? || is_position(position_or_angle).to_bool || is_position_list(position_or_angle).to_bool
-          true
-        else
-          Compass::Util.compass_warn("Warning: Angle-based gradients are not yet supported in SVG. Found: #{position_or_angle}")
-          false
-        end
-      else
-        GRADIENT_ASPECTS.include?(aspect)
-      end
-    end
-    def has_aspect?
-      true
-    end
-    def to_webkit(options = self.options)
-      Sass::Script::String.new("-webkit-#{to_s(options)}")
-    end
+    
+    standardized_prefix :webkit
+    standardized_prefix :moz
+    standardized_prefix :o
+    
     def to_owg(options = self.options)
       args = [
-        grad_point(position_or_angle || _center_position),
+        grad_point(position || _center_position),
         Sass::Script::String.new("0"),
-        grad_point(position_or_angle || _center_position),
+        grad_point(position || _center_position),
         grad_end_position(color_stops, Sass::Script::Bool.new(true)),
         grad_color_stops(color_stops)
       ]
       args.each {|a| a.options = options}
       Sass::Script::String.new("-webkit-gradient(radial, #{args.join(', ')})")
     end
-    def to_moz(options = self.options)
-      Sass::Script::String.new("-moz-#{to_s(options)}")
-    end
-    def to_o(options = self.options)
-      Sass::Script::String.new("-o-#{to_s(options)}")
-    end
+
     def to_svg(options = self.options)
       # XXX Add shape support if possible
-      radial_svg_gradient(color_stops, position_or_angle || _center_position)
+      radial_svg_gradient(color_stops, position || _center_position)
     end
+
     def to_pie(options = self.options)
       Compass::Logger.new.record(:warning, "PIE does not support radial-gradient.")
       Sass::Script::String.new("-pie-radial-gradient(unsupported)")
     end
+
     def to_css2(options = self.options)
       Sass::Script::String.new("")
     end
   end
 
   class LinearGradient < Sass::Script::Literal
+    include Gradient
+
     attr_accessor :color_stops, :position_or_angle
+
     def children
       [color_stops, position_or_angle].compact
     end
+
     def initialize(position_or_angle, color_stops)
       unless color_stops.value.size >= 2
         raise Sass::SyntaxError, "At least two color stops are required for a linear-gradient"
@@ -116,33 +146,18 @@ module Compass::SassExtensions::Functions::GradientSupport
       self.position_or_angle = position_or_angle
       self.color_stops = color_stops
     end
-    def inspect
-      to_s
-    end
+
     def to_s(options = self.options)
       s = "linear-gradient("
       s << position_or_angle.to_s(options) << ", " if position_or_angle
       s << color_stops.to_s(options)
       s << ")"
     end
-    def supports?(aspect)
-      if aspect == "svg"
-        if position_or_angle.nil? || is_position(position_or_angle).to_bool || is_position_list(position_or_angle).to_bool
-          true
-        else
-          Compass::Util.compass_warn("Warning: Angle-based gradients are not yet supported in SVG. Found: #{position_or_angle}")
-          false
-        end
-      else
-        GRADIENT_ASPECTS.include?(aspect)
-      end
-    end
-    def has_aspect?
-      true
-    end
-    def to_webkit(options = self.options)
-      Sass::Script::String.new("-webkit-#{to_s(options)}")
-    end
+
+    standardized_prefix :webkit
+    standardized_prefix :moz
+    standardized_prefix :o
+    
     # Output the original webkit gradient syntax
     def to_owg(options = self.options)
       args = []
@@ -152,20 +167,17 @@ module Compass::SassExtensions::Functions::GradientSupport
       args.each{|a| a.options = options}
       Sass::Script::String.new("-webkit-gradient(linear, #{args.join(', ')})")
     end
-    def to_moz(options = self.options)
-      Sass::Script::String.new("-moz-#{to_s(options)}")
-    end
-    def to_o(options = self.options)
-      Sass::Script::String.new("-o-#{to_s(options)}")
-    end
+
     def to_svg(options = self.options)
       linear_svg_gradient(color_stops, position_or_angle || Sass::Script::String.new("top"))
     end
+
     def to_pie(options = self.options)
       # PIE just uses the standard rep, but the property is prefixed so
       # the presence of this attribute helps flag when to render a special rule.
       Sass::Script::String.new to_s(options)
     end
+
     def to_css2(options = self.options)
       Sass::Script::String.new("")
     end
@@ -289,7 +301,7 @@ module Compass::SassExtensions::Functions::GradientSupport
         stop = pos.stop
         stop = stop.div(max).times(Sass::Script::Number.new(100,["%"])) if stop.numerator_units == max.numerator_units && max.numerator_units != ["%"]
         # Make sure the color stops are specified in the right order.
-        if last_value && stop.numerator_units == last_value.numerator_units && stop.denominator_units == last_value.denominator_units && stop.value < last_value.value
+        if last_value && stop.numerator_units == last_value.numerator_units && stop.denominator_units == last_value.denominator_units && (stop.value * 1000).round < (last_value.value * 1000).round
           raise Sass::SyntaxError.new("Color stops must be specified in increasing order. #{stop.value} came after #{last_value.value}.")
         end
         last_value = stop
@@ -445,9 +457,13 @@ module Compass::SassExtensions::Functions::GradientSupport
         arg.all?{|a| color_stop?(a)} ? arg : nil
       end
     end
-
+    
     def linear_svg(color_stops, x1, y1, x2, y2)
-      gradient = %Q{<linearGradient id="grad" x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}">#{color_stops_svg(color_stops)}</linearGradient>}
+      transform = ''
+      if angle?(position_or_angle)
+        transform = %Q{ gradientTransform = "rotate(#{position_or_angle.value})"}
+      end
+      gradient = %Q{<linearGradient id="grad" gradientUnits="userSpaceOnUse" x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}"#{transform}>#{color_stops_svg(color_stops)}</linearGradient>}
       svg(gradient)
     end