Removed compat.rb and added force_encoding check (Jarod Reid / http:/…

…/github.com/pmamediagroup/ohm)
maccman · Oct 26, 2009 · 35af0a5 · 35af0a5
1 parent ef04918
commit 35af0a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/lib/ohm.rb b/lib/ohm.rb
@@ -1,7 +1,6 @@
 # encoding: UTF-8
 
 require "base64"
-require File.join(File.dirname(__FILE__), "ohm", "compat")
 require File.join(File.dirname(__FILE__), "ohm", "redis")
 require File.join(File.dirname(__FILE__), "ohm", "validations")
 

diff --git a/lib/ohm/compat.rb b/lib/ohm/compat.rb
diff --git a/lib/ohm/redis.rb b/lib/ohm/redis.rb
@@ -240,9 +240,12 @@ def format_integer_reply(line)
     def format_bulk_reply(line)
       bulklen = line.to_i
       return nil if bulklen == -1
-      reply = @sock.read(bulklen).force_encoding("UTF-8")
+      reply = @sock.read(bulklen)
       @sock.read(2) # Discard CRLF.
-      reply
+
+      reply.respond_to?(:force_encoding) ?
+        reply.force_encoding("UTF-8") :
+        reply
     end
 
     def format_multi_bulk_reply(line)