sass 3.1.0.alpha.25 → 3.1.0.alpha.26

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.25
+3.1.0.alpha.26

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.25
+3.1.0.alpha.26

data/lib/sass/engine.rb

@@ -7,6 +7,7 @@ require 'sass/tree/rule_node'
 require 'sass/tree/comment_node'
 require 'sass/tree/prop_node'
 require 'sass/tree/directive_node'
+require 'sass/tree/media_node'
 require 'sass/tree/variable_node'
 require 'sass/tree/mixin_def_node'
 require 'sass/tree/mixin_node'
@@ -645,6 +646,8 @@ WARNING
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath charset directives.",
           :line => @line + 1) unless line.children.empty?
         Tree::CharsetNode.new(name)
+      elsif directive == "media"
+        Tree::MediaNode.new(value)
       else
         Tree::DirectiveNode.new(line.text)
       end

data/lib/sass/scss/parser.rb

@@ -253,7 +253,7 @@ module Sass
 
       def media_directive
         val = str {media_query_list}.strip
-        block(node(Sass::Tree::DirectiveNode.new("@media #{val}")), :directive)
+        block(node(Sass::Tree::MediaNode.new(val)), :directive)
       end
 
       # http://www.w3.org/TR/css3-mediaqueries/#syntax

data/lib/sass/tree/media_node.rb

@@ -0,0 +1,72 @@
+module Sass::Tree
+  # A static node representing a `@media` rule.
+  # `@media` rules behave differently from other directives
+  # in that when they're nested within rules,
+  # they bubble up to top-level.
+  #
+  # @see Sass::Tree
+  class MediaNode < DirectiveNode
+    # The media query (e.g. `print` or `screen`).
+    #
+    # @return [String]
+    attr_accessor :query
+
+    # @see RuleNode#tabs
+    attr_accessor :tabs
+
+    # @see RuleNode#group_end
+    attr_accessor :group_end
+
+    # @param query [String] See \{#query}
+    def initialize(query)
+      @query = query
+      @tabs = 0
+      super('')
+    end
+
+    # @see DirectiveNode#value
+    def value
+      "@media #{query}"
+    end
+
+    # Pass on the parent if it's a RuleNode.
+    #
+    # @see Node#cssize
+    def cssize(extends, parent = nil)
+      _cssize(extends, (parent if [MediaNode, RuleNode].include?(parent.class)))
+    rescue Sass::SyntaxError => e
+      e.modify_backtrace(:filename => filename, :line => line)
+      raise e
+    end
+
+    protected
+
+    # Merge nested media queries.
+    #
+    # @see Node#_cssize
+    def _cssize(extends, parent)
+      node = super
+      media = node.children.select {|c| c.is_a?(MediaNode)}
+      node.children.reject! {|c| c.is_a?(MediaNode)}
+      media.each {|n| n.query = "#{query} and #{n.query}"}
+      (node.children.empty? ? [] : [node]) + media
+    end
+
+    # If we're passed a parent, bubble it down.
+    #
+    # @see Node#cssize
+    def cssize!(extends, parent)
+      return super unless parent.is_a?(RuleNode)
+      new_rule = parent.dup
+      new_rule.children = self.children
+      self.children = Array(new_rule.cssize(extends, self))
+    end
+
+    # @see Node#to_s
+    def _to_s(tabs)
+      str = super(tabs + self.tabs)
+      str.gsub!(/\n\Z/, '') unless style == :compressed || group_end
+      str
+    end
+  end
+end

data/lib/sass/tree/rule_node.rb

@@ -53,11 +53,8 @@ module Sass::Tree
     # @param rule [Array<String, Sass::Script::Node>]
     #   The CSS rule. See \{#rule}
     def initialize(rule)
-      #p rule
       merged = Sass::Util.merge_adjacent_strings(rule)
-      #p merged
       @rule = Sass::Util.strip_string_array(merged)
-      #p @rule
       @tabs = 0
       super()
     end
@@ -200,8 +197,8 @@ module Sass::Tree
     #   or nil if the parent isn't a {RuleNode}
     def _cssize(extends, parent)
       node = super
-      rules = node.children.grep(RuleNode)
-      props = node.children.reject {|c| c.is_a?(RuleNode) || c.invisible?}
+      rules = node.children.select {|c| c.is_a?(RuleNode) || c.is_a?(MediaNode)}
+      props = node.children.reject {|c| c.is_a?(RuleNode) || c.is_a?(MediaNode) || c.invisible?}
 
       unless props.empty?
         node.children = props
@@ -223,7 +220,8 @@ module Sass::Tree
     #   or nil if the parent isn't a {RuleNode}
     # @raise [Sass::SyntaxError] if the rule has no parents but uses `&`
     def cssize!(extends, parent)
-      self.resolved_rules = @parsed_rules.resolve_parent_refs(parent && parent.resolved_rules)
+      # It's possible for resolved_rules to be set if we've duplicated this node during @media bubbling
+      self.resolved_rules ||= @parsed_rules.resolve_parent_refs(parent && parent.resolved_rules)
       super
     end
 

data/test/sass/engine_test.rb

@@ -2241,6 +2241,138 @@ foo
 SASS
   end
 
+  def test_media_bubbling
+    assert_equal <<CSS, render(<<SASS)
+.foo {
+  a: b; }
+  @media bar {
+    .foo {
+      c: d; } }
+  .foo .baz {
+    e: f; }
+    @media bip {
+      .foo .baz {
+        g: h; } }
+
+.other {
+  i: j; }
+CSS
+.foo
+  a: b
+  @media bar
+    c: d
+  .baz
+    e: f
+    @media bip
+      g: h
+
+.other
+  i: j
+SASS
+
+    assert_equal <<CSS, render(<<SASS, :style => :compact)
+.foo { a: b; }
+@media bar { .foo { c: d; } }
+.foo .baz { e: f; }
+@media bip { .foo .baz { g: h; } }
+
+.other { i: j; }
+CSS
+.foo
+  a: b
+  @media bar
+    c: d
+  .baz
+    e: f
+    @media bip
+      g: h
+
+.other
+  i: j
+SASS
+
+    assert_equal <<CSS, render(<<SASS, :style => :expanded)
+.foo {
+  a: b;
+}
+@media bar {
+  .foo {
+    c: d;
+  }
+}
+.foo .baz {
+  e: f;
+}
+@media bip {
+  .foo .baz {
+    g: h;
+  }
+}
+
+.other {
+  i: j;
+}
+CSS
+.foo
+  a: b
+  @media bar
+    c: d
+  .baz
+    e: f
+    @media bip
+      g: h
+
+.other
+  i: j
+SASS
+  end
+
+  def test_double_media_bubbling
+    assert_equal <<CSS, render(<<SASS)
+@media bar and baz {
+  .foo {
+    c: d; } }
+CSS
+@media bar
+  @media baz
+    .foo
+      c: d
+SASS
+
+    assert_equal <<CSS, render(<<SASS)
+@media bar {
+  .foo {
+    a: b; } }
+  @media bar and baz {
+    .foo {
+      c: d; } }
+CSS
+.foo
+  @media bar
+    a: b
+    @media baz
+      c: d
+SASS
+  end
+
+  def test_rule_media_rule_bubbling
+    assert_equal <<CSS, render(<<SASS)
+@media bar {
+  .foo {
+    a: b;
+    e: f; }
+    .foo .baz {
+      c: d; } }
+CSS
+.foo
+  @media bar
+    a: b
+    .baz
+      c: d
+    e: f
+SASS
+  end
+
   # Encodings
 
   unless Sass::Util.ruby1_8?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.25
+  version: 3.1.0.alpha.26
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -121,6 +121,7 @@ files:
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/each_node.rb
+- lib/sass/tree/media_node.rb
 - lib/sass/util.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb