padrino-websockets 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48a6c2dbc40407de9d89363244273ea101a333b9
-  data.tar.gz: f55b458cb97d4931a9bb9178827961e5a3a24819
+  metadata.gz: 0fcb9330007638099edcb3fe7c5f86ae8147d1fe
+  data.tar.gz: e0f9a5887325488f3266cc1939803f9d80a80c61
 SHA512:
-  metadata.gz: de5f1cc610fb4b047ca7beea1b5d735fab5eb5fb298085efb96578c45eed5fa7b4673ebf1b8fbb36be3b57b0b310a677960042e32c696d3877cd267c213d1def
-  data.tar.gz: b1f972357d3054ebe90b4fa5c727acc90a16d8b59e40ed0500e83591a81e391e6a0f2def90f02279a8ecb15fe3d2ff43c43d77e3c1df35045f62ec7441af6e1e
+  metadata.gz: f0ffe8ae0cf071bbbea799d02643fcf8a13af81e5e9ff24a394c1fe0c6c7aaaedc46d2c7bff5a3957fec61e6088f04822d436ce4298ff87c87da5d98afe1fcf8
+  data.tar.gz: fba963a1fb0357ad92ee0a08939c8e83badc1a5f1aa1cb465b9ffd220d7b70ed9816f58a84bb8ccb5e54032ab0f0eb2bc28b0832955b5dd7e185d68a355df025

data/README.md

@@ -1,30 +1,31 @@
 # Padrino Websockets
 
 A WebSockets abstraction for the Padrino Ruby Web Framework to manage
-    channels, users and events regardless of the underlying WebSockets implementation.
+channels, users and events regardless of the underlying WebSockets implementation.
 
 ## Current support
 
 * [SpiderGazelle](https://github.com/cotag/spider-gazelle) a LibUV application server.
 * [Puma](http://puma.io/) >= 2.0. (*)
-* [Thin](http://code.macournoyer.com/thin/) (*)
-* [Rainbows](http://rainbows.rubyforge.org/) (*) (**)
-* [Goliath](http://postrank-labs.github.com/goliath/) (*) (**)
-* [Phusion Passenger](https://www.phusionpassenger.com/) >= 4.0 with nginx >= 1.4 (*) (**)
+* [Thin](http://code.macournoyer.com/thin/)  (*)
+* [Rainbows](http://rainbows.rubyforge.org/)  (\*)  (**)
+* [Goliath](http://postrank-labs.github.com/goliath/)  (\*) (**)
+* [Phusion Passenger](https://www.phusionpassenger.com/) >= 4.0 with nginx >= 1.4  (\*)  (**)
 
 (*) Supported through [faye-websocket-ruby](https://github.com/faye/faye-websocket-ruby).
+ 
 (**) Untested.
 
 
-UPDATE: See the [faye-support](https://github.com/dariocravero/padrino-websockets/tree/faye-support) branch for Thin support (more updats coming on this).
-
-
 ## Installation
 
 Add this line to your application's `Gemfile`:
 
 ```
 gem 'padrino-websockets'
+
+# Uncomment the following line if you're using a Faye backend
+# gem 'faye-websocket'
 ```
 
 And then execute:
@@ -52,7 +53,8 @@ Then in any controller or in the app itself, define a WebSocket channel:
 ```
 websocket :channel do
   on :ping do |message|
-    send_message({pong: true, data: message})
+    send_message(:ping, session['websocket_user'], {pong: true, data: message})
+    broadcast(:ping, {pong: true, data: message, broadcast: true})
   end
 end
 ```

data/examples/padrino-app/Gemfile

@@ -4,16 +4,19 @@ source 'https://rubygems.org'
 # gemspec
 
 # Server requirements
-# gem 'thin' # or mongrel
-# gem 'trinidad', :platform => 'jruby'
-gem 'spider-gazelle', github: 'cotag/spider-gazelle'
+# For Puma
+gem 'faye-websocket'
+gem 'puma'
+
+# For SpiderGazelle
+# gem 'spider-gazelle', github: 'cotag/spider-gazelle'
+# gem 'uv-rays', github: 'cotag/uv-rays'
 
 # Optional JSON codec (faster performance)
 gem 'oj'
 
 # Project requirements
 gem 'rake'
-gem 'uv-rays', github: 'cotag/uv-rays'
 gem 'padrino-websockets', path: '../..'
 # gem 'padrino-websockets', github: 'dariocravero/padrino-websockets'
 

data/examples/padrino-app/app/app.rb

@@ -10,9 +10,10 @@ module PadrinoWebsocketsDemo
     end
 
     websocket :channel do
-      event :test do |context, message|
+      on :test do |message|
         "test on channel"
-        send_message message
+        send_message :channel, session['websocket_user'], message
+        broadcast :channel, message.merge({'broadcast' => true})
       end
     end
   end

data/lib/padrino-websockets/base-event-manager.rb

@@ -124,7 +124,7 @@ module Padrino
       #
       def on_shutdown
         logger.debug "Disconnecting user: #{@user} from channel: #{@channel}."
-        @@connections[@channel].delete(@ws)
+        @@connections[@channel].delete(@user)
       end
 
       class << self

data/lib/padrino-websockets/faye/event-manager.rb

@@ -21,6 +21,7 @@ module Padrino
         #
         def on_shutdown(event)
           @pinger.cancel if @pinger
+          super
         end
 
         ##

data/lib/padrino-websockets/faye/routing.rb

@@ -17,7 +17,8 @@ module Padrino
 
             set_websocket_user
             ws = ::Faye::WebSocket.new(env, nil, {ping: 15})
-            Padrino::WebSockets::Faye::EventManager.new(channel, session['websocket_user'],
+            Padrino::WebSockets::Faye::EventManager.new(params[:channel] || channel,
+                                                        session['websocket_user'],
                                                         ws, self, &block)
             ws.rack_response
           end

data/lib/padrino-websockets/spider-gazelle/routing.rb

@@ -16,6 +16,7 @@ module Padrino
             throw :pass unless request.env['rack.hijack']
 
             event_context = self
+            ws_channel = params[:channel] || channel
 
             # It's a WebSocket. Get the libuv promise and manage its events
             request.env['rack.hijack'].call.then do |hijacked|
@@ -24,7 +25,7 @@ module Padrino
               set_websocket_user
 
               Padrino::WebSockets::SpiderGazelle::EventManager.new(
-                channel, session['websocket_user'], ws, event_context, &block)
+                ws_channel, session['websocket_user'], ws, event_context, &block)
               ws.start
             end
           end

data/lib/padrino-websockets/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Websockets
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: padrino-websockets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Darío Javier Cravero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A WebSockets abstraction for Padrino
 test_files: []
-has_rdoc: