haml-edge 2.3.179 → 2.3.180

data/test/sass/scss/test_helper.rb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'sass/engine'
+
+module ScssTestHelper
+  def assert_parses(scss)
+    assert_equal scss.rstrip, render(scss).rstrip
+  end
+
+  def assert_not_parses(expected, scss)
+    raise "Template must include <err> where an error is expected" unless scss.include?("<err>")
+
+    after, was = scss.split("<err>")
+    line = after.count("\n") + 1
+
+    after.gsub!(/\s*\n\s*$/, '')
+    after.gsub!(/.*\n/, '')
+    after = "..." + after[-15..-1] if after.size > 18
+
+    was.gsub!(/^\s*\n\s*/, '')
+    was.gsub!(/\n.*/, '')
+    was = was[0...15] + "..." if was.size > 18
+
+    to_render = scss.sub("<err>", "")
+    render(to_render)
+    assert(false, "Expected syntax error for:\n#{to_render}\n")
+  rescue Sass::SyntaxError => err
+    assert_equal("Invalid CSS after \"#{after}\": expected #{expected}, was \"#{was}\"",
+      err.message)
+    assert_equal line, err.sass_line
+  end
+
+  def render(scss, options = {})
+    options[:syntax] ||= :scss
+    munge_filename options
+    Sass::Engine.new(scss, options).render
+  end
+end

data/test/sass/templates/alt.sass

@@ -12,5 +12,5 @@ h1
     color: red
     :background-color green
   const
-    nosp= 1 + 2
-    sp = 1 + 2
+    nosp: 1 + 2
+    sp : 1 + 2

data/test/sass/templates/bork1.sass

@@ -1,2 +1,2 @@
 bork
-  :bork= !bork
+  :bork $bork

data/test/sass/templates/import.sass

@@ -1,11 +1,11 @@
-!preconst = "hello"
+$preconst: hello
 
 =premixin
   pre-mixin: here
 
-@import importee.sass, basic.sass, basic.css, ../results/complex.css, partial.sass
+@import importee.sass, scss_importee, basic.sass, basic.css, ../results/complex.css, partial.sass
 
 nonimported
-  :myconst = !preconst
-  :otherconst = !postconst
+  :myconst $preconst
+  :otherconst $postconst
   +postmixin

data/test/sass/templates/importee.sass

@@ -1,11 +1,11 @@
-!postconst = "goodbye"
+$postconst: goodbye
 
 =postmixin
   post-mixin: here
 
 imported
-  :otherconst = !preconst
-  :myconst = !postconst
+  :otherconst $preconst
+  :myconst $postconst
   +premixin
 
 @import basic

data/test/sass/templates/line_numbers.sass

@@ -5,7 +5,7 @@ foo
   squggle
     blat: bang
 
-!preconst = 12
+$preconst: 12
 
 @import importee
 

data/test/sass/templates/mixins.sass

@@ -1,10 +1,10 @@
-!yellow = #fc0
+$yellow: #fc0
 
 =bordered
   :border
     :top
       :width 2px
-      :color = !yellow
+      :color $yellow
     :left
       :width 1px
       :color #000

data/test/sass/templates/nested_mixin_bork.sass

@@ -1,6 +1,6 @@
 
 
 =error-mixin
-  width = 1px * 1em
+  width: 1px * 1em
 
 @import mixin_bork

data/test/sass/templates/options.sass

@@ -1,2 +1,2 @@
 foo
-  style= option("style")
+  style: option("style")

data/test/sass/templates/parent_ref.sass

@@ -15,9 +15,9 @@ p, div
     :style solid
     :width 2em
   .ie7 &, .ie6 &
-    :content string(Totally not cool.)
+    :content string("Totally not cool.")
   .firefox &
-    :content string(Quite cool.)
+    :content string("Quite cool.")
 
 .wow, .snazzy
   :font-family fantasy

data/test/sass/templates/script.sass

@@ -1,101 +1,101 @@
-!width = 10em + 20
-!color = #00ff98
-!main_text = #ffa
-!num = 10
-!dec = 10.2
-!dec_0 = 99.0
-!neg = -10
-!esc= 10"+12"
-!str= "Hello!"
-!qstr= "Quo\"ted\"!"
-!hstr= "Hyph-en!"
-!concat = "#{5 + 4} hi there"
-!percent= 11%
-!complex = 1px/1em
+$width: 10em + 20
+$color: #00ff98
+$main_text: #ffa
+$num: 10
+$dec: 10.2
+$dec_0: 99.0
+$neg: -10
+$esc: 10\+12
+$str: Hello\!
+$qstr: "Quo\"ted\"!"
+$hstr: Hyph-en\!
+$concat: #{5 + 4} hi there
+$percent: 11%
+$complex: 1px/1em
 
 #main
-  :content = !str
-  :qstr = !qstr
-  :hstr = !hstr
-  :width = !width
+  :content $str
+  :qstr $qstr
+  :hstr $hstr
+  :width $width
   :background-color #000
-  :color= !main_text
-  :short-color= #123
-  :named-color= olive
-  :con= "foo" bar (!concat "boom")
-  :con2= "noquo" "quo"
+  :color $main_text
+  :short-color #123
+  :named-color olive
+  :con "foo" bar ($concat "boom")
+  :con2 "noquo" quo
   #sidebar
-    :background-color= !color
+    :background-color $color
     :num
-      :normal= !num
-      :dec= !dec
-      :dec0= !dec_0
-      :neg= !neg
-    :esc= !esc
-    :many= 1 + 2 + 3
-    :order= 1 + 2 * 3
-    :complex= ((1 + 2) + 15)+#3a8b9f + ("hi"+(1 +1+ 2)*   4)
+      :normal $num
+      :dec $dec
+      :dec0 $dec_0
+      :neg $neg
+    :esc $esc
+    :many 1 + 2 + 3
+    :order 1 + 2 * 3
+    :complex ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)*   4)
 
 #plus
   :num
-    :num= 5+2
-    :num-un= 10em + 15em
-    :num-un2= 10 + 13em
-    :num-neg= 10 + -.13
-    :str= 100 * 1px
-    :col= 13 + #aaa
-    :perc = !percent + 20%
+    :num 5+2
+    :num-un 10em + 15em
+    :num-un2 10 + 13em
+    :num-neg 10 + -.13
+    :str 100 * 1px
+    :col 13 + #aaa
+    :perc $percent + 20%
   :str
-    :str= "hi" + "\ there"
-    :str2= "hi" + " there"
-    :col= "14em solid " + #123
-    :num= "times: " + 13
+    :str "hi" + "\ there"
+    :str2 "hi" + " there"
+    :col "14em solid " + #123
+    :num "times: " + 13
   :col
-    :num= #f02 + 123.5
-    :col= #12A + #405162
+    :num #f02 + 123.5
+    :col #12A + #405162
 
 #minus
   :num
-    :num= 912 - 12
+    :num 912 - 12
   :col
-    :num= #fffffa - 5.2
-    :col= #abcdef - #fedcba
+    :num #fffffa - 5.2
+    :col #abcdef - #fedcba
   :unary
-    :num= -1
-    :const= -!neg
-    :paren= -(5 + 6)
-    :two= --12
-    :many= --------12
-    :crazy= -----(5 + ---!neg)
+    :num -1
+    :const -$neg
+    :paren -(5 + 6)
+    :two --12
+    :many --------12
+    :crazy -----(5 + ---$neg)
 
 #times
   :num
-    :num= 2 * 3.5
-    :col= 2 * #3a4b5c
+    :num 2 * 3.5
+    :col 2 * #3a4b5c
   :col
-    :num= #12468a * 0.5
-    :col= #121212 * #020304
+    :num #12468a * 0.5
+    :col #121212 * #020304
     
 #div
   :num
-    :num= 10 / 3.0
-    :num2= 10 / 3
+    :num (10 / 3.0)
+    :num2 (10 / 3)
   :col
-    :num= #12468a / 2
-    :col= #abcdef / #0f0f0f
-  :comp = !complex * 1em
+    :num #12468a / 2
+    :col #abcdef / #0f0f0f
+  :comp  $complex * 1em
 
 #mod
   :num
-    :num= 17 % 3
+    :num 17 % 3
   :col
-    :col= #5f6e7d % #10200a
-    :num= #aaabac % 3
+    :col #5f6e7d % #10200a
+    :num #aaabac % 3
 
 #const
   :escaped
-    :quote = "!foo"
-  :default = !str !important
+    :quote \$foo \!bar
+  :default $str !important
 
 #regression
-  :a= (3 + 2) - 1
+  :a (3 + 2) - 1

data/test/sass/templates/scss_import.scss

@@ -0,0 +1,10 @@
+$preconst: hello;
+
+@mixin premixin {pre-mixin: here}
+
+@import "importee.sass";
+
+nonimported {
+  myconst: $preconst;
+  otherconst: $postconst;
+  @include postmixin; }

data/test/sass/templates/scss_importee.scss

@@ -0,0 +1 @@
+scss {imported: yes}

data/test/sass/templates/units.sass

@@ -1,11 +1,11 @@
 b
-  :foo= 0.5 * 10px
-  :bar= 10zzz * 12px / 5zzz
-  :baz= percentage(12.0px / 18px)
-  :many-units= 10.0zzz / 3yyy * 12px / 5zzz * 3yyy / 3px * 4em
-  :mm= 5mm + 1cm
-  :pc= 1pc + 12pt
-  :pt= 72pt - 2in
-  :inches= 1in + 2.54cm
-  :more-inches= 1in + ((72pt * 2in) + (36pt * 1in)) / 2.54cm
-  :mixed= (1 + (1em * 6px / 3in)) * 4in / 2em
+  :foo 0.5 * 10px
+  :bar 10zzz * 12px / 5zzz
+  :baz percentage(12.0px / 18px)
+  :many-units 10.0zzz / 3yyy * 12px / 5zzz * 3yyy / 3px * 4em
+  :mm 5mm + 1cm
+  :pc 1pc + 12pt
+  :pt 72pt - 2in
+  :inches 1in + 2.54cm
+  :more-inches 1in + ((72pt * 2in) + (36pt * 1in)) / 2.54cm
+  :mixed (1 + (1em * 6px / 3in)) * 4in / 2em

data/test/test_helper.rb

@@ -19,18 +19,18 @@ module Sass::Script::Functions
 end
 
 class Test::Unit::TestCase
-  def munge_filename(opts)
+  def munge_filename(opts = {})
     return if opts.has_key?(:filename)
-    opts[:filename] = filename_for_test
+    opts[:filename] = filename_for_test(opts[:syntax] || :sass)
   end
 
-  def filename_for_test
+  def filename_for_test(syntax = :sass)
     test_name = caller.
       map {|c| Haml::Util.caller_info(c)[2]}.
       compact.
       map {|c| c.sub(/^(block|rescue) in /, '')}.
       find {|c| c =~ /^test_/}
-    "#{test_name}_inline.sass"
+    "#{test_name}_inline.#{syntax}"
   end
 
   def clean_up_sassc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.179
+  version: 2.3.180
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -04:00
+date: 2010-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,9 @@ files:
 - lib/sass/script/string.rb
 - lib/sass/script/unary_operation.rb
 - lib/sass/script/variable.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/css_parser.rb
+- lib/sass/script/interpolation.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
@@ -113,6 +116,12 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/scss.rb
+- lib/sass/scss/css_parser.rb
+- lib/sass/scss/parser.rb
+- lib/sass/scss/rx.rb
+- lib/sass/scss/script_lexer.rb
+- lib/sass/scss/script_parser.rb
 - vendor/fssm/LICENSE
 - vendor/fssm/README.markdown
 - vendor/fssm/Rakefile
@@ -147,6 +156,7 @@ files:
 - bin/haml
 - bin/html2haml
 - bin/sass
+- bin/sass-convert
 - test/benchmark.rb
 - test/haml/engine_test.rb
 - test/haml/helper_test.rb
@@ -244,6 +254,12 @@ files:
 - test/sass/results/subdir/nested_subdir/nested_subdir.css
 - test/sass/results/subdir/subdir.css
 - test/sass/results/units.css
+- test/sass/results/scss_import.css
+- test/sass/results/scss_importee.css
+- test/sass/scss/css_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/scss/test_helper.rb
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
 - test/sass/templates/basic.sass
@@ -274,7 +290,11 @@ files:
 - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
 - test/sass/templates/subdir/subdir.sass
 - test/sass/templates/units.sass
+- test/sass/templates/scss_import.scss
+- test/sass/templates/scss_importee.scss
 - test/sass/callbacks_test.rb
+- test/sass/conversion_test.rb
+- test/sass/script_conversion_test.rb
 - test/test_helper.rb
 - extra/haml-mode.el
 - extra/sass-mode.el
@@ -337,4 +357,9 @@ test_files:
 - test/sass/functions_test.rb
 - test/sass/plugin_test.rb
 - test/sass/script_test.rb
+- test/sass/scss/css_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/scss_test.rb
 - test/sass/callbacks_test.rb
+- test/sass/conversion_test.rb
+- test/sass/script_conversion_test.rb