sass 3.2.0.alpha.88 → 3.2.0.alpha.91

data/REVISION

@@ -1 +1 @@
-40099dad35612c37c3197699a46a469af180c046
+0f20305d2c2cff846f830634070e60bdb790e903

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.88
+3.2.0.alpha.91

data/lib/sass/script/lexer.rb

@@ -114,6 +114,12 @@ module Sass
         [:single, true] => string_re('', "'"),
         [:uri, false] => /url\(#{W}(#{URLCHAR}*?)(#{W}\)|#\{)/,
         [:uri, true] => /(#{URLCHAR}*?)(#{W}\)|#\{)/,
+        # Defined in https://developer.mozilla.org/en/CSS/@-moz-document as a
+        # non-standard version of http://www.w3.org/TR/css3-conditional/
+        [:url_prefix, false] => /url-prefix\(#{W}(#{URLCHAR}*?)(#{W}\)|#\{)/,
+        [:url_prefix, true] => /(#{URLCHAR}*?)(#{W}\)|#\{)/,
+        [:domain, false] => /domain\(#{W}(#{URLCHAR}*?)(#{W}\)|#\{)/,
+        [:domain, true] => /(#{URLCHAR}*?)(#{W}\)|#\{)/,
       }
 
       # @param str [String, StringScanner] The source text to lex

data/lib/sass/scss/parser.rb

@@ -122,7 +122,10 @@ module Sass
       end
 
       DIRECTIVES = Set[:mixin, :include, :function, :return, :debug, :warn, :for,
-        :each, :while, :if, :else, :extend, :import, :media, :charset, :content]
+        :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
+        :_moz_document]
+
+      PREFIXED_DIRECTIVES = Set[:supports]
 
       def directive
         return unless tok(/@/)
@@ -131,6 +134,8 @@ module Sass
 
         if dir = special_directive(name)
           return dir
+        elsif dir = prefixed_directive(name)
+          return dir
         end
 
         # Most at-rules take expressions (e.g. @import),
@@ -138,7 +143,11 @@ module Sass
         # Some take no arguments at all.
         val = expr || selector
         val = val ? ["@#{name} "] + Sass::Util.strip_string_array(val) : ["@#{name}"]
-        node = node(Sass::Tree::DirectiveNode.new(val))
+        directive_body(val)
+      end
+
+      def directive_body(value)
+        node = node(Sass::Tree::DirectiveNode.new(value))
 
         if tok(/\{/)
           node.has_children = true
@@ -154,6 +163,11 @@ module Sass
         DIRECTIVES.include?(sym) && send("#{sym}_directive")
       end
 
+      def prefixed_directive(name)
+        sym = name.gsub(/^-[a-z0-9]+-/i, '').gsub('-', '_').to_sym
+        PREFIXED_DIRECTIVES.include?(sym) && send("#{sym}_directive", name)
+      end
+
       def mixin_directive
         name = tok! IDENT
         args = sass_script(:parse_mixin_definition_arglist)
@@ -386,6 +400,78 @@ module Sass
         node(Sass::Tree::CharsetNode.new(name))
       end
 
+      # The document directive is specified in
+      # http://www.w3.org/TR/css3-conditional/, but Gecko allows the
+      # `url-prefix` and `domain` functions to omit quotation marks, contrary to
+      # the standard.
+      #
+      # We could parse all document directives according to Mozilla's syntax,
+      # but if someone's using e.g. @-webkit-document we don't want them to
+      # think WebKit works sans quotes.
+      def _moz_document_directive
+        res = ["@-moz-document "]
+        loop do
+          res << str{ss} << expr!(:moz_document_function)
+          break unless c = tok(/,/)
+          res << c
+        end
+        directive_body(res.flatten)
+      end
+
+      def moz_document_function
+        return unless val = interp_uri || _interp_string(:url_prefix) ||
+          _interp_string(:domain) || function(!:allow_var) || interpolation
+        ss
+        val
+      end
+
+      # http://www.w3.org/TR/css3-conditional/
+      def supports_directive(name)
+        value = str {expr!(:supports_condition)}
+        directive_body(["@#{name} #{value}".strip])
+      end
+
+      def supports_condition
+        supports_negation || supports_operator || supports_declaration_condition
+      end
+
+      def supports_negation
+        return unless tok(/not/i)
+        ss
+        expr!(:supports_condition_in_parens)
+      end
+
+      def supports_operator
+        return unless supports_condition_in_parens
+        tok!(/and|or/i)
+        begin
+          ss
+          expr!(:supports_condition_in_parens)
+        end while tok(/and|or/i)
+        true
+      end
+
+      def supports_condition_in_parens
+        return unless tok(/\(/); ss
+        if supports_condition
+          tok!(/\)/); ss
+        else
+          supports_declaration_body
+        end
+      end
+
+      def supports_declaration_condition
+        return unless tok(/\(/); ss
+        supports_declaration_body
+      end
+
+      def supports_declaration_body
+        tok!(IDENT); ss
+        tok!(/:/); ss
+        expr!(:expr); ss
+        tok!(/\)/); ss
+      end
+
       def variable
         return unless tok(/\$/)
         name = tok!(IDENT)
@@ -751,9 +837,9 @@ MESSAGE
 
       def term(allow_var)
         if e = tok(NUMBER) ||
-            tok(URI) ||
+            interp_uri ||
             function(allow_var) ||
-            tok(STRING) ||
+            interp_string ||
             tok(UNICODERANGE) ||
             interp_ident ||
             tok(HEXCOLOR) ||
@@ -794,6 +880,10 @@ MESSAGE
         _interp_string(:double) || _interp_string(:single)
       end
 
+      def interp_uri
+        _interp_string(:uri)
+      end
+
       def _interp_string(type)
         return unless start = tok(Sass::Script::Lexer::STRING_REGULAR_EXPRESSIONS[[type, false]])
         res = [start]
@@ -888,6 +978,9 @@ MESSAGE
         :selector_comma_sequence => "selector",
         :simple_selector_sequence => "selector",
         :import_arg => "file to import (string or url())",
+        :moz_document_function => "matching function (e.g. url-prefix(), domain())",
+        :supports_condition => "@supports condition (e.g. (display: flexbox))",
+        :supports_condition_in_parens => "@supports condition (e.g. (display: flexbox))",
       }
 
       TOK_NAMES = Sass::Util.to_hash(

data/lib/sass/scss/rx.rb

@@ -107,6 +107,11 @@ module Sass
       TILDE = /#{W}~/
       NOT = quote(":not(", Regexp::IGNORECASE)
 
+      # Defined in https://developer.mozilla.org/en/CSS/@-moz-document as a
+      # non-standard version of http://www.w3.org/TR/css3-conditional/
+      URL_PREFIX = /url-prefix\(#{W}(?:#{STRING}|#{URL})#{W}\)/i
+      DOMAIN = /domain\(#{W}(?:#{STRING}|#{URL})#{W}\)/i
+
       # Custom
       HEXCOLOR = /\#[0-9a-fA-F]+/
       INTERP_START = /#\{/

data/lib/sass/scss/static_parser.rb

@@ -1,3 +1,5 @@
+require 'sass/script/css_parser'
+
 module Sass
   module SCSS
     # A parser for a static SCSS tree.
@@ -24,18 +26,29 @@ module Sass
 
       private
 
+      def moz_document_function
+        return unless val = tok(URI) || tok(URL_PREFIX) || tok(DOMAIN) ||
+          function(!:allow_var)
+        ss
+        [val]
+      end
+
       def variable; nil; end
       def script_value; nil; end
       def interpolation; nil; end
       def var_expr; nil; end
       def interp_string; s = tok(STRING) and [s]; end
+      def interp_uri; s = tok(URI) and [s]; end
       def interp_ident(ident = IDENT); s = tok(ident) and [s]; end
       def use_css_import?; true; end
 
       def special_directive(name)
-        return unless  %w[media import charset].include?(name)
+        return unless %w[media import charset -moz-document].include?(name)
         super
       end
+
+      @sass_script_parser = Class.new(Sass::Script::CssParser)
+      @sass_script_parser.send(:include, ScriptParser)
     end
   end
 end

data/test/sass/scss/css_test.rb

@@ -586,6 +586,50 @@ CSS
 SCSS
   end
 
+  def test_moz_document_directive
+    assert_equal <<CSS, render(<<SCSS)
+@-moz-document url(http://www.w3.org/),
+               url-prefix(http://www.w3.org/Style/),
+               domain(mozilla.org),
+               regexp("^https:.*") {
+  .foo {
+    a: b; } }
+CSS
+@-moz-document url(http://www.w3.org/),
+               url-prefix(http://www.w3.org/Style/),
+               domain(mozilla.org),
+               regexp("^https:.*") {
+  .foo {a: b}
+}
+SCSS
+  end
+
+  def test_supports
+    assert_equal <<CSS, render(<<SCSS)
+@supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+  .foo {
+    a: b; } }
+CSS
+@supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+  .foo {
+    a: b;
+  }
+}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+@-prefix-supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+  .foo {
+    a: b; } }
+CSS
+@-prefix-supports (a: b) and (c: d) or (not (d: e)) and ((not (f: g)) or (not ((h: i) and (j: k)))) {
+  .foo {
+    a: b;
+  }
+}
+SCSS
+  end
+
   ## Selectors
 
   # Taken from http://www.w3.org/TR/css3-selectors/#selectors

data/test/sass/scss/scss_test.rb

@@ -926,6 +926,44 @@ $vals: 1 2 3;
 SCSS
   end
 
+  def test_moz_document_interpolation
+    assert_equal <<CSS, render(<<SCSS)
+@-moz-document url(http://sass-lang.com/),
+               url-prefix(http://sass-lang.com/docs),
+               domain(sass-lang.com),
+               domain("sass-lang.com") {
+  .foo {
+    a: b; } }
+CSS
+$domain: "sass-lang.com";
+@-moz-document url(http://\#{$domain}/),
+               url-prefix(http://\#{$domain}/docs),
+               domain(\#{$domain}),
+               \#{domain($domain)} {
+  .foo {a: b}
+}
+SCSS
+  end
+
+  def test_random_directive_interpolation
+    assert_equal <<CSS, render(<<SCSS)
+@foo url(http://sass-lang.com/),
+     domain("sass-lang.com"),
+     "foobarbaz",
+     foobarbaz {
+  .foo {
+    a: b; } }
+CSS
+$domain: "sass-lang.com";
+@foo url(http://\#{$domain}/),
+     \#{domain($domain)},
+     "foo\#{'ba' + 'r'}baz",
+     foo\#{'ba' + 'r'}baz {
+  .foo {a: b}
+}
+SCSS
+  end
+
   ## Errors
 
   def test_mixin_defs_only_at_toplevel

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303021
+  hash: 592303019
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 88
-  version: 3.2.0.alpha.88
+  - 91
+  version: 3.2.0.alpha.91
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -150,7 +150,9 @@ files:
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/content_node.rb
+- lib/sass/tree/css_import_node.rb
 - lib/sass/tree/variable_node.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/convert.rb
@@ -159,9 +161,7 @@ files:
 - lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/to_css.rb
-- lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/tree/css_import_node.rb
 - lib/sass/tree/trace_node.rb
 - lib/sass/media.rb
 - lib/sass/util/multibyte_string_scanner.rb