slanger 0.2.1 → 0.2.2

data/README.md

@@ -122,5 +122,21 @@ I wanted to write a non-trivial evented app. I also want to write a book on even
 
 Pusher is an awesome service, very reasonably priced, and run by an awesome crew. Give them a spin on your next project.
 
+# Author
+
+- Stevie Graham
+
+# Core Team
+
+- Stevie Graham
+- Mark Burns
+
+# Contributors
+
+- Stevie Graham
+- Mark Burns
+- Florian Gilcher
+- Claudio Poli
+
 © 2011 a Stevie Graham joint.
 

data/lib/slanger/channel.rb

@@ -44,7 +44,7 @@ module Slanger
     # Only events to channels requiring authentication (private or presence)
     # are accepted. Public channels only get events from the API.
     def send_client_message(message)
-      push message.to_json if authenticated?
+      Slanger::Redis.publish(message['channel'], message.to_json) if authenticated?
     end
 
     # Send an event received from Redis to the EventMachine channel

data/lib/slanger/handler.rb

@@ -22,25 +22,20 @@ module Slanger
     # Dispatches message handling to method with same name as
     # the event name
     def onmessage(msg)
-      begin
-        msg   = JSON.parse msg
-        event = msg['event'].gsub(/^pusher:/, 'pusher_')
-
-        if event =~ /^client-/
-          msg['socket_id'] = @socket_id
-          Channel.send_client_message msg
-        elsif respond_to? event, true
-          send event, msg
-        end
-
-      rescue Exception => e
-        case e
-        when JSON::ParserError
-          error({ code: 5001, message: "Invalid JSON" })
-        else
-          error({ code: 500, message: "#{e.message}\n #{e.backtrace}" })
-        end
+      msg   = JSON.parse msg
+      event = msg['event'].gsub(/^pusher:/, 'pusher_')
+
+      if event =~ /^client-/
+        msg['socket_id'] = connection.socket_id
+        Channel.send_client_message msg
+      elsif respond_to? event, true
+        send event, msg
       end
+
+    rescue JSON::ParserError
+      error({ code: 5001, message: "Invalid JSON" })
+    rescue Exception => e
+      error({ code: 500, message: "#{e.message}\n #{e.backtrace}" })
     end
 
     def onclose

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slanger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70166097146020 !ruby/object:Gem::Requirement
+  requirement: &70325614971280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70166097146020
+  version_requirements: *70325614971280
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &70166097145140 !ruby/object:Gem::Requirement
+  requirement: &70325614970400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70166097145140
+  version_requirements: *70325614970400
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70166097144120 !ruby/object:Gem::Requirement
+  requirement: &70325614969380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70166097144120
+  version_requirements: *70325614969380
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70166097142720 !ruby/object:Gem::Requirement
+  requirement: &70325614967980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70166097142720
+  version_requirements: *70325614967980
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: &70166097141600 !ruby/object:Gem::Requirement
+  requirement: &70325614966860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70166097141600
+  version_requirements: *70325614966860
 - !ruby/object:Gem::Dependency
   name: signature
-  requirement: &70166097140380 !ruby/object:Gem::Requirement
+  requirement: &70325614965640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70166097140380
+  version_requirements: *70325614965640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70166097138660 !ruby/object:Gem::Requirement
+  requirement: &70325614963660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70166097138660
+  version_requirements: *70325614963660
 - !ruby/object:Gem::Dependency
   name: glamazon
-  requirement: &70166097137500 !ruby/object:Gem::Requirement
+  requirement: &70325614962720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70166097137500
+  version_requirements: *70325614962720
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70166097136360 !ruby/object:Gem::Requirement
+  requirement: &70325614961560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70166097136360
+  version_requirements: *70325614961560
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70166097135480 !ruby/object:Gem::Requirement
+  requirement: &70325614960700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70166097135480
+  version_requirements: *70325614960700
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70166097134400 !ruby/object:Gem::Requirement
+  requirement: &70325614959620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70166097134400
+  version_requirements: *70325614959620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70166097133020 !ruby/object:Gem::Requirement
+  requirement: &70325614958260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70166097133020
+  version_requirements: *70325614958260
 - !ruby/object:Gem::Dependency
   name: pusher
-  requirement: &70166097131960 !ruby/object:Gem::Requirement
+  requirement: &70325614957200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70166097131960
+  version_requirements: *70325614957200
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70166097131100 !ruby/object:Gem::Requirement
+  requirement: &70325614956240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 3.1.2
   type: :development
   prerelease: false
-  version_requirements: *70166097131100
+  version_requirements: *70325614956240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70166097129660 !ruby/object:Gem::Requirement
+  requirement: &70325614954760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166097129660
+  version_requirements: *70325614954760
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70166097128500 !ruby/object:Gem::Requirement
+  requirement: &70325614953680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166097128500
+  version_requirements: *70325614953680
 description: A websocket service compatible with Pusher libraries
 email: sjtgraham@mac.com
 executables: