sass 3.2.0.alpha.76 → 3.2.0.alpha.85

data/README.md

@@ -175,16 +175,15 @@ See `sass-convert --help` for further information and options.
 
 Sass was envisioned by [Hampton Catlin](http://hamptoncatlin.com) (hcatlin).
 However, Hampton doesn't even know his way around the code anymore and now
-occasionally consults on the language issues. Hampton lives in Jacksonville,
-Florida and is the lead mobile developer for Wikimedia.
+occasionally consults on the language issues. Hampton lives in Cambridge, UK and
+is the owner of [Catlin Software](http://www.catlinsoftware.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
 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 while not being
-a student at the University of Washington or working at an internship, he
-consults for Unspace Interactive.
+task for a boy-genius). Nathan 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
 Sass and the creator of Compass, the first Sass-based framework. Chris focuses

data/REVISION

@@ -1 +1 @@
-02ece03560e12575005f7583a43d4e999823447d
+f563a965a5a876cc8228bbca3cae0be28585ad43

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.76
+3.2.0.alpha.85

data/lib/sass/css.rb

@@ -329,7 +329,7 @@ module Sass
       root.children.each do |child|
         next dump_selectors(child) if child.is_a?(Tree::DirectiveNode)
         next unless child.is_a?(Tree::RuleNode)
-        child.rule = child.parsed_rules.to_s
+        child.rule = [child.parsed_rules.to_s]
         dump_selectors(child)
       end
     end

data/lib/sass/engine.rb

@@ -8,6 +8,7 @@ require 'sass/tree/comment_node'
 require 'sass/tree/prop_node'
 require 'sass/tree/directive_node'
 require 'sass/tree/media_node'
+require 'sass/tree/css_import_node'
 require 'sass/tree/variable_node'
 require 'sass/tree/mixin_def_node'
 require 'sass/tree/mixin_node'
@@ -572,7 +573,7 @@ WARNING
     def parse_property_or_rule(line)
       scanner = Sass::Util::MultibyteStringScanner.new(line.text)
       hack_char = scanner.scan(/[:\*\.]|\#(?!\{)/)
-      parser = Sass::SCSS::SassParser.new(scanner, @options[:filename], @line)
+      parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
 
       unless res = parser.parse_interp_ident
         return Tree::RuleNode.new(parse_interp(line.text))
@@ -692,7 +693,7 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         Tree::CharsetNode.new(name)
       elsif directive == "media"
-        parser = Sass::SCSS::SassParser.new(value, @options[:filename], @line)
+        parser = Sass::SCSS::Parser.new(value, @options[:filename], @line)
         Tree::MediaNode.new(parser.parse_media_query_list)
       else
         Tree::DirectiveNode.new(
@@ -784,11 +785,11 @@ WARNING
       return if scanner.eos?
 
       if scanner.match?(/url\(/i)
-        parser = Sass::Script::Parser.new(scanner, @line, offset, @options)
-        str = parser.parse_string
-        media = scanner.scan(/\s*[^,;].*/)
-        media &&= " #{media}"
-        return Tree::DirectiveNode.new(["@import ", str, media || ''])
+        script_parser = Sass::Script::Parser.new(scanner, @line, offset, @options)
+        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)
       end
 
       unless str = scanner.scan(Sass::SCSS::RX::STRING)
@@ -797,10 +798,12 @@ WARNING
 
       val = scanner[1] || scanner[2]
       scanner.scan(/\s*/)
-      if media = scanner.scan(/[^,;].*/)
-        Tree::DirectiveNode.new(["@import #{str || uri} #{media}"])
+      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)
       elsif val =~ /^http:\/\//
-        Tree::DirectiveNode.new(["@import url(#{val})"])
+        Tree::CssImportNode.new("url(#{val})")
       else
         Tree::ImportNode.new(val)
       end

data/lib/sass/media.rb

@@ -216,7 +216,7 @@ module Sass::Media
 
     # The value of the feature.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Sass::Script::Node]
     attr_accessor :value
 
     # The value of the feature after any SassScript has been resolved.
@@ -226,7 +226,7 @@ module Sass::Media
     attr_accessor :resolved_value
 
     # @param name [Array<String, Sass::Script::Node>] See \{#name}
-    # @param value [Array<String, Sass::Script::Node>] See \{#value}
+    # @param value [Sass::Script::Node] See \{#value}
     def initialize(name, value)
       @name = name
       @value = value
@@ -240,7 +240,7 @@ module Sass::Media
     # @yieldreturn [String] The interpolated value.
     def perform
       @resolved_name = yield name
-      @resolved_value = yield value
+      @resolved_value = yield value ? [value] : []
     end
 
     # Returns the CSS for the expression.
@@ -261,7 +261,7 @@ module Sass::Media
     def to_src(options)
       src = '('
       src << Sass::Media._interp_or_var_to_src(name, options)
-      src << ': ' << Sass::Media._interp_or_var_to_src(value, options) unless value.empty?
+      src << ': ' << value.to_sass(options) if value
       src << ')'
       src
     end
@@ -272,7 +272,7 @@ module Sass::Media
     def deep_copy
       Expression.new(
         name.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c},
-        value.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c})
+        value && value.deep_copy)
     end
 
     # Sets the options hash for the script nodes in the expression.
@@ -280,7 +280,7 @@ module Sass::Media
     # @param options [{Symbol => Object}] The options has to set.
     def options=(options)
       name.each {|n| n.options = options if n.is_a?(Sass::Script::Node)}
-      value.each {|v| v.options = options if v.is_a?(Sass::Script::Node)}
+      value.options = options if value
     end
   end
 

data/lib/sass/scss.rb

@@ -2,7 +2,6 @@ require 'sass/scss/rx'
 require 'sass/scss/script_lexer'
 require 'sass/scss/script_parser'
 require 'sass/scss/parser'
-require 'sass/scss/sass_parser'
 require 'sass/scss/static_parser'
 require 'sass/scss/css_parser'
 

data/lib/sass/scss/parser.rb

@@ -293,18 +293,17 @@ module Sass
         return unless (str = tok(STRING)) || (uri = tok?(/url\(/i))
         if uri
           str = sass_script(:parse_string)
-          media = str {media_query_list}.strip
-          media = " #{media}" unless media.empty?
+          media = media_query_list
           ss
-          return node(Tree::DirectiveNode.new(["@import ", str, media]))
+          return node(Tree::CssImportNode.new(str, media))
         end
 
         path = @scanner[1] || @scanner[2]
         ss
 
-        media = str {media_query_list}.strip
-        if path =~ /^http:\/\// || !media.empty? || use_css_import?
-          return node(Sass::Tree::DirectiveNode.new(["@import #{str} #{media}"]))
+        media = media_query_list
+        if path =~ /^http:\/\// || media || use_css_import?
+          return node(Sass::Tree::CssImportNode.new(str, media))
         end
 
         node(Sass::Tree::ImportNode.new(path.strip))
@@ -372,12 +371,12 @@ module Sass
         ss
 
         if tok(/:/)
-          ss; value = expr!(:expr)
+          ss; value = sass_script(:parse)
         end
         tok!(/\)/)
         ss
 
-        Sass::Media::Expression.new(name, value || [])
+        Sass::Media::Expression.new(name, value)
       end
 
       def charset_directive
@@ -835,11 +834,11 @@ MESSAGE
         @strs.pop
       end
 
-      def str?(&block)
+      def str?
         pos = @scanner.pos
         line = @line
         @strs.push ""
-        throw_error(&block) && @strs.last
+        throw_error {yield} && @strs.last
       rescue Sass::SyntaxError => e
         @scanner.pos = pos
         @line = line
@@ -862,6 +861,11 @@ MESSAGE
         parser = self.class.sass_script_parser.new(@scanner, @line,
           @scanner.pos - (@scanner.string[0...@scanner.pos].rindex("\n") || 0))
         result = parser.send(*args)
+        unless @strs.empty?
+          # Convert to CSS manually so that comments are ignored.
+          src = result.to_sass
+          @strs.each {|s| s << src}
+        end
         @line = parser.line
         result
       rescue Sass::SyntaxError => e

data/lib/sass/tree/css_import_node.rb

@@ -0,0 +1,52 @@
+module Sass::Tree
+  # A node representing an `@import` rule that's importing plain CSS.
+  #
+  # @see Sass::Tree
+  class CssImportNode < DirectiveNode
+    # The URI being imported, either as a plain string or an interpolated
+    # script string.
+    #
+    # @return [String, Sass::Script::Node]
+    attr_accessor :uri
+
+    # The text of the URI being imported after any interpolated SassScript has
+    # been resolved. Only set once \{Tree::Visitors::Perform} has been run.
+    #
+    # @return [String]
+    attr_accessor :resolved_uri
+
+    # The media query, or nil.
+    #
+    # @return [Sass::Media::Query?]
+    attr_accessor :query
+
+    # @param uri [String, Sass::Script::Node] See \{#uri}
+    # @param query [Sass::Media::Query] See \{#query}
+    def initialize(uri, query = nil)
+      @uri = uri
+      @query = query
+      super('')
+    end
+
+    # @param uri [String] See \{#resolved_uri}
+    # @return [CssImportNode]
+    def self.resolved(uri)
+      node = new(uri)
+      node.resolved_uri = uri
+      node
+    end
+
+    # @see DirectiveNode#value
+    def value; raise NotImplementedError; end
+
+    # @see DirectiveNode#resolved_value
+    def resolved_value
+      @resolved_value ||=
+        begin
+          str = "@import #{resolved_uri}"
+          str << " #{query.to_css}" if query
+          str
+        end
+    end
+  end
+end

data/lib/sass/tree/media_node.rb

@@ -31,5 +31,12 @@ module Sass::Tree
     def resolved_value
       @resolved_value ||= "@media #{query.to_css}"
     end
+
+    # True when the directive has no visible children.
+    #
+    # @return [Boolean]
+    def invisible?
+      children.all? {|c| c.invisible?}
+    end
   end
 end

data/lib/sass/tree/node.rb

@@ -159,9 +159,9 @@ module Sass
       #
       # @yield node
       # @yieldparam node [Node] a node in the tree
-      def each(&block)
+      def each
         yield self
-        children.each {|c| c.each(&block)}
+        children.each {|c| c.each {|n| yield n}}
       end
 
       # Converts a node to Sass code that will generate it.

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

@@ -143,9 +143,9 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
     return false
   end
 
-  def try_send(method, *args, &block)
+  def try_send(method, *args)
     return unless respond_to?(method)
-    send(method, *args, &block)
+    send(method, *args)
   end
 end
 

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

@@ -150,6 +150,16 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     "#{tab_str}@media #{node.query.to_src(@options)}#{yield}"
   end
 
+  def visit_cssimport(node)
+    if node.uri.is_a?(Sass::Script::Node)
+      str = "#{tab_str}@import #{node.uri.to_sass(@options)}"
+    else
+      str = "#{tab_str}@import #{node.uri}"
+    end
+    str << " #{node.query.to_src(@options)}" if node.query
+    "#{str}#{semi}\n"
+  end
+
   def visit_mixindef(node)
     args =
       if node.args.empty?

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

@@ -135,7 +135,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
   # or parses and includes the imported Sass file.
   def visit_import(node)
     if path = node.css_import?
-      return Sass::Tree::DirectiveNode.resolved("@import url(#{path})")
+      return Sass::Tree::CssImportNode.resolved("url(#{path})")
     end
     file = node.imported_file
     handle_import_loop!(node) if @stack.any? {|e| e[:filename] == file.options[:filename]}
@@ -302,6 +302,15 @@ END
     yield
   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)}
+    end
+    yield
+  end
+
   private
 
   def stack_trace

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

@@ -113,6 +113,10 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     str
   end
 
+  def visit_cssimport(node)
+    visit_directive(node)
+  end
+
   def visit_prop(node)
     tab_str = '  ' * (@tabs + node.tabs)
     if node.style == :compressed

data/test/sass/engine_test.rb

@@ -150,6 +150,7 @@ MSG
     "@content" => '@content may only be used within a mixin.',
     "=simple\n  .simple\n    color: red\n+simple\n  color: blue" => ['Mixin "simple" does not accept a content block.', 4],
     "=foo\n  @content\n+foo" => ["No @content passed.", 2],
+    "@import \"foo\" // bar" => "Invalid CSS after \"\"foo\" \": expected media query list, was \"// bar\"",
 
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
@@ -631,6 +632,17 @@ $family: unquote("Droid+Sans")
 SASS
   end
 
+  def test_import_with_dynamic_media_query
+    assert_equal(<<CSS, render(<<SASS))
+@import "foo" print and (-webkit-min-device-pixel-ratio: 20);
+CSS
+$media: print
+$key: -webkit-min-device-pixel-ratio
+$value: 20
+@import "foo" $media and ($key: $value)
+SASS
+  end
+
   def test_url_import
     assert_equal("@import url(fonts.sass);\n", render("@import url(fonts.sass)"))
   end

data/test/sass/extend_test.rb

@@ -1914,6 +1914,16 @@ $foo: foo;
 SCSS
   end
 
+  def test_media_in_placeholder_selector
+    assert_equal <<CSS, render(<<SCSS)
+.baz {
+  c: d; }
+CSS
+%foo {bar {@media screen {a: b}}}
+.baz {c: d}
+SCSS
+  end
+
   # Regression Tests
 
   def test_newline_near_combinator

data/test/sass/scss/scss_test.rb

@@ -274,6 +274,17 @@ SCSS
     assert_equal("@import \"./fonts.sass\" all;\n", render("@import \"./fonts.sass\" all;"))
   end
 
+  def test_dynamic_media_import
+    assert_equal(<<CSS, render(<<SCSS))
+@import "foo" print and (-webkit-min-device-pixel-ratio: 20);
+CSS
+$media: print;
+$key: -webkit-min-device-pixel-ratio;
+$value: 20;
+@import "foo" $media and ($key: $value);
+SCSS
+  end
+
   def test_http_import
     assert_equal("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";\n",
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";"))
@@ -894,7 +905,7 @@ $baz: 12;
 SCSS
   end
 
-  def test_variables_in_media
+  def test_script_in_media
     assert_equal <<CSS, render(<<SCSS)
 @media screen and (-webkit-min-device-pixel-ratio: 20), only print {
   a: b; }
@@ -904,6 +915,14 @@ $media2: print;
 $var: -webkit-min-device-pixel-ratio;
 $val: 20;
 @media $media1 and ($var: $val), only $media2 {a: b}
+SCSS
+
+    assert_equal <<CSS, render(<<SCSS)
+@media screen and (-webkit-min-device-pixel-ratio: 13) {
+  a: b; }
+CSS
+$vals: 1 2 3;
+@media screen and (-webkit-min-device-pixel-ratio: 5 + 6 + nth($vals, 2)) {a: b}
 SCSS
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302981
+  hash: 592303031
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 76
-  version: 3.2.0.alpha.76
+  - 85
+  version: 3.2.0.alpha.85
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-17 00:00:00 -05:00
+date: 2012-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ files:
 - lib/sass/logger.rb
 - lib/sass/logger/base.rb
 - lib/sass/logger/log_level.rb
-- lib/sass/util.rb
+- lib/sass/scss.rb
 - lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
@@ -117,11 +117,10 @@ files:
 - lib/sass/script/string_interpolation.rb
 - lib/sass/script/unary_operation.rb
 - lib/sass/script/variable.rb
-- lib/sass/scss.rb
+- lib/sass/util.rb
 - lib/sass/scss/css_parser.rb
 - lib/sass/scss/parser.rb
 - lib/sass/scss/rx.rb
-- lib/sass/scss/sass_parser.rb
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/script_parser.rb
 - lib/sass/scss/static_parser.rb
@@ -151,6 +150,7 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/content_node.rb
+- lib/sass/tree/trace_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -162,7 +162,7 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/tree/trace_node.rb
+- lib/sass/tree/css_import_node.rb
 - lib/sass/media.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb

data/lib/sass/scss/sass_parser.rb

@@ -1,11 +0,0 @@
-module Sass
-  module SCSS
-    # A subclass of {Parser} that parses code in Sass documents
-    # using some SCSS constructs.
-    # This is necessary because SassScript in Sass supports `!`-style variables,
-    # whereas in SCSS it doesn't.
-    class SassParser < Parser
-      @sass_script_parser = Sass::Script::Parser
-    end
-  end
-end