vendor/plugins/haml/lib/haml/railtie.rb in radiantcms-couchrest_model-0.1.3 vs vendor/plugins/haml/lib/haml/railtie.rb in radiantcms-couchrest_model-0.1.4
- old
+ new
@@ -1,21 +1,18 @@
-if Haml::Util.ap_geq_3? && !Haml::Util.ap_geq?("3.0.0.beta4")
- raise <<ERROR
-Haml and Sass no longer support Rails 3 versions before beta 4.
- Please upgrade to Rails 3.0.0.beta4 or later.
-ERROR
-end
+# This file is here to integrate with Rails 3,
+# since there's no better way to do so as of 14 March 2010.
+# Yehuda promises there will be soon,
+# and once there is we should switch to that.
-# Rails 3.0.0.beta.2+
if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
- require 'haml/template/options'
- require 'sass/plugin/configuration'
- ActiveSupport.on_load(:before_initialize) do
- require 'sass'
- require 'sass/plugin'
-
- # Haml requires AV, but Sass doesn't
- ActiveSupport.on_load(:action_view) do
- Haml.init_rails(binding)
+ # 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
+ Haml.init_rails(binding)
+ end
end
end
end