em-hiredis 0.0.1 → 0.1.0

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+$:.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
+require 'em-hiredis'
+require 'rspec'
+require 'em-spec/rspec'
+
+require 'support/connection_helper'
+require 'support/redis_mock'
+require 'stringio'
+
+RSpec.configure do |config|
+  config.include ConnectionHelper
+  config.include EventMachine::SpecHelper
+  config.include RedisMock::Helper
+end

data/spec/support/connection_helper.rb

@@ -0,0 +1,9 @@
+module ConnectionHelper
+  def connect(url = nil, &blk)
+    em do
+      redis = EventMachine::Hiredis.connect(url)
+      redis.flushall
+      blk.call(redis)
+    end
+  end
+end

data/spec/support/redis_mock.rb

@@ -0,0 +1,65 @@
+# nabbed from redis-rb, thanks!
+require "socket"
+
+module RedisMock
+  def self.start(port = 6380)
+    server = TCPServer.new("127.0.0.1", port)
+
+    loop do
+      session = server.accept
+
+      while line = session.gets
+        parts = Array.new(line[1..-3].to_i) do
+          bytes = session.gets[1..-3].to_i
+          argument = session.read(bytes)
+          session.read(2) # Discard \r\n
+          argument
+        end
+
+        response = yield(*parts)
+
+        if response.nil?
+          session.shutdown(Socket::SHUT_RDWR)
+          break
+        else
+          session.write(response)
+          session.write("\r\n")
+        end
+      end
+    end
+  end
+
+  module Helper
+    # Forks the current process and starts a new mock Redis server on
+    # port 6380.
+    #
+    # The server will reply with a `+OK` to all commands, but you can
+    # customize it by providing a hash. For example:
+    #
+    #     redis_mock(:ping => lambda { "+PONG" }) do
+    #       assert_equal "PONG", Redis.new(:port => 6380).ping
+    #     end
+    #
+    def redis_mock(replies = {})
+      begin
+        pid = fork do
+          trap("TERM") { exit }
+
+          RedisMock.start do |command, *args|
+            (replies[command.to_sym] || lambda { |*_| "+OK" }).call(*args)
+          end
+        end
+
+        sleep 1 # Give time for the socket to start listening.
+
+        yield
+
+      ensure
+        if pid
+          Process.kill("TERM", pid)
+          Process.wait(pid)
+        end
+      end
+    end
+  end
+end

data/spec/url_param_spec.rb

@@ -0,0 +1,43 @@
+# adapted from redis-rb
+require 'spec_helper'
+
+describe EventMachine::Hiredis, "URL parsing" do
+  it "defaults URL defaults to 127.0.0.1:6379" do
+    redis = EventMachine::Hiredis.setup
+
+    redis.host.should == "127.0.0.1"
+    redis.port.should == 6379
+    redis.db.should == "0"
+    redis.password.should == nil
+  end
+
+  it "allows to pass in a URL" do
+    redis = EventMachine::Hiredis.setup "redis://:secr3t@foo.com:999/2"
+
+    redis.host.should == "foo.com"
+    redis.port.should == 999
+    redis.db.should == "2"
+    redis.password.should == "secr3t"
+  end
+
+  it "does not modify the passed options" do
+    options = "redis://:secr3t@foo.com:999/2"
+
+    redis = EventMachine::Hiredis.setup(options)
+
+    options.should == "redis://:secr3t@foo.com:999/2"
+  end
+
+  it "uses REDIS_URL over default if available" do
+    ENV["REDIS_URL"] = "redis://:secr3t@foo.com:999/2"
+
+    redis = EventMachine::Hiredis.setup
+
+    redis.host.should == "foo.com"
+    redis.port.should == 999
+    redis.db.should == "2"
+    redis.password.should == "secr3t"
+
+    ENV.delete("REDIS_URL")
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: em-hiredis
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Martyn Loughran
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -08:00
+date: 2011-05-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 description: Eventmachine redis client using hiredis native parser
@@ -35,6 +35,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -44,6 +45,13 @@ files:
 - lib/em-hiredis/connection.rb
 - lib/em-hiredis/event_emitter.rb
 - lib/em-hiredis/version.rb
+- spec/connection_spec.rb
+- spec/live_redis_protocol_spec.rb
+- spec/redis_commands_spec.rb
+- spec/spec_helper.rb
+- spec/support/connection_helper.rb
+- spec/support/redis_mock.rb
+- spec/url_param_spec.rb
 has_rdoc: true
 homepage: http://github.com/mloughran/em-hiredis
 licenses: []
@@ -68,9 +76,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: em-hiredis
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Eventmachine redis client
-test_files: []
-
+test_files: 
+- spec/connection_spec.rb
+- spec/live_redis_protocol_spec.rb
+- spec/redis_commands_spec.rb
+- spec/spec_helper.rb
+- spec/support/connection_helper.rb
+- spec/support/redis_mock.rb
+- spec/url_param_spec.rb