sass 3.4.0.rc.1 → 3.4.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86dadd4faf8e93f96f022369b902622f225c18c8
-  data.tar.gz: da7eab9db6a3ae2c4bb925c5712ed1e6e56aa135
+  metadata.gz: 1afd394b8f5238ff1c9946a07f19a8931388586a
+  data.tar.gz: 4832e49d858cfd6602d9b1bd53b5e834c48ba86e
 SHA512:
-  metadata.gz: bf8198a80fd2741f7692e61345a96feb2013084f9c72633a69d6d4aa678fa816f779e09e1cbc604f6b7323cee7bbf1fb98da1b5d7e4d5a5d900ae2b428d38da2
-  data.tar.gz: 64a53c27f497151504a188189e70369e1bb57207b7d6f2a3e04b94aa6fc36b29f66ed9151bc8ce175f90bc1b0e893ee7f81dc63d68c4feb6334136649c5cf9f5
+  metadata.gz: 3cfae679887b0e482a3a5f95bf20aab324acfade3778e8d3b8bd4ae6cec41a71b9e38618cbed02443226af2ed5815e0486de24384ff1e54f004e19c966022604
+  data.tar.gz: cd272dda7c81e9a33885884080f462964db6312f36626df4f61867a4b939f5958d12562b6115438cd8bb15c6fcf5d8378b01952da0773366dbff9f3b1577ae22

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2013 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -199,11 +199,11 @@ and now occasionally consults on the language issues. Hampton lives in San
 Francisco, California and works as VP of Technology
 at [Moovweb](http://www.moovweb.com/).
 
-[Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
-Sass. His hard work has kept the project alive by endlessly answering forum
+[Natalie Weizenbaum](http://nex-3.com) is the primary developer and architect of
+Sass. Her hard work has kept the project alive by endlessly answering forum
 posts, fixing bugs, refactoring, finding speed improvements, writing
 documentation, implementing new features, and getting Hampton coffee (a fitting
-task for a boy-genius). Nathan lives in Seattle, Washington and works on
+task for a girl genius). Natalie lives in Seattle, Washington and works on
 [Dart](http://dartlang.org) application libraries at Google.
 
 [Chris Eppstein](http://acts-as-architect.blogspot.com) is a core contributor to
@@ -214,8 +214,8 @@ his wife and daughter. He is an Engineer for
 [LinkedIn.com](http://linkedin.com), where one of his responsibilities is to
 maintain Sass & Compass.
 
-If you use this software, you must pay Hampton a compliment. And
-buy Nathan some jelly beans. Maybe pet a kitten. Yeah. Pet that kitty.
+If you use this software, you must pay Hampton a compliment. And buy Natalie
+some candy. Maybe pet a kitten. Yeah. Pet that kitty.
 
 Beyond that, the implementation is licensed under the MIT License.
 Okay, fine, I guess that means compliments aren't __required__.

data/VERSION

@@ -1 +1 @@
-3.4.0.rc.1
+3.4.0.rc.2

data/VERSION_DATE

@@ -1 +1 @@
-12 July 2014 01:42:30 UTC
+26 July 2014 00:40:24 UTC

data/lib/sass/exec/sass_scss.rb

@@ -69,7 +69,7 @@ END
       opts.separator 'Common Options:'
 
       opts.on('-I', '--load-path PATH', 'Specify a Sass import path.') do |path|
-        @options[:for_engine][:load_paths] << path
+        (@options[:for_engine][:load_paths] ||= []) << path
       end
 
       opts.on('-r', '--require LIB', 'Require a Ruby library before running Sass.') do |lib|
@@ -159,6 +159,11 @@ END
           $stderr.puts "Unknown sourcemap type #{type}.\n\n"
           $stderr.puts opts
           exit
+        elsif type.nil?
+          Sass::Util.sass_warn <<MESSAGE.rstrip
+DEPRECATION WARNING: Passing --sourcemap without a value is deprecated.
+Sourcemaps are now generated by default, so this flag has no effect.
+MESSAGE
         end
 
         @options[:sourcemap] = (type || :auto).to_sym

data/lib/sass/features.rb

@@ -11,6 +11,7 @@ module Sass
       global-variable-shadowing
       extend-selector-pseudoclass
       units-level-3
+      at-error
     }]
 
     # Check if a feature exists by name. This is used to implement

data/lib/sass/script/functions.rb

@@ -1514,6 +1514,7 @@ module Sass::Script
       end_at = number(-1) if end_at.nil?
       assert_unit end_at, nil, "end-at"
 
+      return Sass::Script::Value::String.new("", string.type) if end_at.value == 0
       s = start_at.value > 0 ? start_at.value - 1 : start_at.value
       e = end_at.value > 0 ? end_at.value - 1 : end_at.value
       s = string.value.length + s if s < 0
@@ -1578,8 +1579,8 @@ module Sass::Script
     #
     # The following features are supported:
     #
-    # * `global-variable-exists` indicates that a local variable will shadow a
-    #   global variable unless `!global` is used.
+    # * `global-variable-shadowing` indicates that a local variable will shadow
+    #   a global variable unless `!global` is used.
     #
     # * `extend-selector-pseudoclass` indicates that `@extend` will reach into
     #   selector pseudoclasses like `:not`.
@@ -1589,6 +1590,8 @@ module Sass::Script
     #
     # [Values and Units Level 3]: http://www.w3.org/TR/css3-values/
     #
+    # * `at-error` indicates that the Sass `@error` directive is supported.
+    #
     # @example
     #   feature-exists(some-feature-that-exists) => true
     #   feature-exists(what-is-this-i-dont-know) => false
@@ -2461,7 +2464,7 @@ module Sass::Script
     #
     # @example
     #   selector-replace(".foo .bar", ".bar", ".baz") => ".foo .baz"
-    #   selector-replace(".foo.bar.baz", ".foo.baz", ".qux") => ".foo.qux"
+    #   selector-replace(".foo.bar.baz", ".foo.baz", ".qux") => ".bar.qux"
     #
     # @overload selector_replace($selector, $original, $replacement)
     #   @param $selector [Sass::Script::Value::String, Sass::Script::Value::List]
@@ -2569,7 +2572,7 @@ module Sass::Script
     #   is-superselector(".foo", ".foo.bar") => true
     #   is-superselector(".foo.bar", ".foo") => false
     #   is-superselector(".bar", ".foo .bar") => true
-    #   is-superselector(".foo .bar", ".bar") => true
+    #   is-superselector(".foo .bar", ".bar") => false
     #
     # @overload is_superselector($super, $sub)
     #   @param $super [Sass::Script::Value::String, Sass::Script::Value::List]

data/lib/sass/script/lexer.rb

@@ -278,8 +278,9 @@ module Sass
         line, offset = @line, @offset
         return unless scan(STRING_REGULAR_EXPRESSIONS[re][open])
         if @scanner[0] =~ /([^\\]|^)\n/
+          filename = @options[:filename]
           Sass::Util.sass_warn <<MESSAGE
-DEPRECATION WARNING on line #{line}, column #{offset}#{" of #{@filename}" if @filename}:
+DEPRECATION WARNING on line #{line}, column #{offset}#{" of #{filename}" if filename}:
 Unescaped multiline strings are deprecated and will be removed in a future version of Sass.
 To include a newline in a string, use "\\a" or "\\a " as in CSS.
 MESSAGE

data/lib/sass/script/tree/interpolation.rb

@@ -109,7 +109,7 @@ If you really want to use the color value here, use `#{alternative.to_sass}'.
 MESSAGE
       end
 
-      res << (val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s)
+      res << val.to_s(:quote => :none)
       res << " " if @after && @whitespace_after
       res << @after.perform(environment).to_s if @after
       opts(Sass::Script::Value::String.new(res))

data/lib/sass/script/tree/string_interpolation.rb

@@ -81,7 +81,7 @@ module Sass::Script::Tree
       before = @before.perform(environment)
       res << before.value
       mid = @mid.perform(environment)
-      res << (mid.is_a?(Sass::Script::Value::String) ? mid.value : mid.to_s)
+      res << (mid.is_a?(Sass::Script::Value::String) ? mid.value : mid.to_s(:quote => :none))
       res << @after.perform(environment).value
       opts(Sass::Script::Value::String.new(res, before.type))
     end

data/lib/sass/script/value/base.rb

@@ -96,10 +96,8 @@ MSG
     # @return [Script::Value::String] A string containing both values
     #   without any separation
     def plus(other)
-      if other.is_a?(Sass::Script::Value::String)
-        return Sass::Script::Value::String.new(to_s + other.value, other.type)
-      end
-      Sass::Script::Value::String.new(to_s + other.to_s)
+      type = other.is_a?(Sass::Script::Value::String) ? other.type : :identifier
+      Sass::Script::Value::String.new(to_s(:quote => :none) + other.to_s(:quote => :none), type)
     end
 
     # The SassScript `-` operation.
@@ -213,6 +211,9 @@ MSG
     # Returns the string representation of this value
     # as it would be output to the CSS document.
     #
+    # @options opts :quote [String]
+    #   The preferred quote style for quoted strings. If `:none`, strings are
+    #   always emitted unquoted.
     # @return [String]
     def to_s(opts = {})
       Sass::Util.abstract(self)

data/lib/sass/script/value/color.rb

@@ -441,7 +441,7 @@ module Sass::Script::Value
       end
       attrs[:alpha] ||= alpha
 
-      Color.new(attrs, :allow_both_rgb_and_hsl)
+      Color.new(attrs, nil, :allow_both_rgb_and_hsl)
     end
 
     # The SassScript `+` operation.

data/lib/sass/script/value/string.rb

@@ -71,13 +71,17 @@ module Sass::Script::Value
 
     # @see Value#plus
     def plus(other)
-      other_str = other.is_a?(Sass::Script::Value::String) ? other.value : other.to_s
-      Sass::Script::Value::String.new(value + other_str, type)
+      other_value = if other.is_a?(Sass::Script::Value::String)
+                      other.value
+                    else
+                      other.to_s(:quote => :none)
+                    end
+      Sass::Script::Value::String.new(value + other_value, type)
     end
 
     # @see Value#to_s
     def to_s(opts = {})
-      return @value.gsub(/\n\s*/, ' ') if @type == :identifier
+      return @value.gsub(/\n\s*/, ' ') if opts[:quote] == :none || @type == :identifier
       Sass::Script::Value::String.quote(value, opts[:quote])
     end
 

data/lib/sass/selector/comma_sequence.rb

@@ -142,8 +142,9 @@ module Sass
       def to_sass_script
         Sass::Script::Value::List.new(members.map do |seq|
           Sass::Script::Value::List.new(seq.members.map do |component|
+            next if component == "\n"
             Sass::Script::Value::String.new(component.to_s)
-          end, :space)
+          end.compact, :space)
         end, :comma)
       end
 

data/lib/sass/supports.rb

@@ -203,8 +203,7 @@ module Sass::Supports
     end
 
     def perform(env)
-      val = value.perform(env)
-      @resolved_value = val.is_a?(Sass::Script::Value::String) ? val.value : val.to_s
+      @resolved_value = value.perform(env).to_s(:quote => :none)
     end
 
     def to_css

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

@@ -515,10 +515,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   def run_interp_no_strip(text)
     text.map do |r|
       next r if r.is_a?(String)
-      val = r.perform(@environment)
-      # Interpolated strings should never render with quotes
-      next val.value if val.is_a?(Sass::Script::Value::String)
-      val.to_s
+      r.perform(@environment).to_s(:quote => :none)
     end.join
   end
 

data/test/sass/engine_test.rb

@@ -2014,10 +2014,10 @@ $var: "bar"
 SASS
   end
 
-  def test_interpolation_doesnt_deep_unquote_strings
+  def test_interpolation_deep_unquotes_strings
     assert_equal(<<CSS, render(<<SASS))
 .foo {
-  a: "bar" "baz"; }
+  a: bar baz; }
 CSS
 .foo
   a: \#{"bar" "baz"}

data/test/sass/functions_test.rb

@@ -945,6 +945,7 @@ class SassFunctionTest < MiniTest::Test
     assert_equal('ab',   evaluate('str-slice(abcd,1,2)'))    # for completeness
     assert_equal('abcd', evaluate('str-slice(abcd,1,4)'))    # at the end points
     assert_equal('abcd', evaluate('str-slice(abcd,0,4)'))    # when start is before the start of the string
+    assert_equal('',     evaluate('str-slice(abcd,1,0)'))    # when end is before the start of the string
     assert_equal('abcd', evaluate('str-slice(abcd,1,100)'))  # when end is past the end of the string
     assert_equal('',     evaluate('str-slice(abcd,2,1)'))    # when end is before start
     assert_equal('"bc"', evaluate('str-slice("abcd",2,3)'))  # when used with a quoted string

data/test/sass/script_test.rb

@@ -206,6 +206,11 @@ class SassScriptTest < MiniTest::Test
     assert_equal "foo1bar5baz4bang", resolve('\'foo#{1 + "bar#{2 + 3}baz" + 4}bang\'')
   end
 
+  def test_interpolation_with_newline
+    assert_equal "\nbang", resolve('"#{"\a "}bang"')
+    assert_equal "\n\nbang", resolve('"#{"\a "}\a bang"')
+  end
+
   def test_rule_interpolation
     assert_equal(<<CSS, render(<<SASS))
 foo bar baz bang {
@@ -342,6 +347,7 @@ SASS
     assert_equal '"foo", "bar"', resolve("'foo' , 'bar'")
     assert_equal "true, 1", resolve('true , 1')
     assert_equal "foobar", resolve('"foo" + "bar"')
+    assert_equal "\nfoo\nxyz", resolve('"\a foo" + "\axyz"')
     assert_equal "true1", resolve('true + 1')
     assert_equal '"foo"-"bar"', resolve("'foo' - 'bar'")
     assert_equal "true-1", resolve('true - 1')
@@ -647,6 +653,18 @@ SASS
     assert_equal ".bar", resolve("nth(nth(&, 1), 3)", {}, env)
   end
 
+  def test_selector_with_newlines
+    env = Sass::Environment.new
+    env.selector = selector(".foo.bar\n.baz.bang,\n\n.bip.bop")
+    assert_equal ".foo.bar .baz.bang, .bip.bop", resolve("&", {}, env)
+    assert_equal ".foo.bar .baz.bang", resolve("nth(&, 1)", {}, env)
+    assert_equal ".bip.bop", resolve("nth(&, 2)", {}, env)
+    assert_equal ".foo.bar", resolve("nth(nth(&, 1), 1)", {}, env)
+    assert_equal ".baz.bang", resolve("nth(nth(&, 1), 2)", {}, env)
+    assert_equal ".bip.bop", resolve("nth(nth(&, 2), 1)", {}, env)
+    assert_equal "string", resolve("type-of(nth(nth(&, 1), 1))", {}, env)
+  end
+
   def test_setting_global_variable_globally
     assert_no_warning {assert_equal(<<CSS, render(<<SCSS, :syntax => :scss))}
 .foo {
@@ -822,6 +840,25 @@ SCSS
 
   # Regression Tests
 
+  def test_repeatedly_modified_color
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  link-color: #161C14;
+  link-color-hover: black;
+  link-color-tap: rgba(22, 28, 20, 0.3); }
+CSS
+$green: #161C14
+$link-color: $green
+$link-color-hover: darken($link-color, 10%)
+$link-color-tap: rgba($green, 0.3)
+
+a
+  link-color: $link-color
+  link-color-hover: $link-color-hover
+  link-color-tap: $link-color-tap
+SASS
+  end
+
   def test_inspect_divided_numbers
     assert_equal "1px/2px", resolve("inspect(1px/2px)")
     assert_equal "0.5", resolve("inspect((1px/2px))")

data/test/sass/scss/scss_test.rb

@@ -3511,7 +3511,7 @@ SCSS
 
   def test_raw_newline_warning
     assert_warning(<<MESSAGE.rstrip) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 2, column 9:
+DEPRECATION WARNING on line 2, column 9 of #{filename_for_test :scss}:
 Unescaped multiline strings are deprecated and will be removed in a future version of Sass.
 To include a newline in a string, use "\\a" or "\\a " as in CSS.
 MESSAGE

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.0.rc.1
+  version: 3.4.0.rc.2
 platform: ruby
 authors:
-- Nathan Weizenbaum
+- Natalie Weizenbaum
 - Chris Eppstein
 - Hampton Catlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard