haml 3.2.0.alpha.13 → 3.2.0.alpha.14

data/lib/haml/template.rb

@@ -5,7 +5,7 @@ require 'haml/helpers/action_view_extensions'
 require 'haml/helpers/xss_mods'
 
 module Haml
-  module Compiler
+  class Compiler
     def precompiled_method_return_value_with_haml_xss
       "::Haml::Util.html_safe(#{precompiled_method_return_value_without_haml_xss})"
     end
@@ -25,8 +25,8 @@ module Haml
 end
 
 
-Haml::Template.options[:ugly] ||= Rails.env.development?
+Haml::Template.options[:ugly]        = !Rails.env.development?
 Haml::Template.options[:escape_html] = true
-Haml::Template.options[:format] ||= :html5
+Haml::Template.options[:format]      = :html5
 
 require 'haml/template/plugin'

data/lib/haml/template/plugin.rb

@@ -18,7 +18,7 @@ module Haml
       options = Haml::Template.options.dup
       options[:mime_type] = template.mime_type if template.respond_to? :mime_type
       options[:filename] = template.identifier
-      Haml::Engine.new(template.source, options).send(:precompiled_with_ambles, [])
+      Haml::Engine.new(template.source, options).compiler.precompiled_with_ambles([])
     end
 
     # In Rails 3.1+, #call takes the place of #compile

data/lib/haml/util.rb

@@ -8,14 +8,6 @@ module Haml
   module Util
     extend self
 
-    # Returns the path of a file relative to the Haml root directory.
-    #
-    # @param file [String] The filename relative to the Haml root
-    # @return [String] The filename relative to the the working directory
-    def scope(file)
-      File.expand_path("../../../#{file}", __FILE__)
-    end
-
     # Computes the powerset of the given array.
     # This is the set of all subsets of the array.
     #
@@ -90,8 +82,7 @@ module Haml
     # @return [String, nil] `text`, marked as HTML-safe
     def html_safe(text)
       return unless text
-      return text.html_safe if defined?(ActiveSupport::SafeBuffer)
-      text.html_safe!
+      text.html_safe
     end
 
     # Checks that the encoding of a string is valid in Ruby 1.9
@@ -172,17 +163,22 @@ MSG
       end
     end
 
-    # Like `Object#inspect`, but preserves non-ASCII characters rather than escaping them under Ruby 1.9.2.
-    # This is necessary so that the precompiled Haml template can be `#encode`d into `@options[:encoding]`
-    # before being evaluated.
-    #
-    # @param obj {Object}
-    # @return {String}
-    def inspect_obj(obj)
-      return obj.inspect unless (::RUBY_VERSION >= "1.9.2")
-      return ':' + inspect_obj(obj.to_s) if obj.is_a?(Symbol)
-      return obj.inspect unless obj.is_a?(String)
-      '"' + obj.gsub(/[\x00-\x7F]+/) {|s| s.inspect[1...-1]} + '"'
+    if RUBY_VERSION < "1.9.2"
+      def inspect_obj(obj)
+        return obj.inspect
+      end
+    else
+      # Like `Object#inspect`, but preserves non-ASCII characters rather than escaping them under Ruby 1.9.2.
+      # This is necessary so that the precompiled Haml template can be `#encode`d into `@options[:encoding]`
+      # before being evaluated.
+      #
+      # @param obj {Object}
+      # @return {String}
+      def inspect_obj(obj)
+        return ':' + inspect_obj(obj.to_s) if obj.is_a?(Symbol)
+        return obj.inspect unless obj.is_a?(String)
+        '"' + obj.gsub(/[\x00-\x7F]+/) {|s| s.inspect[1...-1]} + '"'
+      end
     end
 
     ## Static Method Stuff
@@ -327,6 +323,26 @@ METHOD
       "#{indentation.length} #{noun}#{'s' unless singular}#{was}"
     end
 
+    def contains_interpolation?(str)
+      str.include?('#{')
+    end
+
+    def unescape_interpolation(str, escape_html = nil)
+      res = ''
+      rest = Haml::Util.handle_interpolation str.dump do |scan|
+        escapes = (scan[2].size - 1) / 2
+        res << scan.matched[0...-3 - escapes]
+        if escapes % 2 == 1
+          res << '#{'
+        else
+          content = eval('"' + balance(scan, ?{, ?}, 1)[0][0...-1] + '"')
+          content = "Haml::Helpers.html_escape((#{content}))" if escape_html
+          res << '#{' + content + "}"# Use eval to get rid of string escapes
+        end
+      end
+      res + rest
+    end
+
     private
 
     # Parses a magic comment at the beginning of a Haml file.

data/lib/haml/version.rb

@@ -1,3 +1,3 @@
 module Haml
-  VERSION = "3.2.0.alpha.13"
+  VERSION = "3.2.0.alpha.14"
 end

data/test/engine_test.rb

@@ -731,7 +731,8 @@ HAML
   end
 
   def test_silent_script_with_hyphen_end_and_block
-    assert_equal(<<HTML, render(<<HAML))
+    silence_warnings do
+      assert_equal(<<HTML, render(<<HAML))
 <p>foo-end</p>
 <p>bar-end</p>
 HTML
@@ -739,6 +740,7 @@ HTML
   %p= s
 - end; nil)
 HAML
+    end
   end
 
   def test_if_without_content_and_else
@@ -1152,7 +1154,9 @@ HAML
   EXCEPTION_MAP.each do |key, value|
     define_method("test_exception (#{key.inspect})") do
       begin
-        render(key, :filename => "(test_exception (#{key.inspect}))")
+        silence_warnings do
+          render(key, :filename => "(test_exception (#{key.inspect}))")
+        end
       rescue Exception => err
         value = [value] unless value.is_a?(Array)
         expected_message, line_no = value
@@ -1327,6 +1331,20 @@ HAML
                  render("%p= 's' * 75", :ugly => true))
   end
 
+  def test_remove_whitespace_true
+    assert_equal("<div id='outer'><div id='inner'><p>hello world</p></div></div>",
+                 render("#outer\n  #inner\n    %p hello world", :remove_whitespace => true))
+    assert_equal("<p>hello world<pre>foo   bar\nbaz</pre></p>", render(<<HAML, :remove_whitespace => true))
+%p
+  hello world
+  %pre
+    foo   bar
+    baz
+HAML
+    assert_equal("<div><span>foo</span> <span>bar</span></div>",
+                 render('%div <span>foo</span> <span>bar</span>', :remove_whitespace => true))
+  end
+
   def test_auto_preserve_unless_ugly
     assert_equal("<pre>foo&#x000A;bar</pre>\n", render('%pre="foo\nbar"'))
     assert_equal("<pre>foo\nbar</pre>\n", render("%pre\n  foo\n  bar"))

data/test/filters_test.rb

@@ -41,9 +41,9 @@ class FiltersTest < MiniTest::Unit::TestCase
 
   test "should pass options to Tilt filters that precompile" do
     haml  = ":erb\n  <%= 'foo' %>"
-    refute_match('TEST_VAR', Haml::Engine.new(haml).precompiled)
+    refute_match('TEST_VAR', Haml::Engine.new(haml).compiler.precompiled)
     Haml::Filters::Erb.options = {:outvar => 'TEST_VAR'}
-    assert_match('TEST_VAR', Haml::Engine.new(haml).precompiled)
+    assert_match('TEST_VAR', Haml::Engine.new(haml).compiler.precompiled)
   end
 
   test "should pass options to Tilt filters that don't precompile" do

data/test/gemfiles/Gemfile.rails-3.0.x.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: ../../vendor/haml-contrib
+  specs:
+    haml-contrib (0.0.0)
+
+PATH
+  remote: /Users/norman/work/haml/haml
+  specs:
+    haml (3.2.0.alpha.13)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.12)
+      actionpack (= 3.0.12)
+      mail (~> 2.2.19)
+    actionpack (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+    activesupport (3.0.12)
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    json (1.7.3)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    mime-types (1.18)
+    minitest (3.0.1)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.12)
+      actionmailer (= 3.0.12)
+      actionpack (= 3.0.12)
+      activerecord (= 3.0.12)
+      activeresource (= 3.0.12)
+      activesupport (= 3.0.12)
+      bundler (~> 1.0)
+      railties (= 3.0.12)
+    railties (3.0.12)
+      actionpack (= 3.0.12)
+      activesupport (= 3.0.12)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
+    rbench (0.2.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    syntax (1.0.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    yard (0.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  haml!
+  haml-contrib!
+  json
+  maruku (>= 0.5.9)
+  minitest
+  rails (>= 3.0.0, < 3.1.0)
+  rbench
+  yard (>= 0.5.3)

data/test/gemfiles/Gemfile.rails-3.1.x.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: ../../vendor/haml-contrib
+  specs:
+    haml-contrib (0.0.0)
+
+PATH
+  remote: /Users/norman/work/haml/haml
+  specs:
+    haml (3.2.0.alpha.13)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.5)
+      actionpack (= 3.1.5)
+      mail (~> 2.3.3)
+    actionpack (3.1.5)
+      activemodel (= 3.1.5)
+      activesupport (= 3.1.5)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.5)
+      activesupport (= 3.1.5)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.5)
+      activemodel (= 3.1.5)
+      activesupport (= 3.1.5)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.5)
+      activemodel (= 3.1.5)
+      activesupport (= 3.1.5)
+    activesupport (3.1.5)
+      multi_json (>= 1.0, < 1.3)
+    arel (2.2.3)
+    builder (3.0.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.7.3)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    mime-types (1.18)
+    minitest (3.0.1)
+    multi_json (1.2.0)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.5)
+      actionmailer (= 3.1.5)
+      actionpack (= 3.1.5)
+      activerecord (= 3.1.5)
+      activeresource (= 3.1.5)
+      activesupport (= 3.1.5)
+      bundler (~> 1.0)
+      railties (= 3.1.5)
+    railties (3.1.5)
+      actionpack (= 3.1.5)
+      activesupport (= 3.1.5)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rbench (0.2.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    syntax (1.0.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    yard (0.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  haml!
+  haml-contrib!
+  json
+  maruku (>= 0.5.9)
+  minitest
+  rails (>= 3.1.0, < 3.2.0)
+  rbench
+  yard (>= 0.5.3)

data/test/gemfiles/Gemfile.rails-3.2.x.lock

@@ -0,0 +1,109 @@
+PATH
+  remote: ../../vendor/haml-contrib
+  specs:
+    haml-contrib (0.0.0)
+
+PATH
+  remote: /Users/norman/work/haml/haml
+  specs:
+    haml (3.2.0.alpha.13)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.5)
+      actionpack (= 3.2.5)
+      mail (~> 2.4.4)
+    actionpack (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+    activerecord (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.5)
+      activemodel (= 3.2.5)
+      activesupport (= 3.2.5)
+    activesupport (3.2.5)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.7.3)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    mime-types (1.18)
+    minitest (3.0.1)
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.5)
+      actionmailer (= 3.2.5)
+      actionpack (= 3.2.5)
+      activerecord (= 3.2.5)
+      activeresource (= 3.2.5)
+      activesupport (= 3.2.5)
+      bundler (~> 1.0)
+      railties (= 3.2.5)
+    railties (3.2.5)
+      actionpack (= 3.2.5)
+      activesupport (= 3.2.5)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rbench (0.2.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    syntax (1.0.0)
+    thor (0.15.2)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    yard (0.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  haml!
+  haml-contrib!
+  json
+  maruku (>= 0.5.9)
+  minitest
+  rails (>= 3.2.0, < 3.3.0)
+  rbench
+  yard (>= 0.5.3)