haml 1.8.0 → 2.0.3

metadata

@@ -1,42 +1,41 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
-date: 2008-01-06 00:00:00 -08:00
-summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
-require_paths: 
-- lib
-email: haml@googlegroups.com
-homepage: http://haml.hamptoncatlin.com/
-rubyforge_project: 
-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.
-autorequire: 
-- haml
-- sass
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 2.0.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
+- Nathan Weizenbaum
 - Hampton Catlin
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-09-07 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+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.
+email: haml@googlegroups.com
+executables: 
+- haml
+- html2haml
+- sass
+- css2sass
+extensions: []
+
+extra_rdoc_files: 
+- VERSION
+- MIT-LICENSE
+- README.rdoc
+- FAQ
+- REVISION
 files: 
+- rails/init.rb
 - lib/sass.rb
 - lib/sass
 - lib/sass/plugin
 - lib/sass/plugin/rails.rb
 - lib/sass/plugin/merb.rb
-- lib/sass/constant.rb.rej
 - lib/sass/error.rb
 - lib/sass/tree
 - lib/sass/tree/value_node.rb
@@ -52,11 +51,11 @@ files:
 - lib/sass/constant/number.rb
 - lib/sass/constant/operation.rb
 - lib/sass/constant/literal.rb
+- lib/sass/constant/nil.rb
 - lib/sass/plugin.rb
 - lib/sass/css.rb
 - lib/sass/engine.rb
 - lib/haml
-- lib/haml/util.rb
 - lib/haml/exec.rb
 - lib/haml/html.rb
 - lib/haml/error.rb
@@ -71,7 +70,6 @@ files:
 - lib/haml/precompiler.rb
 - lib/haml/helpers
 - lib/haml/helpers/action_view_extensions.rb
-- lib/haml/helpers/action_view_mods.rb.rej
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml.rb
 - bin/css2sass
@@ -90,6 +88,8 @@ files:
 - 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/alt.sass
@@ -109,12 +109,13 @@ files:
 - 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/engine_test.rb.rej
 - test/sass/engine_test.rb
 - test/haml
 - test/haml/mocks
@@ -131,11 +132,13 @@ files:
 - 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
@@ -149,14 +152,15 @@ files:
 - test/haml/templates/original_engine.haml
 - test/haml/templates/breakage.haml
 - test/haml/templates/action_view.haml
-- test/haml/runner.rb
 - test/haml/results
 - test/haml/results/content_for_layout.xhtml
 - test/haml/results/just_stuff.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
@@ -168,40 +172,53 @@ files:
 - test/haml/markaby
 - test/haml/markaby/standard.mab
 - test/haml/engine_test.rb
-- test/profile.rb
+- test/rails
 - test/benchmark.rb
+- test/test_helper.rb
 - Rakefile
 - init.rb
 - VERSION
 - MIT-LICENSE
-- README
-test_files: 
-- test/sass/plugin_test.rb
-- test/sass/engine_test.rb
-- test/haml/template_test.rb
-- test/haml/html2haml_test.rb
-- test/haml/helper_test.rb
-- test/haml/engine_test.rb
+- README.rdoc
+- FAQ
+- REVISION
+has_rdoc: true
+homepage: http://haml.hamptoncatlin.com/
+post_install_message: 
 rdoc_options: 
 - --title
 - Haml
 - --main
-- README
+- README.rdoc
 - --exclude
 - lib/haml/buffer.rb
 - --line-numbers
 - --inline-source
-extra_rdoc_files: 
-- VERSION
-- MIT-LICENSE
-- README
-executables: 
-- haml
-- html2haml
-- sass
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: haml
+rubygems_version: 1.1.1
+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/haml/html2haml_test.rb
+- test/haml/helper_test.rb
+- test/haml/engine_test.rb

data/lib/haml/helpers/action_view_mods.rb.rej

@@ -1,30 +0,0 @@
-***************
-*** 1,11 ****
-- begin
--   require 'rubygems'
--   require 'active_support'
--   require 'action_controller'
--   require 'action_view'
--   action_view_included = true
-- rescue LoadError
--   action_view_included = false
-  end
-  
-  
---- 1,16 ----
-+ 
-+ # This obviously requires that ActiveSupport be present prior to Haml
-+ # being loaded.
-+ action_view_included = false
-+ if defined?(ActiveSupport)
-+   begin
-+     require 'rubygems'
-+     require 'active_support'
-+     require 'action_controller'
-+     require 'action_view'
-+     action_view_included = true
-+   rescue LoadError
-+   end
-  end
-  
-  

data/lib/haml/util.rb

@@ -1,18 +0,0 @@
-# This file contains various useful bits of code
-# that are shared between Haml and Sass.
-
-class Hash # :nodoc:
-  # Same as Hash#merge!,
-  # but recursively merges sub-hashes
-  def rec_merge!(other)
-    other.each do |key, value|
-      myval = self[key]
-      if value.is_a?(Hash) && myval.is_a?(Hash)
-        myval.rec_merge!(value)
-      else
-        self[key] = value
-      end
-    end
-    self
-  end
-end

data/lib/sass/constant.rb.rej

@@ -1,42 +0,0 @@
-***************
-*** 106,121 ****
-                end
-  
-                # Time for a unary minus!
--               if negative_okay && symbol == :minus
--                 negative_okay = true
-                  to_return << :neg
-                  next
-                end
-  
-                # Are we looking at an operator?
-                if symbol && (str.empty? || symbol != :mod)
-                  str = reset_str.call
--                 negative_okay = true
-                  to_return << symbol
-                  next
-                end
---- 107,129 ----
-                end
-  
-                # Time for a unary minus!
-+               if beginning_of_token && symbol == :minus
-+                 beginning_of_token = true
-                  to_return << :neg
-                  next
-                end
-  
-+               # Is this a constant?
-+               if beginning_of_token && symbol == :const
-+                 beginning_of_token = true
-+                 to_return << :const
-+                 next
-+               end
-+ 
-                # Are we looking at an operator?
-                if symbol && (str.empty? || symbol != :mod)
-                  str = reset_str.call
-+                 beginning_of_token = true
-                  to_return << symbol
-                  next
-                end

data/test/haml/runner.rb

@@ -1,16 +0,0 @@
-require 'rubygems'
-require 'active_support'
-require 'action_controller'
-require 'action_view'
-require '../../lib/haml/template'
-require 'fileutils'
-
-haml_template_engine = Haml::Template.new(ActionView::Base.new)
-haml_template_engine.render(File.dirname(__FILE__) + '/templates/standard.haml')
-
-begin
-  eval(File.read("template_test.rb"))
-rescue StandardError => e
-  puts e.backtrace
-  puts e.inspect
-end

data/test/profile.rb

@@ -1,65 +0,0 @@
-require 'rubygems'
-require 'active_support'
-require 'action_controller'
-require 'action_view'
-
-require File.dirname(__FILE__) + '/../lib/haml'
-require 'haml/template'
-
-require 'profiler'
-require 'stringio'
-
-module Haml
-  # Used by both Haml::Profiler and Sass::Profiler.
-  # Encapsulates profiling behavior.
-  module AbstractProfiler
-    def self.profile(times, &block)
-      # Runs the profiler, collects information
-      Profiler__::start_profile
-      times.times &block
-      Profiler__::stop_profile
-      
-      # Outputs information to a StringIO, returns result
-      io = StringIO.new
-      Profiler__::print_profile(io)
-      io.pos = 0
-      result = io.read
-      io.close
-      result
-    end
-  end
-
-  # A profiler for Haml, mostly for development use. This simply implements
-  # the Ruby profiler for profiling haml code.
-  class Profiler
-  
-    # Creates a new profiler that looks for templates in the base
-    # directory.
-    def initialize(base = File.join(File.dirname(__FILE__), 'haml', 'templates'))
-      unless base.class == ActionView::Base
-        @base = ActionView::Base.new(base)
-      else
-        @base = base
-      end
-    end
-
-    # Profiles haml on the given template with the given number of runs.
-    # The template name shouldn't have a file extension; this will
-    # automatically look for a haml template.
-    # 
-    # Returns the results of the profiling as a string.
-    def profile(runs = 100, template_name = 'standard')      
-      AbstractProfiler.profile(runs) { @base.render template_name }
-    end
-  end
-end
-
-module Sass
-  class Profiler
-    def profile(runs = 100, template_name = 'complex')
-      Haml::AbstractProfiler.profile(runs) do
-        Sass::Engine.new("#{File.dirname(__FILE__)}/sass/templates/#{template_name}.sass").render
-      end
-    end
-  end
-end

data/test/sass/engine_test.rb.rej

@@ -1,18 +0,0 @@
-***************
-*** 44,49 ****
-      "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
-      "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
-      "@foo    bar boom" => "Unknown compiler directive: \"@foo bar boom\"",
-    }
-    
-    def test_basic_render
---- 44,52 ----
-      "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
-      "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
-      "@foo    bar boom" => "Unknown compiler directive: \"@foo bar boom\"",
-+     "!foo = bar baz -" => "Unterminated unary minus.",
-+     "!foo = bar baz !" => "Unterminated constant.",
-+     "!foo = !(foo)" => "Invalid constant.",
-    }
-    
-    def test_basic_render