active_publisher 1.2.0.pre5 → 1.2.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23e85659b8c9077b818a54ff585db2f0b6725222
-  data.tar.gz: ab4715d5030e4d4a8a75d938d62c2555af446442
+  metadata.gz: 37f2dab5370f3b41d1b6e0c6d31f2da54f40528c
+  data.tar.gz: dc04b0a100a216a194ef30f5bb07c1fb27f17982
 SHA512:
-  metadata.gz: d1f14b9a180f322f2de03b68e9cfab1eec8761cbcea16e4b2128022f41c5e16b92c9d6368a64e538c191a588bc5db5599c1042d66fec636e9d068fa4f053ce09
-  data.tar.gz: 9b8db19e5cc9ffbe14f691eb9d79105ecbc1f99116a9057d298fb973354dad818d80b0af392b112fd9e50583c58394f21109e975eb505984fb2c5fc1ced11345
+  metadata.gz: f2f5c82a0923940966d5ce4d66e8448f129246b9dd54481313164ceb6c82231fad94522ee5dfbbe4e307d643aff7d8f7e06570343f44cdee22ac452962b6bd29
+  data.tar.gz: 1ee748a6f8e1a145d2b395598d25385e347f61310523928c8776df1ac9aa8187a11dd2dd7c5bf0d645e8908282dc304fa4a5f9825320488f31045bfdbddac0a5

data/lib/active_publisher/async/redis_adapter/redis_multi_pop_queue.rb

@@ -13,7 +13,7 @@ module ActivePublisher
           encoded_message = ::Marshal.dump(message)
 
           redis_pool.with do |redis|
-            redis.lpush(list_key, encoded_message)
+            redis.rpush(list_key, encoded_message)
           end
         end
 
@@ -28,7 +28,7 @@ module ActivePublisher
           end
 
           redis_pool.with do |redis|
-            redis.lpush(list_key, encoded_messages)
+            redis.rpush(list_key, encoded_messages)
           end
         end
 
@@ -71,25 +71,30 @@ module ActivePublisher
         end
 
         def shift(number)
-          messages = []
           number = [number, size].min
+          return [] if number <= 0
+
+          messages = []
+          multi_response = []
           redis_pool.with do |redis|
-            redis.pipelined do
-              number.times do
-                messages << redis.rpop(list_key)
-              end
+            multi_response = redis.multi do
+              redis.lrange(list_key, 0, number - 1)
+              redis.ltrim(list_key, number, -1)
             end
           end
 
+          messages = multi_response.first
+          success = multi_response.last
+          return [] unless success =~ /ok/i
+
           messages = [] if messages.nil?
           messages = [messages] unless messages.respond_to?(:each)
 
           shifted_messages = []
           messages.each do |message|
-            next unless message.is_a?(::Redis::Future)
-            next if message.value.nil?
+            next if message.nil?
 
-            shifted_messages << ::Marshal.load(message.value)
+            shifted_messages << ::Marshal.load(message)
           end
 
           shifted_messages

data/lib/active_publisher/async/redis_adapter.rb

@@ -65,7 +65,7 @@ module ActivePublisher
           return unless encoded_messages.size > 0
 
           redis_pool.with do |redis|
-            redis.lpush(::ActivePublisher::Async::RedisAdapter::REDIS_LIST_KEY, encoded_messages)
+            redis.rpush(::ActivePublisher::Async::RedisAdapter::REDIS_LIST_KEY, encoded_messages)
           end
         end
       end

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "1.2.0.pre5"
+  VERSION = "1.2.0.pre6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre5
+  version: 1.2.0.pre6
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny