sinatra-multi-screen 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.6 2013-02-27
+
+* Server push to TV or Remote
+
 === 0.0.5 2013-02-25
 
 * echo back UI Event on TV

data/README.md

@@ -116,6 +116,25 @@ MultiScreen.on :ui_event do |data, from|
 end
 ```
 
+
+### Server ---(push event)--> TV or Remote
+
+Sinatra Side
+```ruby
+data = {:message => 'hello!!'}
+MultiScreen.push :foo, data  # to all TV and Remote
+MultiScreen.push :foo, data, {:type => "tv"}  # to all TV
+MultiScreen.push :foo, data, {:type => "remote", :channel => "1"}
+```
+
+TV or Remote
+```javascript
+screen.on("foo", function(data){
+  alert(data.message);
+});
+```
+
+
 Samples
 -------
 * https://github.com/shokai/sinatra-multi-screen/tree/master/sample

data/lib/js/multiscreen.js

@@ -9,11 +9,15 @@ var MultiScreen = function(cometio, options){
     options.channel = "__default__channel__";
   }
   var self = this;
+  new EventEmitter().apply(this);
   this.io = cometio;
   this.options = options;
   this.io.on("connect", function(session){
     self.io.push("__multiscreen__options", self.options);
   });
+  this.io.on("__multiscreen__server", function(data){
+    self.emit(data.event, data.data);
+  });
 
   var to;
   if(options.type === 'remote') to = 'tv';
@@ -24,7 +28,8 @@ var MultiScreen = function(cometio, options){
   this[to] = {};
   new EventEmitter().apply(this[to]);
   this[to].push = function(event_name, data){
-    self.io.push("__multiscreen__data", {event: event_name, data: data, options: self.options});
+    self.io.push("__multiscreen__data",
+                 {event: event_name, data: data, options: self.options});
   };
   this.io.on("__multiscreen__data", function(data){
     self[to].emit(data.event, data.data);

data/lib/sinatra-multi-screen/version.rb

@@ -1,3 +1,3 @@
 module SinatraMultiScreen
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/sinatra/multi_screen.rb

@@ -13,6 +13,26 @@ class MultiScreen
     }
   end
 
+  def self.push(event, data, opts={})
+    ids = nil
+    channel = opts[:channel].to_s
+    type = opts[:type].to_s
+    if !channel.empty? and !type.empty?
+      ids = channels[channel][type] or []
+    elsif !channel.empty?
+      ids = channels[channel].values.flatten or []
+    elsif !type.empty?
+      ids = channels.values.map{|i| i[type] }.flatten or []
+    else
+      ids = channels.values.map{|i| i.values }.flatten or []
+    end
+    ids.each do |session_id|
+      CometIO.push(:__multiscreen__server,
+                   {:event => event, :data => data},
+                   {:to => session_id})
+    end
+  end
+
 end
 
 EventEmitter.apply MultiScreen

data/sample/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (2.8.2)
+    backports (3.0.3)
     daemons (1.1.9)
     event_emitter (0.2.2)
     eventmachine (1.0.0)
@@ -16,7 +16,7 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     sass (3.2.6)
-    sinatra (1.3.4)
+    sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)

data/sample/main.rb

@@ -11,6 +11,11 @@ end
 MultiScreen.on :connect do |client|
   puts "new client #{client.inspect}"
   p MultiScreen.channels
+  to = case client[:type]
+       when "tv" then "remote"
+       when "remote" then "tv"
+       end
+  MultiScreen.push :new_client, client, {:type => to, :channel => client[:channel]}
 end
 
 MultiScreen.on :disconnect do |client|

data/sample/public/js/remote.js

@@ -12,6 +12,11 @@ tv.on("ui_event", function(data){
   $("#message").text(data.event+' was dispatched on TV-side '+data.selector);
 });
 
+// push from server
+screen.on("new_client", function(e){
+  $("#message").text("new TV <"+e.session+"> available.");
+});
+
 $(function(){
   generate_code();
   $("select").change(generate_code);

data/sample/public/js/tv.js

@@ -12,6 +12,11 @@ remote.on("ui_event", function(data){
   $("#message").text(JSON.stringify(data));
 });
 
+// push from server
+screen.on("new_client", function(e){
+  $("#message").text("new Remote <"+e.session+"> available.");
+});
+
 $(function(){
   $(".btn").click(function(e){
     alert(e.currentTarget.innerText);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-multi-screen
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra