sass 3.3.0.alpha.391 → 3.3.0.alpha.392

data/REVISION

@@ -1 +1 @@
-8a52009908c0e749c18e10c4a62e792c4f70f024
+7cd0572b56d7915a0b3af53d6776fa3f7fd10317

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.391
+3.3.0.alpha.392

data/VERSION_DATE

@@ -1 +1 @@
-11 October 2013 23:20:43 GMT
+12 October 2013 15:27:22 GMT

data/lib/sass/engine.rb

@@ -736,11 +736,15 @@ WARNING
     end
 
     def parse_variable(line)
-      name, value, default = line.text.scan(Script::MATCH)[0]
+      name, value, flags = line.text.scan(Script::MATCH)[0]
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath variable declarations.",
         :line => @line + 1) unless line.children.empty?
       raise SyntaxError.new("Invalid variable: \"#{line.text}\".",
         :line => @line) unless name && value
+      flags = flags ? flags.split(/\s+/) : []
+      if (invalid_flag = flags.find {|f| f != '!default' && f != '!global'})
+        raise SyntaxError.new("Invalid flag \"#{invalid_flag}\".", :line => @line)
+      end
 
       # This workaround is needed for the case when the variable value is part of the identifier,
       # otherwise we end up with the offset equal to the value index inside the name:
@@ -749,7 +753,7 @@ WARNING
       index = line.text.index(value, line.offset + var_lhs_length) || 0
       expr = parse_script(value, :offset => to_parser_offset(line.offset + index))
 
-      Tree::VariableNode.new(name, expr, default)
+      Tree::VariableNode.new(name, expr, flags.include?('!default'), flags.include?('!global'))
     end
 
     def parse_comment(line)

data/lib/sass/environment.rb

@@ -21,6 +21,11 @@ module Sass
             (@#{name}s && @#{name}s[name]) || @parent && @parent._#{name}(name)
           end
           protected :_#{name}
+
+          def is_#{name}_global?(name)
+            return !@parent if @#{name}s && @#{name}s.has_key?(name)
+            @parent && @parent.is_#{name}_global?(name)
+          end
         RUBY
       end
 

data/lib/sass/script.rb

@@ -7,7 +7,8 @@ module Sass
   # This module contains code that handles the parsing and evaluation of SassScript.
   module Script
     # The regular expression used to parse variables.
-    MATCH = /^\$(#{Sass::SCSS::RX::IDENT})\s*:\s*(.+?)(!(?i:default))?$/
+    MATCH = /^\$(#{Sass::SCSS::RX::IDENT})\s*:\s*(.+?)
+      (!#{Sass::SCSS::RX::IDENT}(?:\s+!#{Sass::SCSS::RX::IDENT})*)?$/x
 
     # The regular expression used to validate variables without matching.
     VALIDATE = /^\$#{Sass::SCSS::RX::IDENT}$/

data/lib/sass/scss/parser.rb

@@ -598,8 +598,19 @@ module Sass
         ss; tok!(/:/); ss
 
         expr = sass_script(:parse)
-        guarded = tok(DEFAULT)
-        result = Sass::Tree::VariableNode.new(name, expr, guarded)
+        while tok(/!/)
+          flag_name = tok!(IDENT)
+          if flag_name == 'default'
+            guarded ||= true
+          elsif flag_name == 'global'
+            global ||= true
+          else
+            raise Sass::SyntaxError.new("Invalid flag \"!#{flag_name}\".", :line => @line)
+          end
+          ss
+        end
+
+        result = Sass::Tree::VariableNode.new(name, expr, guarded, global)
         node(result, start_pos)
       end
 

data/lib/sass/scss/rx.rb

@@ -94,7 +94,6 @@ module Sass
       HASH = /##{NAME}/
 
       IMPORTANT = /!#{W}important/i
-      DEFAULT = /!#{W}default/i
 
       NUMBER = /#{NUM}(?:#{IDENT}|%)?/
 

data/lib/sass/tree/variable_node.rb

@@ -16,13 +16,19 @@ module Sass
       # @return [Boolean]
       attr_reader :guarded
 
+      # Whether this is a global variable assignment (`!global`).
+      # @return [Boolean]
+      attr_reader :global
+
       # @param name [String] The name of the variable
       # @param expr [Script::Tree::Node] See \{#expr}
       # @param guarded [Boolean] See \{#guarded}
-      def initialize(name, expr, guarded)
+      # @param global [Boolean] See \{#global}
+      def initialize(name, expr, guarded, global)
         @name = name
         @expr = expr
         @guarded = guarded
+        @global = global
         super()
       end
     end

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

@@ -253,7 +253,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
 
   def visit_variable(node)
     "#{tab_str}$#{dasherize(node.name)}: #{node.expr.to_sass(@options)}" +
-      "#{' !default' if node.guarded}#{semi}\n"
+      "#{' !global' if node.global}#{' !default' if node.guarded}#{semi}\n"
   end
 
   def visit_warn(node)

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

@@ -416,7 +416,23 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
 
   # Loads the new variable value into the environment.
   def visit_variable(node)
-    var = @environment.var(node.name)
+    env = @environment
+    if node.global
+      env = env.global_env
+    elsif env.parent && env.is_var_global?(node.name)
+      var_expr = "$#{node.name}: #{node.expr.to_sass(env.options)} !global"
+      var_expr << " !default" if node.guarded
+      location = "on line #{node.line}"
+      location << " of #{node.filename}" if node.filename
+      Sass::Util.sass_warn <<WARNING
+DEPRECATION WARNING #{location}:
+Assigning to global variable "$#{node.name}" by default is deprecated.
+In future versions of Sass, this will create a new local variable.
+If you want to assign to the global variable, use "#{var_expr}" instead.
+WARNING
+    end
+
+    var = env.var(node.name)
     return [] if node.guarded && var && !var.null?
     val = node.expr.perform(@environment)
     if node.expr.source_range
@@ -424,7 +440,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     else
       val.source_range = node.source_range
     end
-    @environment.set_var(node.name, val)
+    env.set_var(node.name, val)
     []
   end
 

data/test/sass/conversion_test.rb

@@ -1893,6 +1893,23 @@ foo {
 SCSS
   end
 
+  def test_variable_with_global
+    assert_renders(<<SASS, <<SCSS)
+$var: 1
+
+foo
+  $var: 2 !global
+  $var: 3 !global !default
+SASS
+$var: 1;
+
+foo {
+  $var: 2 !global;
+  $var: 3 !global !default;
+}
+SCSS
+  end
+
   private
 
   def assert_sass_to_sass(sass, options = {})

data/test/sass/engine_test.rb

@@ -1579,7 +1579,7 @@ $a: 5
 @while $a != 0
   a-\#{$a}
     blooble: gloop
-  $a: $a - 1
+  $a: $a - 1 !global
 SASS
   end
 
@@ -1673,8 +1673,8 @@ a {
   b: 1;
   c: 2; }
 CSS
-$a: 1
 a
+  $a: 1
   b: $a
   $a: 2
   c: $a
@@ -1682,7 +1682,7 @@ SASS
   end
 
   def test_variable_scope
-    assert_equal(<<CSS, render(<<SASS))
+    silence_warnings {assert_equal(<<CSS, render(<<SASS))}
 a {
   b-1: c;
   b-2: c;
@@ -1708,9 +1708,6 @@ SASS
 
   def test_hyphen_underscore_insensitive_variables
     assert_equal(<<CSS, render(<<SASS))
-a {
-  b: c; }
-
 d {
   e: 13;
   f: foobar; }
@@ -1718,10 +1715,8 @@ CSS
 $var-hyphen: 12
 $var_under: foo
 
-a
-  $var_hyphen: 1 + $var_hyphen
-  $var-under: $var-under + bar
-  b: c
+$var_hyphen: 1 + $var_hyphen
+$var-under: $var-under + bar
 
 d
   e: $var-hyphen
@@ -2489,6 +2484,25 @@ CSS
 SASS
   end
 
+  def test_variable_assignment_with_global
+    assert_no_warning {assert_equal(<<CSS, render(<<SASS))}
+.foo {
+  a: x; }
+
+.bar {
+  b: x; }
+CSS
+$var: 1
+
+.foo
+  $var: x !global
+  a: $var
+
+.bar
+  b: $var
+SASS
+  end
+
   # Regression tests
 
   def test_list_separator_with_arg_list

data/test/sass/script_test.rb

@@ -585,6 +585,105 @@ SASS
     assert_equal ".bar", resolve("nth(nth(&, 1), 3)", {}, env)
   end
 
+  def test_setting_global_variable_locally_warns
+    assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
+DEPRECATION WARNING on line 4 of test_setting_global_variable_locally_warns_inline.scss:
+Assigning to global variable "$var" by default is deprecated.
+In future versions of Sass, this will create a new local variable.
+If you want to assign to the global variable, use "$var: x !global" instead.
+WARNING
+.foo {
+  a: x; }
+
+.bar {
+  b: x; }
+CSS
+$var: 1;
+
+.foo {
+  $var: x;
+  a: $var;
+}
+
+.bar {
+  b: $var;
+}
+SCSS
+  end
+
+  def test_setting_global_variable_globally
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
+.foo {
+  a: 1; }
+
+.bar {
+  b: 2; }
+CSS
+$var: 1;
+
+.foo {
+  a: $var;
+}
+
+$var: 2;
+
+.bar {
+  b: $var;
+}
+SCSS
+  end
+
+  def test_setting_global_variable_with_flag
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
+.bar {
+  a: x;
+  b: y;
+  c: z; }
+CSS
+$var1: 1;
+$var3: 3;
+
+.foo {
+  $var1: x !global;
+  $var2: y !global;
+  @each $var3 in _ {
+    $var3: z !global;
+  }
+}
+
+.bar {
+  a: $var1;
+  b: $var2;
+  c: $var3;
+}
+SCSS
+  end
+
+  def test_setting_global_variable_with_flag_and_default
+    assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))
+.bar {
+  a: 1;
+  b: y;
+  c: z; }
+CSS
+$var1: 1;
+
+.foo {
+  $var1: x !global !default;
+  $var2: y !global !default;
+  @each $var3 in _ {
+    $var3: z !global !default;
+  }
+}
+
+.bar {
+  a: $var1;
+  b: $var2;
+  c: $var3;
+}
+SCSS
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/scss_test.rb

@@ -229,7 +229,7 @@ $i: 1;
 .foo {
   @while $i != 5 {
     a: $i;
-    $i: $i + 1;
+    $i: $i + 1 !global;
   }
 }
 SCSS
@@ -2639,7 +2639,7 @@ SCSS
 CSS
 $var: null;
 .foo {
-  $var: &;
+  $var: & !global;
 }
 
 .bar {

data/test/sass/source_map_test.rb

@@ -488,7 +488,7 @@ CSS
 $i: 6;
 @while $i > 0 {
   {{1}}{{4}}{{7}}.item-#{$i} {{/1}}{{/4}}{{/7}}{ {{2}}{{5}}{{8}}width{{/2}}{{/5}}{{/8}}: {{3}}{{6}}{{9}}2em * $i{{/3}}{{/6}}{{/9}}; }
-  $i: $i - 2;
+  $i: $i - 2 !global;
 }
 SCSS
 {{1}}.item-6{{/1}} {
@@ -510,7 +510,7 @@ $i: 6
 @while $i > 0
   {{1}}{{4}}{{7}}.item-#{$i}{{/1}}{{/4}}{{/7}}
     {{2}}{{5}}{{8}}width{{/2}}{{/5}}{{/8}}: {{3}}{{6}}{{9}}2em * $i{{/3}}{{/6}}{{/9}}
-    $i: $i - 2
+    $i: $i - 2 !global
 SASS
 {{1}}.item-6{{/1}} {
   {{2}}width{{/2}}: {{3}}12em{{/3}}; }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302083
+  hash: 592302109
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 391
-  version: 3.3.0.alpha.391
+  - 392
+  version: 3.3.0.alpha.392
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-11 00:00:00 -04:00
+date: 2013-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency