haml-edge 2.3.193 → 2.3.194

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.193
+2.3.194

data/VERSION

@@ -1 +1 @@
-2.3.193
+2.3.194

data/lib/sass/engine.rb

@@ -6,7 +6,6 @@ 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'
@@ -462,10 +461,13 @@ WARNING
 
       # If value begins with url( or ",
       # it's a CSS @import rule and we don't want to touch it.
-      if directive == "import" && value !~ /^(url\(|")/
+      if directive == "import" && value !~ /^(url\(|["'])/
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
           :line => @line + 1) unless line.children.empty?
-        value.split(/,\s*/).map {|f| Tree::ImportNode.new(f)}
+        value.split(/,\s*/).map do |f|
+          f = $1 || $2 || $3 if f =~ Sass::SCSS::RX::STRING || f =~ Sass::SCSS::RX::URI
+          Tree::ImportNode.new(f)
+        end
       elsif directive == "mixin"
         parse_mixin_definition(line)
       elsif directive == "include"
@@ -486,10 +488,6 @@ 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/script/css_lexer.rb

@@ -7,10 +7,7 @@ module Sass
 
       def string(*args)
         return unless scan(STRING)
-        str = (@scanner[1] || @scanner[2]).
-          gsub(/\\([^0-9a-f])/, '\1').
-          gsub(/\\([0-9a-f]{1,4})/, "\\\\\\1")
-        [:string, Script::String.new(str, :string)]
+        [:string, Script::String.new((@scanner[1] || @scanner[2]).gsub(/\\(['"])/, '\1'), :string)]
       end
 
       def important

data/lib/sass/script/lexer.rb

@@ -237,13 +237,13 @@ module Sass
 
       def ident
         return unless s = scan(REGULAR_EXPRESSIONS[:ident])
-        [:ident, s.gsub(/\\(.)/, '\1')]
+        [:ident, s]
       end
 
       def string(re, open)
         return unless scan(STRING_REGULAR_EXPRESSIONS[[re, open]])
         @interpolation_stack << re if @scanner[2].empty? # Started an interpolated section
-        [:string, Script::String.new(@scanner[1].gsub(/\\([^0-9a-f])/, '\1').gsub(/\\([0-9a-f]{1,4})/, "\\\\\\1"), :string)]
+        [:string, Script::String.new(@scanner[1].gsub(/\\(['"]|\#\{)/, '\1'), :string)]
       end
 
       def number

data/lib/sass/script/string.rb

@@ -55,8 +55,6 @@ module Sass::Script
         return self.value
       end
 
-      # Replace single backslashes with double. Really.
-      value = self.value.gsub("\\", "\\\\\\\\")
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}
       return "'#{value.gsub("'", "\\'")}'" if opts[:quote] == %q{'}
       return "\"#{value}\"" unless value.include?('"')

data/lib/sass/script/string_interpolation.rb

@@ -11,10 +11,31 @@ module Sass::Script
     end
 
     def to_sass(opts = {})
+      # We can get rid of all of this when we remove the deprecated :equals context
+      before_unquote, before_quote_char, before_str = parse_str(@before.to_sass(opts))
+      after_unquote, after_quote_char, after_str = parse_str(@after.to_sass(opts))
+      unquote = before_unquote || after_unquote ||
+        (before_quote_char && !after_quote_char && !after_str.empty?) ||
+        (!before_quote_char && after_quote_char && !before_str.empty?)
+      quote_char =
+        if before_quote_char && after_quote_char && before_quote_char != after_quote_char
+          before_str.gsub!("\\'", "'")
+          before_str.gsub!('"', "\\\"")
+          after_str.gsub!("\\'", "'")
+          after_str.gsub!('"', "\\\"")
+          '"'
+        else
+          before_quote_char || after_quote_char
+        end
+
       res = ""
-      res << @before.to_sass(opts)[0...-1]
+      res << 'unquote(' if unquote
+      res << quote_char if quote_char
+      res << before_str
       res << '#{' << @mid.to_sass(opts) << '}'
-      res << @after.to_sass(opts)[1..-1]
+      res << after_str
+      res << quote_char if quote_char
+      res << ')' if unquote
       res
     end
 
@@ -32,5 +53,18 @@ module Sass::Script
       res << @after.perform(environment).value
       Sass::Script::String.new(res, :string)
     end
+
+    def parse_str(str)
+      case str
+      when /^unquote\((["'])(.*)\1\)$/
+        return true, $1, $2
+      when '""'
+        return false, nil, ""
+      when /^(["'])(.*)\1$/
+        return false, $1, $2
+      else
+        return false, nil, str
+      end
+    end
   end
 end

data/lib/sass/scss/parser.rb

@@ -276,13 +276,6 @@ 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
@@ -383,10 +376,8 @@ module Sass
         ['.', expr!(:interp_ident)]
       end
 
-      # @private
-      ID_START = /#(?=#{NMCHAR})/
       def id_selector
-        return unless tok(ID_START)
+        return unless tok(/#(?!\{)/)
         @expected = "id name"
         ['#', expr!(:interp_name)]
       end
@@ -463,8 +454,8 @@ module Sass
 
       def declaration
         # This allows the "*prop: val", ":prop: val", and ".prop: val" hacks
-        if s = tok(/[:\*\.]/)
-          @use_property_exception = s != '.'
+        if s = tok(/[:\*\.]|\#(?!\{)/)
+          @use_property_exception = s !~ /[\.\#]/
           name = [s, str{ss}, *expr!(:interp_ident)]
         else
           return unless name = interp_ident
@@ -665,15 +656,6 @@ 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*$/, '')
@@ -681,6 +663,7 @@ 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/prop_node.rb

@@ -80,6 +80,10 @@ module Sass::Tree
 
     def to_src(tabs, opts, fmt)
       name = self.name.map {|n| n.is_a?(String) ? n : "\#{#{n.to_sass(opts)}}"}.join
+      if name[0] == ?:
+        raise Sass::SyntaxError.new("The \":#{name}: #{self.class.val_to_sass(value, opts)}\" hack is not allowed in the Sass indented syntax")
+      end
+
       old = opts[:old] && fmt == :sass
       initial = old ? ':' : ''
       mid = old ? '' : ':'

data/test/sass/conversion_test.rb

@@ -777,18 +777,71 @@ SCSS
     assert_sass_to_scss '$var: 12px $bar baz !default;', '$var ||= 12px $bar "baz"'
   end
 
-  def test_hash_hack
+  # Hacks
+
+  def test_declaration_hacks
     assert_renders <<SASS, <<SCSS
 foo
-  bar: baz
-  @raw #
+  _name: val
+  *name: val
+  #name: val
+  .name: val
+  name: val
 SASS
 foo {
-  bar: baz;
-  # }
+  _name: val;
+  *name: val;
+  #name: val;
+  .name: val;
+  name: val; }
 SCSS
   end
 
+  def test_old_declaration_hacks
+    assert_renders <<SASS, <<SCSS, :old => true
+foo
+  :_name val
+  :*name val
+  :#name val
+  :.name val
+  :name val
+SASS
+foo {
+  _name: val;
+  *name: val;
+  #name: val;
+  .name: val;
+  name: val; }
+SCSS
+  end
+
+  def test_selector_hacks
+    assert_selector_renders = lambda do |s|
+      assert_renders <<SASS, <<SCSS
+#{s}
+  a: b
+SASS
+#{s} {
+  a: b; }
+SCSS
+    end
+
+    assert_selector_renders['> E']
+    assert_selector_renders['+ E']
+    assert_selector_renders['~ E']
+    assert_selector_renders['>> E']
+
+    assert_selector_renders['E*']
+    assert_selector_renders['E*.foo']
+    assert_selector_renders['E*:hover']
+  end
+
+  def test_disallowed_colon_hack
+    assert_raise(Sass::SyntaxError, '":foo: bar" is not allowed in the Sass syntax') do
+      to_sass("foo {:name: val;}", :syntax => :scss)
+    end
+  end
+
   # Sass 3 Deprecation conversions
 
   def test_simple_quoted_strings_unquoted_with_equals

data/test/sass/engine_test.rb

@@ -56,7 +56,6 @@ 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:
@@ -590,20 +589,6 @@ 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 */
@@ -1906,3 +1891,4 @@ SASS
     Sass::Files.send(:sassc_filename, sassc_path, Sass::Engine::DEFAULT_OPTIONS)
   end
 end
+ 

data/test/sass/results/script.css

@@ -1,7 +1,7 @@
-#main { content: Hello!; qstr: 'Quo"ted"!'; hstr: Hyph-en!; width: 30em; background-color: black; color: #ffffaa; short-color: #112233; named-color: olive; con: "foo" bar(9 hi there "boom"); con2: "noquo" quo; }
-#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 +12; many: 6; order: 7; complex: #4c9db1hi16; }
+#main { content: Hello\!; qstr: 'Quo"ted"!'; hstr: Hyph-en\!; width: 30em; background-color: black; color: #ffffaa; short-color: #112233; named-color: olive; con: "foo" bar(9 hi there "boom"); con2: "noquo" quo; }
+#main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 \+12; many: 6; order: 7; complex: #4c9db1hi16; }
 
-#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi there"; str-str2: "hi there"; str-col: "14em solid #112233"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
+#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi\ there"; str-str2: "hi there"; str-col: "14em solid #112233"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
 
 #minus { num-num: 900; col-num: #f9f9f4; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
 
@@ -11,6 +11,6 @@
 
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
-#const { escaped-quote: $foo !bar; default: Hello! !important; }
+#const { escaped-quote: \$foo \!bar; default: Hello\! !important; }
 
 #regression { a: 4; }

data/test/sass/script_conversion_test.rb

@@ -161,7 +161,23 @@ RUBY
     assert_renders '"foo #{$bar} #{$bang} baz"'
     assert_renders '"#{$bar}baz"'
     assert_renders '"foo#{$bar}"'
-    assert_renders '"#{$bar}"'
+    assert_equal '#{$bar}', render('"#{$bar}"')
+
+    assert_equal '"foo#{$bar}baz"', render("'foo\#{$bar}baz'")
+  end
+
+  def test_sass2_string_interpolation
+    assert_equal 'foo#{$bar}baz', render('"foo#{$bar}baz"', :context => :equals)
+    assert_equal '#{$bar}baz', render('"#{$bar}baz"', :context => :equals)
+    assert_equal 'foo#{$bar}', render('"foo#{$bar}"', :context => :equals)
+
+    assert_equal 'unquote(".foo#{$bar}.bar")', render('".foo#{$bar}.bar"', :context => :equals)
+    assert_equal 'unquote(".foo#{$bar}")', render('".foo#{$bar}"', :context => :equals)
+    assert_equal 'unquote("#{$bar}.bar")', render('"#{$bar}.bar"', :context => :equals)
+
+    assert_equal "unquote(\"f'o\#{$bar}b'z\")", render("'f\\'o\#{$bar}b\\'z'", :context => :equals)
+    assert_equal "unquote('f\"o\#{$bar}b\"z')", render("'f\\\"o\#{$bar}b\\\"z'", :context => :equals)
+    assert_equal "unquote(\"f'o\#{$bar}b\\\"z\")", render("'f\\'o\#{$bar}b\\\"z'", :context => :equals)
   end
 
   private
@@ -172,6 +188,8 @@ RUBY
 
   def render(script, options = {})
     munge_filename(options)
-    Sass::Script.parse(script, 1, 0, options).to_sass
+    node = Sass::Script.parse(script, 1, 0, options)
+    node.context = options[:context] if options[:context]
+    node.to_sass
   end
 end

data/test/sass/script_test.rb

@@ -25,12 +25,12 @@ class SassScriptTest < Test::Unit::TestCase
   def test_string_escapes
     assert_equal "'", resolve("\"'\"")
     assert_equal '"', resolve("\"\\\"\"")
-    assert_equal "\\", resolve("\"\\\\\"")
+    assert_equal "\\\\", resolve("\"\\\\\"")
     assert_equal "\\02fa", resolve("\"\\02fa\"")
 
     assert_equal "'", resolve("'\\''")
     assert_equal '"', resolve("'\"'")
-    assert_equal "\\", resolve("'\\\\'")
+    assert_equal "\\\\", resolve("'\\\\'")
     assert_equal "\\02fa", resolve("'\\02fa'")
   end
 
@@ -290,7 +290,7 @@ SASS
     assert_equal "teal(12)", resolve("teal(12)")
     assert_equal "tealbang(12)", resolve("tealbang(12)")
     assert_equal "teal-bang(12)", resolve("teal-bang(12)")
-    assert_equal "teal+bang(12)", resolve("teal\\+bang(12)")
+    assert_equal "teal\\+bang(12)", resolve("teal\\+bang(12)")
   end
 
   def test_interpolation_after_hash

data/test/sass/scss/css_test.rb

@@ -348,6 +348,7 @@ foo {
   *name: val;
   :name: val;
   .name: val;
+  #name: val;
   name: val; }
 SCSS
   end
@@ -356,8 +357,8 @@ SCSS
     assert_parses <<SCSS
 foo {
   foo: bar;
-  baz: bang;
-  # }
+  #baz: bang;
+  #bip: bop; }
 SCSS
   end
 
@@ -399,6 +400,28 @@ foo {
 SCSS
   end
 
+  def test_css_string_escapes
+    assert_parses <<SCSS
+foo {
+  a: "\\foo bar";
+  b: "foo\\ bar";
+  c: "\\2022 \\0020";
+  d: "foo\\\\bar";
+  e: "foo\\"'bar"; }
+SCSS
+  end
+
+  def test_css_ident_escapes
+    assert_parses <<SCSS
+foo {
+  a: \\foo bar;
+  b: foo\\ bar;
+  c: \\2022 \\0020;
+  d: foo\\\\bar;
+  e: foo\\"\\'bar; }
+SCSS
+  end
+
   ## Directives
 
   def test_charset_directive
@@ -789,7 +812,7 @@ SCSS
 
   def test_no_nested_rules
     assert_not_parses('":"', 'foo {bar <err>{a: b}}')
-    assert_not_parses('"}"', 'foo {<err>#bar {a: b}}')
+    assert_not_parses('"}"', 'foo {<err>[bar=baz] {a: b}}')
   end
 
   def test_no_nested_properties

data/test/sass/templates/import.sass

@@ -3,7 +3,7 @@ $preconst: hello
 =premixin
   pre-mixin: here
 
-@import importee.sass, scss_importee, basic.sass, basic.css, ../results/complex.css, partial.sass
+@import importee.sass, scss_importee, "basic.sass", basic.css, ../results/complex.css, url(partial.sass)
 
 nonimported
   :myconst $preconst

metadata

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

data/lib/sass/tree/raw_node.rb

@@ -1,33 +0,0 @@
-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