haml-edge 2.1.33 → 2.1.34

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.1.33
+2.1.34

data/README.md

@@ -113,15 +113,15 @@ At its most basic,
 Sass is just another way of writing CSS.
 Although it's very much like normal CSS,
 the basic syntax offers a few helpful features:
-tabulation indicates the attributes in a rule,
+indentation indicates the properties in a rule,
 rather than non-DRY brackets;
-and newlines indicate the end of an attribute,
+and newlines indicate the end of a properties,
 rather than a semicolon.
 For example:
 
     #main
-      :background-color #f00
-      :width 98%
+      background-color: #f00
+      width: 98%
 
 becomes:
 
@@ -163,16 +163,16 @@ So, what was:
 becomes:
 
     #main
-      :width 90%
+      width: 90%
       p
-        :border-style solid
-        :border-width 1px
-        :border-color #00f
+        border-style: solid
+        border-width: 1px
+        border-color: #00f
         a
-          :text-decoration none
-          :font-weight bold
+          text-decoration: none
+          font-weight: bold
         a:hover
-          :text-decoration underline
+          text-decoration: underline
 
 Pretty nice, no? Well, it gets better.
 One of the main complaints against CSS is that it doesn't allow variables.
@@ -181,19 +181,19 @@ In CSS, you just have to re-type it each time,
 which is a nightmare when you decide to change it later.
 Not so for Sass!
 You can use the `!` character to set variables.
-Then, if you put `=` after your attribute name,
+Then, if you put `=` after your property name,
 you can set it to a variable.
 For example:
 
     !note_bg= #55aaff
 
     #main
-      :width 70%
+      width: 70%
       .note
-        :background-color= !note_bg
+        background-color = !note_bg
       p
-        :width 5em
-        :background-color= !note_bg
+        width: 5em
+        background-color = !note_bg
 
 becomes:
 
@@ -212,11 +212,11 @@ adding numbers and even colors together:
     !main_width= 40em
 
     #main
-      :background-color= !main_bg
-      :width= !main_width
+      background-color = !main_bg
+      width = !main_width
       .sidebar
-        :background-color= !main_bg + #333333
-        :width= !main_width - 25em
+        background-color = !main_bg + #333333
+        width = !main_width - 25em
 
 becomes:
 
@@ -228,19 +228,19 @@ becomes:
         width: 15em; }
 
 Taking the idea of variables a bit further are mixins.
-These let you group whole swathes of CSS attributes into a single
+These let you group whole bunches of CSS properties into a single
 directive and then include those anywhere you want:
 
     =blue-border
-      :border
-        :color blue
-        :width 2px
-        :style dotted
+      border:
+        color: blue
+        width: 2px
+        style: dotted
 
     .comment
       +blue-border
-      :padding 2px
-      :margin 10px 0
+      padding: 2px
+      margin: 10px 0
 
     .reply
       +blue-border

data/VERSION

@@ -1 +1 @@
-2.1.33
+2.1.34

data/lib/haml/exec.rb

@@ -435,10 +435,12 @@ Description: Transforms a CSS file into corresponding Sass code.
 Options:
 END
 
-        opts.on('-a', '--alternate', 'Output using alternative Sass syntax (margin: 1px)') do
-          @module_opts[:alternate] = true
+        opts.on('--old', 'Output the old-style ":prop val" property syntax') do
+          @module_opts[:old] = true
         end
 
+        opts.on_tail('-a', '--alternate', 'Ignored') {}
+
         super
       end
 

data/lib/haml/helpers/action_view_extensions.rb

@@ -23,12 +23,12 @@ module Haml
       # you could refer to this specific action:
       #
       #     .entry.show
-      #       :font-weight bold
+      #       font-weight: bold
       #
       # or to all actions in the entry controller:
       #
       #     .entry
-      #       :color #00f
+      #       color: #00f
       #
       # @return [String] The class name for the current page
       def page_class

data/lib/sass/css.rb

@@ -24,7 +24,7 @@ module Sass
     class RuleNode
       # @see Node#to_sass
       def to_sass(tabs, opts = {})
-        str = "\n#{'  ' * tabs}#{rules.first}#{children.any? { |c| c.is_a? AttrNode } ? "\n" : ''}"
+        str = "\n#{'  ' * tabs}#{rules.first}#{children.any? { |c| c.is_a? PropNode } ? "\n" : ''}"
 
         children.each do |child|
           str << "#{child.to_sass(tabs + 1, opts)}"
@@ -34,10 +34,10 @@ module Sass
       end
     end
 
-    class AttrNode
+    class PropNode
       # @see Node#to_sass
       def to_sass(tabs, opts = {})
-        "#{'  ' * tabs}#{opts[:alternate] ? '' : ':'}#{name}#{opts[:alternate] ? ':' : ''} #{value}\n"
+        "#{'  ' * tabs}#{opts[:old] ? ':' : ''}#{name}#{opts[:old] ? '' : ':'} #{value}\n"
       end
     end
 
@@ -56,18 +56,20 @@ module Sass
   #
   # Example usage:
   #
-  #     Sass::CSS.new("p { color: blue }").render #=> "p\n  :color blue"
+  #     Sass::CSS.new("p { color: blue }").render #=> "p\n  color: blue"
   class CSS
     # @param template [String] The CSS code
-    # @option options :alternate [Boolean] (false)
-    #     Whether or not to output alternate attribute syntax
-    #     (`color: blue` as opposed to `:color blue`).
+    # @option options :old [Boolean] (false)
+    #     Whether or not to output old property syntax
+    #     (`:color blue` as opposed to `color: blue`).
     def initialize(template, options = {})
       if template.is_a? IO
         template = template.read
       end
 
-      @options = options
+      @options = options.dup
+      # Backwards compatibility
+      @options[:old] = true if @options[:alternate] == false
       @template = StringScanner.new(template)
     end
 
@@ -133,14 +135,14 @@ module Sass
 
       assert_match /\{/
       node = Tree::RuleNode.new(rule)
-      attributes(node)
+      properties(node)
       return node
     end
 
-    # Parses a set of CSS attributes within a rule.
+    # Parses a set of CSS properties within a rule.
     #
-    # @param rule [Tree::RuleNode] The parent node of the attributes
-    def attributes(rule)
+    # @param rule [Tree::RuleNode] The parent node of the properties
+    def properties(rule)
       while @template.scan(/[^:\}\s]+/)
         name = @template[0]
         whitespace
@@ -153,7 +155,7 @@ module Sass
         end
 
         assert_match /(;|(?=\}))/
-        rule << Tree::AttrNode.new(name, value, nil)
+        rule << Tree::PropNode.new(name, value, nil)
       end
 
       assert_match /\}/
@@ -297,12 +299,12 @@ module Sass
     #
     #     foo
     #       bar
-    #         :color red
+    #         color: red
     #
     # becomes
     #
     #     foo bar
-    #       :color red
+    #       color: red
     #
     # and
     #

data/lib/sass/engine.rb

@@ -3,7 +3,7 @@ require 'digest/sha1'
 require 'sass/tree/node'
 require 'sass/tree/rule_node'
 require 'sass/tree/comment_node'
-require 'sass/tree/attr_node'
+require 'sass/tree/prop_node'
 require 'sass/tree/directive_node'
 require 'sass/tree/variable_node'
 require 'sass/tree/mixin_def_node'
@@ -75,11 +75,11 @@ module Sass
       end
     end
 
-    # The character that begins a CSS attribute.
-    ATTRIBUTE_CHAR  = ?:
+    # The character that begins a CSS property.
+    PROPERTY_CHAR  = ?:
 
     # The character that designates that
-    # an attribute should be assigned to a SassScript expression.
+    # a property should be assigned to a SassScript expression.
     SCRIPT_CHAR     = ?=
 
     # The character that designates the beginning of a comment,
@@ -106,16 +106,16 @@ module Sass
     # Includes named mixin declared using MIXIN_DEFINITION_CHAR
     MIXIN_INCLUDE_CHAR    = ?+
 
-    # The regex that matches and extracts data from
-    # attributes of the form <tt>:name attr</tt>.
-    ATTRIBUTE = /^:([^\s=:"]+)\s*(=?)(?:\s+|$)(.*)/
+    # The regex that matches properties of the form <tt>name: prop</tt>.
+    PROPERTY_NEW_MATCHER = /^[^\s:"]+\s*[=:](\s|$)/
 
-    # The regex that matches attributes of the form <tt>name: attr</tt>.
-    ATTRIBUTE_ALTERNATE_MATCHER = /^[^\s:"]+\s*[=:](\s|$)/
+    # The regex that matches and extracts data from
+    # properties of the form <tt>name: prop</tt>.
+    PROPERTY_NEW = /^([^\s=:"]+)(\s*=|:)(?:\s+|$)(.*)/
 
     # The regex that matches and extracts data from
-    # attributes of the form <tt>name: attr</tt>.
-    ATTRIBUTE_ALTERNATE = /^([^\s=:"]+)(\s*=|:)(?:\s+|$)(.*)/
+    # properties of the form <tt>:name prop</tt>.
+    PROPERTY_OLD = /^:([^\s=:"]+)\s*(=?)(?:\s+|$)(.*)/
 
     # The default options for Sass::Engine.
     DEFAULT_OPTIONS = {
@@ -131,6 +131,13 @@ module Sass
     def initialize(template, options={})
       @options = DEFAULT_OPTIONS.merge(options)
       @template = template
+
+      # Backwards compatibility
+      @options[:property_syntax] ||= @options[:attribute_syntax]
+      case @options[:property_syntax]
+      when :alternate; @options[:property_syntax] = :new
+      when :normal; @options[:property_syntax] = :old
+      end
     end
 
     # Render the template to CSS.
@@ -284,9 +291,9 @@ END
 
     def parse_line(parent, line, root)
       case line.text[0]
-      when ATTRIBUTE_CHAR
-        if line.text[1] != ATTRIBUTE_CHAR
-          parse_attribute(line, ATTRIBUTE)
+      when PROPERTY_CHAR
+        if line.text[1] != PROPERTY_CHAR
+          parse_property(line, PROPERTY_OLD)
         else
           # Support CSS3-style pseudo-elements,
           # which begin with ::
@@ -309,26 +316,26 @@ END
           parse_mixin_include(line, root)
         end
       else
-        if line.text =~ ATTRIBUTE_ALTERNATE_MATCHER
-          parse_attribute(line, ATTRIBUTE_ALTERNATE)
+        if line.text =~ PROPERTY_NEW_MATCHER
+          parse_property(line, PROPERTY_NEW)
         else
           Tree::RuleNode.new(line.text)
         end
       end
     end
 
-    def parse_attribute(line, attribute_regx)
-      name, eq, value = line.text.scan(attribute_regx)[0]
+    def parse_property(line, property_regx)
+      name, eq, value = line.text.scan(property_regx)[0]
 
       if name.nil? || value.nil?
-        raise SyntaxError.new("Invalid attribute: \"#{line.text}\".", @line)
+        raise SyntaxError.new("Invalid property: \"#{line.text}\".", @line)
       end
       expr = if (eq.strip[0] == SCRIPT_CHAR)
         parse_script(value, :offset => line.offset + line.text.index(value))
       else
         value
       end
-      Tree::AttrNode.new(name, expr, attribute_regx == ATTRIBUTE ? :old : :new)
+      Tree::PropNode.new(name, expr, property_regx == PROPERTY_OLD ? :old : :new)
     end
 
     def parse_variable(line)

data/lib/sass/tree/directive_node.rb

@@ -36,26 +36,26 @@ module Sass::Tree
                  else
                    "#{'  ' * (tabs - 1)}#{value} {" + (style == :compact ? ' ' : "\n")
                  end
-        was_attr = false
+        was_prop = false
         first = true
         children.each do |child|
           next if child.invisible?
           if style == :compact
-            if child.is_a?(AttrNode)
-              result << "#{child.to_s(first || was_attr ? 1 : tabs + 1)} "
+            if child.is_a?(PropNode)
+              result << "#{child.to_s(first || was_prop ? 1 : tabs + 1)} "
             else
-              if was_attr
+              if was_prop
                 result[-1] = "\n"
               end
               rendered = child.to_s(tabs + 1)
               rendered.lstrip! if first
               result << rendered
             end
-            was_attr = child.is_a?(AttrNode)
+            was_prop = child.is_a?(PropNode)
             first = false
           elsif style == :compressed
-            result << (was_attr ? ";#{child.to_s(1)}" : child.to_s(1))
-            was_attr = child.is_a?(AttrNode)
+            result << (was_prop ? ";#{child.to_s(1)}" : child.to_s(1))
+            was_prop = child.is_a?(PropNode)
           else
             result << child.to_s(tabs + 1) + "\n"
           end

data/lib/sass/tree/node.rb

@@ -122,8 +122,8 @@ module Sass
       def to_s
         result = String.new
         children.each do |child|
-          if child.is_a? AttrNode
-            raise Sass::SyntaxError.new('Attributes aren\'t allowed at the root of a document.', child.line)
+          if child.is_a? PropNode
+            raise Sass::SyntaxError.new('Properties aren\'t allowed at the root of a document.', child.line)
           else
             next if child.invisible?
             child_str = child.to_s(1)

data/lib/sass/tree/{attr_node.rb → prop_node.rb}

@@ -2,7 +2,7 @@ module Sass::Tree
   # A static node reprenting a CSS property.
   #
   # @see Sass::Tree
-  class AttrNode < Node
+  class PropNode < Node
     # The name of the property.
     #
     # @return [String]
@@ -16,12 +16,12 @@ module Sass::Tree
 
     # @param name [String] See \{#name}
     # @param value [String] See \{#value}
-    # @param attr_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
+    # @param prop_syntax [Symbol] `:new` if this property uses `a: b`-style syntax,
     #   `:old` if it uses `:a b`-style syntax
-    def initialize(name, value, attr_syntax)
+    def initialize(name, value, prop_syntax)
       @name = name
       @value = value
-      @attr_syntax = attr_syntax
+      @prop_syntax = prop_syntax
       super()
     end
 
@@ -39,22 +39,22 @@ module Sass::Tree
     # @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 attribute uses invalid syntax
+    # @raise [Sass::SyntaxError] if the property uses invalid syntax
     def to_s(tabs, parent_name = nil)
-      if @options[:attribute_syntax] == :normal && @attr_syntax == :new
-        raise Sass::SyntaxError.new("Illegal attribute syntax: can't use alternate syntax when :attribute_syntax => :normal is set.")
-      elsif @options[:attribute_syntax] == :alternate && @attr_syntax == :old
-        raise Sass::SyntaxError.new("Illegal attribute syntax: can't use normal syntax when :attribute_syntax => :alternate is set.")
+      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.")
       end
 
       if value[-1] == ?;
-        raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (no \";\" required at end-of-line).", @line)
+        raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no \";\" required at end-of-line).", @line)
       end
       real_name = name
       real_name = "#{parent_name}-#{real_name}" if parent_name
       
       if value.empty? && children.empty?
-        raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (no value).", @line)
+        raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no value).", @line)
       end
       
       join_string = case style
@@ -91,19 +91,19 @@ module Sass::Tree
     # Returns an error message if the given child node is invalid,
     # and false otherwise.
     #
-    # {AttrNode} only allows other {AttrNode}s and {CommentNode}s as children.
+    # {PropNode} only allows other {PropNode}s and {CommentNode}s as children.
     # @param child [Tree::Node] A potential child node
     # @return [String] An error message if the child is invalid, or nil otherwise
     def invalid_child?(child)
-      if !child.is_a?(AttrNode) && !child.is_a?(CommentNode)
-        "Illegal nesting: Only attributes may be nested beneath attributes."
+      if !child.is_a?(PropNode) && !child.is_a?(CommentNode)
+        "Illegal nesting: Only properties may be nested beneath properties."
       end
     end
 
     private
 
     def declaration
-      @attr_syntax == :new ? "#{name}: #{value}" : ":#{name} #{value}"
+      @prop_syntax == :new ? "#{name}: #{value}" : ":#{name} #{value}"
     end
   end
 end

data/lib/sass/tree/rule_node.rb

@@ -79,7 +79,7 @@ module Sass::Tree
     def to_s(tabs, super_rules = nil)
       resolved_rules = resolve_parent_refs(super_rules)
 
-      attributes = []
+      properties = []
       sub_rules = []
 
       rule_separator = style == :compressed ? ',' : ', '
@@ -96,12 +96,12 @@ module Sass::Tree
         if child.is_a? RuleNode
           sub_rules << child
         else
-          attributes << child
+          properties << child
         end
       end
 
       to_return = ''
-      if !attributes.empty?
+      if !properties.empty?
         old_spaces = '  ' * (tabs - 1)
         spaces = '  ' * tabs
         if @options[:line_comments] && style != :compressed
@@ -124,19 +124,19 @@ module Sass::Tree
         end
 
         if style == :compact
-          attributes = attributes.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(' ')
-          to_return << "#{total_rule} { #{attributes} }\n"
+          properties = properties.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(' ')
+          to_return << "#{total_rule} { #{properties} }\n"
         elsif style == :compressed
-          attributes = attributes.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(';')
-          to_return << "#{total_rule}{#{attributes}}"
+          properties = properties.map { |a| a.to_s(1) }.select{|a| a && a.length > 0}.join(';')
+          to_return << "#{total_rule}{#{properties}}"
         else
-          attributes = attributes.map { |a| a.to_s(tabs + 1) }.select{|a| a && a.length > 0}.join("\n")
-          end_attrs = (style == :expanded ? "\n" + old_spaces : ' ')
-          to_return << "#{total_rule} {\n#{attributes}#{end_attrs}}\n"
+          properties = properties.map { |a| a.to_s(tabs + 1) }.select{|a| a && a.length > 0}.join("\n")
+          end_props = (style == :expanded ? "\n" + old_spaces : ' ')
+          to_return << "#{total_rule} {\n#{properties}#{end_props}}\n"
         end
       end
 
-      tabs += 1 unless attributes.empty? || style != :nested
+      tabs += 1 unless properties.empty? || style != :nested
       sub_rules.each do |sub|
         to_return << sub.to_s(tabs, resolved_rules)
       end

data/test/sass/css2sass_test.rb

@@ -11,27 +11,27 @@ h1 {
 CSS
     assert_equal(<<SASS, css2sass(css))
 h1
-  :color red
+  color: red
 SASS
-    assert_equal(<<SASS, css2sass(css, :alternate => true))
+    assert_equal(<<SASS, css2sass(css, :old => true))
 h1
-  color: red
+  :color red
 SASS
   end
 
   def test_nesting
     assert_equal(<<SASS, css2sass(<<CSS))
 li
-  :display none
+  display: none
 
   a
-    :text-decoration none
+    text-decoration: none
 
     span
-      :color yellow
+      color: yellow
 
     &:hover
-      :text-decoration underline
+      text-decoration: underline
 SASS
 li {
   display: none;
@@ -54,15 +54,15 @@ CSS
   def test_no_nesting_around_rules
     assert_equal(<<SASS, css2sass(<<CSS))
 div .warning
-  :color #d21a19
+  color: #d21a19
 
 
 span .debug
-  :cursor crosshair
+  cursor: crosshair
 
 
 div .debug
-  :cursor default
+  cursor: default
 SASS
 div .warning {
   color: #d21a19; }
@@ -104,24 +104,24 @@ span.turkey {
 CSS
     sass = <<SASS
 elephant.rawr
-  :rampages excessively
+  rampages: excessively
 
 
 span.turkey
-  :isdinner true
+  isdinner: true
 
 
 .turducken
-  :chimera not_really
+  chimera: not_really
 
 
 #overhere
-  :bored sorta
-  :better_than thread_pools
+  bored: sorta
+  better_than: thread_pools
 
 
 #one_more
-  :finally srsly
+  finally: srsly
 SASS
     assert_equal(css2sass(css), sass)
   end
@@ -130,7 +130,7 @@ SASS
     assert_equal(<<SASS, css2sass(<<CSS))
 li
   .one, .two
-    :color red
+    color: red
 SASS
 li .one {
   color: red;
@@ -142,16 +142,16 @@ CSS
 
     assert_equal(<<SASS, css2sass(<<CSS))
 .one
-  :color green
+  color: green
 
 
 .two
-  :color green
-  :color red
+  color: green
+  color: red
 
 
 .three
-  :color red
+  color: red
 SASS
 .one, .two {
   color: green;
@@ -166,23 +166,23 @@ CSS
   def test_bad_formatting
     assert_equal(<<SASS, css2sass(<<CSS))
 hello
-  :parent true
+  parent: true
 
   there
-    :parent false
+    parent: false
 
   who
-    :hoo false
+    hoo: false
 
   why
-    :y true
+    y: true
 
   when
-    :wen nao
+    wen: nao
 
 
 down_here
-  :yeah true
+  yeah: true
 SASS
 hello {
   parent: true;

data/test/sass/engine_test.rb

@@ -15,19 +15,19 @@ class SassEngineTest < Test::Unit::TestCase
     "!a = foo(\"bar\"" => 'Expected rparen token, was end of text.',
     "!a = 1 }" => 'Unexpected end_interpolation token.',
     "!a = 1 }foo\"" => 'Unexpected end_interpolation token.',
-    ":" => 'Invalid attribute: ":".',
-    ": a" => 'Invalid attribute: ": a".',
-    ":= a" => 'Invalid attribute: ":= a".',
-    "a\n  :b" => 'Invalid attribute: ":b " (no value).',
-    "a\n  b:" => 'Invalid attribute: "b: " (no value).',
-    "a\n  :b: c" => 'Invalid attribute: ":b: c".',
-    "a\n  :b:c d" => 'Invalid attribute: ":b:c d".',
-    "a\n  :b=c d" => 'Invalid attribute: ":b=c d".',
-    "a\n  :b c;" => 'Invalid attribute: ":b c;" (no ";" required at end-of-line).',
-    "a\n  b: c;" => 'Invalid attribute: "b: c;" (no ";" required at end-of-line).',
-    "a\n  b : c" => 'Invalid attribute: "b : c".',
-    "a\n  b=c: d" => 'Invalid attribute: "b=c: d".',
-    ":a" => 'Attributes aren\'t allowed at the root of a document.',
+    ":" => 'Invalid property: ":".',
+    ": a" => 'Invalid property: ": a".',
+    ":= a" => 'Invalid property: ":= a".',
+    "a\n  :b" => 'Invalid property: ":b " (no value).',
+    "a\n  b:" => 'Invalid property: "b: " (no value).',
+    "a\n  :b: c" => 'Invalid property: ":b: c".',
+    "a\n  :b:c d" => 'Invalid property: ":b:c d".',
+    "a\n  :b=c d" => 'Invalid property: ":b=c d".',
+    "a\n  :b c;" => 'Invalid property: ":b c;" (no ";" required at end-of-line).',
+    "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.',
     "!" => 'Invalid variable: "!".',
     "!a" => 'Invalid variable: "!a".',
     "! a" => 'Invalid variable: "! a".',
@@ -38,7 +38,7 @@ class SassEngineTest < Test::Unit::TestCase
     "!a = 2px + #ccc" => "Cannot add a number with units (2px) to a color (#cccccc).",
     "!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 attributes may be nested beneath attributes.",
+    "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],
@@ -66,7 +66,7 @@ class SassEngineTest < Test::Unit::TestCase
     "=a(,)" => "Mixin arguments can't be empty.",
     "=a(!)" => "Mixin arguments can't be empty.",
     "=a(!foo bar)" => "Invalid variable \"!foo bar\".",
-    "=foo\n  bar: baz\n+foo" => ["Attributes aren't allowed at the root of a document.", 2],
+    "=foo\n  bar: baz\n+foo" => ["Properties aren't allowed at the root of a document.", 2],
     "a-\#{!b\n  c: d" => ["Expected end_interpolation token, was end of text.", 1],
     "=a(!b = 1, !c)" => "Required arguments must not follow optional arguments \"!c\".",
     "=a(!b = 1)\n  :a= !b\ndiv\n  +a(1,2)" => "Mixin a takes 1 argument but 2 were passed.",
@@ -83,7 +83,7 @@ class SassEngineTest < Test::Unit::TestCase
     '@debug' => "Invalid debug directive '@debug': expected expression.",
 
     # Regression tests
-    "a\n  b:\n    c\n    d" => ["Illegal nesting: Only attributes may be nested beneath attributes.", 3],
+    "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],
     "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
   }
@@ -140,7 +140,7 @@ class SassEngineTest < Test::Unit::TestCase
   def test_exception_line
     to_render = <<SASS
 rule
-  :attr val
+  :prop val
   // comment!
 
   :broken
@@ -157,7 +157,7 @@ SASS
   def test_exception_location
     to_render = <<SASS
 rule
-  :attr val
+  :prop val
   // comment!
 
   :broken
@@ -244,21 +244,21 @@ SASS
 
   def test_colon_only
     begin
-      render("a\n  b: c", :attribute_syntax => :normal)
+      render("a\n  b: c", :property_syntax => :old)
     rescue Sass::SyntaxError => e
-      assert_equal("Illegal attribute syntax: can't use alternate syntax when :attribute_syntax => :normal is set.",
+      assert_equal("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.",
                    e.message)
     else
-      assert(false, "SyntaxError not raised for :attribute_syntax => :normal")
+      assert(false, "SyntaxError not raised for :property_syntax => :old")
     end
 
     begin
-      render("a\n  :b c", :attribute_syntax => :alternate)
+      render("a\n  :b c", :property_syntax => :new)
     rescue Sass::SyntaxError => e
-      assert_equal("Illegal attribute syntax: can't use normal syntax when :attribute_syntax => :alternate is set.",
+      assert_equal("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.",
                    e.message)
     else
-      assert(false, "SyntaxError not raised for :attribute_syntax => :alternate")
+      assert(false, "SyntaxError not raised for :property_syntax => :new")
     end
   end
 
@@ -699,7 +699,7 @@ SASS
 
   # Regression tests
 
-  def test_comment_beneath_attr
+  def test_comment_beneath_prop
     assert_equal(<<RESULT, render(<<SOURCE))
 .box {
   border-style: solid; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.1.33
+  version: 2.1.34
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -79,7 +79,7 @@ files:
 - lib/sass/script/unary_operation.rb
 - lib/sass/script/variable.rb
 - lib/sass/tree
-- lib/sass/tree/attr_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
@@ -88,10 +88,10 @@ files:
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/mixin_node.rb
-- lib/sass/tree/node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/tree/prop_node.rb
 - bin/css2sass
 - bin/haml
 - bin/html2haml