haml-edge 2.3.23 → 2.3.24

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.23
+2.3.24

data/VERSION

@@ -1 +1 @@
-2.3.23
+2.3.24

data/lib/haml/helpers/action_view_mods.rb

@@ -123,8 +123,10 @@ module ActionView
         @template_object.send :is_haml?
       end
 
-      alias_method :content_tag_without_haml, :content_tag
-      alias_method :content_tag, :content_tag_with_haml
+      unless defined?(ActionView::Helpers::ActiveRecordInstanceTag)
+        alias_method :content_tag_without_haml, :content_tag
+        alias_method :content_tag, :content_tag_with_haml
+      end
     end
 
     module FormTagHelper

data/lib/haml/util.rb

@@ -15,7 +15,7 @@ module Haml
     # @param file [String] The filename relative to the Haml root
     # @return [String] The filename relative to the the working directory
     def scope(file)
-      File.join(File.dirname(__FILE__), '..', '..', file)
+      File.join(File.dirname(File.dirname(File.dirname(__FILE__))), file)
     end
 
     # Converts an array of `[key, value]` pairs to a hash.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.23
+  version: 2.3.24
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 -04:00
+date: 2009-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,10 +44,10 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
+- REVISION
 - MIT-LICENSE
 - VERSION
 - VERSION_NAME
-- REVISION
 - EDGE_GEM_VERSION
 files: 
 - rails/init.rb
@@ -249,10 +249,10 @@ files:
 - init.rb
 - .yardopts
 - README.md
+- REVISION
 - MIT-LICENSE
 - VERSION
 - VERSION_NAME
-- REVISION
 - EDGE_GEM_VERSION
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/