haml 3.0.25 → 3.1.0.alpha.2

data/test/test_helper.rb

@@ -5,43 +5,12 @@ require 'test/unit'
 require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
-require 'sass'
 
 require 'haml/template'
 Haml::Template.options[:ugly] = false
 Haml::Template.options[:format] = :xhtml
 
-Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
-
-module Sass::Script::Functions
-  module UserFunctions; end
-  include UserFunctions
-
-  def option(name)
-    Sass::Script::String.new(@options[name.value.to_sym].to_s)
-  end
-end
-
 class Test::Unit::TestCase
-  def munge_filename(opts = {})
-    return if opts.has_key?(:filename)
-    opts[:filename] = filename_for_test(opts[:syntax] || :sass)
-  end
-
-  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.#{syntax}"
-  end
-
-  def clean_up_sassc
-    path = File.dirname(__FILE__) + "/../.sass-cache"
-    FileUtils.rm_r(path) if File.exist?(path)
-  end
-
   def assert_warning(message)
     the_real_stderr, $stderr = $stderr, StringIO.new
     yield
@@ -95,12 +64,4 @@ class Test::Unit::TestCase
   else
     flunk "Expected exception #{klass}, none raised"
   end
-
-  def assert_raise_line(line)
-    yield
-  rescue Sass::SyntaxError => e
-    assert_equal(line, e.sass_line)
-  else
-    flunk "Expected exception on line #{line}, none raised"
-  end
 end

metadata

@@ -1,362 +1,154 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 25
-  version: 3.0.25
+  version: 3.1.0.alpha.2
 platform: ruby
 authors: 
 - Nathan Weizenbaum
-- Chris Eppstein
 - Hampton Catlin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -05:00
+date: 2010-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
         version: 0.5.3
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 5
-        - 9
         version: 0.5.9
-  type: :development
-  version_requirements: *id002
+    version: 
 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
 - html2haml
-- sass
-- css2sass
-- sass-convert
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - rails/init.rb
-- lib/sass/error.rb
-- lib/sass/files.rb
-- lib/sass/environment.rb
-- lib/sass/plugin/rack.rb
-- lib/sass/plugin/staleness_checker.rb
-- lib/sass/plugin/configuration.rb
-- lib/sass/plugin/merb.rb
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/generic.rb
-- lib/sass/callbacks.rb
-- lib/sass/script/string.rb
-- lib/sass/script/node.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/string_interpolation.rb
-- lib/sass/script/css_parser.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/literal.rb
-- lib/sass/script/bool.rb
-- lib/sass/script/number.rb
-- lib/sass/script/unary_operation.rb
-- lib/sass/script/css_lexer.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/funcall.rb
-- lib/sass/script/color.rb
-- lib/sass/script/interpolation.rb
-- lib/sass/script/functions.rb
-- lib/sass/tree/root_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/if_node.rb
-- lib/sass/tree/charset_node.rb
-- lib/sass/tree/extend_node.rb
-- lib/sass/tree/rule_node.rb
-- lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/warn_node.rb
-- lib/sass/tree/directive_node.rb
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/variable_node.rb
-- lib/sass/tree/debug_node.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/while_node.rb
-- lib/sass/tree/for_node.rb
-- lib/sass/scss/sass_parser.rb
-- lib/sass/scss/script_parser.rb
-- lib/sass/scss/css_parser.rb
-- lib/sass/scss/script_lexer.rb
-- lib/sass/scss/rx.rb
-- lib/sass/scss/parser.rb
-- lib/sass/scss/static_parser.rb
-- lib/sass/less.rb
-- lib/sass/selector/simple_sequence.rb
-- lib/sass/selector/simple.rb
-- lib/sass/selector/sequence.rb
-- lib/sass/selector/abstract_sequence.rb
-- lib/sass/selector/comma_sequence.rb
-- lib/sass/css.rb
-- lib/sass/selector.rb
-- lib/sass/engine.rb
-- lib/sass/plugin.rb
-- lib/sass/repl.rb
-- lib/sass/scss.rb
-- lib/sass/script.rb
-- lib/haml/util/subset_map.rb
-- lib/haml/helpers.rb
-- lib/haml/html.rb
-- lib/haml/shared.rb
+- lib/haml.rb
+- lib/haml/buffer.rb
+- lib/haml/engine.rb
 - lib/haml/error.rb
-- lib/haml/html/erb.rb
-- lib/haml/helpers/xss_mods.rb
+- lib/haml/exec.rb
+- lib/haml/filters.rb
+- lib/haml/helpers.rb
 - 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/html/erb.rb
+- lib/haml/precompiler.rb
 - lib/haml/railtie.rb
-- lib/haml/template/patch.rb
-- lib/haml/template/options.rb
-- lib/haml/template/plugin.rb
-- lib/haml/version.rb
 - lib/haml/root.rb
-- lib/haml/engine.rb
-- lib/haml/precompiler.rb
-- lib/haml/buffer.rb
-- lib/haml/filters.rb
+- lib/haml/shared.rb
 - lib/haml/template.rb
-- lib/haml/exec.rb
+- lib/haml/template/options.rb
+- lib/haml/template/patch.rb
+- lib/haml/template/plugin.rb
 - lib/haml/util.rb
-- lib/sass.rb
-- lib/haml.rb
-- vendor/fssm/lib/fssm.rb
-- vendor/fssm/lib/fssm/path.rb
-- vendor/fssm/lib/fssm/tree.rb
-- vendor/fssm/lib/fssm/monitor.rb
-- vendor/fssm/lib/fssm/support.rb
-- vendor/fssm/lib/fssm/pathname.rb
-- vendor/fssm/lib/fssm/state/file.rb
-- vendor/fssm/lib/fssm/state/directory.rb
-- vendor/fssm/lib/fssm/backends/fsevents.rb
-- vendor/fssm/lib/fssm/backends/polling.rb
-- vendor/fssm/lib/fssm/backends/inotify.rb
-- vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
-- vendor/fssm/example.rb
-- vendor/fssm/LICENSE
-- vendor/fssm/README.markdown
-- vendor/fssm/Rakefile
-- vendor/fssm/profile/prof-fssm-pathname.html
-- vendor/fssm/profile/prof-pathname.rb
-- vendor/fssm/profile/prof-plain-pathname.html
-- vendor/fssm/profile/prof-cache.rb
-- vendor/fssm/profile/prof.html
-- vendor/fssm/fssm.gemspec
-- vendor/fssm/VERSION.yml
-- vendor/fssm/spec/spec_helper.rb
-- vendor/fssm/spec/path_spec.rb
-- vendor/fssm/spec/root/duck/quack.txt
-- vendor/fssm/spec/root/moo/cow.txt
-- vendor/fssm/spec/root/file.rb
-- vendor/fssm/spec/root/file.css
-- vendor/fssm/spec/root/file.yml
-- bin/sass
+- lib/haml/version.rb
 - bin/haml
-- bin/sass-convert
 - bin/html2haml
-- bin/css2sass
-- test/sass/plugin_test.rb
-- test/sass/templates/basic.sass
-- test/sass/templates/line_numbers.sass
-- test/sass/templates/nested_bork2.sass
-- test/sass/templates/_imported_charset_utf8.sass
-- test/sass/templates/mixin_bork.sass
-- test/sass/templates/import_charset.sass
-- test/sass/templates/importee.less
-- test/sass/templates/warn.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/nested_bork3.sass
-- test/sass/templates/script.sass
-- test/sass/templates/import.sass
-- test/sass/templates/scss_importee.scss
-- test/sass/templates/bork1.sass
-- test/sass/templates/compressed.sass
-- test/sass/templates/importee.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/units.sass
-- test/sass/templates/nested_bork1.sass
-- test/sass/templates/bork3.sass
-- test/sass/templates/nested_mixin_bork.sass
-- test/sass/templates/complex.sass
-- test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/alt.sass
-- test/sass/templates/scss_import.scss
-- test/sass/templates/compact.sass
-- test/sass/templates/_imported_charset_ibm866.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/warn_imported.sass
-- test/sass/templates/options.sass
-- test/sass/templates/bork4.sass
-- test/sass/templates/import_charset_1_8.sass
-- test/sass/templates/nested_bork4.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/expanded.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/bork2.sass
-- test/sass/script_conversion_test.rb
-- test/sass/functions_test.rb
-- test/sass/less_conversion_test.rb
-- test/sass/more_results/more1.css
-- test/sass/more_results/more1_with_line_comments.css
-- test/sass/more_results/more_import.css
-- test/sass/data/hsl-rgb.txt
-- test/sass/scss/test_helper.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/script_test.rb
-- test/sass/conversion_test.rb
-- test/sass/more_templates/more1.sass
-- test/sass/more_templates/_more_partial.sass
-- test/sass/more_templates/more_import.sass
-- test/sass/extend_test.rb
-- test/sass/engine_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/results/units.css
-- test/sass/results/alt.css
-- test/sass/results/scss_importee.css
-- test/sass/results/line_numbers.css
-- test/sass/results/import_charset.css
-- test/sass/results/expanded.css
-- test/sass/results/warn.css
-- test/sass/results/script.css
-- test/sass/results/scss_import.css
-- test/sass/results/nested.css
-- test/sass/results/options.css
-- test/sass/results/import_charset_1_8.css
-- test/sass/results/parent_ref.css
-- test/sass/results/multiline.css
-- test/sass/results/import_charset_ibm866.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/warn_imported.css
-- test/sass/results/compact.css
-- test/sass/results/mixins.css
-- test/sass/results/complex.css
-- test/sass/results/compressed.css
-- test/sass/results/import.css
-- test/sass/results/basic.css
-- test/test_helper.rb
-- test/haml/util/subset_map_test.rb
-- test/haml/templates/just_stuff.haml
-- test/haml/templates/original_engine.haml
-- test/haml/templates/helpers.haml
-- test/haml/templates/_av_partial_2_ugly.haml
-- test/haml/templates/content_for_layout.haml
-- test/haml/templates/action_view.haml
-- test/haml/templates/nuke_inner_whitespace.haml
-- test/haml/templates/eval_suppressed.haml
-- test/haml/templates/_layout.erb
-- test/haml/templates/_partial.haml
-- test/haml/templates/tag_parsing.haml
-- test/haml/templates/silent_script.haml
-- test/haml/templates/breakage.haml
-- test/haml/templates/whitespace_handling.haml
-- test/haml/templates/partial_layout.haml
-- test/haml/templates/_av_partial_2.haml
-- test/haml/templates/very_basic.haml
-- test/haml/templates/list.haml
-- test/haml/templates/partialize.haml
-- test/haml/templates/render_layout.haml
-- test/haml/templates/action_view_ugly.haml
-- test/haml/templates/_av_partial_1.haml
-- test/haml/templates/partials.haml
-- test/haml/templates/_av_partial_1_ugly.haml
-- test/haml/templates/_text_area.haml
-- test/haml/templates/filters.haml
-- test/haml/templates/standard.haml
-- test/haml/templates/nuke_outer_whitespace.haml
-- test/haml/templates/_layout_for_partial.haml
-- test/haml/templates/standard_ugly.haml
-- test/haml/templates/helpful.haml
-- test/haml/template_test.rb
-- test/haml/markaby/standard.mab
+- test/benchmark.rb
+- test/haml/engine_test.rb
 - test/haml/erb/_av_partial_1.erb
 - test/haml/erb/_av_partial_2.erb
-- test/haml/erb/standard.erb
 - test/haml/erb/action_view.erb
-- test/haml/html2haml_test.rb
-- test/haml/spec_test.rb
+- test/haml/erb/standard.erb
 - test/haml/helper_test.rb
-- test/haml/util_test.rb
-- test/haml/mocks/article.rb
-- test/haml/engine_test.rb
 - test/haml/html2haml/erb_tests.rb
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/spec/tests.json
-- test/haml/spec/lua_haml_spec.lua
-- test/haml/spec/README.md
-- test/haml/results/partial_layout.xhtml
-- test/haml/results/original_engine.xhtml
-- test/haml/results/helpers.xhtml
-- test/haml/results/render_layout.xhtml
-- test/haml/results/tag_parsing.xhtml
-- test/haml/results/whitespace_handling.xhtml
-- test/haml/results/nuke_inner_whitespace.xhtml
+- test/haml/html2haml_test.rb
+- test/haml/markaby/standard.mab
+- test/haml/mocks/article.rb
+- test/haml/results/content_for_layout.xhtml
+- test/haml/results/eval_suppressed.xhtml
 - test/haml/results/filters.xhtml
-- test/haml/results/standard.xhtml
+- test/haml/results/helpers.xhtml
 - test/haml/results/helpful.xhtml
 - test/haml/results/just_stuff.xhtml
 - test/haml/results/list.xhtml
-- test/haml/results/eval_suppressed.xhtml
-- test/haml/results/content_for_layout.xhtml
-- test/haml/results/silent_script.xhtml
+- test/haml/results/nuke_inner_whitespace.xhtml
 - test/haml/results/nuke_outer_whitespace.xhtml
+- test/haml/results/original_engine.xhtml
+- test/haml/results/partial_layout.xhtml
 - test/haml/results/partials.xhtml
+- test/haml/results/render_layout.xhtml
+- test/haml/results/silent_script.xhtml
+- test/haml/results/standard.xhtml
+- test/haml/results/tag_parsing.xhtml
 - test/haml/results/very_basic.xhtml
-- test/benchmark.rb
+- test/haml/results/whitespace_handling.xhtml
+- test/haml/spec/README.md
+- test/haml/spec/lua_haml_spec.lua
+- test/haml/spec/ruby_haml_test.rb
+- test/haml/spec/tests.json
+- test/haml/spec_test.rb
+- test/haml/template_test.rb
+- test/haml/templates/_av_partial_1.haml
+- test/haml/templates/_av_partial_1_ugly.haml
+- test/haml/templates/_av_partial_2.haml
+- test/haml/templates/_av_partial_2_ugly.haml
+- test/haml/templates/_layout.erb
+- test/haml/templates/_layout_for_partial.haml
+- test/haml/templates/_partial.haml
+- test/haml/templates/_text_area.haml
+- test/haml/templates/action_view.haml
+- test/haml/templates/action_view_ugly.haml
+- test/haml/templates/breakage.haml
+- test/haml/templates/content_for_layout.haml
+- test/haml/templates/eval_suppressed.haml
+- test/haml/templates/filters.haml
+- test/haml/templates/helpers.haml
+- test/haml/templates/helpful.haml
+- test/haml/templates/just_stuff.haml
+- test/haml/templates/list.haml
+- test/haml/templates/nuke_inner_whitespace.haml
+- test/haml/templates/nuke_outer_whitespace.haml
+- test/haml/templates/original_engine.haml
+- test/haml/templates/partial_layout.haml
+- test/haml/templates/partialize.haml
+- test/haml/templates/partials.haml
+- test/haml/templates/render_layout.haml
+- test/haml/templates/silent_script.haml
+- test/haml/templates/standard.haml
+- test/haml/templates/standard_ugly.haml
+- test/haml/templates/tag_parsing.haml
+- test/haml/templates/very_basic.haml
+- test/haml/templates/whitespace_handling.haml
+- test/haml/util_test.rb
 - test/linked_rails.rb
+- test/test_helper.rb
 - extra/update_watch.rb
-- extra/sass-mode.el
-- extra/haml-mode.el
 - Rakefile
 - init.rb
 - .yardopts
+- README.md
+- CONTRIBUTING
 - MIT-LICENSE
-- REVISION
 - VERSION
 - VERSION_NAME
-- README.md
-- CONTRIBUTING
-has_rdoc: true
+- EDGE_GEM_VERSION
+- REVISION
+has_rdoc: false
 homepage: http://haml-lang.com/
 licenses: []
 
@@ -366,49 +158,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
+  version: 
 requirements: []
 
 rubyforge_project: haml
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
+summary: An elegant, structured XHTML/XML templating engine.
 test_files: 
-- test/sass/plugin_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/functions_test.rb
-- test/sass/less_conversion_test.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/script_test.rb
-- test/sass/conversion_test.rb
-- test/sass/extend_test.rb
-- test/sass/engine_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/callbacks_test.rb
-- test/haml/util/subset_map_test.rb
-- test/haml/template_test.rb
+- test/haml/engine_test.rb
+- test/haml/helper_test.rb
 - test/haml/html2haml_test.rb
+- test/haml/spec/ruby_haml_test.rb
 - test/haml/spec_test.rb
-- test/haml/helper_test.rb
+- test/haml/template_test.rb
 - test/haml/util_test.rb
-- test/haml/engine_test.rb
-- test/haml/spec/ruby_haml_test.rb