haml 3.0.9 → 3.0.10

data/VERSION

@@ -1 +1 @@
-3.0.9
+3.0.10

data/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 3.0.0
+;; Version: 3.0.10
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html
@@ -136,7 +136,8 @@ and `font-lock-syntactic-keywords', respectively."
 
 (defun haml-fontify-region-as-ruby (beg end)
   "Use Ruby's font-lock variables to fontify the region between BEG and END."
-  (haml-fontify-region beg end ruby-font-lock-keywords nil
+  (haml-fontify-region beg end ruby-font-lock-keywords
+                       ruby-font-lock-syntax-table
                        ruby-font-lock-syntactic-keywords))
 
 (defun haml-handle-filter (filter-name limit fn)

data/extra/sass-mode.el

@@ -4,11 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 3.0.0
+;; Version: 3.0.10
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "3.0.0"))
+;; Package-Requires: ((haml-mode "3.0.10"))
 
 ;;; Commentary:
 

data/lib/haml/exec.rb

@@ -710,6 +710,8 @@ END
         end
         @options[:output] ||= @options[:input]
 
+        from = @options[:from]
+        from = :sass if from == :sass2
         if @options[:to] == @options[:from] && !@options[:in_place]
           fmt = @options[:from]
           raise "Error: converting from #{fmt} to #{fmt} without --in-place"

data/lib/haml/html.rb

@@ -221,7 +221,7 @@ module Haml
         if content.include?("\n")
           "#{tabulate(tabs)}/#{condition}\n#{parse_text(content, tabs + 1)}"
         else
-          "#{tabulate(tabs)}/#{condition} #{content.strip}"
+          "#{tabulate(tabs)}/#{condition} #{content.strip}\n"
         end
       end
     end

data/lib/haml/root.rb

@@ -3,5 +3,5 @@ module Haml
   # This may be overridden by the package manager
   # if the lib directory is separated from the main source tree.
   # @api public
-  ROOT_DIR = File.expand_path("../../..", __FILE__)
+  ROOT_DIR = File.expand_path(File.join(__FILE__, "../../.."))
 end

data/lib/sass/plugin/rails.rb

@@ -12,7 +12,7 @@ unless defined?(Sass::RAILS_LOADED)
   if defined?(ActionController::Metal)
     # Rails >= 3.0
     require 'sass/plugin/rack'
-    ActionController::Metal.use(Sass::Plugin::Rack)
+    Rails.configuration.middleware.use(Sass::Plugin::Rack)
   elsif defined?(ActionController::Dispatcher) &&
       defined?(ActionController::Dispatcher.middleware)
     # Rails >= 2.3

data/test/haml/html2haml_test.rb

@@ -86,6 +86,13 @@ HTML
 
   def test_inline_comment
     assert_equal("/ foo", render("<!-- foo -->"))
+    assert_equal(<<HAML.strip, render(<<HTML))
+/ foo
+%p bar
+HAML
+<!-- foo -->
+<p>bar</p>
+HTML
   end
 
   def test_non_inline_comment

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 9
-  version: 3.0.9
+  - 10
+  version: 3.0.10
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency