compass 0.11.alpha.4 → 0.11.beta.0

data/lib/compass/commands/project_base.rb

@@ -28,7 +28,7 @@ module Compass
       end
 
       def add_project_configuration
-        Compass.add_project_configuration(options[:configuration_file]) do
+        Compass.add_project_configuration(options[:configuration_file], :defaults => Compass.configuration_for(options, "cli_defaults")) do
           options[:project_type]
         end
       end

data/lib/compass/commands/watch_project.rb

@@ -69,6 +69,23 @@ module Compass
               path.create &method(:recompile)
             end
           end
+          Compass.configuration.watches.each do |glob, callback|
+            monitor.path Compass.configuration.project_path do |path|
+              path.glob glob
+              path.update do |base, relative|
+                puts ">>> Change detected to: #{relative}"
+                callback.call(base, relative)
+              end
+              path.create do |base, relative|
+                puts ">>> New file detected: #{relative}"
+                callback.call(base, relative)
+              end
+              path.delete do |base, relative|
+                puts ">>> File Removed: #{relative}"
+                callback.call(base, relative)
+              end
+            end
+          end
 
         end
         

data/lib/compass/configuration/data.rb

@@ -99,6 +99,21 @@ module Compass
         end
       end
 
+      def watch(glob, &block)
+        @watches ||= []
+        @watches << [glob, block]
+      end
+      
+      def watches
+        if defined?(@watches)
+          @watches
+        elsif inherited_data.respond_to?(:watches)
+          inherited_data.watches
+        else
+          []
+        end
+      end
+
       # Require a compass plugin and capture that it occured so that the configuration serialization works next time.
       def require(lib)
         (self.required_libraries ||= []) << lib

data/lib/compass/configuration/helpers.rb

@@ -27,16 +27,18 @@ module Compass
         @configuration = data
       end
 
-      def configuration_for(config, filename = nil)
-        if config.is_a?(Compass::Configuration::Data)
+      def configuration_for(config, filename = nil, defaults = nil)
+        if config.nil?
+          nil
+        elsif config.is_a?(Compass::Configuration::Data)
           config
         elsif config.respond_to?(:read)
           filename ||= config.to_s if config.is_a?(Pathname)
-          Compass::Configuration::Data.new_from_string(config.read, filename)
+          Compass::Configuration::Data.new_from_string(config.read, filename, defaults)
         elsif config.is_a?(Hash)
           Compass::Configuration::Data.new(filename, config)
         elsif config.is_a?(String)
-          Compass::Configuration::Data.new_from_file(config)
+          Compass::Configuration::Data.new_from_file(config, defaults)
         elsif config.is_a?(Symbol)
           Compass::AppIntegration.lookup(config).configuration
         else
@@ -74,10 +76,7 @@ module Compass
         options = args.last.is_a?(Hash) ? args.pop : {}
         configuration_file_path = args.shift || detect_configuration_file
         raise ArgumentError, "Too many arguments" if args.any?
-        if configuration_file_path && File.exists?(configuration_file_path)
-
-          data = configuration_for(configuration_file_path)
-
+        if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
           if data.raw_project_type
             add_configuration(data.raw_project_type.to_sym)
           elsif options[:project_type]

data/lib/compass/configuration/inheritance.rb

@@ -87,6 +87,16 @@ module Compass
           self
         end
 
+        def reset_inheritance!
+          self.inherited_data = nil
+        end
+
+        def with_defaults(data)
+          inherit_from!(data)
+          yield
+          reset_inheritance!
+        end
+
         def unset!(attribute)
           @set_attributes ||= {}
           send("#{attribute}=", nil)
@@ -99,6 +109,10 @@ module Compass
           @set_attributes[attribute]
         end
 
+        def any_attributes_set?
+          @set_attributes && @set_attributes.size > 0
+        end
+
         def default_for(attribute)
           method = "default_#{attribute}".to_sym
           if respond_to?(method)

data/lib/compass/configuration/serialization.rb

@@ -8,15 +8,19 @@ module Compass
       end
 
       module ClassMethods
-        def new_from_file(config_file)
+        def new_from_file(config_file, defaults = nil)
           data = Data.new(config_file)
-          data._parse(config_file)
+          data.with_defaults(defaults) do
+            data._parse(config_file)
+          end
           data
         end
 
-        def new_from_string(contents, filename)
+        def new_from_string(contents, filename, defaults = nil)
           data = Data.new(filename)
-          data.parse_string(contents, filename)
+          data.with_defaults(defaults) do
+            data.parse_string(contents, filename)
+          end
           data
         end
       end

data/lib/compass/sass_extensions/functions.rb

@@ -4,7 +4,7 @@ end
 %w(
   selectors enumerate urls display
   inline_image image_size constants gradient_support
-  font_files lists colors trig sprites
+  font_files lists colors trig sprites cross_browser_support
 ).each do |func|
   require "compass/sass_extensions/functions/#{func}"
 end
@@ -23,6 +23,7 @@ module Sass::Script::Functions
   include Compass::SassExtensions::Functions::Colors
   include Compass::SassExtensions::Functions::Trig
   include Compass::SassExtensions::Functions::Sprites
+  include Compass::SassExtensions::Functions::CrossBrowserSupport
 end
 
 # Wierd that this has to be re-included to pick up sub-modules. Ruby bug?

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

@@ -1,11 +1,10 @@
 module Compass::SassExtensions::Functions::Colors
-  include Compass::Util
 
   # a genericized version of lighten/darken so that negative values can be used.
   def adjust_lightness(color, amount)
     assert_type color, :Color
     assert_type amount, :Number
-    color.with(:lightness => restrict(color.lightness + amount.value, 0..100))
+    color.with(:lightness => Compass::Util.restrict(color.lightness + amount.value, 0..100))
   end
 
   # Scales a color's lightness by some percentage.
@@ -21,7 +20,7 @@ module Compass::SassExtensions::Functions::Colors
   def adjust_saturation(color, amount)
     assert_type color, :Color
     assert_type amount, :Number
-    color.with(:saturation => restrict(color.saturation + amount.value, 0..100))
+    color.with(:saturation => Compass::Util.restrict(color.saturation + amount.value, 0..100))
   end
 
   # Scales a color's saturation by some percentage.

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

@@ -0,0 +1,39 @@
+module Compass::SassExtensions::Functions::CrossBrowserSupport
+  # Check if any of the arguments passed require a vendor prefix.
+  def prefixed(prefix, *args)
+    aspect = prefix.value.sub(/^-/,"")
+    needed = args.any?{|a| a.respond_to?(:supports?) && a.supports?(aspect)}
+    Sass::Script::Bool.new(needed)
+  end
+
+  %w(webkit moz o ms svg pie css2).each do |prefix|
+    class_eval <<-RUBY, __FILE__, __LINE__ + 1
+      # Syntactic sugar to apply the given prefix
+      # -moz($arg) is the same as calling prefix(-moz, $arg)
+      def _#{prefix}(*args)
+        prefix("#{prefix}", *args)
+      end
+    RUBY
+  end
+
+  def prefix(prefix, *objects)
+    prefix = prefix.value if prefix.is_a?(Sass::Script::String)
+    prefix = prefix[1..-1] if prefix[0] == ?-
+    if objects.size > 1
+      self.prefix(prefix, Sass::Script::List.new(objects, :comma))
+    else
+      object = objects.first
+      if object.is_a?(Sass::Script::List)
+        Sass::Script::List.new(object.value.map{|e|
+          self.prefix(prefix, e)
+        }, object.separator)
+      elsif object.respond_to?(:supports?) && object.supports?(prefix) && object.respond_to?(:"to_#{prefix}")
+        object.options = options
+        object.send(:"to_#{prefix}")
+      else
+        object
+      end
+    end
+  end
+
+end

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

@@ -1,322 +1,6 @@
 module Compass::SassExtensions::Functions::GradientSupport
 
-  module ListFreeSassSupport
-    class List < Sass::Script::Literal
-      attr_accessor :values
-      def children
-        values
-      end
-      def value
-        # duck type to a Sass List
-        values
-      end
-      def initialize(*values)
-        self.values = values
-      end
-      def join_with
-        ", "
-      end
-      def inspect
-        to_s
-      end
-      def to_s(options = self.options)
-        values.map {|v| v.to_s }.join(join_with)
-      end
-      def size
-        values.size
-      end
-    end
-
-    class SpaceList < List
-      def join_with
-        " "
-      end
-    end
-
-    # given a position list, return a corresponding position in percents
-    def grad_point(position)
-      position = position.is_a?(Sass::Script::String) ? position.value : position.to_s
-      position = if position[" "]
-        if position =~ /(top|bottom|center) (left|right|center)/
-          "#{$2} #{$1}"
-        else
-          position
-        end
-      else
-        case position
-        when /top|bottom/
-          "center #{position}"
-        when /left|right/
-          "#{position} center"
-        when /center/
-          "center center"
-        else
-          "#{position} center"
-        end
-      end
-      position = position.
-        gsub(/top/, "0%").
-        gsub(/bottom/, "100%").
-        gsub(/left/,"0%").
-        gsub(/right/,"100%").
-        gsub(/center/, "50%")
-      SpaceList.new(*position.split(/ /).map{|s| Sass::Script::String.new(s)})
-    end
-
-    def color_stops(*args)
-      List.new(*args.map do |arg|
-        case arg
-        when ColorStop
-          arg
-        when Sass::Script::Color
-          ColorStop.new(arg)
-        when Sass::Script::String
-          # We get a string as the result of concatenation
-          # So we have to reparse the expression
-          parse_color_stop(arg)
-        else
-          raise Sass::SyntaxError, "Not a valid color stop: #{arg.class.name}: #{arg}"
-        end
-      end)
-    end
-
-    # Returns a comma-delimited list after removing any non-true values
-    def compact(*args)
-      List.new(*args.reject{|a| !a.to_bool})
-    end
-
-    # Returns a list object from a value that was passed.
-    # This can be used to unpack a space separated list that got turned
-    # into a string by sass before it was passed to a mixin.
-    def _compass_list(arg)
-      return arg if arg.is_a?(List)
-      values = case arg
-        when Sass::Script::String
-          expr = Sass::Script::Parser.parse(arg.value, 0, 0)
-          if expr.is_a?(Sass::Script::Operation)
-            extract_list_values(expr)
-          elsif expr.is_a?(Sass::Script::Funcall)
-            expr.perform(Sass::Environment.new) #we already evaluated the args in context so no harm in using a fake env
-          else
-            [arg]
-          end
-        else
-          [arg]
-        end
-
-      SpaceList.new(*values)
-    end
-
-    def _compass_space_list(list)
-      if list.is_a?(List) && !list.is_a?(SpaceList)
-        SpaceList.new(*list.values)
-      elsif list.is_a?(SpaceList)
-        list
-      else
-        SpaceList.new(list)
-      end
-    end
-
-    def _compass_list_size(list)
-      Sass::Script::Number.new(list.size)
-    end
-
-    # slice a sublist from a list
-    def _compass_slice(list, start_index, end_index = nil)
-      end_index ||= Sass::Script::Number.new(-1)
-      start_index = start_index.value
-      end_index = end_index.value
-      start_index -= 1 unless start_index < 0
-      end_index -= 1 unless end_index < 0
-      list.class.new *list.values[start_index..end_index]
-    end
-
-    # Check if any of the arguments passed have a tendency towards vendor prefixing.
-    def prefixed(prefix, *args)
-      method = prefix.value.sub(/^-/,"to_").to_sym
-      args.map!{|a| a.is_a?(List) ? a.values : a}.flatten!
-      Sass::Script::Bool.new(args.any?{|a| a.respond_to?(method)})
-    end
-
-    %w(webkit moz o ms svg pie css2).each do |prefix|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def _#{prefix}(*args)
-          List.new(*args.map! {|a| add_prefix(:to_#{prefix}, a)})
-        end
-      RUBY
-    end
-
-    protected
-
-    def add_prefix(prefix_method, object)
-      if object.is_a?(List)
-        object.class.new(object.value.map{|e|
-          add_prefix(prefix_method, e)
-        })
-      elsif object.respond_to?(prefix_method)
-        object.options = options
-        object.send(prefix_method)
-      else
-        object
-      end
-    end
-
-    def color_stop?(arg)
-      parse_color_stop(arg)
-    rescue
-      nil
-    end
-
-    def assert_list(value)
-      unless value.is_a?(List)
-        raise ArgumentError.new("#{value.inspect} is not a list")
-      end
-    end
-
-  end
-
-  module ListBasedSassSupport
-    # given a position list, return a corresponding position in percents
-    def grad_point(position)
-      position = unless position.is_a?(Sass::Script::List)
-        Sass::Script::List.new([position], :space)
-      else
-        Sass::Script::List.new(position.value.dup, position.separator)
-      end
-      position.value.reject!{|p| p.is_a?(Sass::Script::Number) && p.numerator_units.include?("deg")}
-      if (position.value.first.value =~ /top|bottom/) or (position.value.last.value =~ /left|right/)
-        # browsers are pretty forgiving of reversed positions so we are too.
-        position.value.reverse!
-      end
-      if position.value.size == 1
-        if position.value.first.value =~ /top|bottom/
-          position.value.unshift Sass::Script::String.new("center")
-        elsif position.value.first.value =~ /left|right/
-          position.value.push Sass::Script::String.new("center")
-        end
-      end
-      position.value.map! do |p|
-        case p.value
-        when /top|left/
-          Sass::Script::Number.new(0, ["%"])
-        when /bottom|right/
-          Sass::Script::Number.new(100, ["%"])
-        when /center/
-          Sass::Script::Number.new(50, ["%"])
-        else
-          p
-        end
-      end
-      position
-    end
-
-    def color_stops(*args)
-      Sass::Script::List.new(args.map do |arg|
-        case arg
-        when ColorStop
-          arg
-        when Sass::Script::Color
-          ColorStop.new(arg)
-        when Sass::Script::List
-          ColorStop.new(*arg.value)
-        else
-          raise Sass::SyntaxError, "Not a valid color stop: #{arg.class.name}: #{arg}"
-        end
-      end, :comma)
-    end
-
-    # Returns a comma-delimited list after removing any non-true values
-    def compact(*args)
-      sep = :comma
-      if args.size == 1 && args.first.is_a?(Sass::Script::List)
-        args = args.first.value
-        sep = args.first.separator
-      end
-      Sass::Script::List.new(args.reject{|a| !a.to_bool}, sep)
-    end
-
-    # Returns a list object from a value that was passed.
-    # This can be used to unpack a space separated list that got turned
-    # into a string by sass before it was passed to a mixin.
-    def _compass_list(arg)
-      if arg.is_a?(Sass::Script::List)
-        Sass::Script::List.new(arg.value.dup, arg.separator)
-      else
-        Sass::Script::List.new([arg], :space)
-      end
-    end
-
-    def _compass_space_list(list)
-      if list.is_a?(Sass::Script::List)
-        Sass::Script::List.new(list.value.dup, :space)
-      else
-        Sass::Script::List.new([list], :space)
-      end
-    end
-
-    def _compass_list_size(list)
-      assert_list list
-      Sass::Script::Number.new(list.value.size)
-    end
-
-    # slice a sublist from a list
-    def _compass_slice(list, start_index, end_index = nil)
-      end_index ||= Sass::Script::Number.new(-1)
-      start_index = start_index.value
-      end_index = end_index.value
-      start_index -= 1 unless start_index < 0
-      end_index -= 1 unless end_index < 0
-      Sass::Script::List.new list.values[start_index..end_index], list.separator
-    end
-
-    # Check if any of the arguments passed have a tendency towards vendor prefixing.
-    def prefixed(prefix, *args)
-      method = prefix.value.sub(/^-/,"to_").to_sym
-      2.times do
-        args.map!{|a| a.is_a?(Sass::Script::List) ? a.value : a}.flatten!
-      end
-      Sass::Script::Bool.new(args.any?{|a| a.respond_to?(method)})
-    end
-
-    %w(webkit moz o ms svg pie css2).each do |prefix|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def _#{prefix}(*args)
-          Sass::Script::List.new(args.map! {|a| add_prefix(:to_#{prefix}, a)}, :comma)
-        end
-      RUBY
-    end
-
-    protected
-
-    def add_prefix(prefix_method, object)
-      if object.is_a?(Sass::Script::List)
-        Sass::Script::List.new(object.value.map{|e|
-          add_prefix(prefix_method, e)
-        }, object.separator)
-      elsif object.respond_to?(prefix_method)
-        object.options = options
-        object.send(prefix_method)
-      else
-        object
-      end
-    end
-
-    def color_stop?(arg)
-      arg.is_a?(ColorStop) ||
-      (arg.is_a?(Sass::Script::List) && ColorStop.new(*arg.value)) ||
-      ColorStop.new(arg)
-    rescue
-      nil
-    end
-
-    def assert_list(value)
-      unless value.is_a?(Sass::Script::List)
-        raise ArgumentError.new("#{value.inspect} is not a list")
-      end
-    end
-
-  end
-
+  GRADIENT_ASPECTS = %w(webkit moz svg pie css2).freeze
 
   class ColorStop < Sass::Script::Literal
     attr_accessor :color, :stop
@@ -372,6 +56,12 @@ module Compass::SassExtensions::Functions::GradientSupport
       s << color_stops.to_s(options)
       s << ")"
     end
+    def supports?(aspect)
+      GRADIENT_ASPECTS.include?(aspect)
+    end
+    def has_aspect?
+      true
+    end
     def to_webkit(options = self.options)
       args = [
         grad_point(position_and_angle || _center_position),
@@ -421,6 +111,12 @@ module Compass::SassExtensions::Functions::GradientSupport
       s << color_stops.to_s(options)
       s << ")"
     end
+    def supports?(aspect)
+      GRADIENT_ASPECTS.include?(aspect)
+    end
+    def has_aspect?
+      true
+    end
     def to_webkit(options = self.options)
       args = []
       args << grad_point(position_and_angle || Sass::Script::String.new("top"))
@@ -447,11 +143,53 @@ module Compass::SassExtensions::Functions::GradientSupport
 
   module Functions
 
-    # While supporting sass 3.1 and older versions, we need two different implementations.
-    if defined?(Sass::Script::List)
-      include ListBasedSassSupport
-    else
-      include ListFreeSassSupport
+    # given a position list, return a corresponding position in percents
+    def grad_point(position)
+      position = unless position.is_a?(Sass::Script::List)
+        Sass::Script::List.new([position], :space)
+      else
+        Sass::Script::List.new(position.value.dup, position.separator)
+      end
+      position.value.reject!{|p| p.is_a?(Sass::Script::Number) && p.numerator_units.include?("deg")}
+      if (position.value.first.value =~ /top|bottom/) or (position.value.last.value =~ /left|right/)
+        # browsers are pretty forgiving of reversed positions so we are too.
+        position.value.reverse!
+      end
+      if position.value.size == 1
+        if position.value.first.value =~ /top|bottom/
+          position.value.unshift Sass::Script::String.new("center")
+        elsif position.value.first.value =~ /left|right/
+          position.value.push Sass::Script::String.new("center")
+        end
+      end
+      position.value.map! do |p|
+        case p.value
+        when /top|left/
+          Sass::Script::Number.new(0, ["%"])
+        when /bottom|right/
+          Sass::Script::Number.new(100, ["%"])
+        when /center/
+          Sass::Script::Number.new(50, ["%"])
+        else
+          p
+        end
+      end
+      position
+    end
+
+    def color_stops(*args)
+      Sass::Script::List.new(args.map do |arg|
+        case arg
+        when ColorStop
+          arg
+        when Sass::Script::Color
+          ColorStop.new(arg)
+        when Sass::Script::List
+          ColorStop.new(*arg.value)
+        else
+          raise Sass::SyntaxError, "Not a valid color stop: #{arg.class.name}: #{arg}"
+        end
+      end, :comma)
     end
 
     def radial_gradient(position_and_angle, shape_and_size, *color_stops)
@@ -508,7 +246,7 @@ module Compass::SassExtensions::Functions::GradientSupport
     end
 
     def color_stops_in_percentages(color_list)
-      assert_list(color_list)
+      assert_type color_list, :List
       color_list = normalize_stops(color_list)
       max = color_list.value.last.stop
       last_value = nil
@@ -527,13 +265,13 @@ module Compass::SassExtensions::Functions::GradientSupport
 
     # returns the end position of the gradient from the color stop
     def grad_end_position(color_list, radial = Sass::Script::Bool.new(false))
-      assert_list(color_list)
+      assert_type color_list, :List
       default = Sass::Script::Number.new(100)
       grad_position(color_list, Sass::Script::Number.new(color_list.value.size), default, radial)
     end
 
     def grad_position(color_list, index, default, radial = Sass::Script::Bool.new(false))
-      assert_list(color_list)
+      assert_type color_list, :List
       stop = color_list.value[index.value - 1].stop
       if stop && radial.to_bool
         orig_stop = stop
@@ -576,55 +314,16 @@ module Compass::SassExtensions::Functions::GradientSupport
       inline_image_string(svg.gsub(/\s+/, ' '), 'image/svg+xml')
     end
 
-    # Get the nth value from a list
-    def _compass_nth(list, place)
-      assert_list list
-      if place.value == "first"
-        list.value.first
-      elsif place.value == "last"
-        list.value.last
-      else
-        list.value[place.value - 1]
-      end
-    end
-
-    def blank(obj)
-      case obj
-      when Sass::Script::Bool
-        Sass::Script::Bool.new !obj.to_bool
-      when Sass::Script::String
-        Sass::Script::Bool.new obj.value.strip.size == 0
-      when Sass::Script::List
-        Sass::Script::Bool.new obj.value.size == 0 || obj.value.all?{|el| blank(el).to_bool}
-      else
-        Sass::Script::Bool.new false
-      end
-    end
-
     private
 
-    # After using the sass script parser to parse a string, this reconstructs
-    # a list from operands to the space/concat operation
-    def extract_list_values(operation)
-      left = operation.instance_variable_get("@operand1")
-      right = operation.instance_variable_get("@operand2")
-      left = extract_list_values(left) if left.is_a?(Sass::Script::Operation)
-      right = extract_list_values(right) if right.is_a?(Sass::Script::Operation)
-      left = literalize(left) unless left.is_a?(Array)
-      right = literalize(right) unless right.is_a?(Array)
-      Array(left) + Array(right)
-    end
-    # Makes a literal from other various script nodes.
-    def literalize(node)
-      case node
-      when Sass::Script::Literal
-        node
-      when Sass::Script::Funcall
-        node.perform(Sass::Environment.new)
-      else
-        Sass::Script::String.new(node.to_s)
-      end
+    def color_stop?(arg)
+      arg.is_a?(ColorStop) ||
+      (arg.is_a?(Sass::Script::List) && ColorStop.new(*arg.value)) ||
+      ColorStop.new(arg)
+    rescue
+      nil
     end
+
     def normalize_stops(color_list)
       positions = color_list.value.map{|obj| obj.dup}
       # fill in the start and end positions, if unspecified
@@ -715,23 +414,32 @@ EOS
     end
 
     def _center_position
-      if defined?(Sass::Script::List)
-        Sass::Script::List.new([
-          Sass::Script::String.new("center"),
-          Sass::Script::String.new("center")
-        ],:space)
-      else
-        Sass::Script::String.new("center center")
-      end
+      Sass::Script::List.new([
+        Sass::Script::String.new("center"),
+        Sass::Script::String.new("center")
+      ],:space)
     end
 
   end
+
+  module Assertions
+    def assert_type(value, type, name = nil)
+      return if value.is_a?(Sass::Script.const_get(type))
+      err = "#{value.inspect} is not a #{type.to_s.downcase}"
+      err = "$#{name}: " + err if name
+      raise ArgumentError.new(err)
+    end
+  end
+
   class LinearGradient < Sass::Script::Literal
+    include Assertions
     include Functions
     include Compass::SassExtensions::Functions::Constants
     include Compass::SassExtensions::Functions::InlineImage
   end
+
   class RadialGradient < Sass::Script::Literal
+    include Assertions
     include Functions
     include Compass::SassExtensions::Functions::Constants
     include Compass::SassExtensions::Functions::InlineImage