haml-edge 2.3.47 → 2.3.48

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.47
+2.3.48

data/VERSION

@@ -1 +1 @@
-2.3.47
+2.3.48

data/lib/sass/tree/prop_node.rb

@@ -14,6 +14,18 @@ module Sass::Tree
     # @return [String, Script::Node]
     attr_accessor :value
 
+    # How deep this property is indented
+    # relative to a normal property.
+    # This is only greater than 0 in the case that:
+    #
+    # * This node is in a static tree
+    # * The style is :nested
+    # * This is a child property of another property
+    # * The parent property has a value, and thus will be rendered
+    #
+    # @return [Fixnum]
+    attr_accessor :indentation
+
     # @param name [String] See \{#name}
     # @param value [String] See \{#value}
     # @param prop_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
@@ -21,6 +33,7 @@ module Sass::Tree
     def initialize(name, value, prop_syntax)
       @name = name
       @value = value
+      @indentation = 0
       @prop_syntax = prop_syntax
       super()
     end
@@ -39,43 +52,36 @@ module Sass::Tree
     # Computes the CSS for the property.
     #
     # @param tabs [Fixnum] The level of indentation for the CSS
-    # @param parent_name [String] The name of the parent property (e.g. `text`) or nil
     # @return [String] The resulting CSS
     # @raise [Sass::SyntaxError] if the property uses invalid syntax
-    def _to_s(tabs, parent_name = nil)
+    def _to_s(tabs)
       if @options[:property_syntax] == :old && @prop_syntax == :new
         raise Sass::SyntaxError.new("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.")
       elsif @options[:property_syntax] == :new && @prop_syntax == :old
         raise Sass::SyntaxError.new("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.")
       elsif value[-1] == ?;
         raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no \";\" required at end-of-line).")
-      elsif value.empty? && children.empty?
+      elsif value.empty?
         raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no value).")
       end
 
-      real_name = name
-      real_name = "#{parent_name}-#{real_name}" if parent_name
+      to_return = '  ' * (tabs - 1 + indentation) + name + ":" +
+        (style == :compressed ? '' : ' ') + value + (style == :compressed ? "" : ";")
+    end
 
-      join_string = case style
-                    when :compact; ' '
-                    when :compressed; ''
-                    else "\n"
-                    end
-      spaces = '  ' * (tabs - 1)
-      to_return = ''
-      if !value.empty?
-        to_return << "#{spaces}#{real_name}:#{style == :compressed ? '' : ' '}#{value};#{join_string}"
-      end
-      
-      children.each do |kid|
-        next if kid.invisible?
-        to_return << kid.to_s(tabs, real_name) << join_string
-      end
-      
-      (style == :compressed && parent_name) ? to_return : to_return[0...-1]
+    # Returns this node's fully-resolved child properties, and/or this node.
+    #
+    # @param environment [Sass::Environment] The lexical environment containing
+    #   variable and mixin values
+    def _perform(environment)
+      node = super
+      result = node.children.dup
+      result.unshift(node) if !node.value.empty? || node.children.empty?
+      result
     end
 
-    # Runs any SassScript that may be embedded in the property.
+    # Runs any SassScript that may be embedded in the property,
+    # and invludes the parent property, if any.
     #
     # @param environment [Sass::Environment] The lexical environment containing
     #   variable and mixin values
@@ -83,6 +89,12 @@ module Sass::Tree
       @name = interpolate(@name, environment)
       @value = @value.is_a?(String) ? interpolate(@value, environment) : @value.perform(environment).to_s
       super
+      # Once we've called super, the child nodes have been dup'ed
+      # so we can destructively modify them
+      children.select {|c| c.is_a?(PropNode)}.each do |c|
+        c.name = "#{name}-#{c.name}"
+        c.indentation += 1 if style == :nested && !@value.empty?
+      end
     end
 
     # Returns an error message if the given child node is invalid,

data/lib/sass/tree/rule_node.rb

@@ -1,6 +1,9 @@
 require 'pathname'
 
 module Sass::Tree
+  # A static node reprenting a CSS rule.
+  #
+  # @see Sass::Tree
   class RuleNode < Node
     # The character used to include the parent selector
     PARENT = '&'

data/test/sass/engine_test.rb

@@ -27,7 +27,7 @@ class SassEngineTest < Test::Unit::TestCase
     "a\n  b: c;" => 'Invalid property: "b: c;" (no ";" required at end-of-line).',
     "a\n  b : c" => 'Invalid property: "b : c".',
     "a\n  b=c: d" => 'Invalid property: "b=c: d".',
-    ":a" => 'Properties aren\'t allowed at the root of a document.',
+    "a: b" => 'Properties aren\'t allowed at the root of a document.',
     "!" => 'Invalid variable: "!".',
     "!a" => 'Invalid variable: "!a".',
     "! a" => 'Invalid variable: "! a".',
@@ -463,6 +463,31 @@ SASS
     assert_equal("foo {\n  a: b;\n  c: d;\n  e: f; }\n", render("foo\r  a: b\r\n  c: d\n\r  e: f"))
   end
 
+  def test_property_with_content_and_nested_props
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: b;
+    a-c: d;
+      a-c-e: f; }
+CSS
+foo
+  a: b
+    c: d
+      e: f
+SASS
+
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+  a: b;
+    a-c-e: f; }
+CSS
+foo
+  a: b
+    c:
+      e: f
+SASS
+  end
+
   def test_or_eq
     assert_equal("foo {\n  a: b; }\n", render(%Q{!foo = "b"\n!foo ||= "c"\nfoo\n  a = !foo}))
     assert_equal("foo {\n  a: b; }\n", render(%Q{!foo ||= "b"\nfoo\n  a = !foo}))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.47
+  version: 2.3.48
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -04:00
+date: 2009-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,8 +152,8 @@ files:
 - test/haml/rhtml/action_view.rhtml
 - test/haml/rhtml/standard.rhtml
 - test/haml/spec
-- test/haml/spec_test.rb
 - test/haml/template_test.rb
+- test/haml/spec_test.rb
 - test/haml/templates
 - test/haml/templates/_av_partial_1.haml
 - test/haml/templates/_av_partial_1_ugly.haml
@@ -300,8 +300,8 @@ test_files:
 - test/haml/engine_test.rb
 - test/haml/helper_test.rb
 - test/haml/html2haml_test.rb
-- test/haml/spec_test.rb
 - test/haml/template_test.rb
+- test/haml/spec_test.rb
 - test/haml/util_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/engine_test.rb