haml 3.0.24 → 3.0.25

data/VERSION

@@ -1 +1 @@
-3.0.24
+3.0.25

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]
 

data/lib/sass/engine.rb

@@ -237,7 +237,7 @@ module Sass
       comment_tab_str = nil
       first = true
       lines = []
-      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/).each_with_index do |line, index|
+      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         if line.strip.empty?
           lines.last.text << "\n" if lines.last && lines.last.comment?

data/lib/sass/plugin.rb

@@ -67,12 +67,15 @@ module Sass
       return if options[:never_update]
 
       run_updating_stylesheets individual_files
-
-      individual_files.each {|t, c| update_stylesheet(t, c)}
-
       @checked_for_updates = true
       staleness_checker = StalenessChecker.new
 
+      individual_files.each do |t, c|
+        if options[:always_update] || staleness_checker.stylesheet_needs_update?(c, t)
+          update_stylesheet(t, c)
+        end
+      end
+
       template_location_array.each do |template_location, css_location|
 
         Dir.glob(File.join(template_location, "**", "*.s[ca]ss")).sort.each do |file|

data/lib/sass/script/lexer.rb

@@ -92,7 +92,7 @@ module Sass
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => HEXCOLOR,
         :bool => /(true|false)\b/,
-        :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|$)")})})},
+        :ident_op => %r{(#{Regexp.union(*IDENT_OP_NAMES.map{|s| Regexp.new(Regexp.escape(s) + "(?!#{NMCHAR}|\Z)")})})},
         :op => %r{(#{Regexp.union(*OP_NAMES)})},
       }
 

data/lib/sass/tree/for_node.rb

@@ -51,17 +51,5 @@ module Sass::Tree
       end
       children
     end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {ForNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/lib/sass/tree/if_node.rb

@@ -65,17 +65,5 @@ module Sass::Tree
       return @else.perform(environment) if @else
       []
     end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {IfNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/lib/sass/tree/mixin_def_node.rb

@@ -43,18 +43,6 @@ module Sass
         environment.set_mixin(@name, Sass::Mixin.new(@name, @args, environment, children))
         []
       end
-
-      # Returns an error message if the given child node is invalid,
-      # and false otherwise.
-      #
-      # {ExtendNode}s are valid within {MixinDefNode}s.
-      #
-      # @param child [Tree::Node] A potential child node.
-      # @return [Boolean, String] Whether or not the child node is valid,
-      #   as well as the error message to display if it is invalid
-      def invalid_child?(child)
-        super unless child.is_a?(ExtendNode)
-      end
     end
   end
 end

data/lib/sass/tree/mixin_node.rb

@@ -28,18 +28,6 @@ module Sass::Tree
 
     protected
 
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {MixinNode}s.
-    #
-    # @param child [Tree::Node] A potential child node
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
-
     # @see Node#to_src
     def to_src(tabs, opts, fmt)
       args = '(' + @args.map {|a| a.to_sass(opts)}.join(", ") + ')' unless @args.empty?

data/lib/sass/tree/node.rb

@@ -315,6 +315,7 @@ module Sass
       # @see #perform
       def perform!(environment)
         self.children = perform_children(Environment.new(environment))
+        self.children.each {|c| check_child! c}
       end
 
       # Non-destructively runs \{#perform} on all children of the current node.
@@ -368,8 +369,6 @@ module Sass
           "Mixins may only be defined at the root of a document."
         when Tree::ImportNode
           "Import directives may only be used at the root of a document."
-        when Tree::ExtendNode
-          "Extend directives may only be used within rules."
         end
       end
 

data/lib/sass/tree/root_node.rb

@@ -17,7 +17,7 @@ module Sass
       def to_s(*args)
         super
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -36,7 +36,7 @@ module Sass
         environment.options = @options if environment.options.nil? || environment.options.empty?
         super
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -49,7 +49,7 @@ module Sass
       def cssize(extends = Haml::Util::SubsetMap.new, parent = nil)
         return super(extends, parent), extends
       rescue Sass::SyntaxError => e
-        e.sass_template = @template
+        e.sass_template ||= @template
         raise e
       end
 
@@ -148,9 +148,15 @@ module Sass
       #
       # @see Node#invalid_child?
       def invalid_child?(child)
-        return unless child.is_a?(Tree::PropNode)
-        "Properties aren't allowed at the root of a document." +
-          child.pseudo_class_selector_message
+        case child
+        when Tree::ExtendNode
+          "Extend directives may only be used within rules."
+        when Tree::PropNode
+          "Properties aren't allowed at the root of a document." +
+            child.pseudo_class_selector_message
+        else
+          return
+        end
       end
     end
   end

data/lib/sass/tree/rule_node.rb

@@ -226,18 +226,6 @@ module Sass::Tree
       super
     end
 
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {RuleNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
-
     # A hash that will be associated with this rule in the CSS document
     # if the {file:SASS_REFERENCE.md#debug_info-option `:debug_info` option} is enabled.
     # This data is used by e.g. [the FireSass Firebug extension](https://addons.mozilla.org/en-US/firefox/addon/103988).

data/lib/sass/tree/while_node.rb

@@ -32,17 +32,5 @@ module Sass::Tree
       end
       children
     end
-
-    # Returns an error message if the given child node is invalid,
-    # and false otherwise.
-    #
-    # {ExtendNode}s are valid within {WhileNode}s.
-    #
-    # @param child [Tree::Node] A potential child node.
-    # @return [Boolean, String] Whether or not the child node is valid,
-    #   as well as the error message to display if it is invalid
-    def invalid_child?(child)
-      super unless child.is_a?(ExtendNode)
-    end
   end
 end

data/test/sass/engine_test.rb

@@ -114,6 +114,10 @@ MSG
     '@warn' => "Invalid warn directive '@warn': expected expression.",
     %Q{@warn "a message"\n  "nested message"} => "Illegal nesting: Nothing may be nested beneath warn directives.",
     "/* foo\n    bar\n  baz" => "Inconsistent indentation: previous line was indented by 4 spaces, but this line was indented by 2 spaces.",
+    "@if foo\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
+    "$var: true\n@while $var\n  @extend .bar\n  $var: false" => ["Extend directives may only be used within rules.", 3],
+    "@for $i from 0 to 1\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
+    "@mixin foo\n  @extend .bar\n@include foo" => ["Extend directives may only be used within rules.", 2],
 
     # Regression tests
     "a\n  b:\n    c\n    d" => ["Illegal nesting: Only properties may be nested beneath properties.", 3],

data/test/sass/scss/scss_test.rb

@@ -1097,6 +1097,26 @@ SCSS
     assert_raise_line(2) {render(<<SCSS)}
 @if true {foo: bar}
 }
+SCSS
+  end
+
+  def test_multiline_var
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: 3;
+  b: false;
+  c: a b c; }
+CSS
+foo {
+  $var1: 1 +
+    2;
+  $var2: true and
+    false;
+  $var3: a b
+    c;
+  a: $var1;
+  b: $var2;
+  c: $var3; }
 SCSS
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 3
   - 0
-  - 24
-  version: 3.0.24
+  - 25
+  version: 3.0.25
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -08:00
+date: 2010-12-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency