lib/oxblood/session.rb in oxblood-0.1.0.dev3 vs lib/oxblood/session.rb in oxblood-0.1.0.dev4

@@ -1,7 +1,5 @@
-require 'oxblood/command'
-
 module Oxblood
   class Session
     def initialize(connection)
       @connection = connection
     end
@@ -16,22 +14,22 @@
     # @param [String] key under which hash is stored
     # @param [Array<#to_s>] fields to delete
     #
     # @return [Integer] the number of fields that were removed from the hash
     def hdel(key, fields)
-      run(cmd.hdel(key, fields))
+      run(:HDEL, key, fields)
     end
 
     # Returns if field is an existing field in the hash stored at key
     # @see http://redis.io/commands/hexists
     #
     # @param [String] key under which hash is stored
     # @param [String] field to check for existence
     #
     # @return [Boolean] do hash contains field or not
     def hexists(key, field)
-      1 == run(cmd.hexists(key, field))
+      1 == run(:HEXISTS, key, field)
     end
 
     # Get the value of a hash field
     # @see http://redis.io/commands/hget
     #
@@ -39,21 +37,21 @@
     # @param [String] field name
     #
     # @return [String, nil] the value associated with field
     #   or nil when field is not present in the hash or key does not exist.
     def hget(key, field)
-      run(cmd.hget(key, field))
+      run(:HGET, key, field)
     end
 
     # Get all the fields and values in a hash
     # @see http://redis.io/commands/hgetall
     #
     # @param [String] key under which hash is stored
     #
     # @return [Hash] of fields and their values
     def hgetall(key)
-      Hash[*run(cmd.hgetall(key))]
+      Hash[*run(:HGETALL, key)]
     end
 
     # Increment the integer value of a hash field by the given number
     # @see http://redis.io/commands/hincrby
     #
@@ -61,11 +59,11 @@
     # @param [String] field to increment
     # @param [Integer] increment by value
     #
     # @return [Integer] the value at field after the increment operation
     def hincrby(key, field, increment)
-      run(cmd.hincrby(key, field, increment))
+      run(:HINCRBY, key, field, increment)
     end
 
     # Increment the float value of a hash field by the given number
     # @see http://redis.io/commands/hincrby
     #
@@ -73,33 +71,33 @@
     # @param [String] field to increment
     # @param [Integer] increment by value
     #
     # @return [String] the value of field after the increment
     def hincrbyfloat(key, field, increment)
-      run(cmd.hincrbyfloat(key, field, increment))
+      run(:HINCRBYFLOAT, key, field, increment)
     end
 
     # Get all the keys in a hash
     # @see http://redis.io/commands/hkeys
     #
     # @param [String] key
     #
     # @return [Array] list of fields in the hash, or an empty list when
     #   key does not exist.
     def hkeys(key)
-      run(cmd.hkeys(key))
+      run(:HKEYS, key)
     end
 
     # Get the number of keys in a hash
     # @see http://redis.io/commands/hlen
     #
     # @param [String] key
     #
     # @return [Integer] number of fields in the hash, or 0 when
     #   key does not exist.
     def hlen(key)
-      run(cmd.hlen(key))
+      run(:HLEN, key)
     end
 
     # Get the field values of all given hash fields
     # @see http://redis.io/commands/hmget
     #
@@ -107,22 +105,22 @@
     # @param [String, Array<String>] fields to get
     #
     # @return [Array] list of values associated with the given fields,
     #   in the same order as they are requested.
     def hmget(key, *fields)
-      run(cmd.hmget(key, *fields))
+      run(*fields.unshift(:HMGET, key))
     end
 
     # Set multiple hash fields to multiple values
     # @see http://redis.io/commands/hmset
     #
     # @param [String] key under which store hash
     # @param [[String, String], Array<[String, String]>] args fields and values
     #
     # @return [String] 'OK'
     def hmset(key, *args)
-      run(cmd.hmset(key, *args))
+      run(*args.unshift(:HMSET, key))
     end
 
 
     # Set the string value of a hash field
     # @see http://redis.io/commands/hset
@@ -132,11 +130,11 @@
     # @param [String] value
     #
     # @return [Integer] 1 if field is a new field in the hash and value was set.
     #   0 if field already exists in the hash and the value was updated.
     def hset(key, field, value)
-      run(cmd.hset(key, field, value))
+      run(:HSET, key, field, value)
     end
 
     # Set the value of a hash field, only if the field does not exist
     # @see http://redis.io/commands/hsetnx
     #
@@ -145,11 +143,11 @@
     # @param [String] value
     #
     # @return [Integer] 1 if field is a new field in the hash and value was set.
     #   0 if field already exists in the hash and no operation was performed.
     def hsetnx(key, field, value)
-      run(cmd.hsetnx(key, field, value))
+      run(:HSETNX, key, field, value)
     end
 
     # Get the length of the value of a hash field
     # @see http://redis.io/commands/hstrlen
     #
@@ -157,22 +155,22 @@
     # @param [String] field
     #
     # @return [Integer] the string length of the value associated with field,
     #   or 0 when field is not present in the hash or key does not exist at all.
     def hstrlen(key, field)
-      run(cmd.hstrlen(key, field))
+      run(:HSTRLEN, key, field)
     end
 
     # Get all values in a hash
     # @see http://redis.io/commands/hvals
     #
     # @param [String] key
     #
     # @return [Array] list of values in the hash, or an empty list when
     #   key does not exist
     def hvals(key)
-      run(cmd.hvals(key))
+      run(:HVALS, key)
     end
 
     # Incrementally iterate hash fields and associated values
     # @see http://redis.io/commands/hscan
     #
@@ -189,11 +187,11 @@
     #
     # @param [String] password
     #
     # @return [String] 'OK'
     def auth(password)
-      run(cmd.auth(password))
+      run(:AUTH, password)
     end
 
     # Like {#auth}, except that if error returned, raises it.
     #
     # @param [String] password
@@ -212,32 +210,32 @@
     #
     # @param [String] message to return
     #
     # @return [String] message passed as argument
     def ping(message = nil)
-      run(cmd.ping(message))
+      message ? run(:PING, message) : run(:PING)
     end
 
     # Change the selected database for the current connection
     # @see http://redis.io/commands/select
     #
     # @param [Integer] index database to switch
     #
     # @return [String] 'OK'
     def select(index)
-      run(cmd.select(index))
+      run(:SELECT, index)
     end
 
     # ------------------ Server ---------------------
 
     # Returns information and statistics about the server in a format that is
     # simple to parse by computers and easy to read by humans
     # @see http://redis.io/commands/info
     #
     # @param [String] section used to select a specific section of information
     def info(section = nil)
-      run(cmd.info(section))
+      section ? run(:INFO, section) : run(:INFO)
       # FIXME: Parse response
     end
 
     # ------------------ Keys ------------------------
 
@@ -246,19 +244,19 @@
     #
     # @param [String, Array<String>] keys to delete
     #
     # @return [Integer] the number of keys that were removed
     def del(*keys)
-      run(cmd.del(*keys))
+      run(*keys.unshift(:DEL))
     end
 
     # Find all keys matching the given pattern
     # @see http://redis.io/commands/keys
     #
     # @param [String] pattern used to match keys
     def keys(pattern)
-      run(cmd.keys(pattern))
+      run(:KEYS, pattern)
     end
 
     # Set a key's time to live in seconds
     # @see http://redis.io/commands/expire
     #
@@ -266,11 +264,11 @@
     # @param [Integer] seconds number of seconds
     #
     # @return [Integer] 1 if the timeout was set. 0 if key does not exist or
     #   the timeout could not be set.
     def expire(key, seconds)
-      run(cmd.expire(key, seconds))
+      run(:EXPIRE, key, seconds)
     end
 
     # ------------------ Sets ------------------------
 
     # Add one or more members to a set
@@ -280,21 +278,21 @@
     # @param [String, Array<String>] members to store
     #
     # @return [Integer] the number of elements that were added to the set,
     #   not including all the elements already present into the set.
     def sadd(key, *members)
-      run(cmd.sadd(key, *members))
+      run(*members.unshift(:SADD, key))
     end
 
     # Add multiple sets
     # @see http://redis.io/commands/sunion
     #
     # @param [String, Array<String>] keys
     #
     # @return [Array] list with members of the resulting set
     def sunion(*keys)
-      run(cmd.sunion(*keys))
+      run(*keys.unshift(:SUNION))
     end
 
     # ------------------ Sorted Sets -----------------
 
     # Add one or more members to a sorted set, or update its score if it already
@@ -305,11 +303,11 @@
     #   http://redis.io/commands/zadd#zadd-options-redis-302-or-greater
     #
     # @param [String] key under which store set
     # @param [[Float, String], Array<[Float, String]>] args scores and members
     def zadd(key, *args)
-      run(cmd.zadd(key, *args))
+      run(*args.unshift(:ZADD, key))
     end
 
     # Return a range of members in a sorted set, by score
     # @see http://redis.io/commands/zrangebyscore
     #
@@ -317,20 +315,20 @@
     #
     # @param [String] key under which set is stored
     # @param [String] min value
     # @param [String] max value
     def zrangebyscore(key, min, max)
-      run(cmd.zrangebyscore(key, min, max))
+      run(:ZRANGEBYSCORE, key, min, max)
     end
 
     protected
 
-    def cmd
-      Command
+    def serialize(*command)
+      Protocol.build_command(*command)
     end
 
-    def run(command)
-      @connection.write(command)
+    def run(*command)
+      @connection.write(serialize(*command))
       @connection.read_response
     end
 
     private