fix: updates remaining static impl

add:
- all the remaining fixes into redis static functions on order to fit
  the tests.
- tests it all

Author: Felipe-gsilva

src/com/moclojer/rq/queue.clj

@@ -88,32 +88,18 @@
   [client queue-name tmot & {:keys [direction pattern]
                              :or {direction :l pattern :rq}}]
   (let [packed-queue-name (utils/pack-pattern pattern queue-name)
-        result (if (= direction :l)
+        return (if (= direction :l)
                  (.blpop @client tmot packed-queue-name)
                  (.brpop @client tmot packed-queue-name))]
-    (when result
-      (let [message (second result)]
+    (when return
+      (let [message (second return)]
         (log/debug "popped from queue"
                    {:client client
                     :queue-name packed-queue-name
                     :options {:direction direction :pattern pattern}
                     :message message})
-        (edn/read-string message)))))
+          (edn/read-string message)))))
 
-(defn lrange
-  "Return an entire range given min and max indexes
-  
-  Parameters:
-  - client: Redis client
-  - queue-name: Name of the queue
-  - floor: floor index
-  - ceil: ceiling index"
-  [client queue-name floor ceil & options]
-  (let [{:keys [pattern]
-         :or {pattern :rq}} options
-        packed-queue (utils/pack-pattern pattern queue-name)
-        result (.lrange @client packed-queue floor ceil)]
-    result))
 
 (defn lindex
   "Return a element in a specified index
@@ -126,9 +112,9 @@
   (let [{:keys [pattern]
          :or {pattern :rq}} options
         packed-queue-name (utils/pack-pattern pattern queue-name)
-        result (.lindex @client packed-queue-name index)]
+        return (.lindex @client packed-queue-name index)]
 
-    (let [message (clojure.edn/read-string result)]
+    (let [message (clojure.edn/read-string return)]
       (log/debug "message found"
                  {:client client
                   :queue-name packed-queue-name
@@ -148,8 +134,8 @@
   (let [{:keys [pattern]
          :or {pattern :rq} :as opts} options
         packed-queue-name (utils/pack-pattern pattern queue-name)
-        encoded-message (clojure.edn/read-string (str message))
-        return (.lset @client packed-queue-name index (str encoded-message))]
+        encoded-message (str (clojure.edn/read-string (str message)))
+        return (.lset @client packed-queue-name index encoded-message)]
 
     (log/debug "set in queue"
                {:client client
@@ -186,33 +172,57 @@
     return))
 
 (defn linsert
-  "Insert a message before the first occurance of a pivot given.
+  "insert a message before the first occurance of a pivot given.
 
-  Parameters:
-  - client: Redis client
-  - queue-name: Name of the queue
+  parameters:
+  - client: redis client
+  - queue-name: name of the queue
   - msg: new msg to be added
   - pivot: pivot message to be added before or after
   - options:
     - pos (keywords):
       - before: insert the message before the pivot
       - after: insert the message after the pivot"
-  [client queue-name msg pivot & options]
+  [client queue-name pivot msg & options]
   (let [{:keys [pos pattern]
          :or {pos :before
               pattern :rq} :as opts} options
         packed-queue-name (utils/pack-pattern pattern queue-name)
         encoded-message (str (clojure.edn/read-string (str msg)))
         encoded-pivot (str (clojure.edn/read-string (str pivot)))
-        encoded-pos (str (s/capitalize (str pivot)))
+        encoded-pos (if (= pos :before)
+                      redis.clients.jedis.args.ListPosition/BEFORE
+                      redis.clients.jedis.args.ListPosition/AFTER)
         return (.linsert @client packed-queue-name encoded-pos encoded-pivot encoded-message)]
-    (log/debug "inserted in queue"
+      (log/debug "inserted in queue"
+                 {:client client
+                  :queue-name queue-name
+                  :msg encoded-message
+                  :opts opts
+                  :return return})
+      return))
+
+
+(defn lrange
+  "Return an entire range given min and max indexes
+  
+  Parameters:
+  - client: Redis client
+  - queue-name: Name of the queue
+  - floor: floor index
+  - ceil: ceiling index"
+  [client queue-name floor ceil & options]
+  (let [{:keys [pattern]
+         :or {pattern :rq} :as opts} options
+        packed-queue-name (utils/pack-pattern pattern queue-name)
+        return (.lrange @client packed-queue-name floor ceil)]
+    (log/debug "queue specified range"
                {:client client
-                :queue-name queue-name
-                :msg (clojure.edn/read-string (str msg))
+                :queue-name packed-queue-name
                 :opts opts
-                :return return})
-    return))
+                :result return})
+    (mapv clojure.edn/read-string return)))
+
 
 (defn ltrim
   "Trim a list to the specified range.
@@ -226,9 +236,17 @@
   - pattern: pattern to pack the queue name"
   [client queue-name start stop & options]
   (let [{:keys [pattern]
-         :or {pattern :rq}} options
+         :or {pattern :rq} :as opts} options
         packed-queue-name (utils/pack-pattern pattern queue-name)]
-    (.ltrim @client packed-queue-name start stop)))
+    (let [return (.ltrim @client packed-queue-name start stop)]
+      (log/debug "queue trimmed"
+                 {:client client
+                  :queue-name queue-name
+                  :opts opts
+                  :result return})
+      return)))
+
+   
 
 (defn rpoplpush
   "Remove the last element in a list and append it to another list.
@@ -243,8 +261,15 @@
   (let [{:keys [pattern]
          :or {pattern :rq}} options
         packed-source-queue (utils/pack-pattern pattern source-queue)
-        packed-destination-queue (utils/pack-pattern pattern destination-queue)]
-    (.rpoplpush @client packed-source-queue packed-destination-queue)))
+        packed-destination-queue (utils/pack-pattern pattern destination-queue)
+        return (.rpoplpush @client packed-source-queue packed-destination-queue)]
+    (log/debug "rpoplpush operation"
+               {:client client
+                :source-queue packed-source-queue
+                :destination-queue packed-destination-queue
+                :result return})
+    return))
+
 
 (defn brpoplpush
   "Remove the last element in a list and append it to another list, blocking if necessary.
@@ -260,11 +285,20 @@
   (let [{:keys [pattern]
          :or {pattern :rq}} options
         packed-source-queue (utils/pack-pattern pattern source-queue)
-        packed-destination-queue (utils/pack-pattern pattern destination-queue)]
-    (.brpoplpush @client packed-source-queue packed-destination-queue timeout)))
+        packed-destination-queue (utils/pack-pattern pattern destination-queue)
+        result (.brpoplpush @client packed-source-queue packed-destination-queue timeout)]
+    (log/debug "brpoplpush operation"
+               {:client client
+                :source-queue packed-source-queue
+                :destination-queue packed-destination-queue
+                :timeout timeout
+                :result result})
+    result))
+
+
 
 (defn lmove
-  "Atomically return and remove the first/last element (head/tail depending on the wherefrom argument) of the source list, and push the element as the first/last element (head/tail depending on the whereto argument) of the destination list.
+  "Atomically return and remove the first/last element of the source list, and push the element as the first/last element of the destination list.
 
   Parameters:
   - client: Redis client
@@ -278,5 +312,19 @@
   (let [{:keys [pattern]
          :or {pattern :rq}} options
         packed-source-queue (utils/pack-pattern pattern source-queue)
-        packed-destination-queue (utils/pack-pattern pattern destination-queue)]
-    (.lmove @client packed-source-queue packed-destination-queue wherefrom whereto)))
+        packed-destination-queue (utils/pack-pattern pattern destination-queue)
+        from-direction (if (= wherefrom "LEFT")
+                         redis.clients.jedis.args.ListDirection/LEFT
+                         redis.clients.jedis.args.ListDirection/RIGHT)
+        to-direction (if (= whereto "LEFT")
+                       redis.clients.jedis.args.ListDirection/LEFT
+                       redis.clients.jedis.args.ListDirection/RIGHT)
+        result (.lmove @client packed-source-queue packed-destination-queue from-direction to-direction)]
+    (log/debug "lmove operation"
+               {:client client
+                :source-queue packed-source-queue
+                :destination-queue packed-destination-queue
+                :from-direction from-direction
+                :to-direction to-direction
+                :result result})
+    result))

src/com/moclojer/rq/utils.clj

@@ -1,4 +1,6 @@
-(ns com.moclojer.rq.utils)
+(ns com.moclojer.rq.utils
+  (:require
+   [clojure.string :as s]))
 
 (defn- pattern->str
   "Adapts given pattern keyword to a know internal pattern. Raises
@@ -21,3 +23,6 @@
 (defn unpack-pattern
   [pattern queue-name]
   (subs queue-name (count (pattern->str pattern))))
+
+
+

test/com/moclojer/rq/queue_test.clj

@@ -54,27 +54,42 @@
       (t/is (= message (rq-queue/lindex client queue-name 1)))
       (rq-queue/pop! client queue-name :direction :l)
       (rq-queue/pop! client queue-name :direction :l))
+
     (t/testing "lrem"
       (rq-queue/push! client queue-name message)
       (rq-queue/lrem client queue-name 1 message)
       (t/is (= 0 (rq-queue/llen client queue-name))))
 
     (t/testing "linsert"
       (rq-queue/push! client queue-name message)
-      (rq-queue/linsert client queue-name another-message message :pos :before)
-      (t/is (= another-message (rq-queue/lindex client queue-name 0))))
+      (rq-queue/linsert client queue-name message another-message :pos :before)
+      (t/is (= another-message (rq-queue/lindex client queue-name 0)))
+      (rq-queue/pop! client queue-name :direction :l)
+      (rq-queue/pop! client queue-name :direction :l))
 
-    (t/testing "ltrim"
-      (rq-queue/push! client queue-name message)
-      (rq-queue/push! client queue-name another-message)
-      (rq-queue/ltrim client queue-name 1 -1)
-      (t/is (= another-message (rq-queue/lindex client queue-name 0))))
 
     (t/testing "lrange"
-      (while (not (nil? (rq-queue/bpop! client queue-name 1 {:direction :l}))))
       (rq-queue/push! client queue-name message)
       (rq-queue/push! client queue-name another-message)
-      (t/is (= [message another-message] (rq-queue/lrange client queue-name 0 1))))
+      (let [result (rq-queue/lrange client queue-name 0 1)]
+        (t/is (= [message another-message] (reverse result))))
+      (rq-queue/pop! client queue-name :direction :l)
+      (rq-queue/pop! client queue-name :direction :l))
+
+
+    (t/testing "ltrim"
+      (let [base-message {:test "hello", :my/test2 "123", :foobar ["321"]}
+            message (assoc base-message :uuid (java.util.UUID/randomUUID))
+            another-message (assoc base-message :uuid (java.util.UUID/randomUUID))]
+        (rq-queue/push! client queue-name message)
+        (rq-queue/push! client queue-name another-message)
+        (t/is (= "OK" (rq-queue/ltrim client queue-name 1 -1)))
+        (let [result (rq-queue/lrange client queue-name 0 -1)]
+          (t/is (= [(dissoc another-message :uuid)]
+                   (map #(dissoc % :uuid) result)))))
+      (rq-queue/pop! client queue-name :direction :l)
+      (rq-queue/pop! client queue-name :direction :l))
+
 
     (t/testing "rpoplpush"
       (rq-queue/push! client queue-name message)