redis-unique-queue 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9845fcfe3f9ba30fe729fd34c6586e4a4d09a701
-  data.tar.gz: 901c5b2050de013e41b84712b4d32bc751072645
+  metadata.gz: 9988ab673216ddbe91cfb262cfadfc946de64eb6
+  data.tar.gz: 4843b3685e9c9b763a2647cf8d042778459cb45d
 SHA512:
-  metadata.gz: 5730faf51a240e88214af1e81b74365921b300313e666641b05f0e959aedc00977b7a60b3465f2883e1aacf733461bd674ac061de91020bc09688adf8dedca77
-  data.tar.gz: 90a24acb69241345577487fe91970d5aa30e66df82e58b35f9fa3923776fddc3e214a9796cc0d121016e95df9edd89039c78ae46560e7ad16c026a094de05d08
+  metadata.gz: c07a0e7e00592d7f2a43bcdefca9670a5cd2b9192b8156ed2a3f5e91676ed8966f947412c108de6b34b637a8d960355278e58a0b59361928a2e925b139af7435
+  data.tar.gz: 0c72f835e333b462a13fb84390d1597d071884788d77e233739e4f903b2478e45442981fe14c9ae8fc6213653f29be9702660617f3a6f6d707457d17e53d3190

data/README.md

@@ -53,6 +53,12 @@ You can pop data from the queue.
 result = q.pop
 ```
 
+You can atomically pop multiple items from the queue.
+
+```ruby
+result = q.pop_multi 3
+```
+
 You can also pop all items in the queue in one op.
 
 ```

data/lib/redis/unique/queue.rb

@@ -5,7 +5,7 @@ class Redis
     class Queue
       attr_reader :name
 
-      VERSION = "0.0.8"
+      VERSION = "0.0.9"
 
       def initialize(name, redis_or_options = {})
         @name  = name
@@ -23,17 +23,15 @@ class Redis
       end
 
       def pop
-        begin
-          success, result = attempt_atomic_pop
-        end while !success && result
-        result
+        block_on_atomic_attempt{ attempt_atomic_pop }
       end
 
       def pop_all
-        begin
-          success, result = attempt_atomic_pop_all
-        end while !success && result
-        result
+        block_on_atomic_attempt{ attempt_atomic_pop_all }
+      end
+
+      def pop_multi amount
+        block_on_atomic_attempt{ attempt_atomic_pop_multi amount }
       end
 
       def front
@@ -66,6 +64,7 @@ class Redis
 
       def clear
         @redis.del name
+        []
       end
 
       def expire seconds
@@ -74,30 +73,44 @@ class Redis
 
       private
 
-      def attempt_atomic_pop_all
-        result  = nil
-        success = @redis.watch(name) do
-          result = all
-          if result
-            @redis.multi do |multi|
-              multi.del name
-            end
-          end
-        end
+      def attempt_atomic_pop_multi amount
+        attempt_atomic_read_write lambda{ peek 0, amount }, lambda{  |multi, read_result| multi.zremrangebyrank name, 0, amount - 1 }
+      end
 
-        [success, result]
+      def attempt_atomic_pop_all
+        attempt_atomic_read_write lambda{ all }, lambda{ |multi, read_result| multi.del name}
       end
 
       def attempt_atomic_pop
         min_score = 0
         max_score = Time.now.to_f
 
+        read = lambda do
+          @redis.zrangebyscore(name, min_score, max_score, :with_scores => false, :limit => [0, 1]).first
+        end
+
+        write = lambda do |multi, read_result|
+          multi.zrem name, read_result
+        end
+
+        attempt_atomic_read_write read, write
+      end
+
+      def block_on_atomic_attempt
+        begin
+          success, result = yield
+        end while !success && result
+        result
+      end
+
+      def attempt_atomic_read_write read_op, write_op
+
         result  = nil
         success = @redis.watch(name) do
-          result = @redis.zrangebyscore(name, min_score, max_score, :with_scores => false, :limit => [0, 1]).first
+          result = read_op.call
           if result
             @redis.multi do |multi|
-              multi.zrem name, result
+              write_op.call multi, result
             end
           end
         end

data/redis-unique-queue.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_runtime_dependency 'redis'
+  spec.add_development_dependency "rake", '~> 0'
+  spec.add_runtime_dependency 'redis', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-unique-queue
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,28 +28,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: A unique queue with atomic operations implemented in Redis.