sass 3.3.7 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3056f55a693a030fff05f6e9cdb3c828c4092823
-  data.tar.gz: 03510d67bb0d7206043ba4fd8ea0f056f036b970
+  metadata.gz: 0bf6310b2324741eab4f6267b1999e90b522b0d7
+  data.tar.gz: df120388678de1053e5f8a22d1b4e972d0ab536c
 SHA512:
-  metadata.gz: 890d0f4b3049a3cad64dfb4aa70ce63b4cbc29d32fcb510f92c2d0dfd23a15f7c438f86fcbc865ecd3035df1e3019cf3225c63cedcb17a692d6597eb9c5e955e
-  data.tar.gz: d550673bc5cbd178c362aa1389ef22aadce524127a9016f0b11299cffd19eccb13af568b8b67f3b56f27698dd60baee9a2daaaf1685be2872a1afdcca1ff3871
+  metadata.gz: 2138eb4290f33ed4058020bdf52e238802a11b5be8d2ad1eed798691005cf6ce02f765cbd6db48ee90e5b7b23c1c6825db0e4711ebc69e9ee9e5dbe788c75879
+  data.tar.gz: 81538da0a25f9c024f7bfd20bbc38e53873c8f2f72b4f822dc950d04f8990274a8cb37483fa1603bf101941bb022244a455c84e496fb152a46d427b03959660f

data/VERSION

@@ -1 +1 @@
-3.3.7
+3.3.8

data/VERSION_DATE

@@ -1 +1 @@
-03 May 2014 00:22:30 UTC
+31 May 2014 00:35:27 UTC

data/lib/sass/engine.rb

@@ -1009,15 +1009,16 @@ WARNING
         script_parser = Sass::Script::Parser.new(scanner, @line, to_parser_offset(offset), @options)
         str = script_parser.parse_string
 
-        media_parser = Sass::SCSS::Parser.new(scanner,
-          @options[:filename], @options[:importer],
-          @line, str.source_range.end_pos.offset)
-        if (media = media_parser.parse_media_query_list)
-          end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
-          node = Tree::CssImportNode.new(str, media.to_a)
-        else
+        if scanner.eos?
           end_pos = str.source_range.end_pos
           node = Tree::CssImportNode.new(str)
+        else
+          media_parser = Sass::SCSS::Parser.new(scanner,
+            @options[:filename], @options[:importer],
+            @line, str.source_range.end_pos.offset)
+          media = media_parser.parse_media_query_list
+          end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
+          node = Tree::CssImportNode.new(str, media.to_a)
         end
 
         node.source_range = Sass::Source::Range.new(

data/lib/sass/plugin/compiler.rb

@@ -229,7 +229,9 @@ module Sass::Plugin
       # A Listen version prior to 2.0 will write a test file to a directory to
       # see if a watcher supports watching that directory. That breaks horribly
       # on read-only directories, so we filter those out.
-      directories.reject {|d| File.writable?(d)} unless Sass::Util.listen_geq_2?
+      unless Sass::Util.listen_geq_2?
+        directories = directories.select {|d| File.directory?(d) && File.writable?(d)}
+      end
 
       # TODO: Keep better track of what depends on what
       # so we don't have to run a global update every time anything changes.
@@ -276,7 +278,7 @@ module Sass::Plugin
     private
 
     def create_listener(*args, &block)
-      load_listen!
+      Sass::Util.load_listen!
       if Sass::Util.listen_geq_2?
         Listen.to(*args, &block)
       else
@@ -310,44 +312,6 @@ module Sass::Plugin
       dedupped
     end
 
-    def load_listen!
-      if defined?(gem)
-        begin
-          gem 'listen', '>= 1.1.0', '< 3.0.0'
-          require 'listen'
-        rescue Gem::LoadError
-          dir = Sass::Util.scope("vendor/listen/lib")
-          $LOAD_PATH.unshift dir
-          begin
-            require 'listen'
-          rescue LoadError => e
-            if Sass::Util.version_geq(RUBY_VERSION, "1.9.3")
-              version_constraint = "~> 2.7"
-            else
-              version_constraint = "~> 1.1"
-            end
-            e.message << "\n" <<
-              "Run \"gem install listen --version '#{version_constraint}'\" to get it."
-            raise e
-          end
-        end
-      else
-        begin
-          require 'listen'
-        rescue LoadError => e
-          dir = Sass::Util.scope("vendor/listen/lib")
-          if $LOAD_PATH.include?(dir)
-            raise e unless File.exists?(scope(".git"))
-            e.message << "\n" <<
-              'Run "git submodule update --init" to get the bundled version.'
-          else
-            $LOAD_PATH.unshift dir
-            retry
-          end
-        end
-      end
-    end
-
     def on_file_changed(individual_files, modified, added, removed)
       recompile_required = false
 

data/lib/sass/script/functions.rb

@@ -2036,7 +2036,7 @@ module Sass::Script
     # @raise [ArgumentError] if `$args` isn't a variable argument list
     def keywords(args)
       assert_type args, :ArgList, :args
-      map(Sass::Util.map_keys(args.keywords.as_stored) {|k| Sass::Script::String.new(k)})
+      map(Sass::Util.map_keys(args.keywords.as_stored) {|k| Sass::Script::Value::String.new(k)})
     end
     declare :keywords, [:args]
 
@@ -2106,31 +2106,29 @@ module Sass::Script
     end
     declare :call, [:name], :var_args => true, :var_kwargs => true
 
-    # This function only exists as a workaround for IE7's [`content: counter`
-    # bug][bug]. It works identically to any other plain-CSS function, except it
+    # This function only exists as a workaround for IE7's [`content:
+    # counter` bug](http://jes.st/2013/ie7s-css-breaking-content-counter-bug/).
+    # It works identically to any other plain-CSS function, except it
     # avoids adding spaces between the argument commas.
     #
-    # [bug]: http://jes.st/2013/ie7s-css-breaking-content-counter-bug/
-    #
     # @example
     #   counter(item, ".") => counter(item,".")
     # @overload counter($args...)
-    # @return [String]
+    # @return [Sass::Script::Value::String]
     def counter(*args)
       identifier("counter(#{args.map {|a| a.to_s(options)}.join(',')})")
     end
     declare :counter, [], :var_args => true
 
-    # This function only exists as a workaround for IE7's [`content: counters`
-    # bug][bug]. It works identically to any other plain-CSS function, except it
+    # This function only exists as a workaround for IE7's [`content:
+    # counter` bug](http://jes.st/2013/ie7s-css-breaking-content-counter-bug/).
+    # It works identically to any other plain-CSS function, except it
     # avoids adding spaces between the argument commas.
     #
-    # [bug]: http://jes.st/2013/ie7s-css-breaking-content-counter-bug/
-    #
     # @example
     #   counters(item, ".") => counters(item,".")
     # @overload counters($args...)
-    # @return [String]
+    # @return [Sass::Script::Value::String]
     def counters(*args)
       identifier("counters(#{args.map {|a| a.to_s(options)}.join(',')})")
     end
@@ -2144,9 +2142,11 @@ module Sass::Script
     #   variable-exists(a-false-value) => true
     #
     #   variable-exists(nonexistent) => false
-    # @param name [Sass::Script::String] The name of the variable to
-    #   check. The name should not include the `$`.
-    # @return [Sass::Script::Bool] Whether the variable is defined in
+    #
+    # @overload variable_exists($name)
+    #   @param $name [Sass::Script::Value::String] The name of the variable to
+    #     check. The name should not include the `$`.
+    # @return [Sass::Script::Value::Bool] Whether the variable is defined in
     #   the current scope.
     def variable_exists(name)
       assert_type name, :String, :name
@@ -2165,9 +2165,11 @@ module Sass::Script
     #     $some-var: false;
     #     @if global-variable-exists(some-var) { /* false, doesn't run */ }
     #   }
-    # @param name [Sass::Script::String] The name of the variable to
-    #   check.  The name should not include the `$`.
-    # @return [Sass::Script::Bool] Whether the variable is defined in
+    #
+    # @overload global_variable_exists($name)
+    #   @param $name [Sass::Script::Value::String] The name of the variable to
+    #     check. The name should not include the `$`.
+    # @return [Sass::Script::Value::Bool] Whether the variable is defined in
     #   the global scope.
     def global_variable_exists(name)
       assert_type name, :String, :name
@@ -2182,9 +2184,11 @@ module Sass::Script
     #
     #   @function myfunc { @return "something"; }
     #   function-exists(myfunc) => true
-    # @param name [Sass::Script::String] The name of the function to
-    #   check.
-    # @return [Sass::Script::Bool] Whether the function is defined.
+    #
+    # @overload function_exists($name)
+    #   @param name [Sass::Script::Value::String] The name of the function to
+    #     check.
+    # @return [Sass::Script::Value::Bool] Whether the function is defined.
     def function_exists(name)
       assert_type name, :String, :name
       exists = Sass::Script::Functions.callable?(name.value.tr("-", "_"))
@@ -2200,9 +2204,11 @@ module Sass::Script
     #
     #   @mixin red-text { color: red; }
     #   mixin-exists(red-text) => true
-    # @param name [Sass::Script::String] The name of the mixin to
-    #   check.
-    # @return [Sass::Script::Bool] Whether the mixin is defined.
+    #
+    # @overload mixin_exists($name)
+    #   @param name [Sass::Script::Value::String] The name of the mixin to
+    #     check.
+    # @return [Sass::Script::Value::Bool] Whether the mixin is defined.
     def mixin_exists(name)
       assert_type name, :String, :name
       bool(environment.mixin(name.value))
@@ -2211,7 +2217,8 @@ module Sass::Script
 
     # Return a string containing the value as its Sass representation.
     #
-    # @param value [Sass::Script::Value::Base] The value to inspect.
+    # @overload inspect($value)
+    #   @param $value [Sass::Script::Value::Base] The value to inspect.
     # @return [Sass::Script::Value::String] A representation of the value as
     #   it would be written in Sass.
     def inspect(value)
@@ -2221,12 +2228,12 @@ module Sass::Script
 
     # @overload random()
     #   Return a decimal between 0 and 1, inclusive of 0 but not 1.
-    #   @return [Sass::Script::Number] A decimal value.
+    #   @return [Sass::Script::Value::Number] A decimal value.
     # @overload random($limit)
     #   Return an integer between 1 and `$limit`, inclusive of 1 but not `$limit`.
     #   @param $limit [Sass::Script::Value::Number] The maximum of the random integer to be
     #     returned, a positive integer.
-    #   @return [Sass::Script::Number] An integer.
+    #   @return [Sass::Script::Value::Number] An integer.
     #   @raise [ArgumentError] if the `$limit` is not 1 or greater
     def random(limit = nil)
       generator = Sass::Script::Functions.random_number_generator

data/lib/sass/scss/parser.rb

@@ -39,7 +39,7 @@ module Sass
       def parse
         init_scanner!
         root = stylesheet
-        expected("selector or at-rule") unless @scanner.eos?
+        expected("selector or at-rule") unless root && @scanner.eos?
         root
       end
 
@@ -62,7 +62,7 @@ module Sass
       def parse_media_query_list
         init_scanner!
         ql = media_query_list
-        expected("media query list") unless @scanner.eos?
+        expected("media query list") unless ql && @scanner.eos?
         ql
       end
 
@@ -74,7 +74,7 @@ module Sass
       def parse_at_root_query
         init_scanner!
         query = at_root_query
-        expected("@at-root query list") unless @scanner.eos?
+        expected("@at-root query list") unless query && @scanner.eos?
         query
       end
 
@@ -86,7 +86,7 @@ module Sass
       def parse_supports_condition
         init_scanner!
         condition = supports_condition
-        expected("supports condition") unless @scanner.eos?
+        expected("supports condition") unless condition && @scanner.eos?
         condition
       end
 

data/lib/sass/selector/comma_sequence.rb

@@ -78,8 +78,7 @@ module Sass
       # @see Simple#to_a
       def to_a
         arr = Sass::Util.intersperse(@members.map {|m| m.to_a}, ", ").flatten
-        arr.delete("\n")
-        arr
+        Sass::Util.replace_subseq(arr, [", ", "\n"], [",\n"])
       end
 
       private

data/lib/sass/selector/sequence.rb

@@ -119,7 +119,9 @@ module Sass
         ary = @members.map do |seq_or_op|
           seq_or_op.is_a?(SimpleSequence) ? seq_or_op.to_a : seq_or_op
         end
-        Sass::Util.intersperse(ary, " ").flatten.compact
+        ary = Sass::Util.intersperse(ary, " ").flatten.compact
+        ary = Sass::Util.replace_subseq(ary, ["\n", " "], ["\n"])
+        Sass::Util.replace_subseq(ary, [" ", "\n"], ["\n"])
       end
 
       # Returns a string representation of the sequence.

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

@@ -236,12 +236,13 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_rule(node)
+    rule = node.parsed_rules ? node.parsed_rules.to_a : node.rule
     if @format == :sass
-      name = selector_to_sass(node.rule)
+      name = selector_to_sass(rule)
       name = "\\" + name if name[0] == ?:
       name.gsub(/^/, tab_str) + yield
     elsif @format == :scss
-      name = selector_to_scss(node.rule)
+      name = selector_to_scss(rule)
       res = name + yield
       if node.children.last.is_a?(Sass::Tree::CommentNode) && node.children.last.type == :silent
         res.slice!(-3..-1)

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

@@ -315,19 +315,31 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
   #   omitted.
   # @return [List<Sass::Tree::Node, Bubble>]
   def debubble(children, parent = nil)
+    # Keep track of the previous parent so that we don't divide `parent`
+    # unnecessarily if the `@at-root` doesn't produce any new nodes (e.g.
+    # `@at-root {@extend %foo}`).
+    previous_parent = nil
+
     Sass::Util.slice_by(children) {|c| c.is_a?(Bubble)}.map do |(is_bubble, slice)|
       unless is_bubble
         next slice unless parent
-        new_parent = parent.dup
-        new_parent.children = slice
-        next new_parent
+        if previous_parent
+          previous_parent.children.push(*slice)
+          next []
+        else
+          previous_parent = new_parent = parent.dup
+          new_parent.children = slice
+          next new_parent
+        end
       end
 
-      next slice.map do |bubble|
+      slice.map do |bubble|
         next unless (node = block_given? ? yield(bubble.node) : bubble.node)
         node.tabs += bubble.tabs
         node.group_end = bubble.group_end
-        [visit(node)].flatten
+        results = [visit(node)].flatten
+        previous_parent = nil unless results.empty?
+        results
       end.compact
     end.flatten
   end

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

@@ -487,7 +487,7 @@ WARNING
 
   def visit_cssimport(node)
     node.resolved_uri = run_interp([node.uri])
-    if node.query
+    if node.query && !node.query.empty?
       parser = Sass::SCSS::StaticParser.new(run_interp(node.query),
         node.filename, node.options[:importer], node.line)
       node.resolved_query ||= parser.parse_media_query_list

data/lib/sass/util.rb

@@ -162,6 +162,43 @@ module Sass
       end
     end
 
+    # Non-destructively replaces all occurrences of a subsequence in an array
+    # with another subsequence.
+    #
+    # @example
+    #   replace_subseq([1, 2, 3, 4, 5], [2, 3], [:a, :b])
+    #     #=> [1, :a, :b, 4, 5]
+    #
+    # @param arr [Array] The array whose subsequences will be replaced.
+    # @param subseq [Array] The subsequence to find and replace.
+    # @param replacement [Array] The sequence that `subseq` will be replaced with.
+    # @return [Array] `arr` with `subseq` replaced with `replacement`.
+    def replace_subseq(arr, subseq, replacement)
+      new = []
+      matched = []
+      i = 0
+      arr.each do |elem|
+        if elem != subseq[i]
+          new.push(*matched)
+          matched = []
+          i = 0
+          new << elem
+          next
+        end
+
+        if i == subseq.length - 1
+          matched = []
+          i = 0
+          new.push(*replacement)
+        else
+          matched << elem
+          i += 1
+        end
+      end
+      new.push(*matched)
+      new
+    end
+
     # Intersperses a value in an enumerable, as would be done with `Array#join`
     # but without concatenating the array together afterwards.
     #
@@ -1173,6 +1210,44 @@ MSG
       tmpfile.unlink if tmpfile
     end
 
+    def load_listen!
+      if defined?(gem)
+        begin
+          gem 'listen', '>= 1.1.0', '< 3.0.0'
+          require 'listen'
+        rescue Gem::LoadError
+          dir = scope("vendor/listen/lib")
+          $LOAD_PATH.unshift dir
+          begin
+            require 'listen'
+          rescue LoadError => e
+            if version_geq(RUBY_VERSION, "1.9.3")
+              version_constraint = "~> 2.7"
+            else
+              version_constraint = "~> 1.1"
+            end
+            e.message << "\n" <<
+              "Run \"gem install listen --version '#{version_constraint}'\" to get it."
+            raise e
+          end
+        end
+      else
+        begin
+          require 'listen'
+        rescue LoadError => e
+          dir = scope("vendor/listen/lib")
+          if $LOAD_PATH.include?(dir)
+            raise e unless File.exists?(scope(".git"))
+            e.message << "\n" <<
+              'Run "git submodule update --init" to get the bundled version.'
+          else
+            $LOAD_PATH.unshift dir
+            retry
+          end
+        end
+      end
+    end
+
     private
 
     # rubocop:disable LineLength

data/test/sass/compiler_test.rb

@@ -174,12 +174,12 @@ class CompilerTest < Test::Unit::TestCase
     directories = nil
     c = watcher do |listener|
       directories = listener.directories
-      listener.removed "/asdf/foobar/sass/foo.scss"
+      listener.removed File.expand_path("./foo.scss")
       listener.fire_events!
     end
-    c.watch([["/asdf/foobar/sass/foo.scss", "/asdf/foobar/css/foo.css", nil]])
-    assert directories.include?("/asdf/foobar/sass"), directories.inspect
-    assert_equal "/asdf/foobar/css/foo.css", c.deleted_css_files.first, "the corresponding css file was not deleted"
+    c.watch([[File.expand_path("./foo.scss"), File.expand_path("./foo.css"), nil]])
+    assert directories.include?(File.expand_path(".")), directories.inspect
+    assert_equal File.expand_path("./foo.css"), c.deleted_css_files.first, "the corresponding css file was not deleted"
     assert_equal [], c.update_stylesheets_called_with[1], "the sass file should not have been compiled"
   end
 

data/test/sass/css2sass_test.rb

@@ -265,6 +265,25 @@ CSS
 
   # Regressions
 
+  def test_nesting_with_matching_property
+    assert_equal(<<SASS, css2sass(<<CSS))
+ul
+  width: 10px
+  div
+    width: 20px
+
+article
+  width: 10px
+  p
+    width: 20px
+SASS
+ul {width: 10px}
+ul div {width: 20px}
+article {width: 10px}
+article p {width: 20px}
+CSS
+  end
+
   def test_empty_rule
     assert_equal(<<SASS, css2sass(<<CSS))
 a

data/test/sass/scss/scss_test.rb

@@ -2848,6 +2848,34 @@ CSS
 SCSS
   end
 
+  def test_at_root_doesnt_always_break_blocks
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a: b; }
+
+@media screen {
+  .foo {
+    c: d; }
+  .bar {
+    e: f; } }
+CSS
+%base {
+  a: b;
+}
+
+@media screen {
+  .foo {
+    c: d;
+    @at-root (without: media) {
+      @extend %base;
+    }
+  }
+
+  .bar {e: f}
+}
+SCSS
+  end
+
   ## Errors
 
   def test_nested_mixin_def_is_scoped
@@ -3098,6 +3126,16 @@ MESSAGE
 SCSS
   end
 
+  def test_empty_media_query_error
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render(<<SCSS)}
+Invalid CSS after "": expected media query list, was ""
+MESSAGE
+@media \#{""} {
+  foo {a: b}
+}
+SCSS
+  end
+
   # Regression
 
   def test_top_level_unknown_directive_in_at_root

data/test/sass/util_test.rb

@@ -79,6 +79,15 @@ class UtilTest < Test::Unit::TestCase
       merge_adjacent_strings([str, " ", str, " ", str, :bang, str, " ", str, 12]))
   end
 
+  def test_replace_subseq
+    assert_equal([1, 2, :a, :b, 5],
+      replace_subseq([1, 2, 3, 4, 5], [3, 4], [:a, :b]))
+    assert_equal([1, 2, 3, 4, 5],
+      replace_subseq([1, 2, 3, 4, 5], [3, 4, 6], [:a, :b]))
+    assert_equal([1, 2, 3, 4, 5],
+      replace_subseq([1, 2, 3, 4, 5], [4, 5, 6], [:a, :b]))
+  end
+
   def test_intersperse
     assert_equal(["foo", " ", "bar", " ", "baz"],
       intersperse(%w[foo bar baz], " "))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.3.8
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard