haml-edge 3.1.41 → 3.1.42

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.41
+3.1.42

data/VERSION

@@ -1 +1 @@
-3.1.41
+3.1.42

data/lib/sass/engine.rb

@@ -509,16 +509,7 @@ WARNING
       # If value begins with url( or ",
       # it's a CSS @import rule and we don't want to touch it.
       if directive == "import"
-        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
-          :line => @line + 1) unless line.children.empty?
-        if (match = value.match(Sass::SCSS::RX::STRING) || value.match(Sass::SCSS::RX::URI)) &&
-            !match.post_match.strip.empty? && match.post_match.strip[0] != ?,
-          return Tree::DirectiveNode.new("@import #{value}")
-        end
-        value.split(/,\s*/).map do |f|
-          f = $1 || $2 || $3 if f =~ Sass::SCSS::RX::STRING || f =~ Sass::SCSS::RX::URI
-          Tree::ImportNode.new(f)
-        end
+        parse_import(line, value)
       elsif directive == "mixin"
         parse_mixin_definition(line)
       elsif directive == "include"
@@ -597,6 +588,32 @@ WARNING
       nil
     end
 
+    def parse_import(line, value)
+      raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
+        :line => @line + 1) unless line.children.empty?
+
+      if (match = value.match(Sass::SCSS::RX::STRING) || value.match(Sass::SCSS::RX::URI)) &&
+          match.offset(0).first == 0 && !match.post_match.strip.empty? &&
+          match.post_match.strip[0] != ?,
+        # @import "filename" media-type
+        return Tree::DirectiveNode.new("@import #{value}")
+      end
+
+      value.split(/,\s*/).map do |f|
+        if f =~ Sass::SCSS::RX::URI
+          # All url()s are literal CSS @imports
+          next Tree::DirectiveNode.new("@import #{f}")
+        elsif f =~ Sass::SCSS::RX::STRING
+          f = $1 || $2
+        end
+
+        # http:// URLs are always literal CSS imports
+        next Tree::DirectiveNode.new("@import url(#{f})") if f =~ /^http:\/\//
+
+        Tree::ImportNode.new(f)
+      end
+    end
+
     MIXIN_DEF_RE = /^(?:=|@mixin)\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
     def parse_mixin_definition(line)
       name, arg_string = line.text.scan(MIXIN_DEF_RE).first

data/lib/sass/script/lexer.rb

@@ -292,7 +292,7 @@ MESSAGE
       end
 
       def special_fun
-        return unless str1 = scan(/(calc|expression|progid:[a-z\.]*)\(/i)
+        return unless str1 = scan(/((-[\w-]+-)?calc|expression|progid:[a-z\.]*)\(/i)
         str2, _ = Haml::Shared.balance(@scanner, ?(, ?), 1)
         c = str2.count("\n")
         old_line = @line

data/lib/sass/scss/parser.rb

@@ -200,13 +200,13 @@ module Sass
 
       def import_directive
         @expected = "string or url()"
-        arg = tok(STRING) || tok!(URI)
+        arg = tok(STRING) || (uri = tok!(URI))
         path = @scanner[1] || @scanner[2] || @scanner[3]
         ss
 
         media = str {media_query_list}.strip
 
-        if !media.strip.empty? || use_css_import?
+        if uri || path =~ /^http:\/\// || !media.strip.empty? || use_css_import?
           return node(Sass::Tree::DirectiveNode.new("@import #{arg} #{media}".strip))
         end
 
@@ -381,6 +381,17 @@ module Sass
         sel.to_a
       end
 
+      def selector_comma_sequence
+        return unless sel = _selector
+        selectors = [sel]
+        while tok(/,/)
+          ws = str{ss}
+          selectors << expr!(:_selector)
+          selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members) if ws.include?("\n")
+        end
+        Selector::CommaSequence.new(selectors)
+      end
+
       def _selector
         # The combinator here allows the "> E" hack
         return unless val = combinator || simple_selector_sequence
@@ -533,12 +544,12 @@ MESSAGE
       end
 
       def negation
-        return unless tok(NOT)
+        return unless name = tok(NOT) || tok(MOZ_ANY)
         ss
         @expected = "selector"
-        sel = element_name || id_selector || class_selector || attrib || expr!(:pseudo)
+        sel = selector_comma_sequence
         tok!(/\)/)
-        Selector::Negation.new(sel)
+        Selector::SelectorPseudoClass.new(name[1...-1], sel)
       end
 
       def declaration
@@ -722,7 +733,7 @@ MESSAGE
         :interp_ident => "identifier",
         :interp_name => "identifier",
         :expr => "expression (e.g. 1px, bold)",
-        :_selector => "selector",
+        :selector_comma_sequence => "selector",
         :simple_selector_sequence => "selector",
       }
 

data/lib/sass/scss/rx.rb

@@ -109,6 +109,7 @@ module Sass
       # Custom
       HEXCOLOR = /\#[0-9a-fA-F]+/
       INTERP_START = /#\{/
+      MOZ_ALL = quote(":-moz-any(", Regexp::IGNORECASE)
 
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/

data/lib/sass/scss/static_parser.rb

@@ -17,14 +17,8 @@ module Sass
       # @raise [Sass::SyntaxError] if there's a syntax error in the selector
       def parse_selector(filename)
         init_scanner!
-        selectors = [expr!(:_selector)]
-        while tok(/,/)
-          ws = str{ss}
-          selectors << expr!(:_selector)
-          selectors[-1] = Selector::Sequence.new(["\n"] + selectors.last.members) if ws.include?("\n")
-        end
+        seq = expr!(:selector_comma_sequence)
         expected("selector") unless @scanner.eos?
-        seq = Selector::CommaSequence.new(selectors)
         seq.line = @line
         seq.filename = filename
         seq

data/lib/sass/selector/comma_sequence.rb

@@ -61,6 +61,13 @@ module Sass
         members.map {|m| m.inspect}.join(", ")
       end
 
+      # @see Simple#to_a
+      def to_a
+        arr = Haml::Util.intersperse(@members.map {|m| m.to_a}, ", ").flatten
+        arr.delete("\n")
+        arr
+      end
+
       private
 
       def _hash

data/lib/sass/selector/simple.rb

@@ -78,10 +78,10 @@ module Sass
         return sels if sels.any? {|sel2| eql?(sel2)}
         sels_with_ix = Haml::Util.enum_with_index(sels)
         _, i =
-          if self.is_a?(Pseudo) || self.is_a?(Negation)
+          if self.is_a?(Pseudo) || self.is_a?(SelectorPseudoClass)
             sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && sels.last.type == :element}
           else
-            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(Negation)}
+            sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) || sel.is_a?(SelectorPseudoClass)}
           end
         return sels + [self] unless i
         return sels[0...i] + [self] + sels[i..-1]

data/lib/sass/selector.rb

@@ -332,21 +332,29 @@ module Sass
       end
     end
 
-    # A negation pseudoclass selector (e.g. `:not(.foo)`).
-    class Negation < Simple
-      # The selector to negate.
+    # A pseudoclass selector whose argument is itself a selector
+    # (e.g. `:not(.foo)` or `:-moz-all(.foo, .bar)`).
+    class SelectorPseudoClass < Simple
+      # The name of the pseudoclass.
       #
-      # @return [Selector]
+      # @return [String]
+      attr_reader :name
+
+      # The selector argument.
+      #
+      # @return [Selector::Sequence]
       attr_reader :selector
 
-      # @param [Selector] The selector to negate
-      def initialize(selector)
+      # @param [String] The name of the pseudoclass
+      # @param [Selector::Sequence] The selector argument
+      def initialize(name, selector)
+        @name = name
         @selector = selector
       end
 
       # @see Selector#to_a
       def to_a
-        [":not("] + @selector.to_a + [")"]
+        [":", @name, "("] + @selector.to_a + [")"]
       end
     end
   end

data/test/sass/conversion_test.rb

@@ -671,11 +671,15 @@ SCSS
     assert_renders <<SASS, <<SCSS
 @import foo
 
+@import url(bar.css)
+
 foo
   bar: baz
 SASS
 @import "foo";
 
+@import url(bar.css);
+
 foo {
   bar: baz; }
 SCSS
@@ -683,11 +687,15 @@ SCSS
     assert_renders <<SASS, <<SCSS
 @import foo.css
 
+@import url(bar.css)
+
 foo
   bar: baz
 SASS
 @import "foo.css";
 
+@import url(bar.css);
+
 foo {
   bar: baz; }
 SCSS
@@ -695,7 +703,6 @@ SCSS
 
   def test_import_as_directive_in_sass
     assert_equal "@import foo.css\n", to_sass('@import "foo.css"')
-    assert_equal "@import foo.css\n", to_sass('@import url(foo.css)')
   end
 
   def test_import_as_directive_in_scss

data/test/sass/engine_test.rb

@@ -487,8 +487,21 @@ CSS
   end
 
   def test_css_import
-    assert_equal("@import url(./fonts.css) screen;\n", render("@import url(./fonts.css) screen"))
-    assert_equal("@import \"./fonts.css\" screen;\n", render("@import \"./fonts.css\" screen"))
+    assert_equal("@import url(./fonts.css);\n", render("@import \"./fonts.css\""))
+  end
+
+  def test_media_import
+    assert_equal("@import \"./fonts.sass\" all;\n",
+      render("@import \"./fonts.sass\" all"))
+  end
+
+  def test_http_import
+    assert_equal("@import url(http://fonts.googleapis.com/css?family=Droid+Sans);\n",
+      render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
+  end
+
+  def test_url_import
+    assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass)"))
   end
 
   def test_sass_import

data/test/sass/scss/css_test.rb

@@ -382,7 +382,10 @@ SCSS
   def test_calc_function
     assert_parses <<SCSS
 foo {
-  a: 12px calc(100%/3 - 2*1em - 2*1px); }
+  a: 12px calc(100%/3 - 2*1em - 2*1px);
+  b: 12px -moz-calc(100%/3 - 2*1em - 2*1px);
+  b: 12px -webkit-calc(100%/3 - 2*1em - 2*1px);
+  b: 12px -foobar-calc(100%/3 - 2*1em - 2*1px); }
 SCSS
   end
 
@@ -703,6 +706,18 @@ SCSS
 
     assert_selector_parses(':not(:hover)')
     assert_selector_parses(':not(:nth-child(2n + 3))')
+
+    # Not technically allowed, but what the heck
+    assert_selector_parses(':not(:not(#foo))')
+    assert_selector_parses(':not(a#foo.bar)')
+    assert_selector_parses(':not(#foo .bar > baz)')
+    assert_selector_parses(':not(h1, h2, h3)')
+  end
+
+  def test_moz_any_selector
+    assert_selector_parses(':-moz-any(h1, h2, h3)')
+    assert_selector_parses(':-moz-any(.foo)')
+    assert_selector_parses(':-moz-any(foo bar, .baz > .bang)')
   end
 
   def test_namespaced_selectors

data/test/sass/scss/scss_test.rb

@@ -212,11 +212,24 @@ SCSS
   def test_css_import_directive
     assert_equal "@import url(foo.css);\n", render('@import "foo.css";')
     assert_equal "@import url(foo.css);\n", render("@import 'foo.css';")
-    assert_equal "@import url(foo.css);\n", render('@import url("foo.css");')
-    assert_equal "@import url(foo.css);\n", render("@import url('foo.css');")
+    assert_equal "@import url(\"foo.css\");\n", render('@import url("foo.css");')
+    assert_equal "@import url('foo.css');\n", render("@import url('foo.css');")
     assert_equal "@import url(foo.css);\n", render('@import url(foo.css);')
   end
 
+  def test_media_import
+    assert_equal("@import \"./fonts.sass\" all;\n", render("@import \"./fonts.sass\" all;"))
+  end
+
+  def test_http_import
+    assert_equal("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";\n",
+      render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";"))
+  end
+
+  def test_url_import
+    assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass);"))
+  end
+
   def test_block_comment_in_script
     assert_equal <<CSS, render(<<SCSS)
 foo {

data/test/sass/templates/import.sass

@@ -4,7 +4,7 @@ $preconst: hello
   pre-mixin: here
 
 @import importee.sass, scss_importee, "basic.sass", basic.css, ../results/complex.css
-@import url(partial.sass)
+@import partial.sass
 
 nonimported
   :myconst $preconst

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.41
+  version: 3.1.42
 platform: ruby
 authors: 
 - Nathan Weizenbaum