sass 3.2.0.alpha.244 → 3.2.0.alpha.247

data/REVISION

@@ -1 +1 @@
-b255878dc6283a5cb4c03879de4eb25f7621f82d
+5cc7590756da94e5c6df3da3be9ca8ff946d7279

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.244
+3.2.0.alpha.247

data/lib/sass/engine.rb

@@ -705,7 +705,7 @@ WARNING
         Tree::CharsetNode.new(name)
       when 'media'
         parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
-        Tree::MediaNode.new(parser.parse_media_query_list)
+        Tree::MediaNode.new(parser.parse_media_query_list.to_a)
       else
         Tree::DirectiveNode.new(
           value.nil? ? ["@#{directive}"] : ["@#{directive} "] + parse_interp(value, offset))
@@ -800,7 +800,7 @@ WARNING
         str = script_parser.parse_string
         media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
         media = media_parser.parse_media_query_list
-        return Tree::CssImportNode.new(str, media)
+        return Tree::CssImportNode.new(str, media.to_a)
       end
 
       unless str = scanner.scan(Sass::SCSS::RX::STRING)
@@ -812,7 +812,7 @@ WARNING
       if !scanner.match?(/[,;]|$/)
         media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
         media = media_parser.parse_media_query_list
-        Tree::CssImportNode.new(str || uri, media)
+        Tree::CssImportNode.new(str || uri, media.to_a)
       elsif val =~ /^http:\/\//
         Tree::CssImportNode.new("url(#{val})")
       else

data/lib/sass/media.rb

@@ -14,16 +14,6 @@ module Sass::Media
       @queries = queries
     end
 
-    # Runs the SassScript in the media query list.
-    #
-    # @yield [interp] A block that should perform interpolation.
-    # @yieldparam interp [Array<String, Sass::Script::Node>]
-    #   An interpolation array to perform.
-    # @yieldreturn [String] The interpolated value.
-    def perform(&run_interp)
-      @queries.each {|q| q.perform(&run_interp)}
-    end
-
     # Merges this query list with another. The returned query list
     # queries for the intersection between the two inputs.
     #
@@ -52,19 +42,22 @@ module Sass::Media
       queries.map {|q| q.to_src(options)}.join(', ')
     end
 
+    # Returns a representation of the query as an array of strings and
+    # potentially {Sass::Script::Node}s (if there's interpolation in it). When
+    # the interpolation is resolved and the strings are joined together, this
+    # will be the string representation of this query.
+    #
+    # @return [Array<String, Sass::Script::Node>]
+    def to_a
+      Sass::Util.intersperse(queries.map {|q| q.to_a}, ', ').flatten
+    end
+
     # Returns a deep copy of this query list and all its children.
     #
     # @return [QueryList]
     def deep_copy
       QueryList.new(queries.map {|q| q.deep_copy})
     end
-
-    # Sets the options hash for the script nodes in the media query.
-    #
-    # @param options [{Symbol => Object}] The options has to set.
-    def options=(options)
-      queries.each {|q| q.options = options}
-    end
   end
 
   # A single media query.
@@ -73,50 +66,51 @@ module Sass::Media
   class Query
     # The modifier for the query.
     #
+    # When parsed as Sass code, this contains strings and SassScript nodes. When
+    # parsed as CSS, it contains a single string (accessible via
+    # \{#resolved_modifier}).
+    #
     # @return [Array<String, Sass::Script::Node>]
     attr_accessor :modifier
 
-    # The modifier for the query after any SassScript has been resolved.
-    # Only set once \{Tree::Visitors::Perform} has been run.
-    #
-    # @return [String]
-    attr_accessor :resolved_modifier
-
     # The type of the query (e.g. `"screen"` or `"print"`).
     #
+    # When parsed as Sass code, this contains strings and SassScript nodes. When
+    # parsed as CSS, it contains a single string (accessible via
+    # \{#resolved_type}).
+    #
     # @return [Array<String, Sass::Script::Node>]
     attr_accessor :type
 
-    # The type of the query after any SassScript has been resolved.
-    # Only set once \{Tree::Visitors::Perform} has been run.
-    #
-    # @return [String]
-    attr_accessor :resolved_type
-
     # The trailing expressions in the query.
     #
-    # @return [Array<Expression>]
+    # When parsed as Sass code, each expression contains strings and SassScript
+    # nodes. When parsed as CSS, each one contains a single string.
+    #
+    # @return [Array<Array<String, Sass::Script::Node>>]
     attr_accessor :expressions
 
     # @param modifier [Array<String, Sass::Script::Node>] See \{#modifier}
     # @param type [Array<String, Sass::Script::Node>] See \{#type}
-    # @param expressions [Array<Expression>] See \{#expressions}
+    # @param expressions [Array<Array<String, Sass::Script::Node>>] See \{#expressions}
     def initialize(modifier, type, expressions)
       @modifier = modifier
       @type = type
       @expressions = expressions
     end
 
-    # Runs the SassScript in the media query.
-    #
-    # @yield [interp] A block that should perform interpolation.
-    # @yieldparam interp [Array<String, Sass::Script::Node>]
-    #   An interpolation array to perform.
-    # @yieldreturn [String] The interpolated value.
-    def perform(&run_interp)
-      @resolved_modifier = yield modifier
-      @resolved_type = yield type
-      expressions.each {|e| e.perform(&run_interp)}
+    # See \{#modifier}.
+    # @return [String]
+    def resolved_modifier
+      # modifier should contain only a single string
+      modifier.first || ''
+    end
+
+    # See \{#type}.
+    # @return [String]
+    def resolved_type
+      # type should contain only a single string
+      type.first || ''
     end
 
     # Merges this query with another. The returned query queries for
@@ -147,8 +141,8 @@ module Sass::Media
         mod = m1.empty? ? m2 : m1
       end
       q = Query.new([], [], other.expressions + expressions)
-      q.resolved_type = type
-      q.resolved_modifier = mod
+      q.type = [type]
+      q.modifier = [mod]
       return q
     end
 
@@ -161,7 +155,12 @@ module Sass::Media
       css << ' ' unless resolved_modifier.empty?
       css << resolved_type
       css << ' and ' unless resolved_type.empty? || expressions.empty?
-      css << expressions.map {|e| e.to_css}.join(' and ')
+      css << expressions.map do |e|
+        # It's possible for there to be script nodes in Expressions even when
+        # we're converting to CSS in the case where we parsed the document as
+        # CSS originally (as in css_test.rb).
+        e.map {|c| c.is_a?(Sass::Script::Node) ? c.to_sass : c.to_s}.join
+      end.join(' and ')
       css
     end
 
@@ -175,10 +174,23 @@ module Sass::Media
       src << ' ' unless modifier.empty?
       src << Sass::Media._interp_to_src(type, options)
       src << ' and ' unless type.empty? || expressions.empty?
-      src << expressions.map {|e| e.to_src(options)}.join(' and ')
+      src << expressions.map do |e|
+        Sass::Media._interp_to_src(e, options)
+      end.join(' and ')
       src
     end
 
+    # @see \{MediaQuery#to\_a}
+    def to_a
+      res = []
+      res += modifier
+      res << ' ' unless modifier.empty?
+      res += type
+      res << ' and ' unless type.empty? || expressions.empty?
+      res += Sass::Util.intersperse(expressions, ' and ').flatten
+      res
+    end
+
     # Returns a deep copy of this query and all its children.
     #
     # @return [Query]
@@ -186,99 +198,7 @@ module Sass::Media
       Query.new(
         modifier.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c},
         type.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c},
-        expressions.map {|q| q.deep_copy})
-    end
-
-    # Sets the options hash for the script nodes in the media query.
-    #
-    # @param options [{Symbol => Object}] The options has to set.
-    def options=(options)
-      modifier.each {|m| m.options = options if m.is_a?(Sass::Script::Node)}
-      type.each {|t| t.options = options if t.is_a?(Sass::Script::Node)}
-      expressions.each {|e| e.options = options}
-    end
-  end
-
-  # A media query expression.
-  #
-  #   '(' S* media_feature S* [ ':' S* expr ]? ')'
-  class Expression
-    # The name of the feature being queried for.
-    #
-    # @return [Sass::Script::Node]
-    attr_accessor :name
-
-    # The name of the feature after any SassScript has been resolved.
-    # Only set once \{Tree::Visitors::Perform} has been run.
-    #
-    # @return [String]
-    attr_accessor :resolved_name
-
-    # The value of the feature.
-    #
-    # @return [Sass::Script::Node]
-    attr_accessor :value
-
-    # The value of the feature after any SassScript has been resolved.
-    # Only set once \{Tree::Visitors::Perform} has been run.
-    #
-    # @return [String]
-    attr_accessor :resolved_value
-
-    # @param name [Sass::Script::Node] See \{#name}
-    # @param value [Sass::Script::Node] See \{#value}
-    def initialize(name, value)
-      @name = name
-      @value = value
-    end
-
-    # Runs the SassScript in the expression.
-    #
-    # @yield [interp] A block that should perform interpolation.
-    # @yieldparam interp [Array<String, Sass::Script::Node>]
-    #   An interpolation array to perform.
-    # @yieldreturn [String] The interpolated value.
-    def perform
-      @resolved_name = yield name ? [name] : []
-      @resolved_value = yield value ? [value] : []
-    end
-
-    # Returns the CSS for the expression.
-    #
-    # @return [String]
-    def to_css
-      css = '('
-      css << resolved_name
-      css << ': ' << resolved_value unless resolved_value.empty?
-      css << ')'
-      css
-    end
-
-    # Returns the Sass/SCSS code for the expression.
-    #
-    # @param options [{Symbol => Object}] An options hash (see {Sass::CSS#initialize}).
-    # @return [String]
-    def to_src(options)
-      src = '('
-      src << name.to_sass(options)
-      src << ': ' << value.to_sass(options) if value
-      src << ')'
-      src
-    end
-
-    # Returns a deep copy of this expression.
-    #
-    # @return [Expression]
-    def deep_copy
-      Expression.new(name.deep_copy, value && value.deep_copy)
-    end
-
-    # Sets the options hash for the script nodes in the expression.
-    #
-    # @param options [{Symbol => Object}] The options has to set.
-    def options=(options)
-      name.options = options
-      value.options = options if value
+        expressions.map {|e| e.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}})
     end
   end
 

data/lib/sass/scss/parser.rb

@@ -309,7 +309,7 @@ module Sass
           str = sass_script(:parse_string)
           media = media_query_list
           ss
-          return node(Tree::CssImportNode.new(str, media))
+          return node(Tree::CssImportNode.new(str, media.to_a))
         end
 
         path = @scanner[1] || @scanner[2]
@@ -317,7 +317,7 @@ module Sass
 
         media = media_query_list
         if path =~ /^http:\/\// || media || use_css_import?
-          return node(Sass::Tree::CssImportNode.new(str, media))
+          return node(Sass::Tree::CssImportNode.new(str, media.to_a))
         end
 
         node(Sass::Tree::ImportNode.new(path.strip))
@@ -326,7 +326,7 @@ module Sass
       def use_css_import?; false; end
 
       def media_directive
-        block(node(Sass::Tree::MediaNode.new(media_query_list)), :directive)
+        block(node(Sass::Tree::MediaNode.new(media_query_list.to_a)), :directive)
       end
 
       # http://www.w3.org/TR/css3-mediaqueries/#syntax
@@ -378,17 +378,20 @@ module Sass
       end
 
       def media_expr
+        interp = interpolation and return interp
         return unless tok(/\(/)
+        res = ['(']
         ss
-        name = sass_script(:parse)
+        res << sass_script(:parse)
 
         if tok(/:/)
-          ss; value = sass_script(:parse)
+          res << ': '
+          ss
+          res << sass_script(:parse)
         end
-        tok!(/\)/)
+        res << tok!(/\)/)
         ss
-
-        Sass::Media::Expression.new(name, value)
+        res
       end
 
       def charset_directive
@@ -724,7 +727,7 @@ module Sass
           val = interp_ident || expr!(:interp_string)
           ss
         end
-        tok(/\]/)
+        tok!(/\]/)
 
         Selector::Attribute.new(merge(name), merge(ns), op, merge(val))
       end

data/lib/sass/tree/css_import_node.rb

@@ -15,13 +15,21 @@ module Sass::Tree
     # @return [String]
     attr_accessor :resolved_uri
 
-    # The media query, or nil.
+    # The media query for this rule, interspersed with {Sass::Script::Node}s
+    # representing `#{}`-interpolation. Any adjacent strings will be merged
+    # together.
     #
-    # @return [Sass::Media::Query?]
+    # @return [Array<String, Sass::Script::Node>]
     attr_accessor :query
 
+    # The media query for this rule, without any unresolved interpolation. It's
+    # only set once {Tree::Node#perform} has been called.
+    #
+    # @return [Sass::Media::QueryList]
+    attr_accessor :resolved_query
+
     # @param uri [String, Sass::Script::Node] See \{#uri}
-    # @param query [Sass::Media::Query] See \{#query}
+    # @param query [Array<String, Sass::Script::Node>] See \{#query}
     def initialize(uri, query = nil)
       @uri = uri
       @query = query
@@ -44,7 +52,7 @@ module Sass::Tree
       @resolved_value ||=
         begin
           str = "@import #{resolved_uri}"
-          str << " #{query.to_css}" if query
+          str << " #{resolved_query.to_css}" if resolved_query
           str
         end
     end

data/lib/sass/tree/media_node.rb

@@ -6,18 +6,28 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class MediaNode < DirectiveNode
-    # The media query.
+    # TODO: parse and cache the query immediately if it has no dynamic elements
+
+    # The media query for this rule, interspersed with {Sass::Script::Node}s
+    # representing `#{}`-interpolation. Any adjacent strings will be merged
+    # together.
     #
-    # @return [Sass::Media::Query]
+    # @return [Array<String, Sass::Script::Node>]
     attr_accessor :query
 
+    # The media query for this rule, without any unresolved interpolation. It's
+    # only set once {Tree::Node#perform} has been called.
+    #
+    # @return [Sass::Media::QueryList]
+    attr_accessor :resolved_query
+
     # @see RuleNode#tabs
     attr_accessor :tabs
 
     # @see RuleNode#group_end
     attr_accessor :group_end
 
-    # @param query [Sass::Media::Query] See \{#query}
+    # @param query [Array<String, Sass::Script::Node>] See \{#query}
     def initialize(query)
       @query = query
       @tabs = 0
@@ -32,7 +42,7 @@ module Sass::Tree
 
     # @see DirectiveNode#resolved_value
     def resolved_value
-      @resolved_value ||= "@media #{query.to_css}"
+      @resolved_value ||= "@media #{resolved_query.to_css}"
     end
 
     # True when the directive has no visible children.

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

@@ -148,7 +148,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_media(node)
-    "#{tab_str}@media #{node.query.to_src(@options)}#{yield}"
+    "#{tab_str}@media #{interp_to_src(node.query)}#{yield}"
   end
 
   def visit_supports(node)
@@ -161,7 +161,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     else
       str = "#{tab_str}@import #{node.uri}"
     end
-    str << " #{node.query.to_src(@options)}" if node.query
+    str << " #{interp_to_src(node.query)}" unless node.query.empty?
     "#{str}#{semi}\n"
   end
 

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

@@ -139,7 +139,7 @@ class Sass::Tree::Visitors::Cssize < Sass::Tree::Visitors::Base
     yield unless bubble(node)
     media = node.children.select {|c| c.is_a?(Sass::Tree::MediaNode)}
     node.children.reject! {|c| c.is_a?(Sass::Tree::MediaNode)}
-    media = media.select {|n| n.query = n.query.merge(node.query)}
+    media = media.select {|n| n.resolved_query = n.resolved_query.merge(node.resolved_query)}
     (node.children.empty? ? [] : [node]) + media
   end
 

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

@@ -298,8 +298,8 @@ END
   end
 
   def visit_media(node)
-    node.query = node.query.deep_copy
-    node.query.perform {|interp| run_interp(interp)}
+    parser = Sass::SCSS::StaticParser.new(run_interp(node.query), node.filename, node.line)
+    node.resolved_query ||= parser.parse_media_query_list
     yield
   end
 
@@ -312,8 +312,8 @@ END
   def visit_cssimport(node)
     node.resolved_uri = run_interp([node.uri])
     if node.query
-      node.query = node.query.deep_copy
-      node.query.perform {|interp| run_interp(interp)}
+      parser = Sass::SCSS::StaticParser.new(run_interp(node.query), node.filename, node.line)
+      node.resolved_query ||= parser.parse_media_query_list
     end
     yield
   end

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

@@ -101,7 +101,12 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
   end
 
   def visit_media(node)
-    node.query.options = @options
+    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    yield
+  end
+
+  def visit_cssimport(node)
+    node.query.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)} if node.query
     yield
   end
 

data/lib/sass/util.rb

@@ -591,7 +591,7 @@ MSG
             Regexp.new(/\A(?:#{_enc("\uFEFF", e)})?#{
               _enc('@charset "', e)}(.*?)#{_enc('"', e)}|\A(#{
               _enc("\uFEFF", e)})/)
-          rescue Encoding::ConverterNotFound => _
+          rescue Encoding::ConverterNotFoundError => _
             nil # JRuby on Java 5 doesn't support UTF-32
           rescue
             # /\A@charset "(.*?)"/

data/test/sass/cache_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require 'test_helper'
-require 'sass/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 
 class CacheTest < Test::Unit::TestCase

data/test/sass/callbacks_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/callbacks'
 
 class CallerBack

data/test/sass/conversion_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class ConversionTest < Test::Unit::TestCase
   def test_basic
@@ -1153,7 +1153,17 @@ SCSS
   end
 
   def test_media_with_expressions
-    assert_renders <<SASS, <<SCSS
+    # TODO: get rid of the #{} in the expression output
+    assert_sass_to_scss <<SCSS, <<SASS
+$media1: screen;
+$media2: print;
+$var: -webkit-min-device-pixel-ratio;
+$val: 20;
+
+@media \#{$media1} and (\#{$var + "-foo"}: \#{$val + 5}), only \#{$media2} {
+  a: b;
+}
+SCSS
 $media1: screen
 $media2: print
 $var: -webkit-min-device-pixel-ratio
@@ -1162,6 +1172,16 @@ $val: 20
 @media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2}
   a: b
 SASS
+
+    assert_scss_to_sass <<SASS, <<SCSS
+$media1: screen
+$media2: print
+$var: -webkit-min-device-pixel-ratio
+$val: 20
+
+@media \#{$media1} and (\#{$var + "-foo"}: \#{$val + 5}), only \#{$media2}
+  a: b
+SASS
 $media1: screen;
 $media2: print;
 $var: -webkit-min-device-pixel-ratio;

data/test/sass/css2sass_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/css'
 
 class CSS2SassTest < Test::Unit::TestCase

data/test/sass/engine_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'test_helper'
-require 'sass/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 require 'stringio'
 require 'mock_importer'

data/test/sass/extend_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 class ExtendTest < Test::Unit::TestCase
   def test_basic

data/test/sass/functions_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/script'
 
 module Sass::Script::Functions

data/test/sass/importer_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require 'test_helper'
-require 'sass/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 
 require 'sass/plugin'
 

data/test/sass/less_conversion_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 
 begin
 require 'sass/less'

data/test/sass/logger_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 
 class LoggerTest < Test::Unit::TestCase

data/test/sass/plugin_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require 'test_helper'
-require 'sass/test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 require 'sass/plugin'
 require 'fileutils'
 

data/test/sass/script_conversion_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
 class SassScriptConversionTest < Test::Unit::TestCase

data/test/sass/script_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
 module Sass::Script::Functions::UserFunctions

data/test/sass/scss/css_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'sass/scss/test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 require 'sass/scss/css_parser'
 
 # These tests just test the parsing of CSS
@@ -957,6 +957,10 @@ SCSS
 
   ## Regressions
 
+  def test_selector_without_closing_bracket
+    assert_not_parses('"]"', "foo[bar <err>{a: b}")
+  end
+
   def test_closing_line_comment_end_with_compact_output
     assert_equal(<<CSS, render(<<SCSS, :style => :compact))
 /* foo */

data/test/sass/scss/rx_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require "sass/scss/test_helper"
+require File.dirname(__FILE__) + '/../../test_helper'
 require 'sass/engine'
 
 class ScssRxTest < Test::Unit::TestCase

data/test/sass/scss/scss_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require "sass/scss/test_helper"
+require File.dirname(__FILE__) + '/test_helper'
 
 class ScssTest < Test::Unit::TestCase
   include ScssTestHelper
@@ -936,6 +936,31 @@ $vals: 1 2 3;
 SCSS
   end
 
+  def test_media_interpolation_with_reparse
+    assert_equal <<CSS, render(<<SCSS)
+@media screen and (max-width: 300px) {
+  a: b; }
+@media screen and (max-width: 300px) {
+  a: b; }
+@media screen and (max-width: 300px) {
+  a: b; }
+@media screen and (max-width: 300px), print and (max-width: 300px) {
+  a: b; }
+CSS
+$constraint: "(max-width: 300px)";
+$fragment: "nd \#{$constraint}";
+$comma: "een, pri";
+@media screen and \#{$constraint} {a: b}
+@media screen {
+  @media \#{$constraint} {a: b}
+}
+@media screen a\#{$fragment} {a: b}
+@media scr\#{$comma}nt {
+  @media \#{$constraint} {a: b}
+}
+SCSS
+  end
+
   def test_moz_document_interpolation
     assert_equal <<CSS, render(<<SCSS)
 @-moz-document url(http://sass-lang.com/),

data/test/sass/scss/test_helper.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 require 'sass/engine'
 
 module ScssTestHelper

data/test/sass/util/multibyte_string_scanner_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 unless Sass::Util.ruby1_8?
   class MultibyteStringScannerTest < Test::Unit::TestCase

data/test/sass/util/subset_map_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 class SubsetMapTest < Test::Unit::TestCase
   def setup

data/test/sass/util_test.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test_helper'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 
 class UtilTest < Test::Unit::TestCase

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302837
+  hash: 592302835
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 244
-  version: 3.2.0.alpha.244
+  - 247
+  version: 3.2.0.alpha.247
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-31 00:00:00 -04:00
+date: 2012-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,6 +154,7 @@ files:
 - lib/sass/tree/content_node.rb
 - lib/sass/tree/css_import_node.rb
 - lib/sass/tree/variable_node.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/convert.rb
@@ -163,7 +164,6 @@ files:
 - lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/to_css.rb
-- lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/supports_node.rb
 - lib/sass/tree/trace_node.rb