sass 3.2.19 → 3.3.0.alpha.1

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

@@ -50,14 +50,6 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
     yield
   end
 
-  def visit_import(node)
-    # We have no good way of propagating the new options through an Engine
-    # instance, so we just null it out. This also lets us avoid caching an
-    # imported Engine along with the importing source tree.
-    node.imported_file = nil
-    yield
-  end
-
   def visit_mixindef(node)
     node.args.each do |k, v|
       k.options = @options

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

@@ -160,6 +160,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
       to_return = ''
       old_spaces = '  ' * @tabs
+      spaces = '  ' * (@tabs + 1)
       if node.style != :compressed
         if node.options[:debug_info] && !@in_directive
           to_return << visit(debug_info_rule(node.debug_info, node.options)) << "\n"

data/lib/sass/util.rb

@@ -3,7 +3,6 @@ require 'set'
 require 'enumerator'
 require 'stringio'
 require 'rbconfig'
-require 'thread'
 
 require 'sass/root'
 require 'sass/util/subset_map'
@@ -257,33 +256,6 @@ module Sass
       arr
     end
 
-    # Returns a sub-array of `minuend` containing only elements that are also in
-    # `subtrahend`. Ensures that the return value has the same order as
-    # `minuend`, even on Rubinius where that's not guaranteed by {Array#-}.
-    #
-    # @param minuend [Array]
-    # @param subtrahend [Array]
-    # @return [Array]
-    def array_minus(minuend, subtrahend)
-      return minuend - subtrahend unless rbx?
-      set = Set.new(minuend) - subtrahend
-      minuend.select {|e| set.include?(e)}
-    end
-
-    # Returns a string description of the character that caused an
-    # `Encoding::UndefinedConversionError`.
-    #
-    # @param [Encoding::UndefinedConversionError]
-    # @return [String]
-    def undefined_conversion_error_char(e)
-      # Rubinius (as of 2.0.0.rc1) pre-quotes the error character.
-      return e.error_char if rbx?
-      # JRuby (as of 1.7.2) doesn't have an error_char field on
-      # Encoding::UndefinedConversionError.
-      return e.error_char.dump unless jruby?
-      e.message[/^"[^"]+"/] #"
-    end
-
     # Asserts that `value` falls within `range` (inclusive), leaving
     # room for slight floating-point errors.
     #
@@ -326,9 +298,7 @@ module Sass
     # @param entry [String] An entry in the `#caller` list, or a similarly formatted string
     # @return [[String, Fixnum, (String, nil)]] An array containing the filename, line, and method name of the caller.
     #   The method name may be nil
-    def caller_info(entry = nil)
-      # JRuby evaluates `caller` incorrectly when it's in an actual default argument.
-      entry ||= caller[1]
+    def caller_info(entry = caller[1])
       info = entry.scan(/^(.*?):(-?.*?)(?::.*`(.+)')?$/).first
       info[1] = info[1].to_i
       # This is added by Rubinius to designate a block, but we don't care about it.
@@ -407,7 +377,6 @@ module Sass
     #
     # @param msg [String]
     def sass_warn(msg)
-      msg = msg + "\n" unless ruby1?
       Sass.logger.warn(msg)
     end
 
@@ -490,27 +459,6 @@ module Sass
       RUBY_ENGINE == "ironruby"
     end
 
-    # Whether or not this is running on Rubinius.
-    #
-    # @return [Boolean]
-    def rbx?
-      RUBY_ENGINE == "rbx"
-    end
-
-    # Whether or not this is running on JRuby.
-    #
-    # @return [Boolean]
-    def jruby?
-      RUBY_PLATFORM =~ /java/
-    end
-
-    # Returns an array of ints representing the JRuby version number.
-    #
-    # @return [Array<Fixnum>]
-    def jruby_version
-      $jruby_version ||= ::JRUBY_VERSION.split(".").map {|s| s.to_i}
-    end
-
     # Like `Dir.glob`, but works with backslash-separated paths on Windows.
     #
     # @param path [String]
@@ -519,28 +467,8 @@ module Sass
       Dir.glob(path, &block)
     end
 
-    # Prepare a value for a destructuring assignment (e.g. `a, b =
-    # val`). This works around a performance bug when using
-    # ActiveSupport, and only needs to be called when `val` is likely
-    # to be `nil` reasonably often.
-    #
-    # See [this bug report](http://redmine.ruby-lang.org/issues/4917).
-    #
-    # @param val [Object]
-    # @return [Object]
-    def destructure(val)
-      val || []
-    end
-
     ## Cross-Ruby-Version Compatibility
 
-    # Whether or not this is running under a Ruby version under 2.0.
-    #
-    # @return [Boolean]
-    def ruby1?
-      Sass::Util::RUBY_VERSION[0] <= 1
-    end
-
     # Whether or not this is running under Ruby 1.8 or lower.
     #
     # Note that IronRuby counts as Ruby 1.8,
@@ -561,11 +489,6 @@ module Sass
       ruby1_8? && Sass::Util::RUBY_VERSION[2] < 7
     end
 
-    # Wehter or not this is running under JRuby 1.6 or lower.
-    def jruby1_6?
-      jruby? && jruby_version[0] == 1 && jruby_version[1] < 7
-    end
-
     # Whether or not this is running under MacRuby.
     #
     # @return [Boolean]
@@ -602,7 +525,7 @@ module Sass
           line.encode(encoding)
         rescue Encoding::UndefinedConversionError => e
           yield <<MSG.rstrip, i + 1
-Invalid #{encoding.name} character #{undefined_conversion_error_char(e)}
+Invalid #{encoding.name} character #{e.error_char.dump}
 MSG
         end
       end
@@ -869,47 +792,6 @@ MSG
       end
     end
 
-    # @private
-    ATOMIC_WRITE_MUTEX = Mutex.new
-
-
-    # This creates a temp file and yields it for writing. When the
-    # write is complete, the file is moved into the desired location.
-    # The atomicity of this operation is provided by the filesystem's
-    # rename operation.
-    #
-    # @param filename [String] The file to write to.
-    # @param perms [Integer] The permissions used for creating this file.
-    #   Will be masked by the process umask. Defaults to readable/writeable
-    #   by all users however the umask usually changes this to only be writable
-    #   by the process's user.
-    # @yieldparam tmpfile [Tempfile] The temp file that can be written to.
-    # @return The value returned by the block.
-    def atomic_create_and_write_file(filename, perms = 0666)
-      require 'tempfile'
-      tmpfile = Tempfile.new(File.basename(filename), File.dirname(filename))
-      tmpfile.binmode if tmpfile.respond_to?(:binmode)
-      result = yield tmpfile
-      tmpfile.flush # ensure all writes are flushed to the OS
-      begin
-        tmpfile.fsync # ensure all buffered data in the OS is sync'd to disk.
-      rescue NotImplementedError
-        # Not all OSes support fsync
-      end
-      tmpfile.close # Windows cannot rename an open file.
-      # Make file readable and writeable to all but respect umask (usually 022).
-      File.chmod(perms & ~File.umask, tmpfile.path)
-      ATOMIC_WRITE_MUTEX.synchronize do
-        File.rename tmpfile.path, filename
-      end
-      result
-    ensure
-      # close and remove the tempfile if it still exists,
-      # presumably due to an error during write
-      tmpfile.close if tmpfile
-      tmpfile.unlink if tmpfile
-    end
-
     private
 
     # Calculates the memoization table for the Least Common Subsequence algorithm.

data/lib/sass/util/multibyte_string_scanner.rb

@@ -3,44 +3,23 @@ require 'strscan'
 if Sass::Util.ruby1_8?
   Sass::Util::MultibyteStringScanner = StringScanner
 else
-  if Sass::Util.rbx?
-    # Rubinius's StringScanner class implements some of its methods in terms of
-    # others, which causes us to double-count bytes in some cases if we do
-    # straightforward inheritance. To work around this, we use a delegate class.
-    require 'delegate'
-    class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
-      def initialize(str)
-        super(StringScanner.new(str))
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
-
-      def is_a?(klass)
-        __getobj__.is_a?(klass) || super
-      end
-    end
-  else
-    class Sass::Util::MultibyteStringScanner < StringScanner
-      def initialize(str)
-        super
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
-    end
-  end
-
   # A wrapper of the native StringScanner class that works correctly with
   # multibyte character encodings. The native class deals only in bytes, not
   # characters, for methods like [#pos] and [#matched_size]. This class deals
   # only in characters, instead.
-  class Sass::Util::MultibyteStringScanner
+  class Sass::Util::MultibyteStringScanner < StringScanner
     def self.new(str)
       return StringScanner.new(str) if str.ascii_only?
       super
     end
 
+    def initialize(str)
+      super
+      @mb_pos = 0
+      @mb_matched_size = nil
+      @mb_last_pos = nil
+    end
+
     alias_method :byte_pos, :pos
     alias_method :byte_matched_size, :matched_size
 

data/test/sass/conversion_test.rb

@@ -1618,22 +1618,6 @@ SCSS
 
   ## Regression Tests
 
-  def test_list_in_args
-    assert_renders(<<SASS, <<SCSS)
-+mixin((a, b, c))
-
-+mixin($arg: (a, b, c))
-
-+mixin(a, b, (c, d, e)...)
-SASS
-@include mixin((a, b, c));
-
-@include mixin($arg: (a, b, c));
-
-@include mixin(a, b, (c, d, e)...);
-SCSS
-  end
-
   def test_media_query_with_expr
     assert_scss_to_sass <<SASS, <<SCSS
 @media foo and (bar: baz)
@@ -1644,6 +1628,14 @@ SASS
 SCSS
   end
 
+  def test_empty_lists
+    assert_renders(<<SASS, <<SCSS)
+$foo: ()
+SASS
+$foo: ();
+SCSS
+  end
+
   def test_nested_if_statements
     assert_renders(<<SASS, <<SCSS)
 @if $foo
@@ -1692,23 +1684,6 @@ foo {
 SCSS
   end
 
-  def test_ambiguous_negation
-    assert_renders(<<SASS, <<SCSS, :indent => '    ')
-foo
-    ok: -$foo
-    comma: 10px, -$foo
-    needs-parens: 10px (-$foo)
-    no-parens: a 50px + 60px b
-SASS
-foo {
-    ok: -$foo;
-    comma: 10px, -$foo;
-    needs-parens: 10px (-$foo);
-    no-parens: a 50px + 60px b;
-}
-SCSS
-  end
-
   private
 
   def assert_sass_to_sass(sass, options = {})

data/test/sass/css2sass_test.rb

@@ -265,25 +265,6 @@ CSS
 
   # Regressions
 
-  def test_empty_rule
-    assert_equal(<<SASS, css2sass(<<CSS))
-a
-SASS
-a {}
-CSS
-  end
-
-  def test_empty_rule_with_selector_combinator
-    assert_equal(<<SASS, css2sass(<<CSS))
-a
-  color: red
-  > b
-SASS
-a {color: red}
-a > b {}
-CSS
-  end
-
   def test_nesting_within_media
     assert_equal(<<SASS, css2sass(<<CSS))
 @media all

data/test/sass/engine_test.rb

@@ -134,19 +134,19 @@ MSG
     '+foo(1 + 1: 2)' => 'Invalid CSS after "(1 + 1": expected comma, was ": 2)"',
     '+foo($var: )' => 'Invalid CSS after "($var: ": expected mixin argument, was ")"',
     '+foo($var: a, $var: b)' => 'Keyword argument "$var" passed more than once',
-    '+foo($var-var: a, $var_var: b)' => 'Keyword argument "$var_var" passed more than once',
-    '+foo($var_var: a, $var-var: b)' => 'Keyword argument "$var-var" passed more than once',
+    '+foo($var-var: a, $var_var: b)' => 'Keyword argument "$var-var" passed more than once',
+    '+foo($var_var: a, $var-var: b)' => 'Keyword argument "$var_var" passed more than once',
     "a\n  b: foo(1 + 1: 2)" => 'Invalid CSS after "foo(1 + 1": expected comma, was ": 2)"',
     "a\n  b: foo($var: )" => 'Invalid CSS after "foo($var: ": expected function argument, was ")"',
     "a\n  b: foo($var: a, $var: b)" => 'Keyword argument "$var" passed more than once',
-    "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var_var" passed more than once',
-    "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var-var" passed more than once',
+    "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var-var" passed more than once',
+    "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var_var" passed more than once',
     "@if foo\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
     "$var: true\n@while $var\n  @extend .bar\n  $var: false" => ["Extend directives may only be used within rules.", 3],
     "@for $i from 0 to 1\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
     "@mixin foo\n  @extend .bar\n@include foo" => ["Extend directives may only be used within rules.", 2],
-    "foo\n  &a\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"a\"\n\n\"a\" may only be used at the beginning of a compound selector.", 2],
-    "foo\n  &1\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"1\"\n\n\"1\" may only be used at the beginning of a compound selector.", 2],
+    "foo\n  &a\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"a\"\n\n\"a\" may only be used at the beginning of a selector.", 2],
+    "foo\n  &1\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"1\"\n\n\"1\" may only be used at the beginning of a selector.", 2],
     "foo %\n  a: b" => ['Invalid CSS after "foo %": expected placeholder name, was ""', 1],
     "=foo\n  @content error" => "Invalid content directive. Trailing characters found: \"error\".",
     "=foo\n  @content\n    b: c" => "Illegal nesting: Nothing may be nested beneath @content directives.",
@@ -158,7 +158,6 @@ MSG
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
     "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
-    "@" => "Invalid directive: '@'.",
   }
 
   def teardown
@@ -218,47 +217,7 @@ MSG
     assert_equal("p {\n  a: b; }\n  p q {\n    c: d; }\n",
                  render("p\n\ta: b\n\tq\n\t\tc: d\n"))
   end
-
-  def test_import_same_name_different_ext
-    assert_warning <<WARNING do
-WARNING: On line 1 of test_import_same_name_different_ext_inline.sass:
-  It's not clear which file to import for '@import "same_name_different_ext"'.
-  Candidates:
-    same_name_different_ext.sass
-    same_name_different_ext.scss
-  For now I'll choose same_name_different_ext.sass.
-  This will be an error in future versions of Sass.
-WARNING
-      options = {:load_paths => [File.dirname(__FILE__) + '/templates/']}
-      munge_filename options
-      result = Sass::Engine.new("@import 'same_name_different_ext'", options).render
-      assert_equal(<<CSS, result)
-.foo {
-  ext: sass; }
-CSS
-    end
-  end
-
-  def test_import_same_name_different_partiality
-    assert_warning <<WARNING do
-WARNING: On line 1 of test_import_same_name_different_partiality_inline.sass:
-  It's not clear which file to import for '@import "same_name_different_partiality"'.
-  Candidates:
-    _same_name_different_partiality.scss
-    same_name_different_partiality.scss
-  For now I'll choose _same_name_different_partiality.scss.
-  This will be an error in future versions of Sass.
-WARNING
-      options = {:load_paths => [File.dirname(__FILE__) + '/templates/']}
-      munge_filename options
-      result = Sass::Engine.new("@import 'same_name_different_partiality'", options).render
-      assert_equal(<<CSS, result)
-.foo {
-  partial: yes; }
-CSS
-    end
-  end
-
+  
   EXCEPTION_MAP.each do |key, value|
     define_method("test_exception (#{key.inspect})") do
       line = 10
@@ -524,21 +483,6 @@ MESSAGE
     assert_hash_has(err.sass_backtrace[2], :mixin => "foo", :line => 2)
   end
 
-  def test_mixin_loop_with_content
-    render <<SASS
-=foo
-  @content
-=bar
-  +foo
-    +bar
-+bar
-SASS
-    assert(false, "Exception not raised")
-  rescue Sass::SyntaxError => err
-    assert_equal("An @include loop has been found: bar includes itself", err.message)
-    assert_hash_has(err.sass_backtrace[0], :mixin => "@content", :line => 5)
-  end
-
   def test_basic_import_loop_exception
     import = filename_for_test
     importer = MockImporter.new
@@ -558,7 +502,7 @@ ERR
     importer.add_import("bar", "@import 'foo'")
 
     engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
-      :load_paths => [importer], :importer => importer)
+      :load_paths => [importer])
 
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
 An @import loop has been found:
@@ -575,7 +519,7 @@ ERR
     importer.add_import("baz", "@import 'foo'")
 
     engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,
-      :load_paths => [importer], :importer => importer)
+      :load_paths => [importer])
 
     assert_raise_message(Sass::SyntaxError, <<ERR.rstrip) {engine.render}
 An @import loop has been found:
@@ -681,11 +625,6 @@ CSS
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
   end
 
-  def test_protocol_relative_import
-    assert_equal("@import url(//fonts.googleapis.com/css?family=Droid+Sans);\n",
-      render("@import \"//fonts.googleapis.com/css?family=Droid+Sans\""))
-  end
-
   def test_import_with_interpolation
     assert_equal(<<CSS, render(<<SASS))
 @import url("http://fonts.googleapis.com/css?family=Droid+Sans");
@@ -731,7 +670,7 @@ SASS
     importer.add_import("imported", "div{color:red}")
     Sass.load_paths << importer
 
-    assert_equal "div {\n  color: red; }\n", Sass::Engine.new('@import "imported"', :importer => importer).render
+    assert_equal "div {\n  color: red; }\n", Sass::Engine.new('@import "imported"').render
   ensure
     Sass.load_paths.clear
   end
@@ -1805,7 +1744,7 @@ SASS
 
   def test_loud_comment_in_compressed_mode
     assert_equal <<CSS, render(<<SASS, :style => :compressed)
-foo{color:blue;/*! foo
+foo{color:blue;/* foo
  * bar
  */}
 CSS
@@ -1819,8 +1758,7 @@ SASS
 
   def test_loud_comment_is_evaluated
     assert_equal <<CSS, render(<<SASS)
-/*!
- * Hue: 327.21649deg */
+/* Hue: 327.21649deg */
 CSS
 /*!
   Hue: \#{hue(#f836a0)}
@@ -2398,55 +2336,6 @@ SASS
 
   # Regression tests
 
-  def test_parent_mixin_in_content_nested
-    assert_equal(<<CSS, render(<<SASS))
-a {
-  b: c; }
-CSS
-=foo
-  @content
-
-=bar
-  +foo
-    +foo
-      a
-        b: c
-
-+bar
-SASS
-  end
-
-  def test_supports_bubbles
-    assert_equal <<CSS, render(<<SASS)
-parent {
-  background: orange; }
-  @supports (perspective: 10px) or (-moz-perspective: 10px) {
-    parent child {
-      background: blue; } }
-CSS
-parent
-  background: orange
-  @supports (perspective: 10px) or (-moz-perspective: 10px)
-    child
-      background: blue
-SASS
-  end
-
-  def test_line_numbers_with_dos_line_endings
-    assert_equal <<CSS, render(<<SASS, :line_comments => true)
-/* line 5, test_line_numbers_with_dos_line_endings_inline.sass */
-.foo {
-  a: b; }
-CSS
-\r
-\r
-\r
-\r
-.foo
-  a: b
-SASS
-  end
-
   def test_variable_in_media_in_mixin
     assert_equal <<CSS, render(<<SASS)
 @media screen and (min-width: 10px) {
@@ -2488,15 +2377,15 @@ SASS
 
   def test_interpolated_comment_in_mixin
     assert_equal <<CSS, render(<<SASS)
-/*! color: red */
+/* color: red */
 .foo {
   color: red; }
 
-/*! color: blue */
+/* color: blue */
 .foo {
   color: blue; }
 
-/*! color: green */
+/* color: green */
 .foo {
   color: green; }
 CSS
@@ -2791,7 +2680,7 @@ CSS
 /* \\\#{foo}
 SASS
     assert_equal <<CSS, render(<<SASS)
-/*! \#{foo} */
+/* \#{foo} */
 CSS
 /*! \\\#{foo}
 SASS
@@ -2974,7 +2863,7 @@ SCSS
 
     original_filename = filename_for_test
     engine = Sass::Engine.new('@import "imported"; div{color:blue}',
-      :filename => original_filename, :load_paths => [importer], :syntax => :scss, :importer => importer)
+      :filename => original_filename, :load_paths => [importer], :syntax => :scss)
     engine.render
 
     assert_equal original_filename, engine.options[:original_filename]
@@ -3209,7 +3098,6 @@ SASS
 
   def render(sass, options = {})
     munge_filename options
-    options[:importer] ||= MockImporter.new
     Sass::Engine.new(sass, options).render
   end