haml 3.2.0.rc.2 → 3.2.0.rc.3

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## 3.2.0 (Unreleased)
 
+* The Haml exectutable now accepts an `--autoclose` option. You can now
+  specify a list of tags that should be autoclosed
+
+* The `:ruby` filter no longer redirects $stdout to the Haml document, as this
+  is not thread safe. Instead it provides a `haml_io` local variable, which is
+  an IO object that writes to the document.
+
 * HTML5 is now the default output format rather than XHTML. This was already
   the default on Rails 3+, so many users will notice no difference.
 
@@ -97,6 +104,9 @@
 
 * Add command-line option to suppress script evaluation.
 
+* It's now possible to use Rails's asset helpers inside the Sass and SCSS
+  filters.
+
 ## 3.1.6
 
 * In indented mode, don't reindent buffers that contain preserved tags, and

data/Rakefile

@@ -94,7 +94,7 @@ def gemfiles
   @gemfiles ||= begin
     Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].
       reject {|f| f =~ /\.lock$/}.
-      reject {|f| RUBY_VERSION >= '1.9' && f =~ /2\.[0-2]/}
+      reject {|f| RUBY_VERSION < '1.9.3' && f =~ /master/}
   end
 end
 

data/lib/haml/compiler.rb

@@ -314,8 +314,9 @@ END
     def push_silent(text, can_suppress = false)
       flush_merged_text
       return if can_suppress && @options.suppress_eval?
-      @precompiled << "#{resolve_newlines}#{text}\n"
-      @output_line += text.count("\n") + 1
+      newline = (text == "end") ? ";" : "\n"
+      @precompiled << "#{resolve_newlines}#{text}#{newline}"
+      @output_line += (text + newline).count("\n")
     end
 
     # Adds `text` to `@buffer` with appropriate tabulation

data/lib/haml/filters.rb

@@ -58,6 +58,19 @@ module Haml
       filter
     end
 
+    # Removes a filter from Haml. If the filter was removed, it returns
+    # the that was remove Module upon success, or nil on failure. If you try
+    # to redefine a filter, Haml will raise an error. Use this method first to
+    # explicitly remove the filter before redefining it.
+    # @return Module The filter module that has been removed
+    # @since 3.2.0
+    def remove_filter(name)
+      defined.delete name.downcase
+      if constants.map(&:to_s).include?(name.to_s)
+        remove_const name.to_sym
+      end
+    end
+
     # The base module for Haml filters.
     # User-defined filters should be modules including this module.
     # The name of the filter is taken by downcasing the module name.
@@ -258,9 +271,13 @@ RUBY
       end
     end
 
-    # Parses the filtered text with the normal Ruby interpreter. All output sent
-    # to `$stdout`, such as with `puts`, is output into the Haml document. Not
-    # available if the {file:REFERENCE.md#suppress_eval-option `:suppress_eval`}
+    # 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. In previous version this filter redirected any output to `$stdout`
+    # to the Haml document, this was not threadsafe and has been removed, you
+    # should use `haml_io` instead.
+    #
+    # Not available if the {file:REFERENCE.md#suppress_eval-option `:suppress_eval`}
     # option is set to true. The Ruby code is evaluated in the same context as
     # the Haml template.
     module Ruby
@@ -272,11 +289,13 @@ RUBY
         return if compiler.options[:suppress_eval]
         compiler.instance_eval do
           push_silent <<-FIRST.gsub("\n", ';') + text + <<-LAST.gsub("\n", ';')
-            _haml_old_stdout = $stdout
-            $stdout = StringIO.new(_hamlout.buffer, 'a')
+            begin
+              haml_io = StringIO.new(_hamlout.buffer, 'a')
           FIRST
-            _haml_old_stdout, $stdout = $stdout, _haml_old_stdout
-            _haml_old_stdout.close
+            ensure
+              haml_io.close
+              haml_io = nil
+            end
           LAST
         end
       end

data/lib/haml/helpers.rb

@@ -537,7 +537,13 @@ MESSAGE
     # @param text [String] The string to sanitize
     # @return [String] The sanitized string
     def html_escape(text)
-      Haml::Util.silence_warnings {text.to_s.gsub(/[\"><&]/n) {|s| HTML_ESCAPE[s]}}
+      pattern = '[\"><&]'
+      regex = if RUBY_VERSION >= '1.9'
+        Regexp.new(pattern.force_encoding(text.encoding), Regexp::FIXEDENCODING)
+      else
+        Regexp.new(pattern)
+      end
+      text.to_s.gsub(regex) {|s| HTML_ESCAPE[s]}
     end
 
     # Escapes HTML entities in `text`, but without escaping an ampersand
@@ -546,9 +552,13 @@ MESSAGE
     # @param text [String] The string to sanitize
     # @return [String] The sanitized string
     def escape_once(text)
-      Haml::Util.silence_warnings do
-        text.to_s.gsub(/[\"><]|&(?!(?:[a-zA-Z]+|(#\d+));)/n) {|s| HTML_ESCAPE[s]}
+      pattern = '[\"><]|&(?!(?:[a-zA-Z]+|(#\d+));)'
+      regex = if RUBY_VERSION >= '1.9'
+        Regexp.new(pattern.force_encoding(text.encoding), Regexp::FIXEDENCODING)
+      else
+        Regexp.new(pattern)
       end
+      text.to_s.gsub(regex) {|s| HTML_ESCAPE[s]}
     end
 
     # Returns whether or not the current template is a Haml template.

data/lib/haml/helpers/action_view_mods.rb

@@ -142,4 +142,6 @@ module ActionView
   end
 end
 
-require "haml/helpers/rails_323_textarea_fix" if Rails.version >= "3.2.3"
+if (ActionPack::VERSION::MAJOR == 3) && (ActionPack::VERSION::MINOR >= 2) && (ActionPack::VERSION::TINY >= 3)
+  require "haml/helpers/rails_323_textarea_fix"
+end

data/lib/haml/railtie.rb

@@ -7,5 +7,15 @@ if defined?(ActiveSupport)
   end
 end
 
+module Haml
+  class Railtie < ::Rails::Railtie
+    initializer :haml do |app|
+      if defined?(::Sass::Rails) && app.config.assets.enabled
+        require "haml/sass_rails_filter"
+      end
+    end
+  end
+end
+
 require "haml/helpers/safe_erubis_template"
 Haml::Filters::Erb.template_class = Haml::SafeErubisTemplate

data/lib/haml/sass_rails_filter.rb

@@ -0,0 +1,33 @@
+module Haml
+  module Filters
+    # This is an extension of Sass::Rails's SassTemplate class that allows
+    # Rails's asset helpers to be used inside Haml Sass filter.
+    class SassRailsTemplate < ::Sass::Rails::SassTemplate
+      def render(scope=Object.new, locals={}, &block)
+        scope = ::Rails.application.assets.context_class.new(::Rails.application.assets, "/", "/")
+        super
+      end
+
+      def sass_options(scope)
+        options = super
+        options[:custom][:resolver] = ::ActionView::Base.new
+        options
+      end
+    end
+
+    # This is an extension of Sass::Rails's SassTemplate class that allows
+    # Rails's asset helpers to be used inside a Haml SCSS filter.
+    class ScssRailsTemplate < SassRailsTemplate
+      self.default_mime_type = 'text/css'
+
+      def syntax
+        :scss
+      end
+    end
+
+    remove_filter :Sass
+    remove_filter :Scss
+    register_tilt_filter "Sass", :extend => "Css", :template_class => SassRailsTemplate
+    register_tilt_filter "Scss", :extend => "Css", :template_class => ScssRailsTemplate
+  end
+end

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "3.2.0.rc.2"
+  VERSION = "3.2.0.rc.3"
 end

data/test/engine_test.rb

@@ -1894,7 +1894,7 @@ HAML
       assert(false, "Expected exception")
     rescue Haml::Error => e
       assert_equal(3, e.line)
-      assert_equal('Invalid UTF-8 character "\xFE"', e.message)
+      assert_match(/Invalid .* character/, e.message)
     end
 
     def test_ascii_incompatible_encoding_error
@@ -1904,7 +1904,7 @@ HAML
       assert(false, "Expected exception")
     rescue Haml::Error => e
       assert_equal(3, e.line)
-      assert_equal('Invalid UTF-16LE character "\xFE"', e.message)
+      assert_match(/Invalid .* character/, e.message)
     end
 
     def test_same_coding_comment_as_encoding

data/test/filters_test.rb

@@ -7,7 +7,7 @@ class FiltersTest < MiniTest::Unit::TestCase
       Module.new {def self.name; "Foo::Bar"; end; include Haml::Filters::Base}
       assert Haml::Filters.defined.has_key? "bar"
     ensure
-      Haml::Filters.defined.delete "bar"
+      Haml::Filters.remove_filter "Bar"
     end
   end
 
@@ -19,8 +19,7 @@ class FiltersTest < MiniTest::Unit::TestCase
         end
       end
     ensure
-      Haml::Filters.defined.delete "foo"
-      Haml::Filters.send :remove_const, :Foo
+      Haml::Filters.remove_filter "Foo"
     end
   end
 
@@ -31,8 +30,7 @@ class FiltersTest < MiniTest::Unit::TestCase
         Haml::Filters.defined["textile"].template_class
       end
     ensure
-      Haml::Filters.defined.delete "textile"
-      Haml::Filters.send :remove_const, :Textile
+      Haml::Filters.remove_filter "Textile"
     end
   end
 
@@ -43,8 +41,7 @@ class FiltersTest < MiniTest::Unit::TestCase
         Haml::Filters.defined["maruku"].template_class
       end
     ensure
-      Haml::Filters.defined.delete "maruku"
-      Haml::Filters.send :remove_const, :Maruku
+      Haml::Filters.remove_filter "Maruku"
     end
   end
 
@@ -108,8 +105,7 @@ class FiltersTest < MiniTest::Unit::TestCase
       haml = ":foo"
       assert_equal "foobar\n", render(haml)
     ensure
-      Haml::Filters.defined.delete "foo"
-      Haml::Filters.send :remove_const, :Foo
+      Haml::Filters.remove_filter "Foo"
     end
   end
 
@@ -235,4 +231,24 @@ class EscapedFilterTest < MiniTest::Unit::TestCase
     haml = ":escaped\n  &"
     assert_equal(html, render(haml))
   end
+end
+
+class RubyFilterTest < MiniTest::Unit::TestCase
+  test "can write to haml_io" do
+    haml = ":ruby\n  haml_io.puts 'hello'\n"
+    html = "hello\n"
+    assert_equal(html, render(haml))
+  end
+
+  test "haml_io appends to output" do
+    haml = "hello\n:ruby\n  haml_io.puts 'hello'\n"
+    html = "hello\nhello\n"
+    assert_equal(html, render(haml))
+  end
+
+  test "can create local variables" do
+    haml = ":ruby\n  a = 7\n=a"
+    html = "7\n"
+    assert_equal(html, render(haml))
+  end
 end

data/test/helper_test.rb

@@ -132,7 +132,7 @@ HTML
 HAML
   end
 
-  if Rails.version >= "3.2.3"
+  if (ActionPack::VERSION::MAJOR == 3) && (ActionPack::VERSION::MINOR >= 2) && (ActionPack::VERSION::TINY >= 3)
     def test_text_area
       assert_equal(%(<textarea id="body" name="body">\nFoo&#x000A;Bar&#x000A; Baz&#x000A;   Boom</textarea>\n),
                    render('= text_area_tag "body", "Foo\nBar\n Baz\n   Boom"', :action_view))
@@ -458,5 +458,41 @@ HAML
   %div> hi there!
 HAML
   end
+
+  def test_html_escape
+    assert_equal "&quot;&gt;&lt;&amp;", Haml::Helpers.html_escape('"><&')
+  end
+
+  def test_html_escape_encoding
+    old_stderr, $stderr = $stderr, StringIO.new
+    string = "\"><&\u00e9" # if you're curious, u00e9 is "LATIN SMALL LETTER E WITH ACUTE"
+    assert_equal "&quot;&gt;&lt;&amp;\u00e9", Haml::Helpers.html_escape(string)
+    assert $stderr.string == "", "html_escape shouldn't generate warnings with UTF-8 strings: #{$stderr.string}"
+  ensure
+    $stderr = old_stderr
+  end
+
+  def test_escape_once
+    assert_equal "&quot;&gt;&lt;&amp;", Haml::Helpers.escape_once('"><&')
+  end
+
+  def test_escape_once_leaves_entity_references
+    assert_equal "&quot;&gt;&lt;&amp; &nbsp;", Haml::Helpers.escape_once('"><& &nbsp;')
+  end
+
+  def test_escape_once_leaves_numeric_references
+    assert_equal "&quot;&gt;&lt;&amp; &#160;", Haml::Helpers.escape_once('"><& &#160;') #decimal
+    #assert_equal "&quot;&gt;&lt;&amp; &#x00a0;", Haml::Helpers.escape_once('"><& &#x00a0;') #hexadecimal
+  end
+
+  def test_escape_once_encoding
+    old_stderr, $stderr = $stderr, StringIO.new
+    string = "\"><&\u00e9 &nbsp;"
+    assert_equal "&quot;&gt;&lt;&amp;\u00e9 &nbsp;", Haml::Helpers.escape_once(string)
+    assert $stderr.string == "", "html_escape shouldn't generate warnings with UTF-8 strings: #{$stderr.string}"
+  ensure
+    $stderr = old_stderr
+  end
+
 end
 

data/test/util_test.rb

@@ -3,19 +3,6 @@ require 'test_helper'
 class UtilTest < MiniTest::Unit::TestCase
   include Haml::Util
 
-  class Dumpable
-    attr_reader :arr
-    def initialize; @arr = []; end
-    def _before_dump; @arr << :before; end
-    def _after_dump; @arr << :after; end
-    def _around_dump
-      @arr << :around_before
-      yield
-      @arr << :around_after
-    end
-    def _after_load; @arr << :loaded; end
-  end
-
   def test_powerset
     return unless Set[Set[]] == Set[Set[]] # There's a bug in Ruby 1.8.6 that breaks nested set equality
     assert_equal([[].to_set].to_set,

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.2
   prerelease: 6
+  version: 3.2.0.rc.3
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -21,14 +21,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -37,14 +37,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rbench
   requirement: !ruby/object:Gem::Requirement
@@ -53,14 +53,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -69,14 +69,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +85,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: ! 'Haml (HTML Abstraction Markup Language) is a layer on top of HTML
   or XML that''s
 
@@ -128,6 +128,7 @@ files:
 - lib/haml/options.rb
 - lib/haml/parser.rb
 - lib/haml/railtie.rb
+- lib/haml/sass_rails_filter.rb
 - lib/haml/template/options.rb
 - lib/haml/template/plugin.rb
 - lib/haml/template.rb
@@ -245,6 +246,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2518859033120832815
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false