compass-core 1.0.0.alpha.20 → 1.0.0.alpha.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 540ff031bc6064fc019098cdc36c0519ef098674
-  data.tar.gz: 6fdb9c93adb91d4c741cee0409a031aa82dcce8e
+  metadata.gz: ae333010970a851ce2a6e4afb2a3dadcd436039a
+  data.tar.gz: 0d100b0b67a12b9dd48e74c4de4ce4f4b98f1cc1
 SHA512:
-  metadata.gz: b66e7785fc379819945af49b8bb3ea77e9b364811c58da26700c7399a74bd17baf1a64ef2bd401cfdf4dac4d84b74f21f1262263e52709d3ef33dc6714d139a2
-  data.tar.gz: 2141cfd943f2db76606d25c1cc6959a1bef38779455a8148fb254eb525682e56f2e0161a7ec6c1f533e39dc586652c1670cff1c4ae17737cb9531773c8987978
+  metadata.gz: 779b3f83ef661bff586fe40d5e19974f62b7b8a96a4b5038ca0ef59fef3ae1571d9292a14c001def22370dce0b19cd6a23305dfff79f82fd3bff60ad4026b2f2
+  data.tar.gz: d171aa6c8abf76fe03f530ffe31ef33a37bdddad66ab929798cf3c4bb9531d6ff136b518dcf6ec700871cbfa3e4d82133754e20845c997e126ff8f7c5d6bcb9b

data/RELEASE_VERSION

@@ -1 +1 @@
-1.0.0.alpha.20
+1.0.0.alpha.21

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.19
+1.0.0.alpha.20

data/lib/compass/configuration/inheritance.rb

@@ -286,7 +286,7 @@ module Compass
 
         def debug
           normalized_attrs = {}
-          ATTRIBUTES.each do |prop|
+          (ATTRIBUTES + ARRAY_ATTRIBUTES).each do |prop|
             values = []
             chain.each do |instance|
               values << {

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

@@ -2,6 +2,147 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
   GRADIENT_ASPECTS = %w(webkit moz svg css2 o owg).freeze
 
+  class CSS3AngleToSVGConverter
+    include Math
+
+    def initialize(angle)
+      @original_angle = angle
+      @angle = handle_keywords(angle)
+      @angle = in_radians(@angle) % (2 * PI)
+      @quadrant = (@angle * 2 / PI).to_i
+      @angle = case @quadrant
+               when 0
+                 @angle
+               when 1
+                 PI - @angle
+               when 2
+                 @angle - PI
+               when 3
+                 2 * PI  - @angle
+               end
+    end
+
+    TOP    = 1
+    BOTTOM = 2
+    RIGHT  = 4
+    LEFT   = 8
+
+    DIR_KEYWORDS_TO_ANGLE = {
+      TOP            => 0,
+      TOP    | RIGHT => 45,
+               RIGHT => 90,
+      BOTTOM | RIGHT => 135,
+      BOTTOM         => 180,
+      BOTTOM | LEFT  => 225,
+               LEFT  => 270,
+      TOP    | LEFT  => 315,
+    }
+
+    def handle_keywords(angle)
+      if angle.is_a?(Sass::Script::Value::List) || angle.is_a?(Sass::Script::Value::String)
+        direction = angle.to_sass
+        is_end_point = !!/\bto\b/i.match(direction)
+        dir = 0
+        dir |= TOP if /\btop\b/i.match(direction)
+        dir |= BOTTOM if /\bbottom\b/i.match(direction)
+        dir |= RIGHT if /\bright\b/i.match(direction)
+        dir |= LEFT if /\bleft\b/i.match(direction)
+        if (r = DIR_KEYWORDS_TO_ANGLE[dir])
+          r += 180 unless is_end_point
+          Sass::Script::Value::Number.new(r, %w(deg), [])
+        else
+          raise Sass::SyntaxError, "Unknown direction: #{angle.to_sass}"
+        end
+      else
+        angle
+      end
+    end
+
+    def in_radians(angle)
+      case angle.unit_str
+      when "deg"
+        angle.value * PI / 180.0
+      when "grad"
+        angle.value * PI / 200.0
+      when "rad"
+        angle.value
+      when "turn"
+        angle.value * PI * 2
+      else
+        raise Sass::SyntaxError.new("#{angle.unit_str} is not an angle")
+      end
+    end
+
+    def sin2(a)
+      v = sin(a)
+      v * v
+    end
+
+    def x
+      @x ||= if @angle > 1.570621793869697
+               1.0 # avoid floating point rounding error at the asymptote
+             else
+               tan(@angle) + (1 - tan(@angle)) * sin2(@angle)
+             end
+    end
+
+    def y
+      @y ||= if @angle < 0.0001
+               1.0 # the limit of the expression as we approach 0 is 1.
+             else
+               x / tan(@angle)
+             end
+    end
+
+    def x1
+      result case @quadrant
+             when 0, 1
+               -x
+             when 2, 3
+               x
+             end
+    end
+
+    def y1
+      result case @quadrant
+             when 0, 3
+               y
+             when 1, 2
+               -y
+             end
+    end
+
+    def x2
+      result case @quadrant
+             when 0, 1
+               x
+             when 2, 3
+               -x
+             end
+    end
+
+    def y2
+      result case @quadrant
+             when 0, 3
+               -y
+             when 1, 2
+               y
+             end
+    end
+
+    def scale(p)
+      (p + 1) / 2.0
+    end
+
+    def round6(v)
+      (v * 1_000_000).round / 1_000_000.0
+    end
+
+    def result(v)
+      round6(scale(v))
+    end
+  end
+
   class ColorStop < Sass::Script::Value::Base
     include Sass::Script::Value::Helpers
     attr_accessor :color, :stop
@@ -94,11 +235,11 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     module ClassMethods
       def standardized_prefix(prefix)
-        class_eval %Q{
+        class_eval %Q<
           def to_#{prefix}(options = self.options)
             identifier("-#{prefix}-\#{to_s_prefixed(options)}")
           end
-        }
+        >
       end
     end
 
@@ -229,7 +370,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
 
     def supports?(aspect)
       # I don't know how to support degree-based gradients in old webkit gradients (owg) or svg so we just disable them.
-      if %w(owg svg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Value::Number) && position_or_angle.numerator_units.include?("deg")
+      if %w(owg).include?(aspect) && position_or_angle.is_a?(Sass::Script::Value::Number) && position_or_angle.numerator_units.include?("deg")
         false
       elsif aspect == "svg" && color_stops.value.any?{|cs| cs.stop.is_a?(Sass::Script::Value::String) }
         # calc expressions cannot be represented in svg
@@ -465,11 +606,10 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
 
     def linear_svg_gradient(color_stops, start)
-      x1, y1 = *grad_point(start).value
-      x2, y2 = *grad_point(opposite_position(start)).value
+      converter = CSS3AngleToSVGConverter.new(start)
       stops = color_stops_in_percentages(color_stops)
 
-      svg = linear_svg(stops, x1, y1, x2, y2)
+      svg = linear_svg(stops, converter.x1, converter.y1, converter.x2, converter.y2)
       inline_image_string(svg.gsub(/\s+/, ' '), 'image/svg+xml')
     end
 
@@ -559,11 +699,7 @@ module Compass::Core::SassExtensions::Functions::GradientSupport
     end
     
     def linear_svg(color_stops, x1, y1, x2, y2)
-      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>}
+      gradient = %Q{<linearGradient id="grad" gradientUnits="objectBoundingBox" x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}">#{color_stops_svg(color_stops)}</linearGradient>}
       svg(gradient)
     end
 

data/stylesheets/compass/css3/_images.scss

@@ -2,7 +2,7 @@
 @import "compass/utilities/general/hacks";
 
 $gradient-support-threshold: $graceful-usage-threshold !default;
-$svg-gradient-shim-threshold: 10.0 !default;
+$svg-gradient-shim-threshold: $graceful-usage-threshold !default;
 $border-image-support-threshold: $graceful-usage-threshold !default;
 
 // Compass assumes you will use the official gradient syntax,

data/stylesheets/compass/css3/_transition.scss

@@ -56,6 +56,27 @@ $transitionable-prefixed-values: transform, transform-origin !default;
   }
 }
 
+// Returns $transition-map which includes key and values that map to a transition declaration
+@function transition-map($transition) {
+  $transition-map: ();
+
+  @each $item in $transition {
+    @if is-time($item) {
+      @if map-has-key($transition-map, duration) {
+        $transition-map: map-merge($transition-map, (delay: $item));
+      } @else {
+        $transition-map: map-merge($transition-map, (duration: $item));
+      }
+    } @else if map-has-key($transition-map, property) {
+      $transition-map: map-merge($transition-map, (timing-function: $item));
+    } @else {
+      $transition-map: map-merge($transition-map, (property: $item));
+    }
+  }
+
+  @return $transition-map;
+}
+
 // One or more properties to transition
 //
 // * for multiple, use a comma-delimited list
@@ -133,20 +154,16 @@ $transitionable-prefixed-values: transform, transform-origin !default;
     // This block can be made considerably simpler at the point in time that
     // we no longer need to deal with the differences in how delays are treated.
     @each $transition in $transitions {
-      // Extract the values from the list
-      // (this would be cleaner if nth took a 3rd argument to provide a default value).
-      $property: nth($transition, 1);
-      $duration: if(length($transition) >= 2, nth($transition, 2), null);
-      $timing-function: if(length($transition) >= 3, nth($transition, 3), null);
-      $delay: if(length($transition) >= 4, nth($transition, 4), null);
-      $has-delays: $has-delays or $delay;
+      // Declare initial values for transition
+      $transition: transition-map($transition);
 
-      // If a delay is provided without a timing function
-      @if is-time($timing-function) and not $delay {
-        $delay: $timing-function;
-        $timing-function: null;
-        $has-delays: true;
-      }
+      $property: map-get($transition, property);
+      $duration: map-get($transition, duration);
+      $timing-function: map-get($transition, timing-function);
+      $delay: map-get($transition, delay);
+
+      // Parse transition string to assign values into correct variables
+      $has-delays: $has-delays or $delay;
 
       @if $current-prefix == -webkit {
         // Keep a list of delays in case one is specified

data/stylesheets/compass/utilities/color/_brightness.scss

@@ -5,8 +5,16 @@
 // a color. Brightness is sometimes called luminance.
 //
 // Returns a number between 0% and 100%, where 100% is fully bright
-// (white) and 0% is fully dark (black).
+// (white) and 0% is fully dark (black) for color values.
+//
+// For numbers and percentages it returns the same value to be used
+// in `@include filter(brightness(1.1))`.
 @function brightness($color) {
-  @return ((red($color) * .299) + (green($color) * .587) + (blue($color) * .114)) / 255 * 100%;
+  @if type-of($color) == color {
+    @return ((red($color) * .299) + (green($color) * .587) + (blue($color) * .114)) / 255 * 100%;
+  }
+  @else {
+    @return unquote("brightness(#{$color})");
+  }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.20
+  version: 1.0.0.alpha.21
 platform: ruby
 authors:
 - Chris Eppstein
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass