haml 3.0.0.beta.3 → 3.0.0.rc.1

data/test/sass/results/complex.css

@@ -17,7 +17,6 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 #menu { clear: both; text-align: right; height: 20px; border-bottom: 5px solid #006b95; background: #00a4e4; }
 #menu .contests ul { margin: 0 5px 0 0; padding: 0; }
 #menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: white; background: #00a4e4; }
-#menu .contests ul li / This rule isn't a comment! { red: green; }
 #menu .contests a:link, #menu .contests a:visited { color: white; text-decoration: none; font-weight: bold; }
 #menu .contests a:hover { text-decoration: underline; }
 

data/test/sass/results/script.css

@@ -1,4 +1,4 @@
-#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 { 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; }

data/test/sass/script_conversion_test.rb

@@ -53,6 +53,12 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "-foo(12px)"
   end
 
+  def test_url
+    assert_renders "url(foo.gif)"
+    assert_renders "url($var)"
+    assert_renders "url(\#{$var}/flip.gif)"
+  end
+
   def test_variable
     assert_renders "$foo-bar"
     assert_renders "$flaznicate"
@@ -180,6 +186,16 @@ RUBY
     assert_equal "unquote(\"f'o\#{$bar}b\\\"z\")", render("'f\\'o\#{$bar}b\\\"z'", :context => :equals)
   end
 
+  def test_sass2_urls
+    Haml::Util.silence_haml_warnings do
+      assert_equal 'url(foo/bar.gif)', render('url(foo/bar.gif)', :context => :equals)
+      assert_equal 'url("foo/bar.gif")', render('url("foo/bar.gif")', :context => :equals)
+
+      assert_equal 'url($var)', render('url(!var)', :context => :equals)
+      assert_equal 'url("#{$var}/flip.gif")', render('url("#{!var}/flip.gif")', :context => :equals)
+    end
+  end
+
   private
 
   def assert_renders(script, options = {})

data/test/sass/script_test.rb

@@ -113,17 +113,17 @@ foo \#{"\#{"ba" + "r"} baz"} bang
   a: b
 SASS
     assert_equal(<<CSS, render(<<SASS))
-foo \#{bar baz} bang {
+foo [bar="\#{bar baz}"] bang {
   a: b; }
 CSS
-foo \\\#{\#{"ba" + "r"} baz} bang
+foo [bar="\\\#{\#{"ba" + "r"} baz}"] bang
   a: b
 SASS
     assert_equal(<<CSS, render(<<SASS))
-foo \#{baz bang {
+foo [bar="\#{baz"] bang {
   a: b; }
 CSS
-foo \#{"\\\#{" + "baz"} bang
+foo [bar="\#{"\\\#{" + "baz"}"] bang
   a: b
 SASS
   end
@@ -143,6 +143,25 @@ SASS
     assert_equal "Options defined!", resolve("assert_options(round(1.2))")
   end
 
+  def test_funcall_requires_no_whitespace_before_lparen
+    assert_equal "no-repeat 15px", resolve("no-repeat (7px + 8px)")
+    assert_equal "no-repeat(15px)", resolve("no-repeat(7px + 8px)")
+  end
+
+  def test_dynamic_url
+    assert_equal "url(foo-bar)", resolve("url($foo)", {}, env('foo' => Sass::Script::String.new("foo-bar")))
+    assert_equal "url(foo-bar baz)", resolve("url($foo $bar)", {}, env('foo' => Sass::Script::String.new("foo-bar"), 'bar' => Sass::Script::String.new("baz")))
+    assert_equal "url(foo baz)", resolve("url(foo $bar)", {}, env('bar' => Sass::Script::String.new("baz")))
+    assert_equal "url(foo bar)", resolve("url(foo    bar)")
+  end
+
+  def test_url_with_interpolation
+    assert_equal "url(http://sass-lang.com/images/foo-bar)", resolve("url(http://sass-lang.com/images/\#{foo-bar})")
+    assert_equal 'url("http://sass-lang.com/images/foo-bar")', resolve("url('http://sass-lang.com/images/\#{foo-bar}')")
+    assert_equal 'url("http://sass-lang.com/images/foo-bar")', resolve('url("http://sass-lang.com/images/#{foo-bar}")')
+    assert_unquoted "url(http://sass-lang.com/images/\#{foo-bar})"
+  end
+
   def test_hyphenated_variables
     assert_equal("a-b", resolve("$a-b", {}, env("a-b" => Sass::Script::String.new("a-b"))))
   end
@@ -305,6 +324,20 @@ SASS
     val.is_a?(Sass::Script::String) ? val.value : val.to_s
   end
 
+  def assert_unquoted(str, opts = {}, environment = env)
+    munge_filename opts
+    val = eval(str, opts, environment)
+    assert_kind_of Sass::Script::String, val
+    assert_equal :identifier, val.type
+  end
+
+  def assert_quoted(str, opts = {}, environment = env)
+    munge_filename opts
+    val = eval(str, opts, environment)
+    assert_kind_of Sass::Script::String, val
+    assert_equal :string, val.type
+  end
+
   def eval(str, opts = {}, environment = env)
     munge_filename opts
     Sass::Script.parse(str, opts.delete(:line) || 1,

data/test/sass/scss/css_test.rb

@@ -157,7 +157,7 @@ SCSS
 
   def test_selector_comments
     assert_equal <<CSS, render(<<SCSS)
-.foo  #bar:baz( bip) {
+.foo #bar:baz(bip) {
   a: b; }
 CSS
 .foo /* .a #foo */ #bar:baz(/* bang )*/ bip) {
@@ -675,7 +675,14 @@ SCSS
     assert_selector_parses(':nth-child(+2n-3)')
     assert_selector_parses(':nth-child(-2n+3)')
     assert_selector_parses(':nth-child(-2n+ 3)')
-    assert_selector_parses(':nth-child( 2n + 3 )')
+
+    assert_equal(<<CSS, render(<<SCSS))
+:nth-child(2n + 3) {
+  a: b; }
+CSS
+:nth-child( 2n + 3 ) {
+  a: b; }
+SCSS
   end
 
   def test_negation_selectors
@@ -743,7 +750,14 @@ SCSS
     assert_selector_parses('> E')
     assert_selector_parses('+ E')
     assert_selector_parses('~ E')
-    assert_selector_parses('>> E')
+    assert_selector_parses('> > E')
+    assert_equal <<CSS, render(<<SCSS)
+> > E {
+  a: b; }
+CSS
+>> E {
+  a: b; }
+SCSS
 
     assert_selector_parses('E*')
     assert_selector_parses('E*.foo')

data/test/sass/scss/rx_test.rb

@@ -93,7 +93,7 @@ class ScssRxTest < Test::Unit::TestCase
     assert_match URI, 'url("foo bar)")'
     assert_match URI, "url('foo bar)')"
     assert_match URI, 'url( "foo bar)" )'
-    assert_match URI, "url(!#\$%&**+,-./0123456789~)"
+    assert_match URI, "url(#\\%&**+,-./0123456789~)"
   end
 
   def test_invalid_uri

data/test/sass/scss/scss_test.rb

@@ -940,4 +940,34 @@ SCSS
     assert_equal "Undefined variable: \"$bang\".", e.message
     assert_equal 4, e.sass_line
   end
+
+  def test_post_resolution_selector_error
+    assert_raise(Sass::SyntaxError, 'Invalid CSS after "foo ": expected selector, was ") bar"') do
+      render 'foo #{") bar"} {a: b}'
+    end
+  end
+
+  def test_parent_in_mid_selector_error
+    assert_raise(Sass::SyntaxError, 'Invalid CSS after ".foo": expected "{", was "&.bar"') {render <<SCSS}
+flim {
+  .foo&.bar {a: b}
+}
+SCSS
+  end
+
+  def test_parent_in_mid_selector_error
+    assert_raise(Sass::SyntaxError, 'Invalid CSS after ".foo.bar": expected "{", was "&"') {render <<SCSS}
+flim {
+  .foo.bar& {a: b}
+}
+SCSS
+  end
+
+  def test_double_parent_selector_error
+    assert_raise(Sass::SyntaxError, 'Invalid CSS after "&": expected "{", was "&"') {render <<SCSS}
+flim {
+  && {a: b}
+}
+SCSS
+  end
 end

data/test/sass/templates/complex.sass

@@ -83,8 +83,6 @@ body
         // This comment is properly indented
         :color #fff
         :background #00a4e4
-        / This rule isn't a comment!
-          :red green
     a:link, a:visited
       :color #fff
       :text-decoration none

data/test/test_helper.rb

@@ -59,4 +59,9 @@ class Test::Unit::TestCase
     return '=' if Haml::Util.ap_geq_3?
     return '-'
   end
+
+  def form_for_calling_convention(name)
+    return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq_3_beta_3?
+    return ":#{name}, @#{name}"
+  end
 end

metadata

@@ -6,9 +6,9 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta
-  - 3
-  version: 3.0.0.beta.3
+  - rc
+  - 1
+  version: 3.0.0.rc.1
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 -07:00
+date: 2010-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,7 @@ files:
 - lib/sass/repl.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/node.rb
+- lib/sass/tree/extend_node.rb
 - lib/sass/tree/for_node.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/debug_node.rb
@@ -111,10 +112,18 @@ files:
 - lib/sass/plugin/staleness_checker.rb
 - lib/sass/environment.rb
 - lib/sass/callbacks.rb
+- lib/sass/selector/simple_sequence.rb
+- lib/sass/selector/abstract_sequence.rb
+- lib/sass/selector/comma_sequence.rb
+- lib/sass/selector/sequence.rb
+- lib/sass/selector/simple.rb
+- lib/sass/selector.rb
 - lib/sass/files.rb
 - lib/sass/scss.rb
 - lib/sass/engine.rb
 - lib/sass/plugin.rb
+- lib/sass/scss/static_parser.rb
+- lib/sass/scss/sass_parser.rb
 - lib/sass/scss/rx.rb
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/parser.rb
@@ -124,6 +133,7 @@ files:
 - lib/haml/exec.rb
 - lib/haml/railtie.rb
 - lib/haml/error.rb
+- lib/haml/util/subset_map.rb
 - lib/haml/html/erb.rb
 - lib/haml/template.rb
 - lib/haml/shared.rb
@@ -181,6 +191,7 @@ files:
 - test/sass/script_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/script_conversion_test.rb
+- test/sass/extend_test.rb
 - test/sass/data/hsl-rgb.txt
 - test/sass/results/warn_imported.css
 - test/sass/results/units.css
@@ -261,6 +272,7 @@ files:
 - test/haml/spec/tests.json
 - test/haml/html2haml_test.rb
 - test/haml/template_test.rb
+- test/haml/util/subset_map_test.rb
 - test/haml/helper_test.rb
 - test/haml/results/tag_parsing.xhtml
 - test/haml/results/content_for_layout.xhtml
@@ -375,6 +387,7 @@ test_files:
 - test/sass/script_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/script_conversion_test.rb
+- test/sass/extend_test.rb
 - test/sass/conversion_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/functions_test.rb
@@ -388,5 +401,6 @@ test_files:
 - test/haml/spec/ruby_haml_test.rb
 - test/haml/html2haml_test.rb
 - test/haml/template_test.rb
+- test/haml/util/subset_map_test.rb
 - test/haml/helper_test.rb
 - test/haml/engine_test.rb