haml 2.2.2 → 2.2.3

data/VERSION

@@ -1 +1 @@
-2.2.2
+2.2.3

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.

data/lib/sass/engine.rb

@@ -298,11 +298,11 @@ END
     def check_for_no_children(node)
       return unless node.is_a?(Tree::RuleNode) && node.children.empty?
       warning = (node.rules.size == 1) ? <<SHORT : <<LONG
-WARNING:
+WARNING on line #{node.line}:
 Selector #{node.rules.first.inspect} doesn't have any properties and will not be rendered.
 SHORT
 
-WARNING:
+WARNING on line #{node.line}:
 Selector
   #{node.rules.join("\n  ")}
 doesn't have any properties and will not be rendered.

data/test/sass/engine_test.rb

@@ -706,17 +706,19 @@ SASS
 
   def test_empty_selector_warning
     assert_warning(<<END) {render("foo bar")}
-WARNING:
+WARNING on line 1:
 Selector "foo bar" doesn't have any properties and will not be rendered.
 END
 
     assert_warning(<<END) {render(<<SASS)}
-WARNING:
+WARNING on line 3:
 Selector
   foo, bar, baz,
   bang, bip, bop
 doesn't have any properties and will not be rendered.
 END
+
+
 foo, bar, baz,
 bang, bip, bop
 SASS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency