haml 4.0.1 → 4.0.2

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Haml Changelog
 
+## 4.0.2
+
+Released April 5, 2013 ([diff](https://github.com/haml/haml/compare/4.0.1...4.0.2)).
+
+* Explicitly require Erubis to work around bug in older versions of Tilt.
+* Fix :erb filter printing duplicate content in Rails views.
+(thanks [Jori Hardman](https://github.com/jorihardman))
+* Replace range with slice to reduce objects created by `capture_haml`.
+(thanks [Tieg Zaharia](https://github.com/tiegz))
+* Correct/improve some documentation.
+
 ## 4.0.1
 
 Released March 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.0...4.0.1)).

data/REFERENCE.md

@@ -130,8 +130,8 @@ encoding.
 
 By default, the HTML generated by Haml has the same encoding as the Haml
 template. However, if `Encoding.default_internal` is set, Haml will attempt to
-use that instead. In addition, the [`:encoding` option](#encoding-option) can be
-used to specify an output encoding manually.
+use that instead. In addition, the {Haml::Options#encoding `:encoding` option}
+can be used to specify an output encoding manually.
 
 Note that, like Ruby, Haml does not support templates encoded in UTF-16 or
 UTF-32, since these encodings are not compatible with ASCII. It is possible to
@@ -186,7 +186,6 @@ is compiled to:
 
 ## HTML Elements
 
-
 ### Element Name: `%`
 
 The percent character is placed at the beginning of a line. It's followed
@@ -406,9 +405,9 @@ will render as:
     <a data-author-id='123' href='/posts'>Posts By Author</a>
 
 Notice that the underscore in `author_id` was replaced by a hyphen. If you wish
-to suppress this behavior, you can set Haml's [`:hyphenate_data_attrs`
-option](#hyphenate_data_attrs-option) to `false`, and the output will be
-rendered as:
+to suppress this behavior, you can set Haml's
+{Haml::Options#hyphenate_data_attrs `:hyphenate_data_attrs` option} to `false`,
+and the output will be rendered as:
 
     <a data-author_id='123' href='/posts'>Posts By Author</a>
 
@@ -492,31 +491,32 @@ and is compiled to:
       </div>
     </div>
 
-### Self-Closing Tags: `/`
+### Empty (void) Tags: `/`
 
 The forward slash character, when placed at the end of a tag definition, causes
-the tag to be self-closed. For example:
+Haml to treat it as being an empty (or void) element. Depending on the format,
+the tag will be rendered either without a closing tag (`:html4` or `:html5`), or
+as a self-closing tag (`:xhtml`). For example:
 
     %br/
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html'}/
 
 is compiled to:
 
-    <br />
-    <meta http-equiv='Content-Type' content='text/html' />
+    <br>
+    <meta content='text/html' http-equiv='Content-Type'>
 
-Some tags are automatically closed, as long as they have no content. `meta`,
-`img`, `link`, `script`, `br`, and `hr` tags are closed by default. This list
-can be customized by setting the [`:autoclose`](#autoclose-option) option. For
-example:
+when the format is `:html4` or `:html5`, and to
 
-    %br
-    %meta{'http-equiv' => 'Content-Type', :content => 'text/html'}
+    <br />
+    <meta content='text/html' http-equiv='Content-Type' />
 
-is also compiled to:
+when the format is `:xhtml`.
 
-    <br />
-    <meta http-equiv='Content-Type' content='text/html' />
+Some tags are automatically treated as being empty, as long as they have no
+content in the Haml source. `meta`, `img`, `link`, `script`, `br`, and `hr` tags
+are treated as empty by default. This list can be customized by setting the
+{Haml::Options#autoclose `:autoclose`} option.
 
 ### Whitespace Removal: `>` and `<`
 
@@ -621,7 +621,6 @@ is compiled to:
       Hello!
     </div>
 
-
 ## Doctype: `!!!`
 
 When describing HTML documents with Haml, you can have a document type or XML
@@ -651,7 +650,7 @@ is compiled to:
     </html>
 
 You can also specify the specific doctype after the `!!!` When the
-[`:format`](#format-option) is set to `:xhtml`. The following doctypes are
+{Haml::Options#format `:format`} is set to `:xhtml`. The following doctypes are
 supported:
 
 `!!!`
@@ -686,7 +685,7 @@ supported:
 : XHTML+RDFa 1.0<br/>
  `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">`
 
-When the [`:format`](#format-option) option is set to `:html4`, the following
+When the {Haml::Options#format `:format`} option is set to `:html4`, the following
 doctypes are supported:
 
 `!!!`
@@ -701,7 +700,7 @@ doctypes are supported:
 : HTML 4.01 Frameset<br/>
  `<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">`
 
-When the [`:format`](#format-option) option is set to `:html5`,
+When the {Haml::Options#format `:format`} option is set to `:html5`,
 `!!!` is always `<!DOCTYPE html>`.
 
 If you're not using the UTF-8 character set for your document, you can specify
@@ -821,7 +820,7 @@ is compiled to:
       yo
     </p>
 
-If the [`:escape_html`](#escape_html-option) option is set, `=` will sanitize
+If the {Haml::Options#escape_html `:escape_html`} option is set, `=` will sanitize
 any HTML-sensitive characters generated by the script. For example:
 
     = '<script>alert("I\'m evil!");</script>'
@@ -1099,8 +1098,8 @@ control when CDATA tags are added.
 {#erb-filter}
 ### `:erb`
 Parses the filtered text with ERb, like an RHTML template. Not available if the
-[`:suppress_eval`](#suppress_eval-option) option is set to true. Embedded Ruby
-code is evaluated in the same context as the Haml template. This filter is
+{Haml::Options#suppress_eval `:suppress_eval`} option is set to true. Embedded
+Ruby code is evaluated in the same context as the Haml template. This filter is
 implemented using Tilt.
 
 {#escaped-filter}
@@ -1119,7 +1118,6 @@ option} to control when CDATA tags are added.
 Parses the filtered text with [Less](http://lesscss.org/) to produce CSS output.
 This filter is implemented using Tilt.
 
-
 {#markdown-filter}
 ### `:markdown`
 Parses the filtered text with
@@ -1151,10 +1149,11 @@ HTML escape code for newlines, to preserve nice-looking output. See also
 
 {#ruby-filter}
 ### `:ruby`
-Parses the filtered text with the normal Ruby interpreter. All output sent to
-`$stdout`, like with `puts`, is output into the Haml document. Not available if
-the [`:suppress_eval`](#suppress_eval-option) option is set to true. The Ruby
-code is evaluated in the same context as the Haml template.
+Parses the filtered text with the normal Ruby interpreter. Creates an `IO`
+object named `haml_io`, anything written to it is output into the Haml document.
+Not available if the {Haml::Options#suppress_eval `:suppress_eval`} option is
+set to true. The Ruby code is evaluated in the same context as the Haml
+template.
 
 {#sass-filter}
 ### `:sass`
@@ -1231,14 +1230,15 @@ Sometimes you don't want Haml to indent all your text.
 For example, tags like `pre` and `textarea` are whitespace-sensitive;
 indenting the text makes them render wrong.
 
-Haml deals with this by "preserving" newlines before they're put into the document --
-converting them to the HTML whitespace escape code, `&#x000A;`.
-Then Haml won't try to re-format the indentation.
+Haml deals with this by "preserving" newlines before they're put into the
+document -- converting them to the HTML whitespace escape code, `&#x000A;`. Then
+Haml won't try to re-format the indentation.
 
-Literal `textarea` and `pre` tags automatically preserve content given through `=`.
-Dynamically-generated `textarea`s and `pre`s can't be preserved automatically,
-and so should be passed through {Haml::Helpers#find\_and\_preserve} or the [`~` command](#tilde),
-which has the same effect.
+Literal `textarea` and `pre` tags automatically preserve content given through
+`=`. Dynamically-generated `textarea`s and `pre`s can't be preserved
+automatically, and so should be passed through
+{Haml::Helpers#find\_and\_preserve} or the [`~` command](#tilde), which has the
+same effect.
 
 Blocks of literal text can be preserved using the [`:preserve` filter](#preserve-filter).
 

data/Rakefile

@@ -20,7 +20,11 @@ end
 
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
-  t.test_files = Dir["test/**/*_test.rb"]
+  # haml-spec tests are explicitly added after other tests so they don't
+  # interfere with the Haml loading process which can cause test failures
+  files = Dir["test/*_test.rb"]
+  files.concat(Dir['test/haml-spec/*_test.rb'])
+  t.test_files = files
   t.verbose = true
 end
 
@@ -94,7 +98,7 @@ def gemfiles
   @gemfiles ||= begin
     Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].
       reject {|f| f =~ /\.lock$/}.
-      reject {|f| RUBY_VERSION < '1.9.3' && f =~ /master/}
+      reject {|f| RUBY_VERSION < '1.9.3' && f =~ /Gemfile.rails-(\d+).\d+.x/ && $1.to_i > 3}
   end
 end
 

data/lib/haml/buffer.rb

@@ -267,8 +267,6 @@ RUBY
     # a newline after textarea helpers.
     #
     # @param input [String] The text to process
-    # @param tabs [String] The tabs provided by the Haml::Buffer
-    # @param options [Hash] The options hash provided by the Haml::Buffer
     # @since Haml 4.0.1
     # @private
     def fix_textareas!(input)

data/lib/haml/filters.rb

@@ -385,6 +385,8 @@ RUBY
     module Erb
       class << self
         def precompiled(text)
+          #workaround for https://github.com/rtomayko/tilt/pull/183
+          require 'erubis' if (defined?(::Erubis) && !defined?(::Erubis::Eruby))
           super.sub(/^#coding:.*?\n/, '')
         end
       end

data/lib/haml/helpers.rb

@@ -381,7 +381,7 @@ MESSAGE
         end
 
         captured.map do |line|
-          line[min_tabs..-1]
+          line.slice(min_tabs, line.length)
         end.join
       end
     ensure

data/lib/haml/helpers/safe_erubis_template.rb

@@ -10,7 +10,7 @@ module Haml
     end
 
     def precompiled_preamble(locals)
-      [super, "@output_buffer = output_buffer ||= nil || ActionView::OutputBuffer.new;"]
+      [super, "@output_buffer = ActionView::OutputBuffer.new;"]
     end
 
     def precompiled_postamble(locals)

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: haml
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -11,88 +11,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :runtime
   name: tilt
+  type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-  type: :development
   name: rails
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
   name: rbench
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
   name: minitest
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  type: :development
   name: nokogiri
+  type: :development
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: ! 'Haml (HTML Abstraction Markup Language) is a layer on top of HTML
   or XML that''s
 
@@ -244,17 +244,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23