ohm 0.0.25 → 0.0.26

data/lib/ohm/redis.rb

@@ -240,9 +240,12 @@ module Ohm
     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)

data/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")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -03:00
+date: 2009-10-26 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +25,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/ohm/compat.rb
 - lib/ohm/redis.rb
 - lib/ohm/validations.rb
 - lib/ohm.rb

data/lib/ohm/compat.rb

@@ -1,12 +0,0 @@
-# encoding: UTF-8
-
-# This file provides Ruby 1.8 compatibility. The intended functionality
-# is not present, because we cannot guess the original encoding, thus
-# making Iconv unsuitable for a conversion.
-if RUBY_VERSION < "1.9"
-  class String
-    def force_encoding(encoding)
-      self
-    end
-  end
-end