faye-redis 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+### 0.2.0 / 2013-10-01
+
+* Migrate from Yajl to MultiJson to support JRuby
+* Trigger `close` event as required by Faye 1.0
+
+
+### 0.1.1 / 2013-04-28
+
+* Improve garbage collection to avoid leaking Redis memory
+
+
+### 0.1.0 / 2012-02-26
+
+* Initial release: Redis backend for Faye 0.8
+

data/README.md

@@ -0,0 +1,61 @@
+# Faye::Redis [![Build Status](https://travis-ci.org/faye/faye-redis-ruby.png)](https://travis-ci.org/faye/faye-redis-ruby)
+
+This plugin provides a Redis-based backend for the
+[Faye](http://faye.jcoglan.com) messaging server. It allows a single Faye
+service to be distributed across many front-end web servers by storing state and
+routing messages through a [Redis](http://redis.io) database server.
+
+
+## Usage
+
+Pass in the engine and any settings you need when setting up your Faye server.
+
+```rb
+require 'faye'
+require 'faye/redis'
+
+bayeux = Faye::RackAdapter.new(
+  :mount   => '/',
+  :timeout => 25,
+  :engine  => {
+    :type  => Faye::Redis,
+    :host  => 'redis.example.com',
+    # more options
+  }
+)
+```
+
+The full list of settings is as follows.
+
+* <b>`:uri`</b> - redis URL (example: `redis://:secretpassword@example.com:9000/4`)
+* <b>`:host`</b> - hostname of your Redis instance
+* <b>`:port`</b> - port number, default is `6379`
+* <b>`:password`</b> - password, if `requirepass` is set
+* <b>`:database`</b> - number of database to use, default is `0`
+* <b>`:namespace`</b> - prefix applied to all keys, default is `''`
+* <b>`:socket`</b> - path to Unix socket if `unixsocket` is set
+
+
+## License
+
+(The MIT License)
+
+Copyright (c) 2011-2013 James Coglan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the 'Software'), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/lib/faye/redis.rb

@@ -1,5 +1,5 @@
 require 'em-hiredis'
-require 'yajl'
+require 'multi_json'
 
 module Faye
   class Redis
@@ -40,9 +40,14 @@ module Faye
       end
       @subscriber = @redis.pubsub
 
-      @subscriber.subscribe(@ns + '/notifications')
+      @message_channel = @ns + '/notifications/messages'
+      @close_channel   = @ns + '/notifications/close'
+
+      @subscriber.subscribe(@message_channel)
+      @subscriber.subscribe(@close_channel)
       @subscriber.on(:message) do |topic, message|
-        empty_queue(message) if topic == @ns + '/notifications'
+        empty_queue(message) if topic == @message_channel
+        @server.trigger(:close, message) if topic == @close_channel
       end
 
       @gc = EventMachine.add_periodic_timer(gc, &method(:gc))
@@ -50,7 +55,8 @@ module Faye
 
     def disconnect
       return unless @redis
-      @subscriber.unsubscribe(@ns + '/notifications')
+      @subscriber.unsubscribe(@message_channel)
+      @subscriber.unsubscribe(@close_channel)
       EventMachine.cancel_timer(@gc)
     end
 
@@ -97,6 +103,7 @@ module Faye
         @redis.zrem(@ns + '/clients', client_id) do
           @server.debug 'Destroyed client ?', client_id
           @server.trigger(:disconnect, client_id)
+          @redis.publish(@close_channel, client_id)
           callback.call if callback
         end
       end
@@ -138,7 +145,7 @@ module Faye
       init
       @server.debug 'Publishing message ?', message
 
-      json_message = Yajl::Encoder.encode(message)
+      json_message = MultiJson.dump(message)
       channels     = Channel.expand(message['channel'])
       keys         = channels.map { |c| @ns + "/channels#{c}" }
 
@@ -148,7 +155,7 @@ module Faye
 
           @server.debug 'Queueing for client ?: ?', client_id, message
           @redis.rpush(queue, json_message)
-          @redis.publish(@ns + '/notifications', client_id)
+          @redis.publish(@message_channel, client_id)
 
           client_exists(client_id) do |exists|
             @redis.del(queue) unless exists
@@ -170,7 +177,7 @@ module Faye
       @redis.del(key)
       @redis.exec.callback  do |json_messages, deleted|
         next unless json_messages
-        messages = json_messages.map { |json| Yajl::Parser.parse(json) }
+        messages = json_messages.map { |json| MultiJson.load(json) }
         @server.deliver(client_id, messages)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faye-redis
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -75,22 +75,40 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: websocket-driver
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: jcoglan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
-- README.rdoc
-- CHANGELOG.txt
+- CHANGELOG.md
+- README.md
 - lib/faye/redis.rb
 homepage: http://github.com/faye/faye-redis-ruby
 licenses: []
 post_install_message: 
 rdoc_options:
 - --main
-- README.rdoc
+- README.md
+- --markup
+- markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -112,4 +130,3 @@ signing_key:
 specification_version: 3
 summary: Redis backend engine for Faye
 test_files: []
-has_rdoc: 

data/CHANGELOG.txt

@@ -1,9 +0,0 @@
-=== 0.1.1 / 2013-04-28
-
-* Improve garbage collection to avoid leaking Redis memory
-
-
-=== 0.1.0 / 2012-02-26
-
-* Initial release: Redis backend for Faye 0.8
-

data/README.rdoc

@@ -1,59 +0,0 @@
-= Faye::Redis {<img src="https://secure.travis-ci.org/faye/faye-redis-ruby.png" alt="Build Status" />}[http://travis-ci.org/faye/faye-redis-ruby]
-
-This plugin provides a Redis-based backend for the {Faye}[http://faye.jcoglan.com]
-messaging server. It allows a single Faye service to be distributed across many
-front-end web servers by storing state and routing messages through a
-{Redis}[http://redis.io] database server.
-
-
-== Usage
-
-Pass in the engine and any settings you need when setting up your Faye server.
-
-    require 'faye'
-    require 'faye/redis'
-
-    bayeux = Faye::RackAdapter.new(
-      :mount   => '/',
-      :timeout => 25,
-      :engine  => {
-        :type  => Faye::Redis,
-        :host  => 'redis.example.com',
-        # more options
-      }
-    )
-
-The full list of settings is as follows.
-
-* <b><tt>:uri</tt></b> - redis URL (example: redis://:secretpassword@example.com:9000/4)
-* <b><tt>:host</tt></b> - hostname of your Redis instance
-* <b><tt>:port</tt></b> - port number, default is +6379+
-* <b><tt>:password</tt></b> - password, if +requirepass+ is set
-* <b><tt>:database</tt></b> - number of database to use, default is +0+
-* <b><tt>:namespace</tt></b> - prefix applied to all keys, default is <tt>''</tt>
-* <b><tt>:socket</tt></b> - path to Unix socket if +unixsocket+ is set
-
-
-== License
-
-(The MIT License)
-
-Copyright (c) 2011-2012 James Coglan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the 'Software'), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-