haml 2.2.2 → 2.2.3
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of haml might be problematic. Click here for more details.
- data/VERSION +1 -1
- data/lib/haml/helpers/action_view_mods.rb +4 -2
- data/lib/haml/util.rb +1 -1
- data/lib/sass/engine.rb +2 -2
- data/test/sass/engine_test.rb +4 -2
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.2.
|
1
|
+
2.2.3
|
@@ -123,8 +123,10 @@ module ActionView
|
|
123
123
|
@template_object.send :is_haml?
|
124
124
|
end
|
125
125
|
|
126
|
-
|
127
|
-
|
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__),
|
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.
|
data/lib/sass/engine.rb
CHANGED
@@ -298,11 +298,11 @@ END
|
|
298
298
|
def check_for_no_children(node)
|
299
299
|
return unless node.is_a?(Tree::RuleNode) && node.children.empty?
|
300
300
|
warning = (node.rules.size == 1) ? <<SHORT : <<LONG
|
301
|
-
WARNING:
|
301
|
+
WARNING on line #{node.line}:
|
302
302
|
Selector #{node.rules.first.inspect} doesn't have any properties and will not be rendered.
|
303
303
|
SHORT
|
304
304
|
|
305
|
-
WARNING:
|
305
|
+
WARNING on line #{node.line}:
|
306
306
|
Selector
|
307
307
|
#{node.rules.join("\n ")}
|
308
308
|
doesn't have any properties and will not be rendered.
|
data/test/sass/engine_test.rb
CHANGED
@@ -706,17 +706,19 @@ SASS
|
|
706
706
|
|
707
707
|
def test_empty_selector_warning
|
708
708
|
assert_warning(<<END) {render("foo bar")}
|
709
|
-
WARNING:
|
709
|
+
WARNING on line 1:
|
710
710
|
Selector "foo bar" doesn't have any properties and will not be rendered.
|
711
711
|
END
|
712
712
|
|
713
713
|
assert_warning(<<END) {render(<<SASS)}
|
714
|
-
WARNING:
|
714
|
+
WARNING on line 3:
|
715
715
|
Selector
|
716
716
|
foo, bar, baz,
|
717
717
|
bang, bip, bop
|
718
718
|
doesn't have any properties and will not be rendered.
|
719
719
|
END
|
720
|
+
|
721
|
+
|
720
722
|
foo, bar, baz,
|
721
723
|
bang, bip, bop
|
722
724
|
SASS
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: haml
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.
|
4
|
+
version: 2.2.3
|
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-
|
13
|
+
date: 2009-08-25 00:00:00 -07:00
|
14
14
|
default_executable:
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|