haml 3.0.0.beta.3 → 3.0.0.rc.1

data/.yardopts

@@ -3,6 +3,8 @@
 --markup-provider maruku
 --default-return  ""
 --title           "Haml/Sass Documentation"
+--query           'object.type != :classvariable'
+--query           'object.type != :constant || @api && @api.text == "public"'
 --hide-void-return
 --protected
 --no-private

data/REMEMBER

@@ -1,13 +1,6 @@
-Deprecate .foo& in stable
-Make .#{} work in extend
-Test newly-invalid selectors, including post-resolution parse errors in Sass
 Be smart about default namespaces (http://www.w3.org/TR/css3-namespace/#declaration)
-Don't conflict with Object#extend.
+Pseudo-selectors should go to the end w/@extend
+Extending nested selectors?
 
-http://camendesign.com/design/ provides some interesting formatting and nesting issues for sass-convert
-Charles Roper's example code for media queries doesn't fare well in css2sass either
-
-Add period to SCSS syntax errors?
-Better #{} in prop names
-Faster than Less
-Comma multiline for Haml
+    .hoverlink {@extend a; @extend :hover}
+    a.user:hover {text-decoration: underline}

data/Rakefile

@@ -239,7 +239,7 @@ end
 begin
   require 'yard'
 
-  namespace :yard do
+  namespace :doc do
     task :sass do
       require scope('lib/sass')
       Dir[scope("yard/default/**/*.sass")].each do |sass|
@@ -248,12 +248,27 @@ begin
         end
       end
     end
+
+    desc "List all undocumented methods and classes."
+    task :undocumented do
+      opts = ENV["YARD_OPTS"] || ""
+      ENV["YARD_OPTS"] = opts.dup + <<OPTS
+ --list --query "
+  object.docstring.blank? &&
+  !(object.type == :method && object.is_alias?)"
+OPTS
+      Rake::Task['yard'].execute
+    end
   end
 
   YARD::Rake::YardocTask.new do |t|
     t.files = FileList.new(scope('lib/**/*.rb')) do |list|
       list.exclude('lib/haml/template/*.rb')
+      list.exclude('lib/haml/railtie.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
+      list.exclude('lib/haml/helpers/xss_mods.rb')
+      list.exclude('lib/sass/plugin/merb.rb')
+      list.exclude('lib/sass/plugin/rails.rb')
     end.to_a
     t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
     t.options += FileList.new(scope('yard/*.rb')).to_a.map {|f| ['-e', f]}.flatten
@@ -261,8 +276,15 @@ begin
     t.options << '--files' << files.join(',')
     t.options << '--template-path' << scope('yard')
     t.options << '--title' << ENV["YARD_TITLE"] if ENV["YARD_TITLE"]
+
+    t.before = lambda do
+      if ENV["YARD_OPTS"]
+        require 'shellwords'
+        t.options.concat(Shellwords.shellwords(ENV["YARD_OPTS"]))
+      end
+    end
   end
-  Rake::Task['yard'].prerequisites.insert(0, 'yard:sass')
+  Rake::Task['yard'].prerequisites.insert(0, 'doc:sass')
   Rake::Task['yard'].instance_variable_set('@comment', nil)
 
   desc "Generate Documentation"

data/VERSION

@@ -1 +1 @@
-3.0.0.beta.3
+3.0.0.rc.1

data/lib/haml.rb

@@ -17,6 +17,7 @@ module Haml
 
   # A string representing the version of Haml.
   # A more fine-grained representation is available from Haml.version.
+  # @api public
   VERSION = version[:string] unless defined?(Haml::VERSION)
 
   # Initializes Haml for Rails.
@@ -37,5 +38,7 @@ module Haml
 end
 
 require 'haml/util'
-require 'haml/engine'
-require 'haml/railtie'
+unless $0 =~ /sass(-convert)?$/
+  require 'haml/engine'
+  require 'haml/railtie'
+end

data/lib/haml/exec.rb

@@ -115,7 +115,6 @@ module Haml
         @options[:input], @options[:output] = input, output
       end
 
-      # @private
       COLORS = { :red => 31, :green => 32, :yellow => 33 }
 
       # Prints a status message about performing the given action,
@@ -298,7 +297,7 @@ END
           @options[:for_engine][:cache_location] = loc
         end
         opts.on('-C', '--no-cache', "Don't cache to sassc files.") do
-          @options[:for_engine][:cache] = false
+          @options[:for_engine][:read_cache] = false
         end
       end
 
@@ -569,8 +568,9 @@ END
       # @param args [Array<String>] The command-line arguments
       def initialize(args)
         super
+        require 'sass'
         @options[:for_tree] = {}
-        @options[:for_engine] = {}
+        @options[:for_engine] = {:cache => false, :read_cache => true}
       end
 
       # Tells optparse how to parse the arguments.
@@ -630,7 +630,7 @@ END
         end
 
         opts.on('-C', '--no-cache', "Don't cache to sassc files.") do
-          @options[:for_engine][:cache] = false
+          @options[:for_engine][:read_cache] = false
         end
 
         super
@@ -654,6 +654,8 @@ END
         process_file(input, output)
       end
 
+      private
+
       def process_directory
         input = @options[:input] = @args.shift
         output = @options[:output] = @args.shift
@@ -665,6 +667,11 @@ END
         end
         @options[:output] ||= @options[:input]
 
+        if @options[:to] == @options[:from] && !@options[:in_place]
+          fmt = @options[:from]
+          raise "Error: converting from #{fmt} to #{fmt} without --in-place"
+        end
+
         ext = @options[:from]
         ext = :sass if ext == :sass2
         Dir.glob("#{@options[:input]}/**/*.#{ext}") do |f|

data/lib/haml/filters.rb

@@ -325,6 +325,9 @@ END
         ::RedCloth.new(text).to_html(:textile)
       end
     end
+    # An alias for the Textile filter,
+    # since the only available Textile parser is RedCloth.
+    # @api public
     RedCloth = Textile
     Filters.defined['redcloth'] = RedCloth
 

data/lib/haml/helpers.rb

@@ -1,8 +1,3 @@
-if defined?(ActionView)
-  require 'haml/helpers/action_view_mods'
-  require 'haml/helpers/action_view_extensions'
-end
-
 module Haml
   # This module contains various helpful methods to make it easier to do various tasks.
   # {Haml::Helpers} is automatically included in the context
@@ -52,8 +47,7 @@ MESSAGE
 
     self.extend self
 
-    @@action_view_defined = defined?(ActionView)
-    @@force_no_action_view = false
+    @@action_view_defined = false
 
     # @return [Boolean] Whether or not ActionView is loaded
     def self.action_view?
@@ -500,7 +494,6 @@ MESSAGE
     end
 
     # Characters that need to be escaped to HTML entities from user input
-    # @private
     HTML_ESCAPE = { '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;', '"'=>'&quot;', "'"=>'&#039;', }
 
     # Returns a copy of `text` with ampersands, angle brackets and quotes
@@ -594,11 +587,10 @@ MESSAGE
       _erbout = _hamlout.buffer
       proc { |*args| proc.call(*args) }
     end
-
-    include ActionViewExtensions if self.const_defined? "ActionViewExtensions"
   end
 end
 
+# @private
 class Object
   # Haml overrides various `ActionView` helpers,
   # which call an \{#is\_haml?} method

data/lib/haml/helpers/action_view_extensions.rb

@@ -1,7 +1,7 @@
-require 'haml/helpers/action_view_mods'
-
 module Haml
   module Helpers
+    @@action_view_defined = true
+
     # This module contains various useful helper methods
     # that either tie into ActionView or the rest of the ActionPack stack,
     # or are only useful in that context.
@@ -51,5 +51,7 @@ module Haml
         @_haml_concat_raw = old
       end
     end
+
+    include ActionViewExtensions
   end
 end

data/lib/haml/helpers/action_view_mods.rb

@@ -126,7 +126,11 @@ module ActionView
       end
 
       def content_tag(*args)
-        content_tag_with_haml(*args)
+        html_tag = content_tag_with_haml(*args)
+        return html_tag unless respond_to?(:error_wrapping)
+        return error_wrapping(html_tag) if method(:error_wrapping).arity == 1
+        return html_tag unless object.respond_to?(:errors) && object.errors.respond_to?(:on)
+        return error_wrapping(html_tag, object.errors.on(@method_name))
       end
     end
 
@@ -156,9 +160,7 @@ module ActionView
         def form_for_with_haml(object_name, *args, &proc)
           if block_given? && is_haml?
             oldproc = proc
-            proc = haml_bind_proc do |*args|
-              with_tabs(1) {oldproc.call(*args)}
-            end
+            proc = proc {|*args| with_tabs(1) {oldproc.call(*args)}}
           end
           res = form_for_without_haml(object_name, *args, &proc)
           res << "\n" if block_given? && is_haml?

data/lib/haml/html.rb

@@ -146,7 +146,6 @@ module Haml
     end
     alias_method :to_haml, :render
 
-    # @private
     TEXT_REGEXP = /^(\s*).*$/
 
     # @see Hpricot

data/lib/haml/precompiler.rb

@@ -8,60 +8,46 @@ module Haml
     include Haml::Util
 
     # Designates an XHTML/XML element.
-    # @private
     ELEMENT         = ?%
 
     # Designates a `<div>` element with the given class.
-    # @private
     DIV_CLASS       = ?.
 
     # Designates a `<div>` element with the given id.
-    # @private
     DIV_ID          = ?#
 
     # Designates an XHTML/XML comment.
-    # @private
     COMMENT         = ?/
 
     # Designates an XHTML doctype or script that is never HTML-escaped.
-    # @private
     DOCTYPE         = ?!
 
     # Designates script, the result of which is output.
-    # @private
     SCRIPT          = ?=
 
     # Designates script that is always HTML-escaped.
-    # @private
     SANITIZE        = ?&
 
     # Designates script, the result of which is flattened and output.
-    # @private
     FLAT_SCRIPT     = ?~
 
     # Designates script which is run but not output.
-    # @private
     SILENT_SCRIPT   = ?-
 
     # When following SILENT_SCRIPT, designates a comment that is not output.
-    # @private
     SILENT_COMMENT  = ?#
 
     # Designates a non-parsed line.
-    # @private
     ESCAPE          = ?\\
 
     # Designates a block of filtered text.
-    # @private
     FILTER          = ?:
 
     # Designates a non-parsed line. Not actually a character.
-    # @private
     PLAIN_TEXT      = -1
 
     # Keeps track of the ASCII values of the characters that begin a
     # specially-interpreted line.
-    # @private
     SPECIAL_CHARACTERS   = [
       ELEMENT,
       DIV_CLASS,
@@ -78,7 +64,6 @@ module Haml
 
     # The value of the character that designates that a line is part
     # of a multiline string.
-    # @private
     MULTILINE_CHAR_VALUE = ?|
 
     # Regex to match keywords that appear in the middle of a Ruby block
@@ -94,15 +79,12 @@ module Haml
     #
     # The block is ended after `%p no!`, because `else`
     # is a member of this array.
-    # @private
     MID_BLOCK_KEYWORD_REGEX = /^-\s*(#{%w[else elsif rescue ensure when end].join('|')})\b/
 
     # The Regex that matches a Doctype command.
-    # @private
     DOCTYPE_REGEX = /(\d(?:\.\d)?)?[\s]*([a-z]*)/i
 
     # The Regex that matches a literal string or symbol value
-    # @private
     LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?![\\#]|\2).|\\.)*\2/
 
     private
@@ -146,6 +128,7 @@ END
     class Line < Struct.new(:text, :unstripped, :full, :index, :precompiler, :eod)
       alias_method :eod?, :eod
 
+      # @private
       def tabs
         line = self
         @tabs ||= precompiler.instance_eval do
@@ -252,6 +235,7 @@ You don't need to use "- end" in Haml. Un-indent to close a block:
 %p This line is un-indented, so it isn't part of the "if" block
 END
 
+        text = handle_ruby_multiline(text)
         push_silent(text[1..-1], true)
         newline_now
 
@@ -395,6 +379,7 @@ END
     # the result before it is added to `@buffer`
     def push_script(text, opts = {})
       raise SyntaxError.new("There's no Ruby code for = to evaluate.") if text.empty?
+      text = handle_ruby_multiline(text)
       return if options[:suppress_eval]
       opts[:escape_html] = options[:escape_html] if opts[:escape_html].nil?
 
@@ -781,10 +766,13 @@ END
       end.compact!
 
       raise SyntaxError.new("Illegal nesting: nesting within a self-closing tag is illegal.", @next_line.index) if block_opened? && self_closing
-      raise SyntaxError.new("Illegal nesting: content can't be both given on the same line as %#{tag_name} and nested within it.", @next_line.index) if block_opened? && !value.empty?
       raise SyntaxError.new("There's no Ruby code for #{action} to evaluate.", last_line - 1) if parse && value.empty?
       raise SyntaxError.new("Self-closing tags can't have content.", last_line - 1) if self_closing && !value.empty?
 
+      if block_opened? && !value.empty? && !is_ruby_multiline?(value)
+        raise SyntaxError.new("Illegal nesting: content can't be both given on the same line as %#{tag_name} and nested within it.", @next_line.index)
+      end
+
       self_closing ||= !!(!block_opened? && value.empty? && @options[:autoclose].any? {|t| t === tag_name})
       value = nil if value.empty? && (block_opened? || self_closing)
 
@@ -984,18 +972,17 @@ END
     end
 
     def handle_multiline(line)
-      if is_multiline?(line.text)
-        line.text.slice!(-1)
-        while new_line = raw_next_line.first
-          break if new_line == :eod
-          newline and next if new_line.strip.empty?
-          break unless is_multiline?(new_line.strip)
-          line.text << new_line.strip[0...-1]
-          newline
-        end
-        un_next_line new_line
-        resolve_newlines
+      return unless is_multiline?(line.text)
+      line.text.slice!(-1)
+      while new_line = raw_next_line.first
+        break if new_line == :eod
+        newline and next if new_line.strip.empty?
+        break unless is_multiline?(new_line.strip)
+        line.text << new_line.strip[0...-1]
+        newline
       end
+      un_next_line new_line
+      resolve_newlines
     end
 
     # Checks whether or not +line+ is in a multiline sequence.
@@ -1003,6 +990,26 @@ END
       text && text.length > 1 && text[-1] == MULTILINE_CHAR_VALUE && text[-2] == ?\s
     end
 
+    def handle_ruby_multiline(text)
+      text = text.rstrip
+      return text unless is_ruby_multiline?(text)
+      un_next_line @next_line.full
+      begin
+        new_line = raw_next_line.first
+        break if new_line == :eod
+        newline and next if new_line.strip.empty?
+        text << " " << new_line.strip
+        newline
+      end while is_ruby_multiline?(new_line.strip)
+      next_line
+      resolve_newlines
+      text
+    end
+
+    def is_ruby_multiline?(text)
+      text && text.length > 1 && text[-1] == ?, && text[-2] != ?? && text[-3..-2] != "?\\"
+    end
+
     def contains_interpolation?(str)
       str.include?('#{')
     end

data/lib/haml/railtie.rb

@@ -3,10 +3,14 @@
 # Yehuda promises there will be soon,
 # and once there is we should switch to that.
 
-if defined?(Rails::Railtie)
+if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
+  # Rails 3.0.0.beta.2+
+  ActiveSupport.on_load(:action_view) {Haml.init_rails(binding)}
+elsif defined?(Rails::Railtie)
+  # Rails 3.0.0.beta1
   module Haml
     class Railtie < Rails::Railtie
-      initializer :haml do
+      ActiveSupport.on_load(:action_view) do
         Haml.init_rails(binding)
       end
     end