sinatra-multi-screen 0.0.3 → 0.0.4

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.0.3 2013-02-14
+=== 0.0.4 2013-02-24
+
+* catch client-side events on server
+
+=== 0.0.3 2013-02-24
 
 * add simple sample application
 * refact

data/README.md

@@ -92,6 +92,26 @@ remote.on("mode", function(data){
 });
 ```
 
+
+### Events on Server
+
+Sinatra Side
+```ruby
+MultiScreen.on :connect do |client|
+  puts "new client #{client.inspect}"
+  p MultiScreen.channels
+end
+
+MultiScreen.on :disconnect do |client|
+  puts "client disconnect - #{client.inspect}"
+  p MultiScreen.channels
+end
+
+MultiScreen.on :ui_event do |data, from|
+  puts "Remote --(dispatch UI Event)--> TV"
+end
+```
+
 Samples
 -------
 * https://github.com/shokai/sinatra-multi-screen/tree/master/sample

data/lib/js/multiscreen.js

@@ -31,8 +31,8 @@ var MultiScreen = function(cometio, options){
   })
 
   if(options.type == "remote"){
-    this.tv.event = function(selector, event_name, args){
-      self.tv.push("ui_event", {selector: selector, event: event_name, args: args});
+    this.tv.event = function(selector, event_name, arg){
+      self.tv.push("ui_event", {selector: selector, event: event_name, arg: arg});
     };
     this.tv.$ = function(selector){
       return {
@@ -65,10 +65,10 @@ var MultiScreen = function(cometio, options){
     self.remote.on("ui_event", function(data){
       if(typeof data.selector === 'undefined' ||
          typeof data.event === 'undefined') return;
-      if(typeof data.args === 'undefined'){
+      if(typeof data.arg === 'undefined'){
         $(data.selector)[data.event]();
       }else{
-        $(data.selector)[data.event](data.args);
+        $(data.selector)[data.event](data.arg);
       }
     });
   }

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

@@ -1,3 +1,3 @@
 module SinatraMultiScreen
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/sinatra/application.rb

@@ -10,6 +10,7 @@ module Sinatra
       unless MultiScreen.channels[opts["channel"]][opts["type"]].include? from
         raise StandardError, "client <#{from}> is not member of channel <#{opts['channel']}>"
       end
+      MultiScreen.emit data["event"], data["data"], {:session => from, :channel => opts["channel"], :type => opts["type"]}
       type = case opts["type"]
              when "tv"
                "remote"

data/sample/main.rb

@@ -18,6 +18,10 @@ MultiScreen.on :disconnect do |client|
   p MultiScreen.channels
 end
 
+MultiScreen.on :ui_event do |data, from|
+  puts "UI Event $('#{data['selector']}').#{data['event']}(#{data['arg']}) -- from #{from.inspect}"
+end
+
 before '/*' do
   @title = app_name
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-multi-screen
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: