faye-redis-delayed 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a969a08d29a772df03ab22d2e458b76af12c35b6
-  data.tar.gz: 96fd1c85787c631167fcc972c9e951209509eb16
+  metadata.gz: 584e100400dc6fdebd0ca406ad9369aeb45268ab
+  data.tar.gz: dcd72092f051411d17d8b5f2eb9d6160d3d64eee
 SHA512:
-  metadata.gz: 28907519b98799fdc2519ab7f74381d5bf09d9ab2189edce37c835e7d242d3c54e39d3addd318a50789c93dc6e346e2429c929e60e2155b84d831d728c876e55
-  data.tar.gz: 5d9f0310e4c2bfecf07be6f7eb6fa4e7113dc6a9971f0e574b9e6f81c96a1dbdbe47979b05f6399be04fd220dcaff0ad76fa5f64b4e628035fd4cc113db2fd5d
+  metadata.gz: fdd8f550dea71be927bfa9a290214a0d7069f7438c27d29ac949e77e5ca6c5c2fe8dbcee8acbd3e11073d9719282622439ad17fcda2e6e868e2ab88cd0e4901a
+  data.tar.gz: caae74d881dc6dcb072e1215eae152e1c0aee07a260a4b6be098aba91c79f9d9ee7c5c2b8d9689d9d78f5f33b2903ed7ae132cf21433a3135790cbb743f3727b

data/README.md

@@ -45,6 +45,19 @@ run server
 Additional options provided by `Faye::DelayedRedis`:
 
 * `:expire` — expire time in seconds, defaults to `60`
+* `:delay_channels` - Array of channels that should be delayed
+
+:delay_channels can be specified as strings or as regular expressions.
+If something is given, then only channels matching one of the listed
+patterns will be delayed.  Without this argument, every channel is
+delayed.
+
+```rb
+  :engine  => {
+    :type           => Faye::RedisDelayed,
+    :delay_channels => [/^\/queues_with_this_prefix/, "/this/one/queue"],
+  }
+```
 
 See the full list of [`Faye::Redis` engine options](https://github.com/faye/faye-redis-ruby).
 

data/faye-redis-delayed.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'faye-redis-delayed'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Dariusz Gertych']
   spec.email         = ['dariusz.gertych@gmail.com']
   spec.description   = %q{Delayed Redis engine backend for Faye}

data/lib/faye/redis_delayed.rb

@@ -29,28 +29,38 @@ module Faye
       keys         = channels.map { |c| @ns + "/channels#{c}" }
 
       @redis.sunion(*keys) do |clients|
-        if clients.empty?
+        if clients.empty? && delay_channel?(message["channel"])
           key = @ns + "/channels#{message["channel"]}/awaiting_messages"
           # store message in redis
           @redis.rpush(key, json_message)
           # Set expiration time to one minute
           @redis.expire(key, @options[:expire] || DEFAULT_EXPIRE)
-        else
-          clients.each do |client_id|
-            queue = @ns + "/clients/#{client_id}/messages"
+        end
+
+        clients.each do |client_id|
+          queue = @ns + "/clients/#{client_id}/messages"
 
-            @server.debug 'Queueing for client ?: ?', client_id, message
-            @redis.rpush(queue, json_message)
-            @redis.publish(@message_channel, client_id)
+          @server.debug 'Queueing for client ?: ?', client_id, message
+          @redis.rpush(queue, json_message)
+          @redis.publish(@message_channel, client_id)
 
-            client_exists(client_id) do |exists|
-              @redis.del(queue) unless exists
-            end
+          client_exists(client_id) do |exists|
+            @redis.del(queue) unless exists
           end
         end
       end
 
       @server.trigger(:publish, message['clientId'], message['channel'], message['data'])
     end
+
+    private
+
+    def delay_channels
+      @delay_channels ||= Array(@options[:delay_channels]).flatten
+    end
+
+    def delay_channel?(channel)
+      delay_channels.empty? || delay_channels.any? { |pattern| pattern === channel }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye-redis-delayed
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dariusz Gertych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Delayed Redis engine backend for Faye