haml 2.0.0 → 2.0.1

data/test/haml/templates/helpers.haml

@@ -43,7 +43,7 @@ click
 - form_tag '' do
   %div= submit_tag 'save'
   - @foo = 'value one'
-  = render :partial => './partial'
+  = test_partial 'partial'
 - form_for :article, @article, :url => '' do |f|
   Title:
   = f.text_field :title

data/test/haml/templates/just_stuff.haml

@@ -19,7 +19,6 @@
 %p== Embedded? #{embedded}!
 %p== Embedded? #{"twice! #{true}"}!
 %p== Embedded? #{"one"} af"t"er #{"another"}!
-.render= render :inline => "%em= 'wow!'", :type => :haml
 = "stuff followed by whitespace"
   
 - if true

data/test/haml/templates/nuke_inner_whitespace.haml

@@ -24,3 +24,9 @@
     %div
       Foo
       Bar
+
+-# Regression test
+%p
+  %q<= "foo"
+  %q{:a => 1 + 1}
+    bar

data/test/haml/templates/partials.haml

@@ -6,7 +6,7 @@
 %p
   @foo = 
   = @foo
-= render :file => "_partial.haml"
+= test_partial "partial"
 %p
   @foo = 
   = @foo

data/test/haml/templates/whitespace_handling.haml

@@ -1,9 +1,9 @@
 #whitespace_test
-  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  ~ render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  ~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  #flattened~ render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
+  = test_partial "text_area", :value => "Oneline"
+  = test_partial "text_area", :value => "Two\nlines"
+  ~ test_partial "text_area", :value => "Oneline"
+  ~ test_partial "text_area", :value => "Two\nlines"
+  #flattened~ test_partial "text_area", :value => "Two\nlines"
 .hithere
   ~ "Foo bar"
   ~ "<pre>foo bar</pre>"
@@ -15,11 +15,11 @@
   ~ ['a', 'b', 'c'].map do |a|
     - "<textarea>\n#{a}\n</textarea>"
 #whitespace_test
-  = render :file => "_text_area.haml", :locals => { :value => "Oneline" }
-  = render :file => "_text_area.haml", :locals => { :value => "Two\nlines" }
-  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Oneline" })
-  = find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
-  #flattened= find_and_preserve render(:file => "_text_area.haml", :locals => { :value => "Two\nlines" })
+  = test_partial "text_area", :value => "Oneline"
+  = test_partial "text_area", :value => "Two\nlines"
+  = find_and_preserve test_partial("text_area", :value => "Oneline")
+  = find_and_preserve test_partial("text_area", :value => "Two\nlines")
+  #flattened= find_and_preserve test_partial("text_area", :value => "Two\nlines")
 .hithere
   = find_and_preserve("Foo bar")
   = find_and_preserve("<pre>foo bar</pre>")

data/test/sass/engine_test.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
-
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/sass'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
 class SassEngineTest < Test::Unit::TestCase
@@ -58,6 +56,8 @@ END
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
     ".bar\n  =foo\n    :color red\n" => "Mixins may only be defined at the root of a document.",
     "=foo\n  :color red\n.bar\n  +foo\n    :color red" => "Illegal nesting: Nothing may be nested beneath mixin directives.",
+    "    a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 1],
+    " \n   \n\t\n  a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 4],
 
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only attributes may be nested beneath attributes.", 3]
@@ -130,8 +130,8 @@ END
   end
 
   def test_default_function
-    assert_equal("foo {\n  bar: url(foo.png); }\n",
-                 render("foo\n  bar = url(foo.png)\n"));
+    assert_equal("foo {\n  bar: url(foo.png); }\n", render("foo\n  bar = url(foo.png)\n"));
+    assert_equal("foo {\n  bar: url(); }\n", render("foo\n  bar = url()\n"));
   end
 
   def test_basic_multiline_selector
@@ -255,6 +255,12 @@ END
     renders_correctly "mixins", { :style => :expanded }
   end
 
+  def test_mixins_dont_interfere_with_sibling_combinator
+    assert_equal("foo + bar {\n  a: b; }\n", render("foo\n  + bar\n    a: b"))
+    assert_equal("foo + bar {\n  a: b; }\nfoo + baz {\n  c: d; }\n",
+                 render("foo\n  +\n    bar\n      a: b\n    baz\n      c: d"))
+  end
+
   private
 
   def render(sass, options = {})

data/test/sass/plugin_test.rb

@@ -3,13 +3,9 @@
 MERB_ENV = RAILS_ENV  = 'testing'
 RAILS_ROOT = '.'
 
-require 'test/unit'
-require 'fileutils'
-require File.dirname(__FILE__) + '/../../lib/sass'
-require 'rubygems'
-
-require 'action_controller'
+require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/plugin'
+require 'fileutils'
 
 class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{

data/test/sass/results/constants.css

@@ -12,3 +12,5 @@
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
 #const { escaped-quote: !foo; escaped-slash: !foo; default: Hello! !important; }
+
+#regression { a: 4; }

data/test/sass/templates/constants.sass

@@ -95,3 +95,6 @@
     :quote = "!foo"
     :slash = \!foo
   :default = !str !important
+
+#regression
+  :a= (3 + 2) - 1

data/test/{haml/test_helper.rb → test_helper.rb}

@@ -1,7 +1,7 @@
 # allows testing with edge Rails by creating a test/rails symlink
-linked_rails = File.dirname(__FILE__) + '/../rails'
+linked_rails = File.dirname(__FILE__) + '/rails'
 
-if File.exists? linked_rails
+if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib')
   puts "[ using linked Rails ]"
   $:.unshift linked_rails + '/activesupport/lib'
   $:.unshift linked_rails + '/actionpack/lib'
@@ -12,4 +12,5 @@ require 'action_controller'
 require 'action_view'
 
 require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/haml'
+require File.dirname(__FILE__) + '/../lib/haml'
+require File.dirname(__FILE__) + '/../lib/sass'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-23 00:00:00 -07:00
+date: 2008-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,159 +24,162 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- VERSION
+- FAQ
 - MIT-LICENSE
+- VERSION
 - README.rdoc
-- FAQ
+- REVISION
 files: 
 - lib/sass.rb
 - lib/sass
-- lib/sass/plugin
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/merb.rb
+- lib/sass/css.rb
 - lib/sass/error.rb
 - lib/sass/tree
+- lib/sass/tree/comment_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/value_node.rb
-- lib/sass/tree/attr_node.rb
 - lib/sass/tree/directive_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/comment_node.rb
+- lib/sass/tree/attr_node.rb
 - lib/sass/tree/rule_node.rb
+- lib/sass/plugin
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/merb.rb
 - lib/sass/constant.rb
+- lib/sass/engine.rb
+- lib/sass/plugin.rb
 - lib/sass/constant
-- lib/sass/constant/color.rb
-- lib/sass/constant/string.rb
 - lib/sass/constant/number.rb
 - lib/sass/constant/operation.rb
 - lib/sass/constant/literal.rb
-- lib/sass/plugin.rb
-- lib/sass/css.rb
-- lib/sass/engine.rb
+- lib/sass/constant/color.rb
+- lib/sass/constant/string.rb
+- lib/sass/constant/nil.rb
 - lib/haml
+- lib/haml/filters.rb
 - lib/haml/exec.rb
-- lib/haml/html.rb
 - lib/haml/error.rb
-- lib/haml/buffer.rb
 - lib/haml/template.rb
+- lib/haml/engine.rb
 - lib/haml/template
-- lib/haml/template/plugin.rb
 - lib/haml/template/patch.rb
+- lib/haml/template/plugin.rb
 - lib/haml/helpers.rb
-- lib/haml/filters.rb
-- lib/haml/engine.rb
+- lib/haml/buffer.rb
+- lib/haml/html.rb
 - lib/haml/precompiler.rb
 - lib/haml/helpers
-- lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
+- lib/haml/helpers/action_view_extensions.rb
 - lib/haml.rb
-- bin/css2sass
 - bin/sass
-- bin/haml
+- bin/css2sass
 - bin/html2haml
+- bin/haml
+- test/benchmark.rb
 - test/sass
+- test/sass/results
+- test/sass/results/constants.css
+- test/sass/results/parent_ref.css
+- test/sass/results/compressed.css
+- test/sass/results/complex.css
+- test/sass/results/compact.css
+- test/sass/results/mixins.css
+- test/sass/results/alt.css
+- test/sass/results/subdir
+- test/sass/results/subdir/subdir.css
+- test/sass/results/subdir/nested_subdir
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/nested.css
+- test/sass/results/import.css
+- test/sass/results/multiline.css
+- test/sass/results/basic.css
+- test/sass/results/expanded.css
 - test/sass/templates
-- test/sass/templates/bork2.sass
+- test/sass/templates/basic.sass
+- test/sass/templates/bork.sass
 - test/sass/templates/compressed.sass
-- test/sass/templates/expanded.sass
 - test/sass/templates/import.sass
+- test/sass/templates/constants.sass
+- test/sass/templates/expanded.sass
+- test/sass/templates/nested.sass
+- test/sass/templates/_partial.sass
+- test/sass/templates/compact.sass
 - test/sass/templates/subdir
 - test/sass/templates/subdir/subdir.sass
 - test/sass/templates/subdir/nested_subdir
 - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/basic.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/compact.sass
+- test/sass/templates/parent_ref.sass
 - test/sass/templates/alt.sass
-- test/sass/templates/constants.sass
 - test/sass/templates/importee.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/bork.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/multiline.sass
 - test/sass/templates/complex.sass
-- test/sass/plugin_test.rb
-- test/sass/results
-- test/sass/results/nested.css
-- test/sass/results/subdir
-- test/sass/results/subdir/nested_subdir
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/import.css
-- test/sass/results/compact.css
-- test/sass/results/expanded.css
-- test/sass/results/alt.css
-- test/sass/results/mixins.css
-- test/sass/results/complex.css
-- test/sass/results/constants.css
-- test/sass/results/compressed.css
-- test/sass/results/parent_ref.css
-- test/sass/results/multiline.css
-- test/sass/results/basic.css
+- test/sass/templates/bork2.sass
 - test/sass/engine_test.rb
+- test/sass/plugin_test.rb
 - test/haml
 - test/haml/mocks
 - test/haml/mocks/article.rb
-- test/haml/template_test.rb
-- test/haml/html2haml_test.rb
 - test/haml/rhtml
-- test/haml/rhtml/_av_partial_1.rhtml
+- test/haml/rhtml/_av_partial_2.rhtml
 - test/haml/rhtml/standard.rhtml
+- test/haml/rhtml/_av_partial_1.rhtml
 - test/haml/rhtml/action_view.rhtml
-- test/haml/rhtml/_av_partial_2.rhtml
+- test/haml/html2haml_test.rb
+- test/haml/template_test.rb
 - test/haml/helper_test.rb
-- test/haml/templates
-- test/haml/templates/list.haml
-- test/haml/templates/_text_area.haml
-- test/haml/templates/_partial.haml
-- test/haml/templates/nuke_outer_whitespace.haml
-- test/haml/templates/_av_partial_2.haml
-- test/haml/templates/helpful.haml
-- test/haml/templates/just_stuff.haml
-- test/haml/templates/silent_script.haml
-- test/haml/templates/very_basic.haml
-- test/haml/templates/nuke_inner_whitespace.haml
-- test/haml/templates/eval_suppressed.haml
-- test/haml/templates/tag_parsing.haml
-- test/haml/templates/whitespace_handling.haml
-- test/haml/templates/partials.haml
-- test/haml/templates/standard.haml
-- test/haml/templates/partialize.haml
-- test/haml/templates/_av_partial_1.haml
-- test/haml/templates/filters.haml
-- test/haml/templates/content_for_layout.haml
-- test/haml/templates/helpers.haml
-- test/haml/templates/original_engine.haml
-- test/haml/templates/breakage.haml
-- test/haml/templates/action_view.haml
-- test/haml/test_helper.rb
 - test/haml/results
+- test/haml/results/tag_parsing.xhtml
 - test/haml/results/content_for_layout.xhtml
-- test/haml/results/just_stuff.xhtml
+- test/haml/results/helpers.xhtml
+- test/haml/results/original_engine.xhtml
+- test/haml/results/very_basic.xhtml
+- test/haml/results/helpful.xhtml
+- test/haml/results/list.xhtml
+- test/haml/results/partials.xhtml
+- test/haml/results/eval_suppressed.xhtml
+- test/haml/results/nuke_inner_whitespace.xhtml
 - test/haml/results/whitespace_handling.xhtml
-- test/haml/results/nuke_outer_whitespace.xhtml
 - test/haml/results/silent_script.xhtml
-- test/haml/results/filters.xhtml
 - test/haml/results/standard.xhtml
-- test/haml/results/nuke_inner_whitespace.xhtml
-- test/haml/results/helpful.xhtml
-- test/haml/results/very_basic.xhtml
-- test/haml/results/eval_suppressed.xhtml
-- test/haml/results/partials.xhtml
-- test/haml/results/original_engine.xhtml
-- test/haml/results/helpers.xhtml
-- test/haml/results/list.xhtml
-- test/haml/results/tag_parsing.xhtml
+- test/haml/results/just_stuff.xhtml
+- test/haml/results/filters.xhtml
+- test/haml/results/nuke_outer_whitespace.xhtml
 - test/haml/markaby
 - test/haml/markaby/standard.mab
+- test/haml/templates
+- test/haml/templates/tag_parsing.haml
+- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/partials.haml
+- test/haml/templates/original_engine.haml
+- test/haml/templates/helpers.haml
+- test/haml/templates/content_for_layout.haml
+- test/haml/templates/silent_script.haml
+- test/haml/templates/very_basic.haml
+- test/haml/templates/filters.haml
+- test/haml/templates/_av_partial_1.haml
+- test/haml/templates/_partial.haml
+- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/breakage.haml
+- test/haml/templates/list.haml
+- test/haml/templates/standard.haml
+- test/haml/templates/whitespace_handling.haml
+- test/haml/templates/eval_suppressed.haml
+- test/haml/templates/action_view.haml
+- test/haml/templates/_av_partial_2.haml
+- test/haml/templates/partialize.haml
+- test/haml/templates/just_stuff.haml
+- test/haml/templates/helpful.haml
+- test/haml/templates/_text_area.haml
 - test/haml/engine_test.rb
-- test/benchmark.rb
+- test/test_helper.rb
 - Rakefile
 - init.rb
-- VERSION
+- FAQ
 - MIT-LICENSE
+- VERSION
 - README.rdoc
-- FAQ
+- REVISION
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
 post_install_message: 
@@ -206,14 +209,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 test_files: 
-- test/sass/plugin_test.rb
 - test/sass/engine_test.rb
-- test/haml/template_test.rb
+- test/sass/plugin_test.rb
 - test/haml/html2haml_test.rb
+- test/haml/template_test.rb
 - test/haml/helper_test.rb
 - test/haml/engine_test.rb