haml 3.2.0.rc.3 → 3.2.0.rc.4

data/lib/haml/filters.rb

@@ -65,7 +65,7 @@ module Haml
     # @return Module The filter module that has been removed
     # @since 3.2.0
     def remove_filter(name)
-      defined.delete name.downcase
+      defined.delete name.to_s.downcase
       if constants.map(&:to_s).include?(name.to_s)
         remove_const name.to_sym
       end

data/lib/haml/helpers/action_view_xss_mods.rb

@@ -0,0 +1,58 @@
+module ActionView
+  module Helpers
+    module CaptureHelper
+      def with_output_buffer_with_haml_xss(*args, &block)
+        res = with_output_buffer_without_haml_xss(*args, &block)
+        case res
+        when Array; res.map {|s| Haml::Util.html_safe(s)}
+        when String; Haml::Util.html_safe(res)
+        else; res
+        end
+      end
+      alias_method :with_output_buffer_without_haml_xss, :with_output_buffer
+      alias_method :with_output_buffer, :with_output_buffer_with_haml_xss
+    end
+
+    module FormTagHelper
+      def form_tag_with_haml_xss(*args, &block)
+        res = form_tag_without_haml_xss(*args, &block)
+        res = Haml::Util.html_safe(res) unless block_given?
+        res
+      end
+      alias_method :form_tag_without_haml_xss, :form_tag
+      alias_method :form_tag, :form_tag_with_haml_xss
+    end
+
+    module FormHelper
+      def form_for_with_haml_xss(*args, &block)
+        res = form_for_without_haml_xss(*args, &block)
+        return Haml::Util.html_safe(res) if res.is_a?(String)
+        return res
+      end
+      alias_method :form_for_without_haml_xss, :form_for
+      alias_method :form_for, :form_for_with_haml_xss
+    end
+
+    module TextHelper
+      def concat_with_haml_xss(string)
+        if is_haml?
+          haml_buffer.buffer.concat(haml_xss_html_escape(string))
+        else
+          concat_without_haml_xss(string)
+        end
+      end
+      alias_method :concat_without_haml_xss, :concat
+      alias_method :concat, :concat_with_haml_xss
+
+      def safe_concat_with_haml_xss(string)
+        if is_haml?
+          haml_buffer.buffer.concat(string)
+        else
+          safe_concat_without_haml_xss(string)
+        end
+      end
+      alias_method :safe_concat_without_haml_xss, :safe_concat
+      alias_method :safe_concat, :safe_concat_with_haml_xss
+    end
+  end
+end

data/lib/haml/helpers/xss_mods.rb

@@ -102,62 +102,3 @@ module Haml
     end
   end
 end
-
-module ActionView
-  module Helpers
-    module CaptureHelper
-      def with_output_buffer_with_haml_xss(*args, &block)
-        res = with_output_buffer_without_haml_xss(*args, &block)
-        case res
-        when Array; res.map {|s| Haml::Util.html_safe(s)}
-        when String; Haml::Util.html_safe(res)
-        else; res
-        end
-      end
-      alias_method :with_output_buffer_without_haml_xss, :with_output_buffer
-      alias_method :with_output_buffer, :with_output_buffer_with_haml_xss
-    end
-
-    module FormTagHelper
-      def form_tag_with_haml_xss(*args, &block)
-        res = form_tag_without_haml_xss(*args, &block)
-        res = Haml::Util.html_safe(res) unless block_given?
-        res
-      end
-      alias_method :form_tag_without_haml_xss, :form_tag
-      alias_method :form_tag, :form_tag_with_haml_xss
-    end
-
-    module FormHelper
-      def form_for_with_haml_xss(*args, &block)
-        res = form_for_without_haml_xss(*args, &block)
-        return Haml::Util.html_safe(res) if res.is_a?(String)
-        return res
-      end
-      alias_method :form_for_without_haml_xss, :form_for
-      alias_method :form_for, :form_for_with_haml_xss
-    end
-
-    module TextHelper
-      def concat_with_haml_xss(string)
-        if is_haml?
-          haml_buffer.buffer.concat(haml_xss_html_escape(string))
-        else
-          concat_without_haml_xss(string)
-        end
-      end
-      alias_method :concat_without_haml_xss, :concat
-      alias_method :concat, :concat_with_haml_xss
-
-      def safe_concat_with_haml_xss(string)
-        if is_haml?
-          haml_buffer.buffer.concat(string)
-        else
-          safe_concat_without_haml_xss(string)
-        end
-      end
-      alias_method :safe_concat_without_haml_xss, :safe_concat
-      alias_method :safe_concat, :safe_concat_with_haml_xss
-    end
-  end
-end

data/lib/haml/template.rb

@@ -3,6 +3,7 @@ require 'haml/engine'
 require 'haml/helpers/action_view_mods'
 require 'haml/helpers/action_view_extensions'
 require 'haml/helpers/xss_mods'
+require 'haml/helpers/action_view_xss_mods'
 
 module Haml
   class Compiler

data/lib/haml/util.rb

@@ -1,4 +1,8 @@
-require 'erb'
+begin
+  require 'erubis/tiny'
+rescue LoadError
+  require 'erb'
+end
 require 'set'
 require 'stringio'
 require 'strscan'
@@ -236,10 +240,12 @@ MSG
       info = caller_info
       powerset(vars).each do |set|
         context = StaticConditionalContext.new(set).instance_eval {binding}
+        method_content = (defined?(Erubis::TinyEruby) && Erubis::TinyEruby || ERB).new(erb).result(context)
+
         klass.class_eval(<<METHOD, info[0], info[1])
-def #{static_method_name(name, *vars.map {|v| set.include?(v)})}(#{args.join(', ')})
-  #{ERB.new(erb).result(context)}
-end
+          def #{static_method_name(name, *vars.map {|v| set.include?(v)})}(#{args.join(', ')})
+            #{method_content}
+          end
 METHOD
       end
     end
@@ -250,7 +256,7 @@ METHOD
     # @param vars [Array<Boolean>] The static variable assignment
     # @return [String] The real name of the static method
     def static_method_name(name, *vars)
-      "#{name}_#{vars.map {|v| !!v}.join('_')}"
+      :"#{name}_#{vars.map {|v| !!v}.join('_')}"
     end
 
     # Scans through a string looking for the interoplation-opening `#{`

data/lib/haml/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: haml
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 3.2.0.rc.3
+  version: 3.2.0.rc.4
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -121,6 +121,7 @@ files:
 - lib/haml/filters.rb
 - lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
+- lib/haml/helpers/action_view_xss_mods.rb
 - lib/haml/helpers/rails_323_textarea_fix.rb
 - lib/haml/helpers/safe_erubis_template.rb
 - lib/haml/helpers/xss_mods.rb
@@ -210,7 +211,8 @@ files:
 - README.md
 - REFERENCE.md
 homepage: http://haml.info/
-licenses: []
+licenses:
+- MIT
 post_install_message: ! '
 
   HEADS UP! Haml 3.2 has many improvements, but also has changes that may break
@@ -248,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2518859033120832815
+      hash: 3493289151037980825
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false