Merge pull request #338 from Razer6/preserve_encoding

Force encoding of posix_spawn output

Author: bkeepers

lib/github/markup/command_implementation.rb

@@ -35,7 +35,7 @@ def call_block(rendered, content)
       def execute(command, target)
         spawn = POSIX::Spawn::Child.new(*command, :input => target)
         if spawn.status.success?
-          spawn.out.gsub("\r", '')
+          spawn.out.gsub("\r", '').force_encoding(target.encoding)
         else
           raise CommandError.new(spawn.err.strip)
         end

test/markup_test.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 $LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'github/markup'
@@ -50,4 +52,9 @@ def test_raises_error_if_command_exits_non_zero
       fail "an exception was expected but was not raised"
     end
   end
+
+  def test_preserve_markup
+    content = "Noël"
+    assert_equal content.encoding.name, GitHub::Markup.render('Foo.rst', content).encoding.name
+  end
 end