haml-edge 2.3.93 → 2.3.94

data/test/sass/script_test.rb

@@ -152,6 +152,11 @@ WARN
     assert_equal "public_instance_methods()", resolve("public_instance_methods()")
   end
 
+  def test_default_functions
+    assert_equal "url(12)", resolve("url(12)")
+    assert_equal 'blam(foo)', resolve('blam("foo")')
+  end
+
   def test_hyphenated_variables
     assert_equal("a-b", resolve("!a-b", {}, env("a-b" => Sass::Script::String.new("a-b"))))
   end
@@ -265,6 +270,9 @@ WARN
 
   def test_funcall_has_higher_precedence_than_color_name
     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)")
   end
 
   def test_interpolation_after_hash

data/test/sass/templates/bork4.sass

@@ -0,0 +1,2 @@
+
+bork: blah

data/test/sass/templates/mixin_bork.sass

@@ -0,0 +1,5 @@
+=outer-mixin
+  +error-mixin
+
+foo
+  +outer-mixin

data/test/sass/templates/nested_bork4.sass

@@ -0,0 +1,2 @@
+
+@import bork4

data/test/sass/templates/nested_mixin_bork.sass

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

data/test/test_helper.rb

@@ -18,9 +18,13 @@ end
 class Test::Unit::TestCase
   def munge_filename(opts)
     return if opts[:filename]
-    test_name = Haml::Util.caller_info(caller[1])[2]
-    test_name.sub!(/^block in /, '')
-    opts[:filename] = "#{test_name}_inline.sass"
+    opts[:filename] = test_filename(caller[1])
+  end
+
+  def test_filename(entry = caller.first)
+    test_name = Haml::Util.caller_info(entry)[2]
+    test_name.sub!(/^(block|rescue) in /, '')
+    "#{test_name}_inline.sass"
   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.93
+  version: 2.3.94
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.3
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
@@ -33,7 +33,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.9
     version: 
-description: Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML that's designed to express the structure of XHTML or XML documents in a non-repetitive, elegant, easy way, using indentation rather than closing tags and allowing Ruby to be embedded with ease. It was originally envisioned as a plugin for Ruby on Rails, but it can function as a stand-alone templating engine.
+description: "      Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML\n      that's designed to express the structure of XHTML or XML documents\n      in a non-repetitive, elegant, easy way,\n      using indentation rather than closing tags\n      and allowing Ruby to be embedded with ease.\n      It was originally envisioned as a plugin for Ruby on Rails,\n      but it can function as a stand-alone templating engine.\n"
 email: haml@googlegroups.com
 executables: 
 - haml
@@ -53,43 +53,36 @@ extra_rdoc_files:
 files: 
 - rails/init.rb
 - lib/haml.rb
-- lib/haml
 - lib/haml/buffer.rb
 - lib/haml/engine.rb
 - lib/haml/error.rb
 - lib/haml/exec.rb
 - lib/haml/filters.rb
 - lib/haml/helpers.rb
-- lib/haml/helpers
 - lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
 - lib/haml/html.rb
 - lib/haml/precompiler.rb
-- lib/haml/html
 - lib/haml/html/erb.rb
 - lib/haml/shared.rb
 - lib/haml/template.rb
-- lib/haml/template
 - lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
 - lib/sass.rb
-- lib/sass
 - lib/sass/css.rb
 - lib/sass/engine.rb
 - lib/sass/environment.rb
 - lib/sass/error.rb
 - lib/sass/files.rb
 - lib/sass/plugin.rb
-- lib/sass/plugin
 - lib/sass/plugin/merb.rb
 - lib/sass/plugin/rack.rb
 - lib/sass/plugin/rails.rb
 - lib/sass/repl.rb
 - lib/sass/script.rb
-- lib/sass/script
 - lib/sass/script/bool.rb
 - lib/sass/script/color.rb
 - lib/sass/script/funcall.rb
@@ -103,7 +96,6 @@ files:
 - lib/sass/script/string.rb
 - lib/sass/script/unary_operation.rb
 - lib/sass/script/variable.rb
-- lib/sass/tree
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
@@ -123,20 +115,15 @@ files:
 - bin/html2haml
 - bin/sass
 - test/benchmark.rb
-- test/haml
 - test/haml/engine_test.rb
 - test/haml/helper_test.rb
 - test/haml/html2haml_test.rb
-- test/haml/erb
 - test/haml/erb/_av_partial_1.erb
 - test/haml/erb/_av_partial_2.erb
 - test/haml/erb/action_view.erb
 - test/haml/erb/standard.erb
-- test/haml/markaby
 - test/haml/markaby/standard.mab
-- test/haml/mocks
 - test/haml/mocks/article.rb
-- test/haml/results
 - test/haml/results/content_for_layout.xhtml
 - test/haml/results/eval_suppressed.xhtml
 - test/haml/results/filters.xhtml
@@ -155,10 +142,8 @@ files:
 - test/haml/results/tag_parsing.xhtml
 - test/haml/results/very_basic.xhtml
 - test/haml/results/whitespace_handling.xhtml
-- test/haml/spec
 - test/haml/util_test.rb
 - test/haml/template_test.rb
-- test/haml/templates
 - test/haml/templates/_av_partial_1.haml
 - test/haml/templates/_av_partial_1_ugly.haml
 - test/haml/templates/_av_partial_2.haml
@@ -190,26 +175,20 @@ files:
 - test/haml/templates/tag_parsing.haml
 - test/haml/templates/very_basic.haml
 - test/haml/templates/whitespace_handling.haml
-- test/haml/html2haml
 - test/haml/html2haml/erb_tests.rb
 - test/haml/spec_test.rb
 - test/linked_rails.rb
-- test/sass
 - test/sass/css2sass_test.rb
 - test/sass/engine_test.rb
 - test/sass/functions_test.rb
-- test/sass/data
 - test/sass/data/hsl-rgb.txt
-- test/sass/more_results
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
 - test/sass/more_results/more_import.css
-- test/sass/more_templates
 - test/sass/more_templates/_more_partial.sass
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
 - test/sass/plugin_test.rb
-- test/sass/results
 - test/sass/results/alt.css
 - test/sass/results/basic.css
 - test/sass/results/compact.css
@@ -223,13 +202,10 @@ files:
 - test/sass/results/nested.css
 - test/sass/results/parent_ref.css
 - test/sass/results/script.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/units.css
 - test/sass/script_test.rb
-- test/sass/templates
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
 - test/sass/templates/basic.sass
@@ -246,17 +222,19 @@ files:
 - test/sass/templates/mixins.sass
 - test/sass/templates/multiline.sass
 - test/sass/templates/nested.sass
+- test/sass/templates/bork4.sass
+- test/sass/templates/mixin_bork.sass
 - test/sass/templates/nested_bork1.sass
-- test/sass/templates/nested_bork2.sass
-- test/sass/templates/nested_bork3.sass
 - test/sass/templates/parent_ref.sass
 - test/sass/templates/script.sass
-- test/sass/templates/subdir
-- test/sass/templates/subdir/nested_subdir
 - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
 - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
 - test/sass/templates/subdir/subdir.sass
 - test/sass/templates/units.sass
+- test/sass/templates/nested_bork2.sass
+- test/sass/templates/nested_bork3.sass
+- test/sass/templates/nested_bork4.sass
+- test/sass/templates/nested_mixin_bork.sass
 - test/test_helper.rb
 - extra/haml-mode.el
 - extra/sass-mode.el
@@ -273,6 +251,8 @@ files:
 - EDGE_GEM_VERSION
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -300,9 +280,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 test_files: 
 - test/haml/engine_test.rb