haml 3.1.0.alpha.36 → 3.1.0.alpha.37

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.36
+3.1.0.alpha.37

data/REVISION

@@ -0,0 +1 @@
+(release)

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.36
+3.1.0.alpha.37

data/lib/haml/html.rb

@@ -3,81 +3,90 @@ require File.dirname(__FILE__) + '/../haml'
 require 'haml/engine'
 require 'rubygems'
 require 'cgi'
+require 'hpricot'
 
 module Haml
   class HTML
     # A module containing utility methods that every Hpricot node
     # should have.
     module Node
-      # Whether this node has already been converted to Haml.
-      # Only used for text nodes and elements.
-      #
-      # @return [Boolean]
-      attr_accessor :converted_to_haml
-
-      # Returns the Haml representation of the given node.
-      #
-      # @param tabs [Fixnum] The indentation level of the resulting Haml.
-      # @option options (see Haml::HTML#initialize)
-      def to_haml(tabs, options)
-        return "" if converted_to_haml || to_s.strip.empty?
-        text = uninterp(self.to_s)
-        node = next_node
-        while node.is_a?(::Hpricot::Elem) && node.name == "haml:loud"
-          node.converted_to_haml = true
-          text << '#{' <<
-            CGI.unescapeHTML(node.inner_text).gsub(/\n\s*/, ' ').strip << '}'
-
-          if node.next_node.is_a?(::Hpricot::Text)
-            node = node.next_node
-            text << uninterp(node.to_s)
-            node.converted_to_haml = true
-          end
-
-          node = node.next_node
-        end
-        return parse_text_with_interpolation(text, tabs)
-      end
+      # We have to do everything in `#included`
+      # rather than including the methods in the module itself
+      # because if we do that, they don't propagate to the already-defined subclasses
+      # of the modules including this.
+      def self.included(base)
+        base.class_eval do
+          # Whether this node has already been converted to Haml.
+          # Only used for text nodes and elements.
+          #
+          # @return [Boolean]
+          attr_accessor :converted_to_haml
+
+          # Returns the Haml representation of the given node.
+          #
+          # @param tabs [Fixnum] The indentation level of the resulting Haml.
+          # @option options (see Haml::HTML#initialize)
+          def to_haml(tabs, options)
+            return "" if converted_to_haml || to_s.strip.empty?
+            text = uninterp(self.to_s)
+            node = next_node
+            while node.is_a?(::Hpricot::Elem) && node.name == "haml:loud"
+              node.converted_to_haml = true
+              text << '#{' <<
+                CGI.unescapeHTML(node.inner_text).gsub(/\n\s*/, ' ').strip << '}'
+
+              if node.next_node.is_a?(::Hpricot::Text)
+                node = node.next_node
+                text << uninterp(node.to_s)
+                node.converted_to_haml = true
+              end
 
-      private
+              node = node.next_node
+            end
+            return parse_text_with_interpolation(text, tabs)
+          end
 
-      def erb_to_interpolation(text, options)
-        return text unless options[:erb]
-        text = CGI.escapeHTML(uninterp(text))
-        %w[<haml:loud> </haml:loud>].each {|str| text.gsub!(CGI.escapeHTML(str), str)}
-        ::Hpricot::XML(text).children.inject("") do |str, elem|
-          if elem.is_a?(::Hpricot::Text)
-            str + CGI.unescapeHTML(elem.to_s)
-          else # <haml:loud> element
-            str + '#{' + CGI.unescapeHTML(elem.innerText.strip) + '}'
+          private
+
+          def erb_to_interpolation(text, options)
+            return text unless options[:erb]
+            text = CGI.escapeHTML(uninterp(text))
+            %w[<haml:loud> </haml:loud>].each {|str| text.gsub!(CGI.escapeHTML(str), str)}
+            ::Hpricot::XML(text).children.inject("") do |str, elem|
+              if elem.is_a?(::Hpricot::Text)
+                str + CGI.unescapeHTML(elem.to_s)
+              else # <haml:loud> element
+                str + '#{' + CGI.unescapeHTML(elem.innerText.strip) + '}'
+              end
+            end
           end
-        end
-      end
 
-      def tabulate(tabs)
-        '  ' * tabs
-      end
+          def tabulate(tabs)
+            '  ' * tabs
+          end
 
-      def uninterp(text)
-        text.gsub('#{', '\#{') #'
-      end
+          def uninterp(text)
+            text.gsub('#{', '\#{') #'
+          end
 
-      def attr_hash
-        attributes.to_hash
-      end
+          def attr_hash
+            attributes.to_hash
+          end
 
-      def parse_text(text, tabs)
-        parse_text_with_interpolation(uninterp(text), tabs)
-      end
+          def parse_text(text, tabs)
+            parse_text_with_interpolation(uninterp(text), tabs)
+          end
 
-      def parse_text_with_interpolation(text, tabs)
-        text.strip!
-        return "" if text.empty?
+          def parse_text_with_interpolation(text, tabs)
+            text.strip!
+            return "" if text.empty?
 
-        text.split("\n").map do |line|
-          line.strip!
-          "#{tabulate(tabs)}#{'\\' if Haml::Engine::SPECIAL_CHARACTERS.include?(line[0])}#{line}\n"
-        end.join
+            text.split("\n").map do |line|
+              line.strip!
+              "#{tabulate(tabs)}#{'\\' if Haml::Engine::SPECIAL_CHARACTERS.include?(line[0])}#{line}\n"
+            end.join
+          end
+        end
       end
     end
   end
@@ -98,8 +107,6 @@ module Hpricot
   end
 end
 
-require 'hpricot'
-
 # @private
 HAML_TAGS = %w[haml:block haml:loud haml:silent]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.36
+  version: 3.1.0.alpha.37
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -05:00
+date: 2010-12-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,27 +46,27 @@ files:
 - rails/init.rb
 - lib/haml.rb
 - lib/haml/buffer.rb
-- lib/haml/compiler.rb
 - lib/haml/engine.rb
-- lib/haml/error.rb
 - lib/haml/exec.rb
+- lib/haml/error.rb
 - lib/haml/filters.rb
 - lib/haml/helpers.rb
+- lib/haml/util.rb
 - lib/haml/helpers/action_view_extensions.rb
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml/helpers/xss_mods.rb
 - lib/haml/html.rb
 - lib/haml/html/erb.rb
-- lib/haml/parser.rb
 - lib/haml/railtie.rb
+- lib/haml/template.rb
 - lib/haml/root.rb
 - lib/haml/shared.rb
-- lib/haml/template.rb
+- lib/haml/compiler.rb
 - lib/haml/template/options.rb
 - lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
-- lib/haml/util.rb
 - lib/haml/version.rb
+- lib/haml/parser.rb
 - lib/sass.rb
 - lib/sass/plugin.rb
 - lib/sass/rails2_shim.rb
@@ -383,6 +383,7 @@ files:
 - VERSION
 - VERSION_NAME
 - EDGE_GEM_VERSION
+- REVISION
 has_rdoc: false
 homepage: http://haml-lang.com/
 licenses: []