r4s 1.1.0 → 1.1.1

data/README.md

@@ -23,6 +23,9 @@ If you make a connection and then close the browser the srv will crash stating t
 who, why, where or how these headers are sent are a mistery to me. My solution was to remove the turbolinks. 
 This might be fixed in the future.
 
+You need to enable threads in your config and your server needs to
+support threads.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -45,7 +48,7 @@ R4S uses only two functions
 
 One to create the stream(s)
 
-    R4S.add_stream(response,"key").start
+    R4S.add_stream(response,session,"key").start
 
 One to push to the stream(s)
 
@@ -57,7 +60,7 @@ I created a "stream" controller to handle my streams
     class StreamController < ApplicationController
         include ActionController::Live
         def stream1
-            R4S.add_stream(response,"stream.key").start
+            R4S.add_stream(response,session,"stream.key").start
         end
     end
 
@@ -80,7 +83,7 @@ Create a action that triggers the event.
 
     class HomeController < ApplicationController
       def index
-        R4S.push_data('kanban',{:time=>Time.now},:event=>"refresh")
+        R4S.push_data('stream.key',{:time=>Time.now},:event=>"refresh")
         render :json => {:success=>true}
       end
     

data/lib/r4s.rb

@@ -1,22 +1,25 @@
 require 'thread_safe'
 require 'json'
-class R4S
+module R4S
   SSES = ThreadSafe::Hash.new
 
-  def self.add_stream(response,key="none")
+  #The session_id is used to identify users who already have a connection
+  #The key is used to group "identical" sse-streams so you can push data to a group of streams
+  def self.add_stream(response,session,key="none")
 
-    if !R4S::SSES.keys.include?(key)
-      R4S::SSES[key] = ThreadSafe::Hash.new
-      key_count = 0
-    else
-      key_count = R4S::SSES[key].keys.count
+    id = session["session_id"]
+
+    R4S::SSES[key] = ThreadSafe::Hash.new unless R4S::SSES.keys.include?(key)
+
+    if R4S::SSES[key].keys.include?(id)
+      sse = R4S::SSES[key][id]
+      sse.close
     end
 
-    sse = R4S::SSE.new(response,key,key_count)
-    R4S::SSES[key][key_count] = sse
+    sse = R4S::SSE.new(response,key,id)
+    R4S::SSES[key][id] = sse
 
     return sse
-
   end
 
   def self.push_data(key,data,options={})
@@ -51,8 +54,10 @@ class R4S
         end
       rescue
       ensure
-        R4S::SSES[@key][@id].close 
-        R4S::SSES[@key].delete(@id)
+        #it might have been reopened
+        unless !R4S::SSES[@key][@id].closed?
+          R4S::SSES[@key].delete(@id)
+        end
       end
     end
 
@@ -64,4 +69,5 @@ class R4S
       @io.close
     end
   end
+
 end

data/lib/r4s/version.rb

@@ -1,3 +1,3 @@
 module R4s
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r4s
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe