haml 1.8.2 → 2.0.0

data/lib/haml/template.rb

@@ -1,19 +1,16 @@
 require 'haml/engine'
-require 'rubygems'
-require 'active_support'
-require 'action_view'
 
 module Haml
   class Template
     class << self
       @@options = {}
 
-      # Gets various options for Haml. See README for details.
+      # Gets various options for Haml. See README.rdoc for details.
       def options
         @@options
       end
 
-      # Sets various options for Haml. See README for details.
+      # Sets various options for Haml. See README.rdoc for details.
       def options=(value)
         @@options = value
       end
@@ -38,7 +35,7 @@ if defined?(RAILS_ROOT)
   # because the new init file is sufficiently flexible
   # to not need updating.
   rails_init_file = File.join(RAILS_ROOT, 'vendor', 'plugins', 'haml', 'init.rb')
-  haml_init_file = File.join(File.dirname(__FILE__), '..', '..', 'init.rb')
+  haml_init_file = Haml.scope('init.rb')
   if File.exists?(rails_init_file)
     require 'fileutils'
     FileUtils.cp(haml_init_file, rails_init_file) unless FileUtils.cmp(rails_init_file, haml_init_file)

data/lib/haml/template/patch.rb

@@ -26,7 +26,7 @@ module ActionView
     def compile_haml(template, file_name, local_assigns)
       render_symbol = assign_method_name(:haml, template, file_name)
       locals = local_assigns.keys
-      
+
       @@template_args[render_symbol] ||= {}
       locals_keys = @@template_args[render_symbol].keys | locals
       @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
@@ -42,7 +42,14 @@ module ActionView
           logger.debug "Backtrace: #{e.backtrace.join("\n")}"
         end
 
-        raise TemplateError.new(@base_path, file_name || template, @assigns, template, e)
+        base_path = if defined?(extract_base_path_from)
+                      # Rails 2.0.x
+                      extract_base_path_from(file_name) || view_paths.first
+                    else
+                      # Rails <=1.2.6
+                      @base_path
+                    end
+        raise ActionView::TemplateError.new(base_path, file_name || template, @assigns, template, e)
       end
 
       @@compile_time[render_symbol] = Time.now

data/lib/haml/template/plugin.rb

@@ -3,41 +3,70 @@
 # using the > 2.0.1 template handler API.
 
 module Haml
-  class Template
+  class Plugin < ActionView::TemplateHandler
     include ActionView::TemplateHandlers::Compilable if defined?(ActionView::TemplateHandlers::Compilable)
 
-    def self.line_offset
-      1
-    end
+    def compile(template)
+      options = Haml::Template.options.dup
 
-    def compilable?
-      true
-    end
- 
-    def line_offset
-      self.class.line_offset
-    end
+      # template is a template object in Rails >=2.1.0,
+      # a source string previously
+      if template.respond_to? :source
+        options[:filename] = template.filename
+        source = template.source
+      else
+        source = template
+      end
 
-    def initialize(view)
-      @view = view
+      Haml::Engine.new(source, options).send(:precompiled_with_ambles, [])
     end
 
-    def compile(template)
-      options = Haml::Template.options.dup
-      Haml::Engine.new(template, options).send(:precompiled_with_ambles, [])
-    end
-   
     def cache_fragment(block, name = {}, options = nil)
       @view.fragment_for(block, name, options) do
         eval("_hamlout.buffer", block.binding)
       end
     end
-   
-    def read_template_file(template_path, extension)
-      File.read(template_path)
-    end
   end
 end
 
-ActionView::Base.register_template_handler(:haml, Haml::Template)
+if defined? ActionView::Template and ActionView::Template.respond_to? :register_template_handler
+  ActionView::Template
+else
+  ActionView::Base
+end.register_template_handler(:haml, Haml::Plugin)
+
+# In Rails 2.0.2, ActionView::TemplateError took arguments
+# that we can't fill in from the Haml::Plugin context.
+# Thus, we've got to monkeypatch ActionView::Base to catch the error.
+if ActionView::TemplateError.instance_method(:initialize).arity == 5
+  class ActionView::Base
+    def compile_template(handler, template, file_name, local_assigns)
+      render_symbol = assign_method_name(handler, template, file_name)
+
+      # Move begin up two lines so it captures compilation exceptions.
+      begin
+        render_source = create_template_source(handler, template, render_symbol, local_assigns.keys)
+        line_offset = @@template_args[render_symbol].size + handler.line_offset
+      
+        file_name = 'compiled-template' if file_name.blank?
+        CompiledTemplates.module_eval(render_source, file_name, -line_offset)
+      rescue Exception => e # errors from template code
+        if logger
+          logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
+          logger.debug "Function body: #{render_source}"
+          logger.debug "Backtrace: #{e.backtrace.join("\n")}"
+        end
+
+        # There's no way to tell Haml about the filename,
+        # so we've got to insert it ourselves.
+        e.backtrace[0].gsub!('(haml)', file_name) if e.is_a?(Haml::Error)
+        
+        raise ActionView::TemplateError.new(extract_base_path_from(file_name) || view_paths.first, file_name || template, @assigns, template, e)
+      end
+      
+      @@compile_time[render_symbol] = Time.now
+      # logger.debug "Compiled template #{file_name || template}\n ==> #{render_symbol}" if logger
+    end
+  end
+end
 # :startdoc:

data/lib/sass.rb

@@ -11,7 +11,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 # and implements various features that are useful
 # for creating manageable stylesheets.
 #
-# == Features 
+# == Features
 #
 # * Whitespace active
 # * Well-formatted output
@@ -32,13 +32,13 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # To enable it as a Rails plugin,
 # then run
-# 
+#
 #   haml --rails path/to/rails/app
-# 
+#
 # To enable Sass in Merb,
 # add
 #
-#   dependency "haml"
+#   dependency "merb-haml"
 #
 # to config/dependencies.rb.
 #
@@ -128,7 +128,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # By default, either attribute syntax may be used.
 # If you want to force one or the other,
-# see the :attribute_syntax option below.
+# see the <tt>:attribute_syntax</tt> option below.
 #
 # === Nested Rules
 #
@@ -157,12 +157,12 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 #   #main
 #     :width 97%
-#     
+#
 #     p, div
 #       :font-size 2em
 #       a
 #         :font-weight bold
-#         
+#
 #     pre
 #       :font-size 3em
 #
@@ -363,6 +363,39 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #   #main {
 #     content: string(Hello, "Hubert" Bean.) }
 #
+# === Optional Assignment
+#
+# You can assign Sass constants if they aren't already assigned
+# using the ||= assignment operator.
+# This means that if the constant has already been assigned to,
+# it won't be re-assigned,
+# but if it doesn't have a value yet,
+# it will be given one.
+# For example:
+#
+#   !content = "First content"
+#   !content ||= "Second content?"
+#
+#   #main
+#     content = content
+#
+# is compiled to:
+#
+#   #main {
+#     content: First content; }
+#
+# However,
+#
+#   !content ||= "Second content?"
+#
+#   #main
+#     content = content
+#
+# is compiled to:
+#
+#   #main {
+#     content: Second content?; }
+#
 # === Default Concatenation
 #
 # All those plusses and quotes for concatenating strings
@@ -453,6 +486,40 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 # might compile to either,
 # depending on whether a file called "foo.sass" existed.
 #
+# === @font-face, @media, etc.
+#
+# Sass behaves as you'd expect for normal CSS @-directives.
+# For example:
+#
+#   @font-face
+#     font-family: "Bitstream Vera Sans"
+#     src: url(http://foo.bar/bvs")
+#
+# compiles to:
+#
+#   @font-face {
+#     font-family: "Bitstream Vera Sans";
+#     src: url(http://foo.bar/bvs"); }
+#
+# and
+#
+#   @media print
+#     #sidebar
+#       display: none
+#
+#     #main
+#       background-color: white
+#
+# compiles to:
+#
+#   @media print {
+#     #sidebar {
+#       display: none; }
+#
+#     #main {
+#       background-color: white; }
+#   }
+#
 # == Comments
 #
 # === Silent Comments
@@ -528,6 +595,84 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #     background-image: url(/images/pbj.png);
 #     color: red; }
 #
+# == Mixins
+#
+# Mixins enable you to define groups of CSS attributes and
+# then include them inline in any number of selectors
+# throughout the document.
+#
+# === Defining a Mixin
+#
+# To define a mixin you use a slightly modified form of selector syntax.
+# For example the 'large-text' mixin is defined as follows:
+#
+#   =large-text
+#     :font
+#       :family Arial
+#       :size 20px
+#       :weight bold
+#     :color #ff0000
+#
+# The initial '=' marks this as a mixin rather than a standard selector.
+# The CSS rules that follow won't be included until the mixin is referenced later on.
+# Anything you can put into a standard selector,
+# you can put into a mixin definition. e.g.
+#
+#   =clearfix
+#     display: inline-block
+#     &:after
+#       content: "."
+#       display: block
+#       height: 0
+#       clear: both
+#       visibility: hidden
+#     * html &
+#       height: 1px
+#
+#
+# === Mixing it in
+#
+# Inlining a defined mixin is simple,
+# just prepend a '+' symbol to the name of a mixin defined earlier in the document.
+# So to inline the 'large-text' defined earlier,
+# we include the statment '+large-text' in our selector definition thus:
+#
+#   .page-title
+#     +large-text
+#     :padding 4px
+#     :margin
+#       :top 10px
+#
+#
+# This will produce the following CSS output:
+#
+#   .page-title {
+#     font-family: Arial;
+#     font-size: 20px;
+#     font-weight: bold;
+#     color: #ff0000;
+#     padding: 4px;
+#     margin-top: 10px;
+#   }
+#
+# Any number of mixins may be defined and there is no limit on
+# the number that can be included in a particular selector.
+#
+# Mixin definitions can also include references to other mixins defined earlier in the file.
+# E.g.
+#
+#   =highlighted-background
+#     background:
+#       color: #fc0
+#   =header-text
+#     font:
+#       size: 20px
+#
+#   =compound
+#     +highlighted-background
+#     +header-text
+#
+#
 # == Output Style
 #
 # Although the default CSS style that Sass outputs is very nice,
@@ -601,7 +746,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #   #main { color: #fff; background-color: #000; }
 #   #main p { width: 10em; }
 #
-#   .huge { font-size: 10em; font-weight: bold; text-decoration: underline; } 
+#   .huge { font-size: 10em; font-weight: bold; text-decoration: underline; }
 #
 # === <tt>:compressed</tt>
 #
@@ -611,7 +756,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 # It's not meant to be human-readable.
 # For example:
 #
-#   #main{color:#fff;background-color:#000}#main p{width:10em}.huge{font-size:10em;font-weight:bold;text-decoration:underline} 
+#   #main{color:#fff;background-color:#000}#main p{width:10em}.huge{font-size:10em;font-weight:bold;text-decoration:underline}
 #
 # == Sass Options
 #
@@ -634,7 +779,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #                               For example: <tt>color: #0f3</tt>
 #                               or <tt>width = !main_width</tt>.
 #                               By default, either syntax is valid.
-#                               
+#
 # [<tt>:never_update</tt>]      Whether the CSS files should never be updated,
 #                               even if the template file changes.
 #                               Setting this to true may give small performance gains.
@@ -646,7 +791,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #                               as opposed to only when the template has been modified.
 #                               Defaults to false.
 #                               Only has meaning within Ruby on Rails or Merb.
-#                               
+#
 # [<tt>:always_check</tt>]      Whether a Sass template should be checked for updates every
 #                               time a controller is accessed,
 #                               as opposed to only when the Rails server starts.
@@ -681,7 +826,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #                               for Sass templates imported with the "@import" directive.
 #                               This defaults to the working directory and, in Rails or Merb,
 #                               whatever <tt>:template_location</tt> is.
-# 
+#
 module Sass; end
 
 require 'sass/engine'

data/lib/sass/constant.rb

@@ -8,13 +8,13 @@ module Sass
 
     # Whitespace characters
     WHITESPACE = [?\ , ?\t, ?\n, ?\r]
-  
+
     # The character used to escape values
     ESCAPE_CHAR = ?\\
 
     # The character used to open and close strings
     STRING_CHAR = ?"
-    
+
     # A mapping of syntactically-significant characters
     # to parsed symbols
     SYMBOLS = {
@@ -31,14 +31,14 @@ module Sass
     }
 
     # The regular expression used to parse constants
-    MATCH = /^#{Regexp.escape(CONSTANT_CHAR.chr)}([^\s#{(SYMBOLS.keys + [ ?= ]).map {|c| Regexp.escape("#{c.chr}") }.join}]+)\s*=\s*(.+)/
-    
+    MATCH = /^#{Regexp.escape(CONSTANT_CHAR.chr)}([^\s#{(SYMBOLS.keys + [ ?= ]).map {|c| Regexp.escape("#{c.chr}") }.join}]+)\s*((?:\|\|)?=)\s*(.+)/
+
     # First-order operations
     FIRST_ORDER = [:times, :div, :mod]
-    
+
     # Second-order operations
     SECOND_ORDER = [:plus, :minus]
-  
+
     class << self
       def parse(value, constants, line)
         begin
@@ -46,28 +46,28 @@ module Sass
         rescue Sass::SyntaxError => e
           if e.message == "Constant arithmetic error"
             e.instance_eval do
-              @message += ": #{value.dump}"
+              @message += ": #{value.dump}."
             end
           end
           e.sass_line = line
           raise e
         end
       end
-      
+
       private
-      
+
       def tokenize(value)
         escaped = false
         is_string = false
         beginning_of_token = true
         str = ''
         to_return = []
-        
+
         reset_str = Proc.new do
           to_return << str unless str.empty?
           ''
         end
-        
+
         value.each_byte do |byte|
           unless escaped
             if byte == ESCAPE_CHAR
@@ -97,7 +97,7 @@ module Sass
                 str = reset_str.call
                 next
               end
-            
+
               symbol = SYMBOLS[byte]
 
               # Adjacent values without an operator should be concatenated
@@ -135,28 +135,28 @@ module Sass
               end
             end
           end
-          
+
           escaped = false
           beginning_of_token = false
           str << byte.chr
         end
-        
+
         if is_string
-          raise Sass::SyntaxError.new("Unterminated string: #{value.dump}")
+          raise Sass::SyntaxError.new("Unterminated string: #{value.dump}.")
         end
         str = reset_str.call
         to_return
       end
-      
+
       def parenthesize(value)
         parenthesize_helper(0, value, value.length)[0]
       end
-      
+
       def parenthesize_helper(i, value, value_len, return_after_expr = false)
         to_return = []
         beginning = i
         token = value[i]
-        
+
         while i < value_len && token != :close
           if token == :open
             to_return.push(*value[beginning...i])
@@ -194,13 +194,13 @@ module Sass
           else
             i += 1
           end
-          
+
           token = value[i]
         end
         to_return.push(*value[beginning...i])
         return to_return, i + 1
       end
-      
+
       #--
       # TODO: Don't pass around original value;
       #       have Constant.parse automatically add it to exception.
@@ -234,10 +234,10 @@ module Sass
           end
         end
       end
-      
+
       def get_constant(value, constants)
         to_return = constants[value]
-        raise SyntaxError.new("Undefined constant: \"!#{value}\"") unless to_return
+        raise SyntaxError.new("Undefined constant: \"!#{value}\".") unless to_return
         to_return
       end
     end