haml-edge 2.3.23 → 2.3.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/EDGE_GEM_VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.23
1
+ 2.3.24
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.3.23
1
+ 2.3.24
@@ -123,8 +123,10 @@ module ActionView
123
123
  @template_object.send :is_haml?
124
124
  end
125
125
 
126
- alias_method :content_tag_without_haml, :content_tag
127
- alias_method :content_tag, :content_tag_with_haml
126
+ unless defined?(ActionView::Helpers::ActiveRecordInstanceTag)
127
+ alias_method :content_tag_without_haml, :content_tag
128
+ alias_method :content_tag, :content_tag_with_haml
129
+ end
128
130
  end
129
131
 
130
132
  module FormTagHelper
data/lib/haml/util.rb CHANGED
@@ -15,7 +15,7 @@ module Haml
15
15
  # @param file [String] The filename relative to the Haml root
16
16
  # @return [String] The filename relative to the the working directory
17
17
  def scope(file)
18
- File.join(File.dirname(__FILE__), '..', '..', file)
18
+ File.join(File.dirname(File.dirname(File.dirname(__FILE__))), file)
19
19
  end
20
20
 
21
21
  # Converts an array of `[key, value]` pairs to a hash.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haml-edge
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.23
4
+ version: 2.3.24
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2009-07-31 00:00:00 -04:00
13
+ date: 2009-08-06 00:00:00 -04:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -44,10 +44,10 @@ extensions: []
44
44
 
45
45
  extra_rdoc_files:
46
46
  - README.md
47
+ - REVISION
47
48
  - MIT-LICENSE
48
49
  - VERSION
49
50
  - VERSION_NAME
50
- - REVISION
51
51
  - EDGE_GEM_VERSION
52
52
  files:
53
53
  - rails/init.rb
@@ -249,10 +249,10 @@ files:
249
249
  - init.rb
250
250
  - .yardopts
251
251
  - README.md
252
+ - REVISION
252
253
  - MIT-LICENSE
253
254
  - VERSION
254
255
  - VERSION_NAME
255
- - REVISION
256
256
  - EDGE_GEM_VERSION
257
257
  has_rdoc: true
258
258
  homepage: http://haml.hamptoncatlin.com/