haml 3.1.0.alpha.22 → 3.1.0.alpha.23

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.22
+3.1.0.alpha.23

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.22
+3.1.0.alpha.23

data/lib/haml/precompiler.rb

@@ -119,8 +119,8 @@ END
 
       names.map do |name|
         # Can't use || because someone might explicitly pass in false with a symbol
-        sym_local = "_haml_locals[#{inspect(name.to_sym)}]"
-        str_local = "_haml_locals[#{inspect(name.to_s)}]"
+        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(';') + ';'
     end
@@ -321,7 +321,7 @@ END
       @to_merge.each do |type, val, tabs|
         case type
         when :text
-          str << inspect(val)[1...-1]
+          str << inspect_obj(val)[1...-1]
           mtabs += tabs
         when :script
           if mtabs != 0 && !@options[:ugly]
@@ -676,7 +676,7 @@ END
         if type == :static
           static_attributes[name] = val
         else
-          dynamic_attributes << inspect(name) << " => " << val << ","
+          dynamic_attributes << inspect_obj(name) << " => " << val << ","
         end
       end
       dynamic_attributes << "}"
@@ -711,7 +711,7 @@ END
 
       return name, [:static, content.first[1]] if content.size == 1
       return name, [:dynamic,
-        '"' + content.map {|(t, v)| t == :str ? inspect(v)[1...-1] : "\#{#{v}}"}.join + '"']
+        '"' + content.map {|(t, v)| t == :str ? inspect_obj(v)[1...-1] : "\#{#{v}}"}.join + '"']
     end
 
     # Parses a line that will render as an XHTML tag, and adds the code that will
@@ -816,7 +816,7 @@ END
         return if tag_closed
       else
         flush_merged_text
-        content = parse ? 'nil' : inspect(value)
+        content = parse ? 'nil' : inspect_obj(value)
         if attributes_hashes.empty?
           attributes_hashes = ''
         elsif attributes_hashes.size == 1
@@ -827,7 +827,7 @@ END
 
         args = [tag_name, self_closing, !block_opened?, preserve_tag, escape_html,
                 attributes, nuke_outer_whitespace, nuke_inner_whitespace
-               ].map {|v| inspect(v)}.join(', ')
+               ].map {|v| inspect_obj(v)}.join(', ')
         push_silent "_hamlout.open_tag(#{args}, #{object_ref}, #{content}#{attributes_hashes})"
         @dont_tab_up_next_text = @dont_indent_next_line = dont_indent_next_line
       end
@@ -1033,7 +1033,7 @@ END
 
     def unescape_interpolation(str, opts = {})
       res = ''
-      rest = Haml::Shared.handle_interpolation inspect(str) do |scan|
+      rest = Haml::Shared.handle_interpolation inspect_obj(str) do |scan|
         escapes = (scan[2].size - 1) / 2
         res << scan.matched[0...-3 - escapes]
         if escapes % 2 == 1

data/lib/haml/util.rb

@@ -678,9 +678,9 @@ MSG
     #
     # @param obj {Object}
     # @return {String}
-    def inspect(obj)
+    def inspect_obj(obj)
       return obj.inspect unless version_geq(::RUBY_VERSION, "1.9.2")
-      return ':' + inspect(obj.to_s) if obj.is_a?(Symbol)
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.22
+  version: 3.1.0.alpha.23
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency