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

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

@@ -1,4 +1,79 @@
 module Compass::SassExtensions::Functions::Lists
+
+  # Returns true when the object is false, an empty string, or an empty list
+  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
+
+  # Returns a new 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
+
+  # Get the nth value from a list
+  def _compass_nth(list, place)
+    assert_type list, :List
+    if place.value == "first"
+      list.value.first
+    elsif place.value == "last"
+      list.value.last
+    else
+      list.value[place.value - 1]
+    end
+  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
+
+  # If the argument is a list, it will return a new list that is space delimited
+  # Otherwise it returns a new, single element, space-delimited list.
+  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
+
+  # Returns the size of the list.
+  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
+
+  # returns the first value of a space delimited list.
   def first_value_of(list)
     if list.is_a?(Sass::Script::String)
       Sass::Script::String.new(list.value.split(/\s+/).first)
@@ -8,4 +83,13 @@ module Compass::SassExtensions::Functions::Lists
       list
     end
   end
+
+  protected
+
+  def assert_list(value)
+    unless value.is_a?(Sass::Script::List)
+      raise ArgumentError.new("#{value.inspect} is not a list")
+    end
+  end
+
 end

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

@@ -60,7 +60,8 @@ module Compass::SassExtensions::Functions::Sprites
         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)
-        @width = [@width, width].max
+        position = position_for(sprite_name)
+        offset = (position.unitless? || position.unit_str == "px") ? position.value : 0
         @images << {
           :name => sprite_name,
           :file => file,
@@ -69,9 +70,10 @@ module Compass::SassExtensions::Functions::Sprites
           :width => width,
           :repeat => repeat_for(sprite_name),
           :spacing => spacing_for(sprite_name),
-          :position => position_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

data/lib/compass/sass_extensions/monkey_patches.rb

@@ -1,3 +1,3 @@
-%w(traversal).each do |patch|
+%w(traversal browser_support).each do |patch|
   require "compass/sass_extensions/monkey_patches/#{patch}"
 end

data/lib/compass/sass_extensions/monkey_patches/browser_support.rb

@@ -0,0 +1,89 @@
+require 'sass/script/node'
+require 'sass/script/literal'
+require 'sass/script/funcall'
+
+module Sass::Script
+  module HasSimpleCrossBrowserFunctionSupport
+    def supports?(aspect)
+      return true if Compass::BrowserSupport.supports?(name, aspect)
+      children.any? {|child| child.respond_to?(:supports?) && child.supports?(aspect) }
+    end
+
+    def has_aspect?(children = nil)
+      children ||= self.children
+      return true if Compass::BrowserSupport.has_aspect?(name)
+      children.any? {|child| child.respond_to?(:has_aspect?) && child.has_aspect? }
+    end
+  end
+
+  class CrossBrowserFunctionCall < Literal
+
+    attr_accessor :name, :args
+
+    include HasSimpleCrossBrowserFunctionSupport
+
+    def initialize(name, args)
+      self.name = name
+      self.args = args
+    end
+
+    def children
+      args
+    end
+
+    def inspect
+      to_s
+    end
+
+    def to_s(options = self.options)
+      s = "#{name}(#{args.join(", ")})"
+    end
+
+    %w(webkit moz o ms svg pie css2).each do |prefix|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def to_#{prefix}(options = self.options)
+          prefixed_args = args.map do |arg|
+            arg.respond_to?(:to_#{prefix}) ? arg.to_#{prefix}(options) : arg
+          end
+          prefixed_name = if Compass::BrowserSupport.supports?(name, "#{prefix}")
+            "-#{prefix}-\#{name}"
+          else
+            name
+          end
+          contents = prefixed_args.join(', ')
+          if contents.size > 0
+            opts(Sass::Script::String.new("\#{prefixed_name}(\#{contents})"))
+          else
+            opts(Sass::Script::String.new(""))
+          end
+        end
+      RUBY
+    end
+
+  end
+
+  class Funcall < Node
+    include HasSimpleCrossBrowserFunctionSupport
+
+    alias sass_to_literal to_literal
+
+    def to_literal(args)
+      if has_aspect?(args)
+        CrossBrowserFunctionCall.new(name, args)
+      else
+        sass_to_literal(args)
+      end
+    end
+  end
+
+  class List < Literal
+    def supports?(aspect)
+      children.any? {|child| child.respond_to?(:supports?) && child.supports?(aspect) }
+    end
+
+    def has_aspect?
+      children.any? {|child| child.respond_to?(:has_aspect?) && child.has_aspect? }
+    end
+  end
+
+end

data/lib/compass/sprites.rb

@@ -88,13 +88,13 @@ end.join(",\n")});
   @include sprite($#{name}-sprites, $name, $dimensions, $offset-x, $offset-y)
 }
 
-@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions) {
-  @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions)
+@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) {
+  @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions, $prefix)
 }
 
 // Generates a class for each sprited image.
-@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions) {
-  @include #{name}-sprites(#{images.join(" ")}, $dimensions);
+@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) {
+  @include #{name}-sprites(#{images.join(" ")}, $dimensions, $prefix);
 }
 SCSS
     end

data/test/fixtures/stylesheets/blueprint/css/screen.css

@@ -315,53 +315,53 @@ caption {
   margin: 0; }
 
 input.span-1, textarea.span-1, select.span-1 {
-  width: 30px !important; }
+  width: 30px; }
 input.span-2, textarea.span-2, select.span-2 {
-  width: 70px !important; }
+  width: 70px; }
 input.span-3, textarea.span-3, select.span-3 {
-  width: 110px !important; }
+  width: 110px; }
 input.span-4, textarea.span-4, select.span-4 {
-  width: 150px !important; }
+  width: 150px; }
 input.span-5, textarea.span-5, select.span-5 {
-  width: 190px !important; }
+  width: 190px; }
 input.span-6, textarea.span-6, select.span-6 {
-  width: 230px !important; }
+  width: 230px; }
 input.span-7, textarea.span-7, select.span-7 {
-  width: 270px !important; }
+  width: 270px; }
 input.span-8, textarea.span-8, select.span-8 {
-  width: 310px !important; }
+  width: 310px; }
 input.span-9, textarea.span-9, select.span-9 {
-  width: 350px !important; }
+  width: 350px; }
 input.span-10, textarea.span-10, select.span-10 {
-  width: 390px !important; }
+  width: 390px; }
 input.span-11, textarea.span-11, select.span-11 {
-  width: 430px !important; }
+  width: 430px; }
 input.span-12, textarea.span-12, select.span-12 {
-  width: 470px !important; }
+  width: 470px; }
 input.span-13, textarea.span-13, select.span-13 {
-  width: 510px !important; }
+  width: 510px; }
 input.span-14, textarea.span-14, select.span-14 {
-  width: 550px !important; }
+  width: 550px; }
 input.span-15, textarea.span-15, select.span-15 {
-  width: 590px !important; }
+  width: 590px; }
 input.span-16, textarea.span-16, select.span-16 {
-  width: 630px !important; }
+  width: 630px; }
 input.span-17, textarea.span-17, select.span-17 {
-  width: 670px !important; }
+  width: 670px; }
 input.span-18, textarea.span-18, select.span-18 {
-  width: 710px !important; }
+  width: 710px; }
 input.span-19, textarea.span-19, select.span-19 {
-  width: 750px !important; }
+  width: 750px; }
 input.span-20, textarea.span-20, select.span-20 {
-  width: 790px !important; }
+  width: 790px; }
 input.span-21, textarea.span-21, select.span-21 {
-  width: 830px !important; }
+  width: 830px; }
 input.span-22, textarea.span-22, select.span-22 {
-  width: 870px !important; }
+  width: 870px; }
 input.span-23, textarea.span-23, select.span-23 {
-  width: 910px !important; }
+  width: 910px; }
 input.span-24, textarea.span-24, select.span-24 {
-  width: 950px !important; }
+  width: 950px; }
 
 .append-1 {
   padding-right: 40px; }

data/test/fixtures/stylesheets/blueprint/css/single-imports/grid.css

@@ -88,53 +88,53 @@
   margin: 0; }
 
 input.span-1, textarea.span-1, select.span-1 {
-  width: 30px !important; }
+  width: 30px; }
 input.span-2, textarea.span-2, select.span-2 {
-  width: 70px !important; }
+  width: 70px; }
 input.span-3, textarea.span-3, select.span-3 {
-  width: 110px !important; }
+  width: 110px; }
 input.span-4, textarea.span-4, select.span-4 {
-  width: 150px !important; }
+  width: 150px; }
 input.span-5, textarea.span-5, select.span-5 {
-  width: 190px !important; }
+  width: 190px; }
 input.span-6, textarea.span-6, select.span-6 {
-  width: 230px !important; }
+  width: 230px; }
 input.span-7, textarea.span-7, select.span-7 {
-  width: 270px !important; }
+  width: 270px; }
 input.span-8, textarea.span-8, select.span-8 {
-  width: 310px !important; }
+  width: 310px; }
 input.span-9, textarea.span-9, select.span-9 {
-  width: 350px !important; }
+  width: 350px; }
 input.span-10, textarea.span-10, select.span-10 {
-  width: 390px !important; }
+  width: 390px; }
 input.span-11, textarea.span-11, select.span-11 {
-  width: 430px !important; }
+  width: 430px; }
 input.span-12, textarea.span-12, select.span-12 {
-  width: 470px !important; }
+  width: 470px; }
 input.span-13, textarea.span-13, select.span-13 {
-  width: 510px !important; }
+  width: 510px; }
 input.span-14, textarea.span-14, select.span-14 {
-  width: 550px !important; }
+  width: 550px; }
 input.span-15, textarea.span-15, select.span-15 {
-  width: 590px !important; }
+  width: 590px; }
 input.span-16, textarea.span-16, select.span-16 {
-  width: 630px !important; }
+  width: 630px; }
 input.span-17, textarea.span-17, select.span-17 {
-  width: 670px !important; }
+  width: 670px; }
 input.span-18, textarea.span-18, select.span-18 {
-  width: 710px !important; }
+  width: 710px; }
 input.span-19, textarea.span-19, select.span-19 {
-  width: 750px !important; }
+  width: 750px; }
 input.span-20, textarea.span-20, select.span-20 {
-  width: 790px !important; }
+  width: 790px; }
 input.span-21, textarea.span-21, select.span-21 {
-  width: 830px !important; }
+  width: 830px; }
 input.span-22, textarea.span-22, select.span-22 {
-  width: 870px !important; }
+  width: 870px; }
 input.span-23, textarea.span-23, select.span-23 {
-  width: 910px !important; }
+  width: 910px; }
 input.span-24, textarea.span-24, select.span-24 {
-  width: 950px !important; }
+  width: 950px; }
 
 .append-1 {
   padding-right: 40px; }

data/test/fixtures/stylesheets/blueprint/css/single-imports/rtl.css

@@ -90,53 +90,53 @@
   margin: 0; }
 
 input.span-1, textarea.span-1, select.span-1 {
-  width: 30px !important; }
+  width: 30px; }
 input.span-2, textarea.span-2, select.span-2 {
-  width: 70px !important; }
+  width: 70px; }
 input.span-3, textarea.span-3, select.span-3 {
-  width: 110px !important; }
+  width: 110px; }
 input.span-4, textarea.span-4, select.span-4 {
-  width: 150px !important; }
+  width: 150px; }
 input.span-5, textarea.span-5, select.span-5 {
-  width: 190px !important; }
+  width: 190px; }
 input.span-6, textarea.span-6, select.span-6 {
-  width: 230px !important; }
+  width: 230px; }
 input.span-7, textarea.span-7, select.span-7 {
-  width: 270px !important; }
+  width: 270px; }
 input.span-8, textarea.span-8, select.span-8 {
-  width: 310px !important; }
+  width: 310px; }
 input.span-9, textarea.span-9, select.span-9 {
-  width: 350px !important; }
+  width: 350px; }
 input.span-10, textarea.span-10, select.span-10 {
-  width: 390px !important; }
+  width: 390px; }
 input.span-11, textarea.span-11, select.span-11 {
-  width: 430px !important; }
+  width: 430px; }
 input.span-12, textarea.span-12, select.span-12 {
-  width: 470px !important; }
+  width: 470px; }
 input.span-13, textarea.span-13, select.span-13 {
-  width: 510px !important; }
+  width: 510px; }
 input.span-14, textarea.span-14, select.span-14 {
-  width: 550px !important; }
+  width: 550px; }
 input.span-15, textarea.span-15, select.span-15 {
-  width: 590px !important; }
+  width: 590px; }
 input.span-16, textarea.span-16, select.span-16 {
-  width: 630px !important; }
+  width: 630px; }
 input.span-17, textarea.span-17, select.span-17 {
-  width: 670px !important; }
+  width: 670px; }
 input.span-18, textarea.span-18, select.span-18 {
-  width: 710px !important; }
+  width: 710px; }
 input.span-19, textarea.span-19, select.span-19 {
-  width: 750px !important; }
+  width: 750px; }
 input.span-20, textarea.span-20, select.span-20 {
-  width: 790px !important; }
+  width: 790px; }
 input.span-21, textarea.span-21, select.span-21 {
-  width: 830px !important; }
+  width: 830px; }
 input.span-22, textarea.span-22, select.span-22 {
-  width: 870px !important; }
+  width: 870px; }
 input.span-23, textarea.span-23, select.span-23 {
-  width: 910px !important; }
+  width: 910px; }
 input.span-24, textarea.span-24, select.span-24 {
-  width: 950px !important; }
+  width: 950px; }
 
 .append-1 {
   padding-left: 40px; }