radiant 0.9.0.rc2 → 0.9.1

data/vendor/plugins/haml/VERSION

@@ -1 +1 @@
-2.2.19
+2.2.24

data/vendor/plugins/haml/doc-src/HAML_CHANGELOG.md

@@ -3,6 +3,83 @@
 * Table of contents
 {:toc}
 
+## 2.2.24
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.24).
+
+* Don't prevent ActiveModel form elements from having error formatting applied.
+
+* Make sure `form_for` blocks are properly indented under Rails 3.0.0.beta.3.
+
+* Don't activate a bug in the `dynamic_form` plugin under Rails 3.0.0.beta.3
+  that would cause its methods not to be loaded.
+
+## 2.2.23
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.23).
+
+* Don't crash when `rake gems` is run in Rails with Haml installed.
+  Thanks to [Florian Frank](http://github.com/flori).
+
+* Don't remove `\n` in filters with interpolation.
+
+* Silence those annoying `"regexp match /.../n against to UTF-8 string"` warnings.
+
+## 2.2.22
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.22).
+
+* Add a railtie so Haml and Sass will be automatically loaded in Rails 3.
+  Thanks to [Daniel Neighman](http://pancakestacks.wordpress.com/).
+
+* Add a deprecation message for using `-` with methods like `form_for`
+  that return strings in Rails 3.
+  This is [the same deprecation that exists in Rails 3](http://github.com/rails/rails/commit/9de83050d3a4b260d4aeb5d09ec4eb64f913ba64).
+
+* Make sure line numbers are reported correctly when filters are being used.
+
+* Make loading the gemspec not crash on read-only filesystems like Heroku's.
+
+* Don't crash when methods like `form_for` return `nil` in, for example, Rails 3 beta.
+
+* Compatibility with Rails 3 beta's RJS facilities.
+
+## 2.2.21
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
+
+* Fix a few bugs in the git-revision-reporting in {Haml::Version#version}.
+  In particular, it will still work if `git gc` has been called recently,
+  or if various files are missing.
+
+* Always use `__FILE__` when reading files within the Haml repo in the `Rakefile`.
+  According to [this bug report](http://github.com/carlhuda/bundler/issues/issue/44),
+  this should make Haml work better with Bundler.
+
+* Make the error message for `- end` a little more intuitive based on user feedback.
+
+* Compatibility with methods like `form_for`
+  that return strings rather than concatenate to the template in Rails 3.
+
+* Add a {Haml::Helpers#with_tabs with_tabs} helper,
+  which sets the indentation level for the duration of a block.
+
+## 2.2.20
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.20).
+
+* The `form_tag` Rails helper is now properly marked as HTML-safe
+  when using Rails' XSS protection with Rails 2.3.5.
+
+* Calls to `defined?` shouldn't interfere with Rails' autoloading
+  in very old versions (1.2.x).
+
+* Fix a bug where calls to ActionView's `render` method
+  with blocks and layouts wouldn't work under the Rails 3.0 beta.
+
+* Fix a bug where the closing tags of nested calls to \{Haml::Helpers#haml\_concat}
+  were improperly escaped under the Rails 3.0 beta.
+
 ## 2.2.19
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.19).

data/vendor/plugins/haml/doc-src/SASS_CHANGELOG.md

@@ -3,6 +3,66 @@
 * Table of contents
 {:toc}
 
+## 2.2.24
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.24).
+
+* Parent references -- the `&` character --
+  may only be placed at the beginning of simple selector sequences in Sass 3.
+  Placing them elsewhere is deprecated in 2.2.24 and will print a warning.
+  For example, `foo &.bar` is allowed, but `foo .bar&` is not.
+
+## 2.2.23
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.23).
+
+* Don't crash when `rake gems` is run in Rails with Sass installed.
+  Thanks to [Florian Frank](http://github.com/flori).
+
+* When raising a file-not-found error,
+  add a list of load paths that were checked.
+
+* If an import isn't found for a cached Sass file and the
+  {file:SASS_REFERENCE.md#full_exception `:full_exception option`} is enabled,
+  print the full exception rather than raising it.
+
+* Fix a bug with a weird interaction with Haml, DataMapper, and Rails 3
+  that caused some tag helpers to go into infinite recursion.
+
+## 2.2.22
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.22).
+
+* Add a railtie so Haml and Sass will be automatically loaded in Rails 3.
+  Thanks to [Daniel Neighman](http://pancakestacks.wordpress.com/).
+
+* Make loading the gemspec not crash on read-only filesystems like Heroku's.
+
+## 2.2.21
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
+
+* Fix a few bugs in the git-revision-reporting in {Haml::Version#version}.
+  In particular, it will still work if `git gc` has been called recently,
+  or if various files are missing.
+
+* Always use `__FILE__` when reading files within the Haml repo in the `Rakefile`.
+  According to [this bug report](http://github.com/carlhuda/bundler/issues/issue/44),
+  this should make Sass work better with Bundler.
+
+## 2.2.20
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.20).
+
+* If the cache file for a given Sass file is corrupt
+  because it doesn't have enough content,
+  produce a warning and read the Sass file
+  rather than letting the exception bubble up.
+  This is consistent with other sorts of sassc corruption handling.
+
+* Calls to `defined?` shouldn't interfere with Rails' autoloading
+  in very old versions (1.2.x).
+
 ## 2.2.19
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.18).

data/vendor/plugins/haml/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.18
+;; Version: 2.2.21
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html
@@ -26,10 +26,11 @@
 (require 'ruby-mode)
 
 ;; Additional (optional) libraries for fontification
-(require 'css-mode nil nil)
-(require 'textile-mode nil nil)
-(require 'markdown-mode nil nil)
-(require 'javascript-mode "javascript" nil)
+(require 'css-mode nil t)
+(require 'textile-mode nil t)
+(require 'markdown-mode nil t)
+(require 'javascript-mode "javascript" t)
+(require 'js nil t)
 
 
 ;; User definable variables
@@ -172,13 +173,15 @@ This requires that `css-mode' is available.
 (defun haml-highlight-js-filter-block (limit)
   "If a :javascript filter is found within LIMIT, highlight it.
 
-This requires that Karl Landström's \"javascript.el\" be available."
-  (if (boundp 'js-font-lock-keywords-3)
-      (haml-fontify-filter-region "javascript"
-                                  limit
-                                  js-font-lock-keywords-3
-                                  javascript-mode-syntax-table
-                                  nil)))
+This requires that Karl Landström's javascript mode be available, either as the
+\"js.el\" bundled with Emacs 23, or as \"javascript.el\" found in ELPA and
+elsewhere."
+  (let ((keywords (or (and (featurep 'js) js--font-lock-keywords-3)
+                      (and (featurep 'javascript-mode) js-font-lock-keywords-3)))
+        (syntax-table (or (and (featurep 'js) js-mode-syntax-table)
+                          (and (featurep 'javascript-mode) javascript-mode-syntax-table))))
+    (when keywords
+      (haml-fontify-filter-region "javascript" limit keywords syntax-table nil))))
 
 (defun haml-highlight-textile-filter-block (limit)
   "If a :textile filter is found within LIMIT, highlight it.

data/vendor/plugins/haml/extra/sass-mode.el

@@ -4,11 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.18
+;; Version: 2.2.21
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "2.2.18"))
+;; Package-Requires: ((haml-mode "2.2.21"))
 
 ;;; Commentary:
 

data/vendor/plugins/haml/haml.gemspec

@@ -7,9 +7,9 @@ require 'rake'
 # every time it's pushed to; this is made available as the haml-edge gem.
 HAML_GEMSPEC = Gem::Specification.new do |spec|
   spec.rubyforge_project = 'haml'
-  spec.name = File.exist?('EDGE_GEM_VERSION') ? 'haml-edge' : 'haml'
+  spec.name = File.exist?(File.dirname(__FILE__) + '/EDGE_GEM_VERSION') ? 'haml-edge' : 'haml'
   spec.summary = "An elegant, structured XHTML/XML templating engine.\nComes with Sass, a similar CSS templating engine."
-  spec.version = File.read('VERSION').strip
+  spec.version = File.read(File.dirname(__FILE__) + '/VERSION').strip
   spec.authors = ['Nathan Weizenbaum', 'Hampton Catlin']
   spec.email = 'haml@googlegroups.com'
   spec.description = <<-END
@@ -25,14 +25,23 @@ HAML_GEMSPEC = Gem::Specification.new do |spec|
   spec.add_development_dependency 'yard', '>= 0.5.3'
   spec.add_development_dependency 'maruku', '>= 0.5.9'
 
-  # We need the revision file to exist,
-  # so we just create it if it doesn't.
-  # It'll usually just get overwritten, though.
-  File.open('REVISION', 'w') { |f| f.puts "(unknown)" } unless File.exist?('REVISION')
+  have_revision = true
+  unless File.exist?('REVISION')
+    begin
+      # We need the revision file to exist,
+      # so we just create it if it doesn't.
+      # It'll usually just get overwritten, though.
+      File.open('REVISION', 'w') { |f| f.puts "(unknown)" }
+    rescue
+      # If the file can't be created (e.g. on Heroku) continue without it
+      have_revision = false
+    end
+  end
+
   readmes = FileList.new('*') do |list|
     list.exclude(/(^|[^.a-z])[a-z]+/)
     list.exclude('TODO')
-    list.include('REVISION')
+    list.include('REVISION') if have_revision
   end.to_a
   spec.executables = ['haml', 'html2haml', 'sass', 'css2sass']
   spec.files = FileList['rails/init.rb', 'lib/**/*', 'bin/*', 'test/**/*',

data/vendor/plugins/haml/init.rb

@@ -7,7 +7,9 @@ rescue LoadError
     # gems:install may be run to install Haml with the skeleton plugin
     # but not the gem itself installed.
     # Don't die if this is the case.
-    raise e unless defined?(Rake) && Rake.application.top_level_tasks.include?('gems:install')
+    raise e unless defined?(Rake) &&
+      (Rake.application.top_level_tasks.include?('gems') ||
+        Rake.application.top_level_tasks.include?('gems:install'))
   end
 end
 

data/vendor/plugins/haml/lib/haml.rb

@@ -38,3 +38,4 @@ end
 
 require 'haml/util'
 require 'haml/engine'
+require 'haml/railtie'

data/vendor/plugins/haml/lib/haml/filters.rb

@@ -100,8 +100,14 @@ module Haml
           if contains_interpolation?(text)
             return if options[:suppress_eval]
 
-            push_script <<RUBY, :escape_html => false
-find_and_preserve(#{filter.inspect}.render_with_options(#{unescape_interpolation(text)}, _hamlout.options))
+            text = unescape_interpolation(text).gsub(/(\\+)n/) do |s|
+              escapes = $1.size
+              next s if escapes % 2 == 0
+              ("\\" * (escapes - 1)) + "\n"
+            end
+            newline if text.gsub!(/\n"\Z/, "\\n\"")
+            push_script <<RUBY.strip, :escape_html => false
+find_and_preserve(#{filter.inspect}.render_with_options(#{text}, _hamlout.options))
 RUBY
             return
           end
@@ -113,6 +119,10 @@ RUBY
           else
             push_text(rendered.rstrip)
           end
+
+          (text.count("\n") - 1).times {newline}
+          resolve_newlines
+          newline
         end
       end
 
@@ -298,6 +308,8 @@ END
         ::RedCloth.new(text).to_html(:textile)
       end
     end
+    # An alias for the Textile filter,
+    # since the only available Textile parser is RedCloth.
     RedCloth = Textile
     Filters.defined['redcloth'] = RedCloth
 

data/vendor/plugins/haml/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?
@@ -234,6 +228,33 @@ MESSAGE
       haml_buffer.tabulation -= i
     end
 
+    # Sets the number of tabs the buffer automatically adds
+    # to the lines of the template,
+    # but only for the duration of the block.
+    # For example:
+    #
+    #     %h1 foo
+    #     - with_tabs(2) do
+    #       %p bar
+    #     %strong baz
+    #
+    # Produces:
+    #
+    #     <h1>foo</h1>
+    #         <p>bar</p>
+    #     <strong>baz</strong>
+    #
+    #
+    # @param i [Fixnum] The number of tabs to use
+    # @yield A block in which the indentation will be `i` spaces
+    def with_tabs(i)
+      old_tabs = haml_buffer.tabulation
+      haml_buffer.tabulation = i
+      yield
+    ensure
+      haml_buffer.tabulation = old_tabs
+    end
+
     # Surrounds a block of Haml code with strings,
     # with no whitespace in between.
     # For example:
@@ -475,7 +496,7 @@ END
     # @param text [String] The string to sanitize
     # @return [String] The sanitized string
     def html_escape(text)
-      text.to_s.gsub(/[\"><&]/n) {|s| HTML_ESCAPE[s]}
+      Haml::Util.silence_warnings {text.to_s.gsub(/[\"><&]/n) {|s| HTML_ESCAPE[s]}}
     end
 
     # Escapes HTML entities in `text`, but without escaping an ampersand
@@ -519,12 +540,12 @@ END
     # @yield A block in which the given buffer should be used
     def with_haml_buffer(buffer)
       @haml_buffer, old_buffer = buffer, @haml_buffer
-      old_buffer.active, was_active = false, old_buffer.active? if old_buffer
-      @haml_buffer.active = true
+      old_buffer.active, old_was_active = false, old_buffer.active? if old_buffer
+      @haml_buffer.active, was_active = true, @haml_buffer.active?
       yield
     ensure
-      @haml_buffer.active = false
-      old_buffer.active = was_active if old_buffer
+      @haml_buffer.active = was_active
+      old_buffer.active = old_was_active if old_buffer
       @haml_buffer = old_buffer
     end
 
@@ -545,11 +566,10 @@ END
       _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/vendor/plugins/haml/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.
@@ -45,11 +45,13 @@ module Haml
       # @yield A block in which all input to `#haml_concat` is treated as raw.
       # @see Haml::Util#rails_xss_safe?
       def with_raw_haml_concat
-        @_haml_concat_raw = true
+        @_haml_concat_raw, old = true, @_haml_concat_raw
         yield
       ensure
-        @_haml_concat_raw = false
+        @_haml_concat_raw = old
       end
     end
+
+    include ActionViewExtensions
   end
 end

data/vendor/plugins/haml/lib/haml/helpers/action_view_mods.rb

@@ -125,54 +125,94 @@ module ActionView
         @template_object.send :is_haml?
       end
 
-      unless defined?(ActionView::Helpers::ActiveRecordInstanceTag)
-        alias_method :content_tag_without_haml, :content_tag
-        alias_method :content_tag, :content_tag_with_haml
+      def content_tag(*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
 
-    module FormTagHelper
-      def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
-        if is_haml?
-          if block_given?
+    if Haml::Util.ap_geq_3?
+      module FormTagHelper
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
+          if is_haml?
+            if block_given?
+              oldproc = proc
+              proc = haml_bind_proc do |*args|
+                concat "\n"
+                with_tabs(1) {oldproc.call(*args)}
+              end
+            end
+            res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
+            res << "\n" if block_given?
+            res
+          else
+            form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
+          end
+        end
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
+      end
+
+      module FormHelper
+        def form_for_with_haml(object_name, *args, &proc)
+          if block_given? && is_haml?
             oldproc = proc
-            proc = haml_bind_proc do |*args|
-              concat "\n"
-              tab_up
-              oldproc.call(*args)
-              tab_down
+            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?
+          res
+        end
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
+      end
+    else
+      module FormTagHelper
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
+          if is_haml?
+            if block_given?
+              oldproc = proc
+              proc = haml_bind_proc do |*args|
+                concat "\n"
+                tab_up
+                oldproc.call(*args)
+                tab_down
+                concat haml_indent
+              end
               concat haml_indent
             end
-            concat haml_indent
+            res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
+            concat "\n" if block_given?
+            res
+          else
+            form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
           end
-          res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
-          concat "\n" if block_given?
-          res
-        else
-          form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
         end
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
       end
-      alias_method :form_tag_without_haml, :form_tag
-      alias_method :form_tag, :form_tag_with_haml
-    end
 
-    module FormHelper
-      def form_for_with_haml(object_name, *args, &proc)
-        if block_given? && is_haml?
-          oldproc = proc
-          proc = haml_bind_proc do |*args|
-            tab_up
-            oldproc.call(*args)
-            tab_down
+      module FormHelper
+        def form_for_with_haml(object_name, *args, &proc)
+          if block_given? && is_haml?
+            oldproc = proc
+            proc = haml_bind_proc do |*args|
+              tab_up
+              oldproc.call(*args)
+              tab_down
+              concat haml_indent
+            end
             concat haml_indent
           end
-          concat haml_indent
+          form_for_without_haml(object_name, *args, &proc)
+          concat "\n" if block_given? && is_haml?
         end
-        form_for_without_haml(object_name, *args, &proc)
-        concat "\n" if block_given? && is_haml?
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
       end
-      alias_method :form_for_without_haml, :form_for
-      alias_method :form_for, :form_for_with_haml
     end
   end
 end