haml 1.8.0 → 2.0.3

data/lib/sass/plugin/merb.rb

@@ -1,20 +1,56 @@
 unless defined?(Sass::MERB_LOADED)
   Sass::MERB_LOADED = true
 
-  Sass::Plugin.options.merge!(:template_location  => MERB_ROOT + '/public/stylesheets/sass',
-                              :css_location       => MERB_ROOT + '/public/stylesheets',
-                              :always_check       => MERB_ENV != "production",
-                              :full_exception     => MERB_ENV != "production")
+  version = Merb::VERSION.split('.').map { |n| n.to_i }
+  if version[0] <= 0 && version[1] < 5
+    root = MERB_ROOT
+    env  = MERB_ENV
+  else
+    root = Merb.root.to_s
+    env  = Merb.environment
+  end
+
+  Sass::Plugin.options.merge!(:template_location  => root + '/public/stylesheets/sass',
+                              :css_location       => root + '/public/stylesheets',
+                              :always_check       => env != "production",
+                              :full_exception     => env != "production")
   config = Merb::Plugins.config[:sass] || Merb::Plugins.config["sass"] || {}
-  config.symbolize_keys!
+
+  if defined? config.symbolize_keys!
+    config.symbolize_keys!
+  end
+
   Sass::Plugin.options.merge!(config)
-  
-  class MerbHandler # :nodoc:
-    def process_with_sass(request, response)
-      Sass::Plugin.update_stylesheets if Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
-      process_without_sass(request, response)
+
+  if version[0] > 0 || version[1] >= 9
+
+    class Merb::Rack::Application # :nodoc:
+      def call_with_sass(env)
+        if !Sass::Plugin.checked_for_updates ||
+            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+          Sass::Plugin.update_stylesheets
+        end
+
+        call_without_sass(env)
+      end
+      alias_method :call_without_sass, :call
+      alias_method :call, :call_with_sass
+    end
+
+  else
+
+    class MerbHandler # :nodoc:
+      def process_with_sass(request, response)
+        if !Sass::Plugin.checked_for_updates ||
+            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+          Sass::Plugin.update_stylesheets
+        end
+
+        process_without_sass(request, response)
+      end
+      alias_method :process_without_sass, :process
+      alias_method :process, :process_with_sass
     end
-    alias_method :process_without_sass, :process
-    alias_method :process, :process_with_sass
+
   end
 end

data/lib/sass/plugin/rails.rb

@@ -5,14 +5,20 @@ unless defined?(Sass::RAILS_LOADED)
                               :css_location       => RAILS_ROOT + '/public/stylesheets',
                               :always_check       => RAILS_ENV != "production",
                               :full_exception     => RAILS_ENV != "production")
-  
-  module ActionController # :nodoc:
-    class Base # :nodoc:
+
+  # :stopdoc:
+  module ActionController
+    class Base
       alias_method :sass_old_process, :process
       def process(*args)
-        Sass::Plugin.update_stylesheets if Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+        if !Sass::Plugin.checked_for_updates ||
+            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+          Sass::Plugin.update_stylesheets
+        end
+
         sass_old_process(*args)
       end
     end
   end
+  # :startdoc:
 end

data/lib/sass/plugin.rb

@@ -13,8 +13,15 @@ module Sass
         :always_check       => true,
         :full_exception     => true
       }
+      @@checked_for_updates = false
 
-      # Gets various options for Sass. See README for details.
+      # Whether or not Sass has *ever* checked if the stylesheets need updates
+      # (in this Ruby instance).
+      def checked_for_updates
+        @@checked_for_updates
+      end
+
+      # Gets various options for Sass. See README.rdoc for details.
       #--
       # TODO: *DOCUMENT OPTIONS*
       #++
@@ -27,6 +34,13 @@ module Sass
         @@options.merge!(value)
       end
 
+      # Get the options ready to be passed to the Sass::Engine
+      def engine_options(additional_options = {})
+        opts = options.dup.merge(additional_options)
+        opts[:load_paths] = load_paths(opts)
+        opts
+      end
+
       # Checks each stylesheet in <tt>options[:css_location]</tt>
       # to see if it needs updating,
       # and updates it using the corresponding template
@@ -35,6 +49,7 @@ module Sass
       def update_stylesheets
         return if options[:never_update]
 
+        @@checked_for_updates = true
         Dir.glob(File.join(options[:template_location], "**", "*.sass")).entries.each do |file|
 
           # Get the relative path to the file with no extension
@@ -45,10 +60,7 @@ module Sass
             File.delete(css) if File.exists?(css)
 
             filename = template_filename(name)
-            l_options = @@options.dup
-            l_options[:filename] = filename
-            l_options[:load_paths] = load_paths
-            engine = Engine.new(File.read(filename), l_options)
+            engine = Engine.new(File.read(filename), engine_options(:filename => filename))
             result = begin
                        engine.render
                      rescue Exception => e
@@ -56,7 +68,7 @@ module Sass
                      end
 
             # Create any directories that might be necessary
-            dirs = [l_options[:css_location]]
+            dirs = [options[:css_location]]
             name.split("/")[0...-1].each { |dir| dirs << "#{dirs[-1]}/#{dir}" }
             dirs.each { |dir| Dir.mkdir(dir) unless File.exist?(dir) }
 
@@ -70,8 +82,8 @@ module Sass
 
       private
 
-      def load_paths
-        (options[:load_paths] || []) + [options[:template_location]]
+      def load_paths(opts = options)
+        (opts[:load_paths] || []) + [options[:template_location]]
       end
 
       def exception_string(e)
@@ -96,7 +108,18 @@ module Sass
               end
             end
           end
-          "/*\n#{e_string}\n\nBacktrace:\n#{e.backtrace.join("\n")}\n*/"
+          <<END
+/*
+#{e_string}
+
+Backtrace:\n#{e.backtrace.join("\n")}
+*/
+body:before {
+  white-space: pre;
+  font-family: monospace;
+  content: "#{e_string.gsub('"', '\"').gsub("\n", '\\A ')}"; }
+END
+          # Fix an emacs syntax-highlighting hiccup: '
         else
           "/* Internal stylesheet error */"
         end
@@ -111,7 +134,7 @@ module Sass
       end
 
       def forbid_update?(name)
-        name[0] == ?_
+        name.sub(/^.*\//, '')[0] == ?_
       end
 
       def stylesheet_needs_update?(name)

data/lib/sass/tree/attr_node.rb

@@ -3,21 +3,21 @@ require 'sass/tree/node'
 module Sass::Tree
   class AttrNode < ValueNode
     attr_accessor :name
-    
+
     def initialize(name, value, style)
       @name = name
       super(value, style)
     end
-    
+
     def to_s(tabs, parent_name = nil)
       if value[-1] == ?;
-        raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (This isn't CSS!)", @line)
+        raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (This isn't CSS!).", @line)
       end
       real_name = name
       real_name = "#{parent_name}-#{real_name}" if parent_name
 
       if value.empty? && children.empty?
-        raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump}", @line)
+        raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump}.", @line)
       end
 
       join_string = case @style
@@ -34,7 +34,7 @@ module Sass::Tree
       children.each do |kid|
         to_return << "#{kid.to_s(tabs, real_name)}" << join_string
       end
-            
+
       (@style == :compressed && parent_name) ? to_return : to_return[0...-1]
     end
 

data/lib/sass/tree/directive_node.rb

@@ -15,11 +15,6 @@ module Sass::Tree
         was_attr = false
         first = true
         children.each do |child|
-          if child.is_a?(RuleNode) && child.continued?
-            check_multiline_rule(child)
-            continued_rule = true
-          end
-
           if @style == :compact
             if child.is_a?(AttrNode)
               result << "#{child.to_s(first || was_attr ? 1 : tabs + 1)} "
@@ -32,12 +27,12 @@ module Sass::Tree
               result << rendered
             end
             was_attr = child.is_a?(AttrNode)
-            first = continued_rule
+            first = false
           elsif @style == :compressed
             result << (was_attr ? ";#{child.to_s(1)}" : child.to_s(1))
             was_attr = child.is_a?(AttrNode)
           else
-            result << child.to_s(tabs + 1) + (continued_rule ? '' : "\n")
+            result << child.to_s(tabs + 1) + "\n"
           end
         end
         result.rstrip + if @style == :compressed

data/lib/sass/tree/node.rb

@@ -16,15 +16,12 @@ module Sass
         end
         @children << child
       end
-      
+
       def to_s
         result = String.new
         children.each do |child|
           if child.is_a? AttrNode
             raise SyntaxError.new('Attributes aren\'t allowed at the root of a document.', child.line)
-          elsif child.is_a?(RuleNode) && child.continued?
-            check_multiline_rule(child)
-            result << child.to_s(1)
           else
             result << "#{child.to_s(1)}" + (@style == :compressed ? '' : "\n")
           end
@@ -32,14 +29,6 @@ module Sass
         @style == :compressed ? result+"\n" : result[0...-1]
       end
 
-      protected
-
-      def check_multiline_rule(rule)
-        unless rule.children.empty?
-          raise SyntaxError.new('Rules can\'t end in commas.', rule.line)
-        end
-      end
-
       private
 
       # This method should be overridden by subclasses to return an error message

data/lib/sass/tree/rule_node.rb

@@ -9,33 +9,50 @@ module Sass::Tree
     alias_method :rule, :value
     alias_method :rule=, :value=
 
+    def rules
+      Array(rule)
+    end
+
+    def add_rules(node)
+      self.rule = rules
+      self.rule += node.rules
+    end
+
     def continued?
       rule[-1] == ?,
     end
-    
+
     def to_s(tabs, super_rules = nil)
       attributes = []
       sub_rules = []
 
-      # Save this because the comma's removed by the super_rule additions
-      was_continued = continued?
-
+      rule_split = /\s*,\s*/
+      rule_separator = @style == :compressed ? ',' : ', '
+      line_separator = [:nested, :expanded].include?(@style) ? ",\n" : rule_separator
+      rule_indent = '  ' * (tabs - 1)
       total_rule = if super_rules
-        super_rules.split(/,\s*/).collect! do |s|
-          self.rule.split(/,\s*/).collect do |r|
-            if r.include?(PARENT)
-              r.gsub(PARENT, s)
-            else
-              "#{s} #{r}"
-            end
-          end.join(", ")
-        end.join(", ") + (was_continued ? ',' : '')
-      elsif self.rule.include?(PARENT)
-        raise Sass::SyntaxError.new("Base-level rules cannot contain the parent-selector-referencing character '#{PARENT}'", line)
+        super_rules.split(",\n").map do |super_line|
+          super_line.strip.split(rule_split).map do |super_rule|
+            self.rules.map do |line|
+              rule_indent + line.gsub(/,$/, '').split(rule_split).map do |rule|
+                if rule.include?(PARENT)
+                  rule.gsub(PARENT, super_rule)
+                else
+                  "#{super_rule} #{rule}"
+                end
+              end.join(rule_separator)
+            end.join(line_separator)
+          end.join(rule_separator)
+        end.join(line_separator)
+      elsif self.rules.any? { |r| r.include?(PARENT) }
+        raise Sass::SyntaxError.new("Base-level rules cannot contain the parent-selector-referencing character '#{PARENT}'.", line)
       else
-        self.rule
+        per_rule_indent, total_indent = [:nested, :expanded].include?(@style) ? [rule_indent, ''] : ['', rule_indent]
+        total_indent + self.rules.map do |r|
+          per_rule_indent + r.gsub(/,$/, '').gsub(rule_split, rule_separator).rstrip
+        end.join(line_separator)
       end
-      
+
       children.each do |child|
         if child.is_a? RuleNode
           sub_rules << child
@@ -43,38 +60,29 @@ module Sass::Tree
           attributes << child
         end
       end
-      
+
       to_return = ''
       if !attributes.empty?
         old_spaces = '  ' * (tabs - 1)
         spaces = '  ' * tabs
         if @style == :compact
           attributes = attributes.map { |a| a.to_s(1) }.join(' ')
-          to_return << "#{old_spaces}#{total_rule} { #{attributes} }\n"
+          to_return << "#{total_rule} { #{attributes} }\n"
         elsif @style == :compressed
           attributes = attributes.map { |a| a.to_s(1) }.join(';')
           to_return << "#{total_rule}{#{attributes}}"
         else
           attributes = attributes.map { |a| a.to_s(tabs + 1) }.join("\n")
           end_attrs = (@style == :expanded ? "\n" + old_spaces : ' ')
-          to_return << "#{old_spaces}#{total_rule} {\n#{attributes}#{end_attrs}}\n"
+          to_return << "#{total_rule} {\n#{attributes}#{end_attrs}}\n"
         end
-      elsif continued?
-        to_return << ('  ' * (tabs - 1)) + total_rule + case @style
-                                                        when :compressed; ''
-                                                        when :compact; ' '
-                                                        else "\n"
-                                                        end
       end
-      
+
       tabs += 1 unless attributes.empty? || @style != :nested
       sub_rules.each do |sub|
-        if sub.continued?
-          check_multiline_rule(sub)
-        end
-
         to_return << sub.to_s(tabs, total_rule)
       end
+
       to_return
     end
   end

data/lib/sass/tree/value_node.rb

@@ -3,7 +3,7 @@ require 'sass/tree/node'
 module Sass::Tree
   class ValueNode < Node
     attr_accessor :value
-  
+
     def initialize(value, style)
       @value = value
       super(style)