sinatra-multi-screen 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.5 2013-02-25
+
+* echo back UI Event on TV
+
 === 0.0.4 2013-02-24
 
 * catch client-side events on server

data/README.md

@@ -44,8 +44,12 @@ var screen = new MultiScreen(io, {type: "remote", channel: "1"});
 var tv = screen.tv;
 
 io.on("connect", function(session){
-  tv.$("#btn").click();  // dispatch click event on TV Side
+  tv.$("#btn").click();  // dispatch CLICK event on TV Side
 };
+
+tv.on("ui_event", function(data){  // UI Event echo back from TV
+  alert(data.event+' was dispatched on TV-side '+data.selector);
+});
 ```
 
 TV Side

data/lib/js/multiscreen.js

@@ -31,31 +31,31 @@ var MultiScreen = function(cometio, options){
   })
 
   if(options.type == "remote"){
-    this.tv.event = function(selector, event_name, arg){
+    this.tv.ui_event = function(selector, event_name, arg){
       self.tv.push("ui_event", {selector: selector, event: event_name, arg: arg});
     };
     this.tv.$ = function(selector){
       return {
         click: function(){
-          self.tv.event(selector, "click");
+          self.tv.ui_event(selector, "click");
         },
         dblclick: function(){
-          self.tv.event(selector, "dblclick");
+          self.tv.ui_event(selector, "dblclick");
         },
         mouseover: function(){
-          self.tv.event(selector, "mouseover");
+          self.tv.ui_event(selector, "mouseover");
         },
         mousedown: function(){
-          self.tv.event(selector, "mousedown");
+          self.tv.ui_event(selector, "mousedown");
         },
         mouseup: function(){
-          self.tv.event(selector, "mouseup");
+          self.tv.ui_event(selector, "mouseup");
         },
         val: function(value){
-          self.tv.event(selector, "val", value);
+          self.tv.ui_event(selector, "val", value);
         },
         change: function(){
-          self.tv.event(selector, "change");
+          self.tv.ui_event(selector, "change");
         }
       };
     };
@@ -70,6 +70,7 @@ var MultiScreen = function(cometio, options){
       }else{
         $(data.selector)[data.event](data.arg);
       }
+      self.remote.push("ui_event", data);
     });
   }
 };

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

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

data/sample/Gemfile

@@ -6,6 +6,7 @@ gem 'sinatra'
 gem 'thin'
 gem 'sinatra-contrib'
 gem 'sinatra-cometio'
+gem 'event_emitter'
 gem 'json'
 gem 'haml'
 gem 'sass'

data/sample/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    sass (3.2.5)
+    sass (3.2.6)
     sinatra (1.3.4)
       rack (~> 1.4)
       rack-protection (~> 1.3)
@@ -45,6 +45,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  event_emitter
   foreman
   haml
   json

data/sample/public/js/remote.js

@@ -7,9 +7,9 @@ io.on("connect", function(session){
   console.log("connect!! "+session);
 });
 
-// from TV
-tv.on("message", function(msg){
-  console.log(msg);
+// UI Event echo back from TV
+tv.on("ui_event", function(data){
+  $("#message").text(data.event+' was dispatched on TV-side '+data.selector);
 });
 
 $(function(){

data/sample/public/js/tv.js

@@ -9,18 +9,16 @@ io.on("connect", function(session){
 
 // catch UI Event from Remote
 remote.on("ui_event", function(data){
-  console.log(data);
+  $("#message").text(JSON.stringify(data));
 });
 
 $(function(){
   $(".btn").click(function(e){
     alert(e.currentTarget.innerText);
-    remote.push("message", "click button #"+e.currentTarget.id);  // push to Remote
   });
 
   $(".btn").mouseover(function(e){
     var color = e.currentTarget.attributes['x-color'].value;
     $("body").css("background-color", color);
-    remote.push("message", "mouse over "+color);  // push to Remote
   });
 });

data/sample/views/remote.haml

@@ -29,3 +29,4 @@
     %input#code{:type => :text, :size => 50}
   %div
     %input#btn_dispatch{:type => :button, :value => "dispatch"}
+  %div#message

data/sample/views/tv.haml

@@ -16,3 +16,4 @@
   %span.btn#btn_red{:type => :button, 'x-color' => '#FAA'} id btn_red
   %span.btn#btn_green{:type => :button, 'x-color' => '#AFA'} id btn_green
   %span.btn#btn_blue{:type => :button, 'x-color' => '#AAF'} id btn_blue
+  %div#message

data/sinatra-multi-screen.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.add_dependency 'sinatra', '>= 1.3.3'
   gem.add_dependency 'sinatra-cometio', '>= 0.1.3', '< 0.2.0'
+  gem.add_dependency 'event_emitter'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-multi-screen
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -49,6 +49,22 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: event_emitter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sinatra Plugin for Multi-Screen Application.
 email:
 - hashimoto@shokai.org