ohm 0.0.30 → 0.0.31

data/lib/ohm.rb

@@ -3,6 +3,7 @@
 require "base64"
 require File.join(File.dirname(__FILE__), "ohm", "redis")
 require File.join(File.dirname(__FILE__), "ohm", "validations")
+require File.join(File.dirname(__FILE__), "ohm", "compat-1.8.6")
 
 module Ohm
 

data/lib/ohm/compat-1.8.6.rb

@@ -0,0 +1,15 @@
+unless "".respond_to?(:lines)
+  class String
+
+    # This version of String#lines is almost fully compatible with that
+    # of Ruby 1.9. If a zero-length record separator is supplied in Ruby
+    # 1.9, the string is split into paragraphs delimited by multiple
+    # successive newlines. This replacement ignores that feature in
+    # favor of code simplicity.
+    def lines(separator = $/)
+      result = split(separator).map { |part| "#{part}#{separator}" }
+      result.each { |r| yield r } if block_given?
+      result
+    end
+  end
+end

data/lib/ohm/redis.rb

@@ -54,7 +54,7 @@ module Ohm
     PROCESSOR_IDENTITY = lambda { |reply| reply }
     PROCESSOR_CONVERT_TO_BOOL = lambda { |reply| reply == 0 ? false : reply }
     PROCESSOR_SPLIT_KEYS = lambda { |reply| reply.split(" ") }
-    PROCESSOR_INFO = lambda { |reply| Hash[*(reply.lines.map { |l| l.chomp.split(":") }.flatten)] }
+    PROCESSOR_INFO = lambda { |reply| Hash[*(reply.lines.map { |l| l.chomp.split(":", 2) }.flatten)] }
 
     REPLY_PROCESSOR = {
       :exists => PROCESSOR_CONVERT_TO_BOOL,

data/test/1.8.6_test.rb

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), "test_helper")
+
+class TestString < Test::Unit::TestCase
+  context "String#lines" do
+    should "return the parts when separated with \\n" do
+      assert_equal ["a\n", "b\n", "c\n"], "a\nb\nc\n".lines.to_a
+    end
+
+    should "return the parts when separated with \\r\\n" do
+      assert_equal ["a\r\n", "b\r\n", "c\r\n"], "a\r\nb\r\nc\r\n".lines.to_a
+    end
+
+    should "accept a record separator" do
+      assert_equal ["ax", "bx", "cx"], "axbxcx".lines("x").to_a
+    end
+
+    should "execute the passed block" do
+      lines = ["a\r\n", "b\r\n", "c\r\n"]
+
+      "a\r\nb\r\nc\r\n".lines do |line|
+        assert_equal lines.shift, line
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ohm
 version: !ruby/object:Gem::Version 
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors: 
 - Michel Martens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -03:00
+date: 2009-11-26 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/ohm/compat-1.8.6.rb
 - lib/ohm/redis.rb
 - lib/ohm/validations.rb
 - lib/ohm.rb
@@ -32,6 +33,7 @@ files:
 - LICENSE
 - Rakefile
 - Thorfile
+- test/1.8.6_test.rb
 - test/all_tests.rb
 - test/benchmarks.rb
 - test/connection_test.rb