haml 3.1.0.alpha.33 → 3.1.0.alpha.36

data/vendor/sass/lib/sass/tree/if_node.rb

@@ -36,6 +36,25 @@ module Sass::Tree
       self.else.options = options if self.else
     end
 
+    # @see Node#_around_dump
+    def _around_dump
+      old_else = @else
+      old_last_else = @last_else
+      @else = Sass::Util.dump(@else)
+      @last_else = (self == @last_else ? nil : Sass::Util.dump(@last_else))
+      super
+    ensure
+      @else = old_else
+      @last_else = old_last_else
+    end
+
+    # @see Node#_after_load
+    def _after_load
+      super
+      @else = Sass::Util.load(@else)
+      @last_else = (@last_else ? Sass::Util.load(@last_else) : self)
+    end
+
     protected
 
     # @see Node#to_src

data/vendor/sass/lib/sass/tree/media_node.rb

@@ -0,0 +1,75 @@
+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))
+      # If the last child is actually the end of the group,
+      # the parent's cssize will set it properly
+      self.children.last.group_end = false unless self.children.empty?
+    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/vendor/sass/lib/sass/tree/prop_node.rb

@@ -199,7 +199,7 @@ module Sass::Tree
 
       def val_to_sass_concat(node, opts)
         return node unless node.is_a?(Sass::Script::Operation)
-        return val_to_sass_div(node, opts) unless node.operator == :concat
+        return val_to_sass_div(node, opts) unless node.operator == :space
 
         Sass::Script::Operation.new(
           val_to_sass_div(node.operand1, opts),

data/vendor/sass/lib/sass/tree/root_node.rb

@@ -17,7 +17,7 @@ module Sass
       def to_s(*args)
         super
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -36,7 +36,7 @@ module Sass
         environment.options = @options if environment.options.nil? || environment.options.empty?
         super
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -47,9 +47,9 @@ module Sass
       # @return [(Tree::Node, Sass::Util::SubsetMap)] The resulting tree of static nodes
       #   *and* the extensions defined for this tree
       def cssize(extends = Sass::Util::SubsetMap.new, parent = nil)
-        return super(extends), extends
+        return super(extends, parent), extends
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -106,7 +106,39 @@ module Sass
         end
         result.rstrip!
         return "" if result.empty?
-        return result + "\n"
+        result << "\n"
+        unless Sass::Util.ruby1_8? || result.ascii_only?
+          if children.first.is_a?(CharsetNode)
+            begin
+              encoding = children.first.name
+              # Default to big-endian encoding, because we have to decide somehow
+              encoding << 'BE' if encoding =~ /\Autf-(16|32)\Z/i
+              result = result.encode(Encoding.find(encoding))
+            rescue EncodingError
+            end
+          end
+
+          result = "@charset \"#{result.encoding.name}\";#{
+            style == :compressed ? '' : "\n"
+          }".encode(result.encoding) + result
+        end
+        result
+      end
+
+      # In Ruby 1.8, ensures that there's only one @charset directive
+      # and that it's at the top of the document.
+      #
+      # @see Node#cssize
+      def cssize!(extends, parent)
+        super
+
+        # In Ruby 1.9 we can make all @charset nodes invisible
+        # and infer the final @charset from the encoding of the final string.
+        if Sass::Util.ruby1_8? && parent.nil?
+          charset = self.children.find {|c| c.is_a?(CharsetNode)}
+          self.children.reject! {|c| c.is_a?(CharsetNode)}
+          self.children.unshift charset if charset
+        end
       end
 
       # Returns an error message if the given child node is invalid,

data/vendor/sass/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/vendor/sass/lib/sass/util.rb

@@ -17,6 +17,11 @@ module Sass
     # @api public
     RUBY_VERSION = ::RUBY_VERSION.split(".").map {|s| s.to_i}
 
+    # The Ruby engine we're running under. Defaults to `"ruby"`
+    # if the top-level constant is undefined.
+    # @api public
+    RUBY_ENGINE = defined?(::RUBY_ENGINE) ? ::RUBY_ENGINE : "ruby"
+
     # Returns the path of a file relative to the Sass root directory.
     #
     # @param file [String] The filename relative to the Sass root
@@ -416,13 +421,25 @@ module Sass
       RbConfig::CONFIG['host_os'] =~ /mswin|windows|mingw/i
     end
 
+    # Whether or not this is running on IronRuby.
+    #
+    # @return [Boolean]
+    def ironruby?
+      RUBY_ENGINE == "ironruby"
+    end
+
     ## Cross-Ruby-Version Compatibility
 
     # Whether or not this is running under Ruby 1.8 or lower.
     #
+    # Note that IronRuby counts as Ruby 1.8,
+    # because it doesn't support the Ruby 1.9 encoding API.
+    #
     # @return [Boolean]
     def ruby1_8?
-      Sass::Util::RUBY_VERSION[0] == 1 && Sass::Util::RUBY_VERSION[1] < 9
+      # IronRuby says its version is 1.9, but doesn't support any of the encoding APIs.
+      # We have to fall back to 1.8 behavior.
+      ironruby? || (Sass::Util::RUBY_VERSION[0] == 1 && Sass::Util::RUBY_VERSION[1] < 9)
     end
 
     # Whether or not this is running under Ruby 1.8.6 or lower.

data/vendor/sass/test/sass/cache_test.rb

@@ -14,13 +14,13 @@ class CacheTest < Test::Unit::TestCase
   end
 
   def test_file_cache_writes_a_file
-    file_store = Sass::FileCacheStore.new(@@cache_dir)
+    file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
     assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
   end
 
   def test_file_cache_reads_a_file
-    file_store = Sass::FileCacheStore.new(@@cache_dir)
+    file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
     assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
@@ -28,13 +28,13 @@ class CacheTest < Test::Unit::TestCase
   end
 
   def test_file_cache_miss_returns_nil
-    file_store = Sass::FileCacheStore.new(@@cache_dir)
+    file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     assert_nil file_store.retrieve("asdf/foo.scssc", "fakesha1")
   end
 
   def test_sha_change_invalidates_cache_and_cleans_up
-    file_store = Sass::FileCacheStore.new(@@cache_dir)
+    file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
     assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
@@ -43,7 +43,7 @@ class CacheTest < Test::Unit::TestCase
   end
 
   def test_version_change_invalidates_cache_and_cleans_up
-    file_store = Sass::FileCacheStore.new(@@cache_dir)
+    file_store = Sass::CacheStores::Filesystem.new(@@cache_dir)
     assert !File.exists?("#{@@cache_dir}/asdf/foo.scssc")
     file_store.store("asdf/foo.scssc", "fakesha1", root_node)
     assert File.exists?("#{@@cache_dir}/asdf/foo.scssc")
@@ -58,7 +58,7 @@ class CacheTest < Test::Unit::TestCase
   end
 
   def test_arbitrary_objects_can_go_into_cache
-    cache = Sass::InMemoryCacheStore.new
+    cache = Sass::CacheStores::Memory.new
     an_object = {:foo => :bar}
     cache.store("an_object", "", an_object)
     assert_equal an_object, cache.retrieve("an_object", "")
@@ -71,4 +71,4 @@ class CacheTest < Test::Unit::TestCase
       div { @include color(red); }
     SCSS
   end
-end
+end

data/vendor/sass/test/sass/conversion_test.rb

@@ -607,6 +607,14 @@ foo {
 SCSS
   end
 
+  def test_charset
+    assert_renders <<SASS, <<SCSS
+@charset "utf-8"
+SASS
+@charset "utf-8";
+SCSS
+  end
+
   def test_for
     assert_renders <<SASS, <<SCSS
 foo
@@ -667,6 +675,26 @@ foo {
 SCSS
   end
 
+  def test_each
+    assert_renders <<SASS, <<SCSS
+a
+  @each $number in 1px 2px 3px 4px
+    b: $number
+
+c
+  @each $str in foo, bar, baz, bang
+    d: $str
+SASS
+a {
+  @each $number in 1px 2px 3px 4px {
+    b: $number; } }
+
+c {
+  @each $str in foo, bar, baz, bang {
+    d: $str; } }
+SCSS
+  end
+
   def test_import
     assert_renders <<SASS, <<SCSS
 @import foo

data/vendor/sass/test/sass/engine_test.rb

@@ -56,12 +56,8 @@ MSG
     "$a: #ccc + 2px" => "Cannot add a number with units (2px) to a color (#cccccc).",
     "& a\n  :b c" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  :b\n    c" => "Illegal nesting: Only properties may be nested beneath properties.",
-    "a,\n  :b c" => ["Rules can\'t end in commas.", 1],
-    "a," => "Rules can\'t end in commas.",
-    "a,\n$b: 1" => ["Rules can\'t end in commas.", 1],
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
-    "a,\n$b: 1" => ["Rules can\'t end in commas.", 1],
     "$a: b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
     "@import foo.sass" => <<MSG,
 File to import not found or unreadable: foo.sass.
@@ -610,6 +606,12 @@ SASS
                  
     assert_equal("#foo #bar,#baz #boom{foo:bar}\n",
                  render("#foo #bar,\n#baz #boom\n  :foo bar", :style => :compressed))
+
+    assert_equal("#foo #bar,\n#baz #boom {\n  foo: bar; }\n",
+                 render("#foo #bar,,\n,#baz #boom,\n  :foo bar"))
+
+    assert_equal("#bip #bop {\n  foo: bar; }\n",
+                 render("#bip #bop,, ,\n  :foo bar"))
   end
 
   def test_complex_multiline_selector
@@ -1281,6 +1283,29 @@ a
 SASS
   end
 
+  def test_each
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: 1px;
+  b: 2px;
+  b: 3px;
+  b: 4px;
+  c: foo;
+  c: bar;
+  c: baz;
+  c: bang;
+  d: blue; }
+CSS
+a
+  @each $number in 1px 2px 3px 4px
+    b: $number
+  @each $str in foo, bar, baz, bang
+    c: $str
+  @each $single in blue
+    d: $single
+SASS
+  end
+
   def test_variable_reassignment
     assert_equal(<<CSS, render(<<SASS))
 a {
@@ -2218,6 +2243,180 @@ 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
+
+  def test_nested_media_around_properties
+    assert_equal <<CSS, render(<<SASS)
+.outside {
+  color: red;
+  background: blue; }
+  @media print {
+    .outside {
+      color: black; } }
+    @media print and nested {
+      .outside .inside {
+        border: 1px solid black; } }
+  .outside .middle {
+    display: block; }
+CSS
+.outside
+  color: red
+  @media print
+    color: black
+    .inside
+      @media nested
+        border: 1px solid black
+  background: blue
+  .middle
+    display: block
+SASS
+  end
+
+  def test_media_with_parent_references
+    sass_str = <<SASS
+.outside
+  @media print
+    &.inside
+      border: 1px solid black
+SASS
+    css_str = <<CSS
+@media print {
+  .outside.inside {
+    border: 1px solid black; } }
+CSS
+    assert_equal css_str, render(sass_str)
+  end
+
   # Encodings
 
   unless Sass::Util.ruby1_8?
@@ -2241,7 +2440,7 @@ SASS
 
     def test_same_charset_as_encoding
       assert_renders_encoded(<<CSS, <<SASS)
-@charset "utf-8";
+@charset "UTF-8";
 fóó {
   a: b; }
 CSS
@@ -2253,7 +2452,7 @@ SASS
 
     def test_different_charset_than_encoding
       assert_renders_encoded(<<CSS.force_encoding("IBM866"), <<SASS)
-@charset "ibm866";
+@charset "IBM866";
 fóó {
   a: b; }
 CSS
@@ -2265,6 +2464,7 @@ SASS
 
     def test_different_encoding_than_system
       assert_renders_encoded(<<CSS.encode("IBM866"), <<SASS.encode("IBM866"))
+@charset "IBM866";
 тАЬ {
   a: b; }
 CSS
@@ -2274,20 +2474,20 @@ SASS
     end
 
     def test_multibyte_charset
-      assert_renders_encoded(<<CSS.encode("UTF-16BE"), <<SASS.encode("UTF-16BE").force_encoding("UTF-8"))
-@charset "utf-16be";
+      assert_renders_encoded(<<CSS.encode("UTF-16LE"), <<SASS.encode("UTF-16LE").force_encoding("UTF-8"))
+@charset "UTF-16LE";
 fóó {
   a: b; }
 CSS
-@charset "utf-16be"
+@charset "utf-16le"
 fóó
   a: b
 SASS
     end
 
     def test_multibyte_charset_without_endian_specifier
-      assert_renders_encoded(<<CSS.encode("UTF-32LE"), <<SASS.encode("UTF-32LE").force_encoding("UTF-8"))
-@charset "utf-32";
+      assert_renders_encoded(<<CSS.encode("UTF-32BE"), <<SASS.encode("UTF-32BE").force_encoding("UTF-8"))
+@charset "UTF-32BE";
 fóó {
   a: b; }
 CSS
@@ -2299,6 +2499,7 @@ SASS
 
     def test_utf8_bom
       assert_renders_encoded(<<CSS, <<SASS.force_encoding("BINARY"))
+@charset "UTF-8";
 fóó {
   a: b; }
 CSS
@@ -2309,6 +2510,7 @@ SASS
 
     def test_utf16le_bom
       assert_renders_encoded(<<CSS.encode("UTF-16LE"), <<SASS.encode("UTF-16LE").force_encoding("BINARY"))
+@charset "UTF-16LE";
 fóó {
   a: b; }
 CSS
@@ -2319,6 +2521,7 @@ SASS
 
     def test_utf32be_bom
       assert_renders_encoded(<<CSS.encode("UTF-32BE"), <<SASS.encode("UTF-32BE").force_encoding("BINARY"))
+@charset "UTF-32BE";
 fóó {
   a: b; }
 CSS