haml 3.2.0.alpha.4 → 3.2.0.alpha.5

data/REVISION

@@ -1 +1 @@
-5c22304b9d03505917f839dea9c84d39418e18d7
+ffb73065aa2843b73b4a85766085cc93b9c8fd85

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.4
+3.2.0.alpha.5

data/lib/haml/template.rb

@@ -54,7 +54,7 @@ end
 # Patching was necessary for versions <= 2.0.1,
 # but we can make it a normal handler for higher versions.
 if defined?(ActionView::TemplateHandler) ||
-    (defined?(ActionView::Template) && defined?(ActionView::Template::Handler))
+    (defined?(ActionView::Template) && defined?(ActionView::Template::Handlers))
   require 'haml/template/plugin'
 else
   require 'haml/template/patch'

data/lib/haml/util.rb

@@ -424,8 +424,11 @@ WARNING
     #   For example, `:Error` will return `ActionView::TemplateError`
     #   or `ActionView::Template::Error`.
     def av_template_class(name)
-      return ActionView.const_get("Template#{name}") if ActionView.const_defined?("Template#{name}")
-      return ActionView::Template.const_get(name.to_s)
+      if ActionView::Template.const_defined?(name)
+        ActionView::Template.const_get(name)
+      else
+        ActionView.const_get("Template#{name}")
+      end
     end
 
     ## Rails XSS Safety

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.2.0.alpha.4
+  version: 3.2.0.alpha.5
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -04:00
+date: 2011-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency