haml-edge 2.3.191 → 2.3.192

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.191
+2.3.192

data/VERSION

@@ -1 +1 @@
-2.3.191
+2.3.192

data/lib/sass/engine.rb

@@ -6,6 +6,7 @@ require 'sass/tree/rule_node'
 require 'sass/tree/comment_node'
 require 'sass/tree/prop_node'
 require 'sass/tree/directive_node'
+require 'sass/tree/raw_node'
 require 'sass/tree/variable_node'
 require 'sass/tree/mixin_def_node'
 require 'sass/tree/mixin_node'
@@ -485,6 +486,10 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         offset = line.offset + line.text.index(value).to_i
         Tree::DebugNode.new(parse_script(value, :offset => offset))
+      elsif directive == "raw"
+        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath raw directives.",
+          :line => @line + 1) unless line.children.empty?
+        Tree::RawNode.new(value)
       else
         Tree::DirectiveNode.new(line.text)
       end

data/lib/sass/scss/parser.rb

@@ -276,6 +276,13 @@ module Sass
         node.has_children = true
         tok!(/\{/)
         block_contents(node, context)
+
+        # Support the hack of having # after all properties.
+        if context == :ruleset && tok(/#/)
+          node << Sass::Tree::RawNode.new("#")
+          ss
+        end
+
         tok!(/\}/)
         node
       end
@@ -376,8 +383,10 @@ module Sass
         ['.', expr!(:interp_ident)]
       end
 
+      # @private
+      ID_START = /#(?=#{NMCHAR})/
       def id_selector
-        return unless tok(/#(?!\{)/)
+        return unless tok(ID_START)
         @expected = "id name"
         ['#', expr!(:interp_name)]
       end
@@ -656,6 +665,15 @@ MESSAGE
         pos = scanner.pos
 
         after = scanner.string[0...pos]
+        was = scanner.rest.dup
+
+        # We support the foo {a: b; #} hack,
+        # but we don't want it cluttering our errors.
+        if after =~ /\#$/ && expected == '"}"'
+          after.slice!(-1)
+          was = '#' + was
+        end
+
         # Get rid of whitespace between pos and the last token,
         # but only if there's a newline in there
         after.gsub!(/\s*\n\s*$/, '')
@@ -663,7 +681,6 @@ MESSAGE
         after.gsub!(/.*\n/, '')
         after = "..." + after[-15..-1] if after.size > 18
 
-        was = scanner.rest.dup
         # Get rid of whitespace between pos and the next token,
         # but only if there's a newline in there
         was.gsub!(/^\s*\n\s*/, '')

data/lib/sass/tree/raw_node.rb

@@ -0,0 +1,33 @@
+module Sass::Tree
+  # A static node representing raw CSS.
+  # This simply renders a string value.
+  #
+  # @see Sass::Tree
+  class RawNode < Node
+    # The text of the hack.
+    #
+    # @return [String]
+    attr_accessor :value
+
+    # @param value [String] See \{#value}
+    def initialize(value)
+      @value = value
+      super()
+    end
+
+    protected
+
+    def to_src(tabs, opts, fmt)
+      return "#{'  ' * tabs}#{value}" if fmt == :scss
+      "#{'  ' * tabs}@raw #{value}"
+    end
+
+    # Returns the value of the node.
+    #
+    # @param tabs [Fixnum] The level of indentation for the CSS
+    # @return [String] The resulting CSS
+    def _to_s(tabs)
+      "#{'  ' * (tabs - 1)}#{value}"
+    end
+  end
+end

data/test/sass/conversion_test.rb

@@ -777,6 +777,18 @@ SCSS
     assert_sass_to_scss '$var: 12px $bar baz !default;', '$var ||= 12px $bar "baz"'
   end
 
+  def test_hash_hack
+    assert_renders <<SASS, <<SCSS
+foo
+  bar: baz
+  @raw #
+SASS
+foo {
+  bar: baz;
+  # }
+SCSS
+  end
+
   # Sass 3 Deprecation conversions
 
   def test_simple_quoted_strings_unquoted_with_equals

data/test/sass/engine_test.rb

@@ -56,6 +56,7 @@ MSG
     "@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.",
+    "@raw foo {}\n  a: b\n" => "Illegal nesting: Nothing may be nested beneath raw directives.",
     "@import foo.sass" => <<MSG,
 File to import not found or unreadable: foo.sass.
 Load paths:
@@ -589,6 +590,20 @@ END
     assert_equal("@a{b:c;#d{e:f}g:h}\n", render(to_render, :style => :compressed))
   end
 
+  def test_raw_directive
+    assert_equal(<<CSS, render(<<SASS))
+foo {
+bar {
+  baz: bang;
+  # }
+CSS
+@raw foo {
+bar
+  baz: bang
+  @raw #
+SASS
+  end
+
   def test_line_annotations
     assert_equal(<<CSS, render(<<SASS, :line_comments => true, :style => :compact))
 /* line 2, test_line_annotations_inline.sass */

data/test/sass/scss/css_test.rb

@@ -352,6 +352,15 @@ foo {
 SCSS
   end
 
+  def test_trailing_hash_hack
+    assert_parses <<SCSS
+foo {
+  foo: bar;
+  baz: bang;
+  # }
+SCSS
+  end
+
   def test_zero_arg_functions
     assert_parses <<SCSS
 foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.191
+  version: 2.3.192
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -04:00
+date: 2010-04-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,6 +119,7 @@ files:
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/root_node.rb
+- lib/sass/tree/raw_node.rb
 - lib/sass/scss/css_parser.rb
 - lib/sass/scss/parser.rb
 - lib/sass/scss/rx.rb