sass 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddad801e37fc518f7e65d22001ccfd3953ed038c
-  data.tar.gz: a14f945fcf23bd0fc3c34c9cd3b74c5c108fef78
+  metadata.gz: 0a14f29ae01795aa104c2385d85709b6267b1b6b
+  data.tar.gz: 963ba1a01ebe057c873468590e7d1a1721d4186f
 SHA512:
-  metadata.gz: f50f5f87c434e97dfb5b97fa9bd3489836f3a59a1026c95d849f0248185528ecb9f36b7436e101517d35c37814023312f58a9c111a15525164165b173313c3da
-  data.tar.gz: e214a6daa25e3de564b65c6443bcbfc85134c9757b1c314f98176db53c7e3fcdd119af6adc64fc99e0566dc451ad59efef89f5cbd64de46ed0d080c714ddbaf9
+  metadata.gz: 9383d9ce058f5fb03da4fa72a4535e211a5e1581a9f36b1394433133b63b984b3dd693f5b12781895c1c280abf3eee6266869bf557a3652d4002bd83b0d1854c
+  data.tar.gz: 0a7aa3edaf6050308a8d399672648ba41a6eaee9f2ba9517d9a99346442b07ba16fbc34b37596efb1e159a546125a53062171cc059289ff2f791b545a8fe0812

data/README.md

@@ -1,4 +1,4 @@
-# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass)
+# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/sass)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS3,
 adding nested rules, variables, mixins, selector inheritance, and more.

data/VERSION

@@ -1 +1 @@
-3.4.0
+3.4.1

data/VERSION_DATE

@@ -1 +1 @@
-19 August 2014 00:38:04 UTC
+23 August 2014 00:21:00 UTC

data/lib/sass/environment.rb

@@ -188,4 +188,21 @@ module Sass
       @content ||= env.is_a?(ReadOnlyEnvironment) ? env : ReadOnlyEnvironment.new(env, env.options)
     end
   end
+
+  # An environment that can write to in-scope global variables, but doesn't
+  # create new variables in the global scope. Useful for top-level control
+  # directives.
+  class SemiGlobalEnvironment < Environment
+    def try_set_var(name, value)
+      @vars ||= {}
+      if @vars.include?(name)
+        @vars[name] = value
+        true
+      elsif @parent
+        @parent.try_set_var(name, value)
+      else
+        false
+      end
+    end
+  end
 end

data/lib/sass/plugin/compiler.rb

@@ -33,6 +33,7 @@ module Sass::Plugin
     # @param opts [{Symbol => Object}]
     #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
     def initialize(opts = {})
+      @watched_files = Set.new
       options.merge!(opts)
     end
 
@@ -238,10 +239,12 @@ module Sass::Plugin
     #   of the directories being updated.
     def file_list(individual_files = [])
       files = individual_files.map do |tuple|
-        if tuple.size < 3
+        if engine_options[:sourcemap] == :none
+          tuple[0..1]
+        elsif tuple.size < 3
           [tuple[0], tuple[1], Sass::Util.sourcemap_name(tuple[1])]
         else
-          tuple
+          tuple.dup
         end
       end
 
@@ -292,7 +295,9 @@ module Sass::Plugin
 
       directories = watched_paths
       individual_files.each do |(source, _, _)|
-        directories << File.dirname(File.expand_path(source))
+        source = File.expand_path(source)
+        @watched_files << source
+        directories << File.dirname(source)
       end
       directories = remove_redundant_directories(directories)
 
@@ -435,6 +440,7 @@ module Sass::Plugin
       end
 
       removed.uniq.each do |f|
+        next unless watched_file?(f)
         run_template_deleted(relative_to_pwd(f))
         if (files = individual_files.find {|(source, _, _)| File.expand_path(source) == f})
           recompile_required = true
@@ -522,7 +528,7 @@ module Sass::Plugin
     end
 
     def watched_file?(file)
-      normalized_load_paths.find {|lp| lp.watched_file?(file)}
+      @watched_files.include?(file) || normalized_load_paths.any? {|lp| lp.watched_file?(file)}
     end
 
     def watched_paths

data/lib/sass/scss/parser.rb

@@ -809,7 +809,7 @@ module Sass
         tok(%r{
           (
             (?!url\()
-            [^"/\#!;\{\}] # "
+            [^"'/\#!;\{\}] # "
           |
             /(?![/*])
           |

data/lib/sass/selector/pseudo.rb

@@ -51,40 +51,50 @@ module Sass
       # Returns a copy of this with \{#selector} set to \{#new\_selector}.
       #
       # @param new_selector [CommaSequence]
-      # @return [CommaSequence]
+      # @return [Array<Simple>]
       def with_selector(new_selector)
-        Pseudo.new(syntactic_type, name, arg, CommaSequence.new(new_selector.members.map do |seq|
-          next seq unless seq.members.length == 1
-          sseq = seq.members.first
-          next seq unless sseq.is_a?(SimpleSequence) && sseq.members.length == 1
-          sel = sseq.members.first
-          next seq unless sel.is_a?(Pseudo) && sel.selector
+        result = Pseudo.new(syntactic_type, name, arg,
+          CommaSequence.new(new_selector.members.map do |seq|
+            next seq unless seq.members.length == 1
+            sseq = seq.members.first
+            next seq unless sseq.is_a?(SimpleSequence) && sseq.members.length == 1
+            sel = sseq.members.first
+            next seq unless sel.is_a?(Pseudo) && sel.selector
 
-          case normalized_name
-          when 'not'
-            # In theory, if there's a nested :not its contents should be
-            # unified with the return value. For example, if :not(.foo)
-            # extends .bar, :not(.bar) should become .foo:not(.bar). However,
-            # this is a narrow edge case and supporting it properly would make
-            # this code and the code calling it a lot more complicated, so
-            # it's not supported for now.
-            next [] unless sel.normalized_name == 'matches'
-            sel.selector.members
-          when 'matches', 'any', 'current', 'nth-child', 'nth-last-child'
-            # As above, we could theoretically support :not within :matches, but
-            # doing so would require this method and its callers to handle much
-            # more complex cases that likely aren't worth the pain.
-            next [] unless sel.name == name && sel.arg == arg
-            sel.selector.members
-          when 'has', 'host', 'host-context'
-            # We can't expand nested selectors here, because each layer adds an
-            # additional layer of semantics. For example, `:has(:has(img))`
-            # doesn't match `<div><img></div>` but `:has(img)` does.
-            sel
-          else
-            []
-          end
-        end.flatten))
+            case normalized_name
+            when 'not'
+              # In theory, if there's a nested :not its contents should be
+              # unified with the return value. For example, if :not(.foo)
+              # extends .bar, :not(.bar) should become .foo:not(.bar). However,
+              # this is a narrow edge case and supporting it properly would make
+              # this code and the code calling it a lot more complicated, so
+              # it's not supported for now.
+              next [] unless sel.normalized_name == 'matches'
+              sel.selector.members
+            when 'matches', 'any', 'current', 'nth-child', 'nth-last-child'
+              # As above, we could theoretically support :not within :matches, but
+              # doing so would require this method and its callers to handle much
+              # more complex cases that likely aren't worth the pain.
+              next [] unless sel.name == name && sel.arg == arg
+              sel.selector.members
+            when 'has', 'host', 'host-context'
+              # We can't expand nested selectors here, because each layer adds an
+              # additional layer of semantics. For example, `:has(:has(img))`
+              # doesn't match `<div><img></div>` but `:has(img)` does.
+              sel
+            else
+              []
+            end
+          end.flatten))
+
+        # Older browsers support :not but only with a single complex selector.
+        # In order to support those browsers, we break up the contents of a :not
+        # unless it originally contained a selector list.
+        return [result] unless normalized_name == 'not'
+        return [result] if selector.members.length > 1
+        result.selector.members.map do |seq|
+          Pseudo.new(syntactic_type, name, arg, CommaSequence.new([seq]))
+        end
       end
 
       # The type of the selector. `:class` if this is a pseudoclass selector,

data/lib/sass/selector/simple_sequence.rb

@@ -161,9 +161,9 @@ module Sass
           extended.members.reject! {|seq| seq.has_placeholder?}
           modified_original = true
           result = sel.with_selector(extended)
-          seen_with_pseudo_selectors << [result]
+          result.each {|new_sel| seen_with_pseudo_selectors << [new_sel]}
           result
-        end
+        end.flatten
 
         groups = Sass::Util.group_by_to_a(extends[members.to_set]) {|ex| ex.extender}
         groups.map! do |seq, group|

data/lib/sass/tree/visitors/cssize.rb

@@ -222,7 +222,11 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   # Bubbles a directive up through RuleNodes.
   def visit_directive(node)
     return node unless node.has_children
-    return bubble(node) if parent.is_a?(Sass::Tree::RuleNode)
+    if parent.is_a?(Sass::Tree::RuleNode)
+      # @keyframes shouldn't include the rule nodes, so we manually create a
+      # bubble that doesn't have the parent's contents for them.
+      return node.normalized_name == '@keyframes' ? Bubble.new(node) : bubble(node)
+    end
 
     yield
 

data/lib/sass/tree/visitors/perform.rb

@@ -222,7 +222,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def visit_each(node)
     list = node.list.perform(@environment)
 
-    with_environment Sass::Environment.new(@environment) do
+    with_environment Sass::SemiGlobalEnvironment.new(@environment) do
       list.to_a.map do |value|
         if node.vars.length == 1
           @environment.set_local_var(node.vars.first, value)
@@ -256,7 +256,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     direction = from.to_i > to.to_i ? -1 : 1
     range = Range.new(direction * from.to_i, direction * to.to_i, node.exclusive)
 
-    with_environment Sass::Environment.new(@environment) do
+    with_environment Sass::SemiGlobalEnvironment.new(@environment) do
       range.map do |i|
         @environment.set_local_var(node.var,
           Sass::Script::Value::Number.new(direction * i,
@@ -279,8 +279,9 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # otherwise, tries the else nodes.
   def visit_if(node)
     if node.expr.nil? || node.expr.perform(@environment).to_bool
-      yield
-      node.children
+      with_environment Sass::SemiGlobalEnvironment.new(@environment) do
+        node.children.map {|c| visit(c)}
+      end.flatten
     elsif node.else
       visit(node.else)
     else
@@ -397,6 +398,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       keyframe_rule_node.line = node.line
       keyframe_rule_node.filename = node.filename
       keyframe_rule_node.source_range = node.source_range
+      keyframe_rule_node.has_children = node.has_children
       with_environment Sass::Environment.new(@environment, node.options) do
         keyframe_rule_node.children = node.children.map {|c| visit(c)}.flatten
       end
@@ -470,7 +472,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # Runs the child nodes until the continuation expression becomes false.
   def visit_while(node)
     children = []
-    with_environment Sass::Environment.new(@environment) do
+    with_environment Sass::SemiGlobalEnvironment.new(@environment) do
       children += node.children.map {|c| visit(c)} while node.expr.perform(@environment).to_bool
     end
     children.flatten

data/test/sass/extend_test.rb

@@ -333,8 +333,8 @@ SCSS
   end
 
   def test_extend_into_not
-    assert_extends(':not(.foo)', '.x {@extend .foo}', ':not(.foo, .x)')
-    assert_extends(':not(.foo.bar)', '.x {@extend .bar}', ':not(.foo.bar, .foo.x)')
+    assert_extends(':not(.foo)', '.x {@extend .foo}', ':not(.foo):not(.x)')
+    assert_extends(':not(.foo.bar)', '.x {@extend .bar}', ':not(.foo.bar):not(.foo.x)')
     assert_extends(
       ':not(.foo.bar, .baz.bar)',
       '.x {@extend .bar}',
@@ -362,7 +362,7 @@ SCSS
   end
 
   def test_complex_extend_into_pseudoclass
-    assert_extends(':not(.bar)', '.x .y {@extend .bar}', ':not(.bar, .x .y)')
+    assert_extends(':not(.bar)', '.x .y {@extend .bar}', ':not(.bar):not(.x .y)')
     assert_extends(':matches(.bar)', '.x .y {@extend .bar}', ':matches(.bar, .x .y)')
     assert_extends(':current(.bar)', '.x .y {@extend .bar}', ':current(.bar, .x .y)')
     assert_extends(':has(.bar)', '.x .y {@extend .bar}', ':has(.bar, .x .y)')
@@ -458,7 +458,7 @@ SCSS
 
   def test_extend_into_not_and_normal_extend
     assert_equal <<CSS, render(<<SCSS)
-.x:not(.y, .bar), .foo:not(.y, .bar) {
+.x:not(.y):not(.bar), .foo:not(.y):not(.bar) {
   a: b; }
 CSS
 .x:not(.y) {a: b}

data/test/sass/script_test.rb

@@ -781,6 +781,112 @@ CSS
 SCSS
   end
 
+  def test_if_can_assign_to_global_variables
+    assert_equal <<CSS, render(<<SCSS, :syntax => :scss)
+.a {
+  b: 2; }
+CSS
+$var: 1;
+@if true {$var: 2}
+.a {b: $var}
+SCSS
+  end
+
+  def test_else_can_assign_to_global_variables
+    assert_equal <<CSS, render(<<SCSS, :syntax => :scss)
+.a {
+  b: 2; }
+CSS
+$var: 1;
+@if false {}
+@else {$var: 2}
+.a {b: $var}
+SCSS
+  end
+
+  def test_for_can_assign_to_global_variables
+    assert_equal <<CSS, render(<<SCSS, :syntax => :scss)
+.a {
+  b: 2; }
+CSS
+$var: 1;
+@for $i from 1 to 2 {$var: 2}
+.a {b: $var}
+SCSS
+  end
+
+  def test_each_can_assign_to_global_variables
+    assert_equal <<CSS, render(<<SCSS, :syntax => :scss)
+.a {
+  b: 2; }
+CSS
+$var: 1;
+@each $a in 1 {$var: 2}
+.a {b: $var}
+SCSS
+  end
+
+  def test_while_can_assign_to_global_variables
+    assert_equal <<CSS, render(<<SCSS, :syntax => :scss)
+.a {
+  b: 2; }
+CSS
+$var: 1;
+@while $var != 2 {$var: 2}
+.a {b: $var}
+SCSS
+  end
+
+  def test_if_doesnt_leak_local_variables
+    assert_raise_message(Sass::SyntaxError, 'Undefined variable: "$var".') do
+      render(<<SCSS, :syntax => :scss)
+@if true {$var: 1}
+.a {b: $var}
+SCSS
+    end
+  end
+
+  def test_else_doesnt_leak_local_variables
+    assert_raise_message(Sass::SyntaxError, 'Undefined variable: "$var".') do
+      render(<<SCSS, :syntax => :scss)
+@if false {}
+@else {$var: 1}
+.a {b: $var}
+SCSS
+    end
+  end
+
+  def test_for_doesnt_leak_local_variables
+    assert_raise_message(Sass::SyntaxError, 'Undefined variable: "$var".') do
+      render(<<SCSS, :syntax => :scss)
+@for $i from 1 to 2 {$var: 1}
+.a {b: $var}
+SCSS
+    end
+  end
+
+  def test_each_doesnt_leak_local_variables
+    assert_raise_message(Sass::SyntaxError, 'Undefined variable: "$var".') do
+      render(<<SCSS, :syntax => :scss)
+@each $a in 1 {$var: 1}
+.a {b: $var}
+SCSS
+    end
+  end
+
+  def test_while_doesnt_leak_local_variables
+    assert_raise_message(Sass::SyntaxError, 'Undefined variable: "$var".') do
+      render(<<SCSS, :syntax => :scss)
+$iter: true;
+@while $iter {
+  $var: 1;
+  $iter: false;
+}
+.a {b: $var}
+SCSS
+    end
+  end
+
   def test_color_format_is_preserved_by_default
     assert_equal "blue", resolve("blue")
     assert_equal "bLuE", resolve("bLuE")

data/test/sass/scss/css_test.rb

@@ -690,6 +690,20 @@ CSS
 SCSS
   end
 
+  def test_keyframes_with_empty_rules
+    assert_equal <<CSS, render(<<SCSS)
+@keyframes identifier {
+  50% {
+    background-color: black; } }
+CSS
+@keyframes identifier {
+  0% {}
+  50% {background-color: black}
+  100% {}
+}
+SCSS
+  end
+
   ## Selectors
 
   # Taken from http://dev.w3.org/csswg/selectors4/#overview

data/test/sass/scss/scss_test.rb

@@ -715,6 +715,26 @@ CSS
 SCSS
   end
 
+  def test_keyframe_bubbling
+    assert_equal(<<CSS, render(<<SCSS, :style => :nested))
+@keyframes spin {
+  0% {
+    transform: rotate(0deg); } }
+@-webkit-keyframes spin {
+  0% {
+    transform: rotate(0deg); } }
+CSS
+.foo {
+  @keyframes spin {
+    0% {transform: rotate(0deg)}
+  }
+  @-webkit-keyframes spin {
+    0% {transform: rotate(0deg)}
+  }
+}
+SCSS
+  end
+
   ## Namespace Properties
 
   def test_namespace_properties
@@ -3528,6 +3548,19 @@ SCSS
 
   # Regression
 
+  def test_attribute_selector_in_selector_pseudoclass
+    # Even though this is plain CSS, it only failed when given to the SCSS
+    # parser.
+    assert_equal(<<CSS, render(<<SCSS))
+[href^='http://'] {
+  color: red; }
+CSS
+[href^='http://'] {
+  color: red;
+}
+SCSS
+  end
+
   def test_top_level_unknown_directive_in_at_root
     assert_equal(<<CSS, render(<<SCSS))
 @fblthp {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard