haml-edge 2.3.75 → 2.3.76

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.75
+2.3.76

data/VERSION

@@ -1 +1 @@
-2.3.75
+2.3.76

data/lib/haml/engine.rb

@@ -58,7 +58,9 @@ module Haml
     # @return [String]
     def precompiled
       return @precompiled if ruby1_8?
-      return @precompiled.encode(Encoding.find(@options[:encoding]))
+      encoding = Encoding.find(@options[:encoding])
+      return @precompiled.force_encoding(encoding) if encoding == Encoding::BINARY
+      return @precompiled.encode(encoding)
     end
 
     # Precompiles the Haml template.

data/test/haml/engine_test.rb

@@ -837,12 +837,18 @@ HAML
         line_no ||= key.split("\n").length
 
         if expected_message == :compile
-          assert_match(/^compile error\n/, err.message, "Line: #{key}")
+          if Haml::Util.ruby1_8?
+            assert_match(/^compile error\n/, err.message, "Line: #{key}")
+          else
+            assert_match(/^#{Regexp.quote __FILE__}:#{line_no}: syntax error,/, err.message, "Line: #{key}")
+          end
         else
           assert_equal(expected_message, err.message, "Line: #{key}")
         end
 
-        assert_match(/^#{Regexp.escape(__FILE__)}:#{line_no}/, err.backtrace[0], "Line: #{key}")
+        if Haml::Util.ruby1_8?
+          assert_match(/^#{Regexp.escape(__FILE__)}:#{line_no}/, err.backtrace[0], "Line: #{key}")
+        end
       else
         assert(false, "Exception not raised for\n#{key}")
       end
@@ -1194,6 +1200,16 @@ HTML
 HAML
     end
 
+    def test_fake_ascii_encoding
+      assert_equal(<<HTML.force_encoding("ascii-8bit"), render(<<HAML, :encoding => "ascii-8bit"))
+<p>bâr</p>
+<p>föö</p>
+HTML
+%p bâr
+%p föö
+HAML
+    end
+
     def test_convert_template_render_proc
       assert_converts_template_properly {|e| e.render_proc.call}
     end

data/test/test_helper.rb

@@ -13,6 +13,7 @@ class Test::Unit::TestCase
   def munge_filename(opts)
     return if opts[:filename]
     test_name = Haml::Util.caller_info(caller[1])[2]
+    test_name.sub!(/^block in /, '')
     opts[:filename] = "#{test_name}_inline.sass"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.75
+  version: 2.3.76
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -05:00
+date: 2009-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency