moriyoshi
diff --git a/‎README.md
Lines changed: 2 additions & 2 deletions b/‎README.md
Lines changed: 2 additions & 2 deletions
diff --git a/‎fluent/handler.py
Lines changed: 1 addition & 1 deletion b/‎fluent/handler.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/test_decode.py
Lines changed: 45 additions & 0 deletions b/‎tests/test_decode.py
Lines changed: 45 additions & 0 deletions
@@ -19,7 +19,7 @@ This library is distributed as 'fluent-logger' python package. Please execute th
 
 ## Configuration
 
-Fluent daemon must be lauched with the following configuration:
+Fluentd daemon must be lauched with the following configuration:
 
     <source>
       type tcp
@@ -36,7 +36,7 @@ Fluent daemon must be lauched with the following configuration:
 
 First, you need to call logger.setup() to create global logger instance. This call needs to be called only once, at the beggining of the application for example.
 
-By default, the logger assumes fluent daemon is launched locally. You can also specify remote logger by passing the options.
+By default, the logger assumes fluentd daemon is launched locally. You can also specify remote logger by passing the options.
 
     from fluent import sender
 
 
@@ -64,7 +64,7 @@ def _decode(self, value):
         if value is None:
             return None
         elif isinstance(value, str):
-            return unicode(value, self.encoding)
+            return unicode(value, self.encoding, errors='replace')
         elif isinstance(value, unicode):
             return value
         else:
 
@@ -0,0 +1,45 @@
+# -*- coding:utf-8 -*-
+
+import unittest
+
+class TestHandler(unittest.TestCase):
+
+    def _getTarget(self):
+        from fluent.handler import FluentHandler
+        return FluentHandler
+
+
+    def _makeOne(self, *args, **kwargs):
+        return self._getTarget()(*args, **kwargs)
+
+
+    def test_decode_none(self):
+        h = self._makeOne('app.follow')
+        result = h._decode(None)
+        self.assertIsNone(result)
+
+    def test_decode_str(self):
+        h = self._makeOne('app.follow')
+        result = h._decode("あいうえお")
+        self.assertTrue(isinstance(result, unicode), type(result).__name__)
+        self.assertEqual(result, u"あいうえお")
+
+    def test_decode_str2(self):
+        h = self._makeOne('app.follow')
+        result = h._decode(u"あいうえお".encode('Shift_JIS'))
+        self.assertTrue(isinstance(result, unicode), type(result).__name__)
+        self.assertEqual(result, u"\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd")  # replaced
+
+    def test_decode_unicode(self):
+        h = self._makeOne('app.follow')
+        result = h._decode(u"あいうえお")
+        self.assertTrue(isinstance(result, unicode), type(result).__name__)
+        self.assertEqual(result, u"あいうえお")
+
+    def test_decode_obj(self):
+        h = self._makeOne('app.follow')
+        marker = object()
+        result = h._decode(marker)
+        self.assertTrue(isinstance(result, unicode), type(result).__name__)
+        
+        self.assertEqual(result, str(marker))