haml-edge 2.1.52 → 2.1.53
Sign up to get free protection for your applications and to get access to all the features.
- data/EDGE_GEM_VERSION +1 -1
- data/VERSION +1 -1
- data/extra/sass-mode.el +1 -1
- data/lib/haml/engine.rb +0 -8
- data/lib/haml/template.rb +4 -0
- data/test/haml/results/content_for_layout.xhtml +0 -3
- data/test/haml/template_test.rb +3 -2
- data/test/haml/templates/content_for_layout.haml +0 -2
- metadata +4 -4
data/EDGE_GEM_VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.1.
|
|
1
|
+
2.1.53
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.1.
|
|
1
|
+
2.1.53
|
data/extra/sass-mode.el
CHANGED
|
@@ -60,7 +60,7 @@ text nested beneath them.")
|
|
|
60
60
|
|
|
61
61
|
(defconst sass-script-font-lock-keywords
|
|
62
62
|
`(("\"\\([^\"\\\\]\\|\\\\.\\)*\"" 0 font-lock-string-face)
|
|
63
|
-
("!\\w+" 0 font-lock-variable-name-face)
|
|
63
|
+
("!\\(\\w\\|_\\)+" 0 font-lock-variable-name-face)
|
|
64
64
|
("#[0-9a-fA-F]\\{0,6\\}" 0 font-lock-preprocessor-face)
|
|
65
65
|
(,(regexp-opt
|
|
66
66
|
'("true" "false" "black" "silver" "gray" "white" "maroon" "red"
|
data/lib/haml/engine.rb
CHANGED
|
@@ -109,14 +109,6 @@ module Haml
|
|
|
109
109
|
@tab_change = 0
|
|
110
110
|
@temp_count = 0
|
|
111
111
|
|
|
112
|
-
if @options[:filters]
|
|
113
|
-
warn <<END
|
|
114
|
-
DEPRECATION WARNING:
|
|
115
|
-
The Haml :filters option is deprecated and will be removed in version 2.2.
|
|
116
|
-
Filters are now automatically registered.
|
|
117
|
-
END
|
|
118
|
-
end
|
|
119
|
-
|
|
120
112
|
precompile
|
|
121
113
|
rescue Haml::Error => e
|
|
122
114
|
e.backtrace.unshift "#{@options[:filename]}:#{(e.line ? e.line + 1 : @index) + @options[:line] - 1}" if @index
|
data/lib/haml/template.rb
CHANGED
|
@@ -14,6 +14,10 @@ module Haml
|
|
|
14
14
|
end
|
|
15
15
|
end
|
|
16
16
|
|
|
17
|
+
if defined?(RAILS_ENV) && RAILS_ENV == "production"
|
|
18
|
+
Haml::Template.options[:ugly] = true
|
|
19
|
+
end
|
|
20
|
+
|
|
17
21
|
# Decide how we want to load Haml into Rails.
|
|
18
22
|
# Patching was necessary for versions <= 2.0.1,
|
|
19
23
|
# but we can make it a normal handler for higher versions.
|
data/test/haml/template_test.rb
CHANGED
|
@@ -95,7 +95,8 @@ class TemplateTest < Test::Unit::TestCase
|
|
|
95
95
|
end
|
|
96
96
|
|
|
97
97
|
def assert_renders_correctly(name, &render_method)
|
|
98
|
-
if ActionPack::VERSION::MAJOR < 2 ||
|
|
98
|
+
if ActionPack::VERSION::MAJOR < 2 ||
|
|
99
|
+
(ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
|
|
99
100
|
render_method ||= proc { |name| @base.render(name) }
|
|
100
101
|
else
|
|
101
102
|
render_method ||= proc { |name| @base.render(:file => name) }
|
|
@@ -139,7 +140,7 @@ class TemplateTest < Test::Unit::TestCase
|
|
|
139
140
|
end
|
|
140
141
|
|
|
141
142
|
def test_action_view_templates_render_correctly
|
|
142
|
-
@base.
|
|
143
|
+
@base.content_for(:layout) {'Lorem ipsum dolor sit amet'}
|
|
143
144
|
assert_renders_correctly 'content_for_layout'
|
|
144
145
|
end
|
|
145
146
|
|
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.1.
|
|
4
|
+
version: 2.1.53
|
|
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-
|
|
13
|
+
date: 2009-07-05 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
|
|
48
47
|
- MIT-LICENSE
|
|
49
48
|
- VERSION
|
|
50
49
|
- 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
|
|
253
252
|
- MIT-LICENSE
|
|
254
253
|
- VERSION
|
|
255
254
|
- VERSION_NAME
|
|
255
|
+
- REVISION
|
|
256
256
|
- EDGE_GEM_VERSION
|
|
257
257
|
has_rdoc: true
|
|
258
258
|
homepage: http://haml.hamptoncatlin.com/
|