haml 2.2.22 → 2.2.23

data/REMEMBER

@@ -3,4 +3,11 @@ Make .#{} work in extend
 Test newly-invalid selectors, including post-resolution parse errors in Sass
 Be smart about default namespaces (http://www.w3.org/TR/css3-namespace/#declaration)
 Don't conflict with Object#extend.
+
 http://camendesign.com/design/ provides some interesting formatting and nesting issues for sass-convert
+Charles Roper's example code for media queries doesn't fare well in css2sass either
+
+Add period to SCSS syntax errors?
+Better #{} in prop names
+Faster than Less
+Comma multiline for Haml

data/Rakefile

@@ -72,7 +72,7 @@ at_exit { File.delete(scope('REVISION')) rescue nil }
 
 desc "Install Haml as a gem."
 task :install => [:package] do
-  sudo = RUBY_PLATFORM =~ /win32/ ? '' : 'sudo'
+  sudo = RUBY_PLATFORM =~ /win32|mingw/ ? '' : 'sudo'
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
   sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
 end

data/VERSION

@@ -1 +1 @@
-2.2.22
+2.2.23

data/init.rb

@@ -7,7 +7,9 @@ rescue LoadError
     # gems:install may be run to install Haml with the skeleton plugin
     # but not the gem itself installed.
     # Don't die if this is the case.
-    raise e unless defined?(Rake) && Rake.application.top_level_tasks.include?('gems:install')
+    raise e unless defined?(Rake) &&
+      (Rake.application.top_level_tasks.include?('gems') ||
+        Rake.application.top_level_tasks.include?('gems:install'))
   end
 end
 

data/lib/haml/filters.rb

@@ -100,7 +100,11 @@ module Haml
           if contains_interpolation?(text)
             return if options[:suppress_eval]
 
-            text = unescape_interpolation(text).gsub("\\n", "\n")
+            text = unescape_interpolation(text).gsub(/(\\+)n/) do |s|
+              escapes = $1.size
+              next s if escapes % 2 == 0
+              ("\\" * (escapes - 1)) + "\n"
+            end
             newline if text.gsub!(/\n"\Z/, "\\n\"")
             push_script <<RUBY.strip, :escape_html => false
 find_and_preserve(#{filter.inspect}.render_with_options(#{text}, _hamlout.options))

data/lib/haml/helpers.rb

@@ -502,7 +502,7 @@ END
     # @param text [String] The string to sanitize
     # @return [String] The sanitized string
     def html_escape(text)
-      text.to_s.gsub(/[\"><&]/n) {|s| HTML_ESCAPE[s]}
+      Haml::Util.silence_warnings {text.to_s.gsub(/[\"><&]/n) {|s| HTML_ESCAPE[s]}}
     end
 
     # Escapes HTML entities in `text`, but without escaping an ampersand

data/lib/haml/helpers/action_view_mods.rb

@@ -125,9 +125,8 @@ module ActionView
         @template_object.send :is_haml?
       end
 
-      unless defined?(ActionView::Helpers) && defined?(ActionView::Helpers::ActiveRecordInstanceTag)
-        alias_method :content_tag_without_haml, :content_tag
-        alias_method :content_tag, :content_tag_with_haml
+      def content_tag(*args)
+        content_tag_with_haml(*args)
       end
     end
 

data/lib/sass/files.rb

@@ -85,7 +85,15 @@ If you really need #{filename}.css, import it explicitly.
 END
         return filename + '.css'
       end
-      raise SyntaxError.new("File to import not found or unreadable: #{original_filename}.", @line)
+
+      message = "File to import not found or unreadable: #{original_filename}.\n"
+      if load_paths.size == 1
+        message << "Load path: #{load_paths.first}"
+      else
+        message << "Load paths:\n  " << load_paths.join("\n  ")
+      end
+
+      raise SyntaxError.new(message, @line)
     end
 
     private

data/lib/sass/plugin.rb

@@ -204,8 +204,13 @@ END
 
     def dependency_updated?(css_mtime)
       lambda do |dep|
-        File.mtime(dep) > css_mtime ||
-          dependencies(dep).any?(&dependency_updated?(css_mtime))
+        begin
+          File.mtime(dep) > css_mtime ||
+            dependencies(dep).any?(&dependency_updated?(css_mtime))
+        rescue Sass::SyntaxError
+          # If there's an error finding depenencies, default to recompiling.
+          true
+        end
       end
     end
 

data/test/haml/engine_test.rb

@@ -629,6 +629,15 @@ HAML
     assert_equal("<a href='#\"'></a>\n", render('%a(href="#\\"")'))
   end
 
+  def test_filter_with_newline_and_interp
+    assert_equal(<<HTML, render(<<HAML))
+\\n
+HTML
+:plain
+  \\n\#{""}
+HAML
+  end
+
   # HTML escaping tests
 
   def test_ampersand_equals_should_escape

data/test/sass/engine_test.rb

@@ -55,7 +55,12 @@ MSG
     "a," => "Rules can\'t end in commas.",
     "a,\n!b = 1" => ["Rules can\'t end in commas.", 1],
     "!a = b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
-    "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
+    "@import foo.sass" => <<MSG,
+File to import not found or unreadable: foo.sass.
+Load paths:
+  #{File.dirname(__FILE__)}
+  .
+MSG
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
     "foo\n  @import #{File.dirname(__FILE__)}/templates/basic" => "Import directives may only be used at the root of a document.",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 22
-  version: 2.2.22
+  - 23
+  version: 2.2.23
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-04-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency