haml 4.0.7 → 4.1.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a38de787ab9e47ac3221b040c9c38ecf4884df
-  data.tar.gz: 29497caf8377f40940a0e094d1477ea2403f380f
+  metadata.gz: 3e558b5f2cf40a4dc76dd5a6d4a6fd7410087cea
+  data.tar.gz: de7642c1dd34404f48def114391e5070ea0d78fa
 SHA512:
-  metadata.gz: 3c71810f7359be3c7536eea848acefb06d09859443d6b80a31908ea07b6c109dc082a7ad8a7e95f1305b08aefeabbe46dd48cc186dff66eb4fe46bdd258956e1
-  data.tar.gz: 0d85d5e2164cef71dab787d7967ab4a3e7ecd1dd0b5e212188032bd94faa6d4923cdb39cd5fdffcdaed6da13b6f637d1d5d5c8171ca878fa017ac64c345d589f
+  metadata.gz: 1713fd685aee4177c59ea3f3353c65a875c2cc3cbf8a840c20c96d2bd2308dad11f28c04d73fde0bfcedfd7e3e50e90a2b20ae17ee0fe8769285971cb5f651bf
+  data.tar.gz: f6a1e655ac0fdaeeb9ae8e215fad6b79673da33f9c404ac192dca1f8dbc8bb81becb33250554c3e2b29907054efb6e28b22349a1153126ba09b40fd1ff734de5

data/CHANGELOG.md

@@ -1,28 +1,16 @@
 # Haml Changelog
 
-## 4.0.7
-
-Released on August 10, 2015
-([diff](https://github.com/haml/haml/compare/4.0.6...4.0.7)).
-
-* Significantly improve performance of regexp used to fix whitespace handling in textareas (thanks [Stan Hu](https://github.com/stanhu)).
-
-## 4.0.6
-
-Released on Dec 1, 2014 ([diff](https://github.com/haml/haml/compare/4.0.5...4.0.6)).
-
-
-* Fix warning on Ruby 1.8.7 "regexp has invalid interval" (thanks [Elia Schito](https://github.com/elia)).
-
-## 4.0.5
-
-Released on Jan 7, 2014 ([diff](https://github.com/haml/haml/compare/4.0.4...4.0.5)).
-
-* Fix haml_concat appending unescaped HTML after a call to haml_tag.
-* Fix for bug whereby when HAML :ugly option is "true",
-  ActionView::Helpers::CaptureHelper::capture returns the whole view buffer
-  when passed a block that returns nothing (thanks [Mircea
-  Moise](https://github.com/mmircea16)).
+## 4.1.0 (Unreleased)
+
+* Haml now requires Ruby 1.9.2 or above.
+* Fix for attribute merging. When an attribute method (or literal nested hash)
+  was used in an old style attribute hash and there is also a (non-static) new
+  style hash there is an error. The fix can result in different behavior in
+  some circumstances. See the [commit message](https://github.com/haml/haml/tree/e475b015d3171fb4c4f140db304f7970c787d6e3)
+  for detailed info. (Matt Wildig)
+* Make escape_once respect hexadecimal references. (Matt Wildig)
+* General performance and memory usage improvements. (Akira Matsuda)
+* Don't treat the 'data' attribute specially when merging attribute hashes. (Matt Wildig and Norman Clarke)
 
 ## 4.0.4
 

data/README.md

@@ -1,6 +1,7 @@
 # Haml
 
 [![Build Status](https://secure.travis-ci.org/haml/haml.png?branch=master)](http://travis-ci.org/haml/haml)
+[![Code Climate](https://codeclimate.com/github/haml/haml.png)](https://codeclimate.com/github/haml/haml)
 
 Haml is a templating engine for HTML. It's designed to make it both easier and
 more pleasant to write HTML documents, by eliminating redundancy, reflecting the
@@ -126,8 +127,8 @@ on a specific area:
 
     ruby -Itest test/helper_test.rb -n test_buffer_access
 
-Haml supports Ruby 1.8.7 and higher, so please make sure your changes run on
-both 1.9 and 1.8.
+Haml supports Ruby 1.9.2 and higher, so please make sure your changes run on
+both 1.9 and 2.0.
 
 ## Team
 

data/REFERENCE.md

@@ -121,7 +121,7 @@ see {Haml::Options}.
 
 ### Encodings
 
-When using Ruby 1.9 or later, Haml supports the same sorts of
+Haml supports the same sorts of
 encoding-declaration comments that Ruby does. Although both Ruby and Haml
 support several different styles, the easiest it just to add `-# coding:
 encoding-name` at the beginning of the Haml template (it must come before all
@@ -306,7 +306,7 @@ hash-style attributes:
 
 #### Ruby 1.9-style Hashes
 
-On Ruby 1.9, Haml also supports Ruby's new hash syntax:
+Haml also supports Ruby's new hash syntax:
 
     %a{title: @title, href: href} Stuff
 
@@ -329,7 +329,7 @@ This is compiled to:
     </html>
 
 You can use as many such attribute methods as you want by separating them with
-commas, like a Ruby argument list. All the hashes will be merged together, from
+commas, like a Ruby argument list. All the hashes will me merged together, from
 left to right. For example, if you defined
 
     def hash1
@@ -496,23 +496,23 @@ and is compiled to:
 The forward slash character, when placed at the end of a tag definition, causes
 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:
+as a self-closing tag (`:xhtml`).
+
+Taking the following as an example:
 
     %br/
     %meta{'http-equiv' => 'Content-Type', :content => 'text/html'}/
 
-is compiled to:
+When the format is `:html4` or `:html5` this is compiled to:
 
     <br>
     <meta content='text/html' http-equiv='Content-Type'>
 
-when the format is `:html4` or `:html5`, and to
+and when the format is `:xhtml` it is compiled to:
 
     <br />
     <meta content='text/html' http-equiv='Content-Type' />
 
-when the format is `:xhtml`.
-
 Some tags are automatically treated as being empty, as long as they have no
 content in the Haml source. `meta`, `img`, `link`, `br`, `hr`, `input`,
 `area`, `param`, `col` and `base` tags are treated as empty by default. This
@@ -779,6 +779,21 @@ is compiled to:
       </a>
     <![endif]-->
 
+To generate “downlevel-revealed” conditional comments, where the content is
+hidden from IE but not other browsers,  add a `!` before the brackets: `/![]`.
+Haml will produce valid HTML when generating this kind of conditional comment.
+
+For example:
+
+    /![if !IE]
+      You are not using Internet Explorer, or are using version 10+.
+
+is compiled to:
+
+    <!--[if !IE]><!-->
+      You are not using Internet Explorer, or are using version 10+.
+    <!--<![endif]-->
+
 ### Haml Comments: `-#`
 
 The hyphen followed immediately by the pound sign signifies a silent comment.
@@ -1093,7 +1108,7 @@ Surrounds the filtered text with CDATA tags.
 
 {#coffee-filter}
 ### `:coffee`
-Compiles the filtered text to Javascript using Cofeescript. You can also
+Compiles the filtered text to Javascript using Coffeescript. You can also
 reference this filter as `:coffeescript`. This filter is implemented using
 Tilt.
 

data/Rakefile

@@ -25,6 +25,7 @@ Rake::TestTask.new do |t|
   files = Dir["test/*_test.rb"]
   files.concat(Dir['test/haml-spec/*_test.rb'])
   t.test_files = files
+  t.warning = true
   t.verbose = true
 end
 
@@ -32,7 +33,7 @@ task :set_coverage_env do
   ENV["COVERAGE"] = "true"
 end
 
-desc "Run Simplecov (only works on 1.9)"
+desc "Run Simplecov"
 task :coverage => [:set_coverage_env, :test]
 
 gemspec = File.expand_path("../haml.gemspec", __FILE__)
@@ -80,13 +81,13 @@ Profile Haml.
 END
 task :profile do
   times  = (ENV['TIMES'] || '1000').to_i
-  file   = ENV['FILE']
+  file   = ENV['FILE'] || 'test/templates/standard.haml'
 
   require 'bundler/setup'
   require 'ruby-prof'
   require 'haml'
-
-  file = File.read(File.expand_path("../test/templates/#{file || 'standard'}.haml", __FILE__))
+  default = 
+  file = File.read(File.expand_path("../#{file}", __FILE__))
   obj = Object.new
   Haml::Engine.new(file, :ugly => true).def_method(obj, :render)
   result = RubyProf.profile { times.times { obj.render } }

data/lib/haml/buffer.rb

@@ -178,7 +178,7 @@ module Haml
         <% end %>
 
         if has_newline
-          result = result.gsub "\\n", "\\n" + tabs(tabulation)
+          result.gsub! "\\n", "\\n" + tabs(tabulation)
 
           # Add tabulation if it wasn't precompiled
           <% if in_tag && !nuke_inner_whitespace %> result = tabs(tabulation) + result <% end %>
@@ -233,7 +233,7 @@ RUBY
     def self.merge_attrs(to, from)
       from['id'] = Compiler.filter_and_join(from['id'], '_') if from['id']
       if to['id'] && from['id']
-        to['id'] << '_' << from.delete('id').to_s
+        to['id'] << "_#{from.delete('id')}"
       elsif to['id'] || from['id']
         from['id'] ||= to['id']
       end
@@ -246,16 +246,21 @@ RUBY
         from['class'] ||= to['class']
       end
 
-      from_data = from.delete('data') || {}
-      to_data = to.delete('data') || {}
+      from.keys.each do |key|
+        next unless from[key].kind_of?(Hash) || to[key].kind_of?(Hash)
 
-      # forces to_data & from_data into a hash
-      from_data = { nil => from_data } unless from_data.is_a?(Hash)
-      to_data = { nil => to_data } unless to_data.is_a?(Hash)
+        from_data = from.delete(key)
+        # forces to_data & from_data into a hash
+        from_data = { nil => from_data } if from_data && !from_data.is_a?(Hash)
+        to[key] = { nil => to[key] } if to[key] && !to[key].is_a?(Hash)
 
-      merged_data = to_data.merge(from_data)
+        if from_data && !to[key]
+          to[key] = from_data
+        elsif from_data && to[key]
+          to[key].merge! from_data
+        end
+      end
 
-      to['data'] = merged_data unless merged_data.empty?
       to.merge!(from)
     end
 
@@ -270,27 +275,21 @@ RUBY
     # @since Haml 4.0.1
     # @private
     def fix_textareas!(input)
-      pattern = /<(textarea)([^>]*)>(\n|&#x000A;)(.*?)<\/textarea>/im
+      pattern = /([ ]*)<(textarea)([^>]*)>(\n|&#x000A;)(.*?)(<\/\2>)/im
       input.gsub!(pattern) do |s|
         match = pattern.match(s)
-        content = match[4]
-        if match[3] == '&#x000A;'
+        content = match[5]
+        if match[4] == '&#x000A;'
           content.sub!(/\A /, '&#x0020;')
         else
           content.sub!(/\A[ ]*/, '')
         end
-        "<#{match[1]}#{match[2]}>\n#{content}</#{match[1]}>"
+        "#{match[1]}<#{match[2]}#{match[3]}>\n#{content}</#{match[2]}>"
       end
     end
 
-    if RUBY_VERSION < "1.9"
-      def new_encoded_string
-        ""
-      end
-    else
-      def new_encoded_string
-        "".encode(Encoding.find(options[:encoding]))
-      end
+    def new_encoded_string
+      "".encode(Encoding.find(options[:encoding]))
     end
 
     @@tab_cache = {}
@@ -335,11 +334,13 @@ RUBY
     # Based on the method of the same name in Rails' Inflector,
     # but copied here so it'll run properly without Rails.
     def underscore(camel_cased_word)
-      camel_cased_word.to_s.gsub(/::/, '_').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
+      word = camel_cased_word.to_s.dup
+      word.gsub!(/::/, '_')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      word.tr!('-', '_')
+      word.downcase!
+      word
     end
   end
 end

data/lib/haml/compiler.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 module Haml
   class Compiler
     include Haml::Util
@@ -11,11 +9,11 @@ module Haml
       @output_tabs = 0
       @to_merge    = []
       @precompiled = ''
+      @node        = nil
     end
 
     def compile(node)
-      parent = instance_variable_defined?('@node') ? @node : nil
-      @node = node
+      parent, @node = @node, node
       if node.children.empty?
         send(:"compile_#{node.type}")
       else
@@ -25,26 +23,20 @@ module Haml
       @node = parent
     end
 
-    if RUBY_VERSION < "1.9"
-      # The source code that is evaluated to produce the Haml document.
-      #
-      # In Ruby 1.9, this is automatically converted to the correct encoding
-      # (see {file:REFERENCE.md#encodings the `:encoding` option}).
-      #
-      # @return [String]
-      def precompiled
-        @precompiled
-      end
-    else
-      def precompiled
-        encoding = Encoding.find(@options[:encoding])
-        return @precompiled.force_encoding(encoding) if encoding == Encoding::BINARY
-        return @precompiled.encode(encoding)
-      end
+    # The source code that is evaluated to produce the Haml document.
+    #
+    # This is automatically converted to the correct encoding
+    # (see {file:REFERENCE.md#encodings the `:encoding` option}).
+    #
+    # @return [String]
+    def precompiled
+      encoding = Encoding.find(@options.encoding)
+      return @precompiled.force_encoding(encoding) if encoding == Encoding::ASCII_8BIT
+      return @precompiled.encode(encoding)
     end
 
     def precompiled_with_return_value
-      precompiled + ";" + precompiled_method_return_value
+      "#{precompiled};#{precompiled_method_return_value}"
     end
 
     # Returns the precompiled string with the preamble and postamble.
@@ -53,20 +45,20 @@ module Haml
     # to avoid ordering issues with partial layouts in Rails. If not available,
     # initializes to nil.
     def precompiled_with_ambles(local_names)
-      preamble = <<END.gsub("\n", ";")
+      preamble = <<END.tr("\n", ';')
 begin
 extend Haml::Helpers
 _hamlout = @haml_buffer = Haml::Buffer.new(haml_buffer, #{options.for_buffer.inspect})
 _erbout = _hamlout.buffer
 @output_buffer = output_buffer ||= ActionView::OutputBuffer.new rescue nil
 END
-      postamble = <<END.gsub("\n", ";")
+      postamble = <<END.tr("\n", ';')
 #{precompiled_method_return_value}
 ensure
 @haml_buffer = @haml_buffer.upper if @haml_buffer
 end
 END
-      preamble + locals_code(local_names) + precompiled + postamble
+      "#{preamble}#{locals_code(local_names)}#{precompiled}#{postamble}"
     end
 
     private
@@ -78,21 +70,21 @@ END
     end
 
     def locals_code(names)
-      names = names.keys if Hash == names
+      names = names.keys if Hash === names
 
       names.map do |name|
         # Can't use || because someone might explicitly pass in false with a symbol
         sym_local = "_haml_locals[#{inspect_obj(name.to_sym)}]"
         str_local = "_haml_locals[#{inspect_obj(name.to_s)}]"
-        "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local}"
-      end.join(';') + ';'
+        "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local};"
+      end.join
     end
 
     def compile_root
       @dont_indent_next_line = @dont_tab_up_next_text = false
       @output_line = 1
       @indentation = nil
-      yield
+      yield if block_given?
       flush_merged_text
     end
 
@@ -119,7 +111,7 @@ END
     end
 
     def compile_silent_script
-      return if @options[:suppress_eval]
+      return if @options.suppress_eval
       push_silent(@node.value[:text])
       keyword = @node.value[:keyword]
 
@@ -156,8 +148,8 @@ END
         (t[:nuke_outer_whitespace] && !block_given?) ||
         (t[:nuke_inner_whitespace] && block_given?)
 
-      if @options[:suppress_eval]
-        object_ref = "nil"
+      if @options.suppress_eval
+        object_ref = :nil
         parse = false
         value = t[:parse] ? nil : t[:value]
         attributes_hashes = {}
@@ -171,7 +163,7 @@ END
       end
 
       # Check if we can render the tag directly to text and not process it in the buffer
-      if object_ref == "nil" && attributes_hashes.empty? && !preserve_script
+      if (object_ref == :nil) && attributes_hashes.empty? && !preserve_script
         tag_closed = !block_given? && !t[:self_closing] && !parse
 
         open_tag = prerender_tag(t[:name], t[:self_closing], t[:attributes])
@@ -195,7 +187,7 @@ END
         elsif attributes_hashes.size == 1
           attributes_hashes = ", #{attributes_hashes.first}"
         else
-          attributes_hashes = ", (#{attributes_hashes.join(").merge(")})"
+          attributes_hashes = ", #{attributes_hashes.join(", ")}"
         end
 
         push_merged_text "<#{t[:name]}", 0, !t[:nuke_outer_whitespace]
@@ -203,17 +195,13 @@ END
           "_hamlout.attributes(#{inspect_obj(t[:attributes])}, #{object_ref}#{attributes_hashes})")
         concat_merged_text(
           if t[:self_closing] && @options.xhtml?
-            " />" + (t[:nuke_outer_whitespace] ? "" : "\n")
+            " />#{"\n" unless t[:nuke_outer_whitespace]}"
           else
-            ">" + ((if t[:self_closing] && @options.html?
-                      t[:nuke_outer_whitespace]
-                    else
-                      !block_given? || t[:preserve_tag] || t[:nuke_inner_whitespace]
-                    end) ? "" : "\n")
+            ">#{"\n" unless (t[:self_closing] && @options.html?) ? t[:nuke_outer_whitespace] : (!block_given? || t[:preserve_tag] || t[:nuke_inner_whitespace])}"
           end)
 
         if value && !parse
-          concat_merged_text("#{value}</#{t[:name]}>#{t[:nuke_outer_whitespace] ? "" : "\n"}")
+          concat_merged_text("#{value}</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}")
         elsif !t[:nuke_inner_whitespace] && !t[:self_closing]
           @to_merge << [:text, '', 1]
         end
@@ -228,7 +216,7 @@ END
         yield if block_given?
         @output_tabs -= 1 unless t[:nuke_inner_whitespace]
         rstrip_buffer! if t[:nuke_inner_whitespace]
-        push_merged_text("</#{t[:name]}>" + (t[:nuke_outer_whitespace] ? "" : "\n"),
+        push_merged_text("</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}",
           t[:nuke_inner_whitespace] ? 0 : -1, !t[:nuke_inner_whitespace])
         @dont_indent_next_line = t[:nuke_outer_whitespace]
         return
@@ -236,16 +224,21 @@ END
 
       if parse
         push_script(value, t.merge(:in_tag => true))
-        concat_merged_text("</#{t[:name]}>" + (t[:nuke_outer_whitespace] ? "" : "\n"))
+        concat_merged_text("</#{t[:name]}>#{"\n" unless t[:nuke_outer_whitespace]}")
       end
     end
 
     def compile_comment
-      open = "<!--#{@node.value[:conditional]}"
+      condition = "#{@node.value[:conditional]}>" if @node.value[:conditional]
+      revealed = @node.value[:revealed]
+
+      open = "<!--#{condition}#{'<!-->' if revealed}"
+
+      close = "#{'<!--' if revealed}#{'<![endif]' if condition}-->"
 
       # Render it statically if possible
       unless block_given?
-        push_text("#{open} #{@node.value[:text]} #{@node.value[:conditional] ? "<![endif]-->" : "-->"}")
+        push_text("#{open} #{@node.value[:text]} #{close}")
         return
       end
 
@@ -253,7 +246,7 @@ END
       @output_tabs += 1
       yield if block_given?
       @output_tabs -= 1
-      push_text(@node.value[:conditional] ? "<![endif]-->" : "-->", -1)
+      push_text(close, -1)
     end
 
     def compile_doctype
@@ -276,7 +269,7 @@ END
     def text_for_doctype
       if @node.value[:type] == "xml"
         return nil if @options.html?
-        wrapper = @options[:attr_wrapper]
+        wrapper = @options.attr_wrapper
         return "<?xml version=#{wrapper}1.0#{wrapper} encoding=#{wrapper}#{@node.value[:encoding] || "utf-8"}#{wrapper} ?>"
       end
 
@@ -316,13 +309,13 @@ END
       return if can_suppress && @options.suppress_eval?
       newline = (text == "end") ? ";" : "\n"
       @precompiled << "#{resolve_newlines}#{text}#{newline}"
-      @output_line += (text + newline).count("\n")
+      @output_line = @output_line + text.count("\n") + newline.count("\n")
     end
 
     # Adds `text` to `@buffer` with appropriate tabulation
     # without parsing it.
     def push_merged_text(text, tab_change = 0, indent = true)
-      text = !indent || @dont_indent_next_line || @options[:ugly] ? text : "#{'  ' * @output_tabs}#{text}"
+      text = !indent || @dont_indent_next_line || @options.ugly ? text : "#{'  ' * @output_tabs}#{text}"
       @to_merge << [:text, text, tab_change]
       @dont_indent_next_line = false
     end
@@ -339,27 +332,27 @@ END
     def flush_merged_text
       return if @to_merge.empty?
 
-      str = ""
       mtabs = 0
-      @to_merge.each do |type, val, tabs|
+      @to_merge.map! do |type, val, tabs|
         case type
         when :text
-          str << inspect_obj(val)[1...-1]
           mtabs += tabs
+          inspect_obj(val)[1...-1]
         when :script
-          if mtabs != 0 && !@options[:ugly]
+          if mtabs != 0 && !@options.ugly
             val = "_hamlout.adjust_tabs(#{mtabs}); " + val
           end
-          str << "\#{#{val}}"
           mtabs = 0
+          "\#{#{val}}"
         else
           raise SyntaxError.new("[HAML BUG] Undefined entry in Haml::Compiler@to_merge.")
         end
       end
+      str = @to_merge.join
 
       unless str.empty?
         @precompiled <<
-          if @options[:ugly]
+          if @options.ugly
             "_hamlout.buffer << \"#{str}\";"
           else
             "_hamlout.push_text(\"#{str}\", #{mtabs}, #{@dont_tab_up_next_text.inspect});"
@@ -377,11 +370,11 @@ END
     def push_script(text, opts = {})
       return if @options.suppress_eval?
 
-      args = %w[preserve_script in_tag preserve_tag escape_html nuke_inner_whitespace]
-      args.map! {|name| opts[name.to_sym]}
-      args << !block_given? << @options[:ugly]
+      args = [:preserve_script, :in_tag, :preserve_tag, :escape_html, :nuke_inner_whitespace]
+      args.map! {|name| opts[name]}
+      args << !block_given? << @options.ugly
 
-      no_format = @options[:ugly] &&
+      no_format = @options.ugly &&
         !(opts[:preserve_script] || opts[:preserve_tag] || opts[:escape_html])
       output_expr = "(#{text}\n)"
       static_method = "_hamlout.#{static_method_name(:format_script, *args)}"
@@ -400,7 +393,7 @@ END
       yield
       push_silent('end', :can_suppress) unless @node.value[:dont_push_end]
       @precompiled << "_hamlout.buffer << #{no_format ? "haml_temp.to_s;" : "#{static_method}(haml_temp);"}"
-      concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace] || @options[:ugly]
+      concat_merged_text("\n") unless opts[:in_tag] || opts[:nuke_inner_whitespace] || @options.ugly
     end
 
     def push_generated_script(text)
@@ -410,7 +403,7 @@ END
 
     # This is a class method so it can be accessed from Buffer.
     def self.build_attributes(is_html, attr_wrapper, escape_attrs, hyphenate_data_attrs, attributes = {})
-      # @TODO this is an absolutely ridiculous amount of arguments. At least
+        # @TODO this is an absolutely ridiculous amount of arguments. At least
       # some of this needs to be moved into an instance method.
       quote_escape     = attr_wrapper == '"' ? "&#x0022;" : "&#x0027;"
       other_quote_char = attr_wrapper == '"' ? "'" : '"'
@@ -463,14 +456,23 @@ END
         end
         " #{attr}=#{this_attr_wrapper}#{value}#{this_attr_wrapper}"
       end
-      result.compact.sort.join
+      result.compact!
+      result.sort!
+      result.join
     end
 
     def self.filter_and_join(value, separator)
-      return "" if value == ""
-      value = [value] unless value.is_a?(Array)
-      value = value.flatten.collect {|item| item ? item.to_s : nil}.compact.join(separator)
-      return !value.empty? && value
+      return '' if (value.respond_to?(:empty?) && value.empty?)
+
+      if value.is_a?(Array)
+        value.flatten!
+        value.map! {|item| item ? item.to_s : nil}
+        value.compact!
+        value = value.join(separator)
+      else
+        value = value ? value.to_s : nil
+      end
+      !value.nil? && !value.empty? && value
     end
 
     def self.build_data_keys(data_hash, hyphenate, attr_name="data")
@@ -478,7 +480,7 @@ END
         if name == nil
           [attr_name, value]
         elsif hyphenate
-          ["#{attr_name}-#{name.to_s.gsub(/_/, '-')}", value]
+          ["#{attr_name}-#{name.to_s.tr('_', '-')}", value]
         else
           ["#{attr_name}-#{name}", value]
         end
@@ -491,8 +493,7 @@ END
       return {key => nil} if seen.include? data.object_id
       seen << data.object_id
 
-      data.sort {|x, y| x[0].to_s <=> y[0].to_s}.inject({}) do |hash, array|
-        k, v = array
+      data.sort {|x, y| x[0].to_s <=> y[0].to_s}.inject({}) do |hash, (k, v)|
         joined = key == '' ? k : [key, k].join(join_char)
         hash.merge! flatten_data_attributes(v, joined, join_char, seen)
       end
@@ -501,7 +502,7 @@ END
     def prerender_tag(name, self_close, attributes)
       # TODO: consider just passing in the damn options here
       attributes_string = Compiler.build_attributes(
-        @options.html?, @options[:attr_wrapper], @options[:escape_attrs], @options[:hyphenate_data_attrs], attributes)
+        @options.html?, @options.attr_wrapper, @options.escape_attrs, @options.hyphenate_data_attrs, attributes)
       "<#{name}#{attributes_string}#{self_close && @options.xhtml? ? ' /' : ''}>"
     end
 
@@ -509,7 +510,7 @@ END
       diff = @node.line - @output_line
       return "" if diff <= 0
       @output_line = @node.line
-      "\n" * [diff, 0].max
+      "\n" * diff
     end
 
     # Get rid of and whitespace at the end of the buffer