sinatra-multi-screen 0.0.1 → 0.0.2

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -15,3 +14,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*#*
+*~

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.0.1 2013-02-06
+=== 0.0.2 2013-02-19
+
+* separate channels
+
+=== 0.0.1 2013-02-16
 
 * dispatch UI Event on TV from Remote
 * push event from TV to Remote

data/README.md

@@ -85,6 +85,8 @@ tv.on("change_color", function(data){ // regist "change_color" event
 Samples
 -------
 * https://github.com/shokai/sinatra-multi-screen/tree/master/sample
+* http://multiscreen-youtube.herokuapp.com
+* https://github.com/shokai/multiscreen-youtube-sample
 
 
 Contributing

data/lib/js/multiscreen.js

@@ -5,11 +5,14 @@ var MultiScreen = function(cometio, options){
   var self = this;
   this.io = cometio;
   this.options = options;
+  this.io.on("connect", function(session){
+    self.io.push("__multiscreen__options", self.options);
+  });
   if(options.type == "remote"){
     this.tv = {};
     new EventEmitter().apply(this.tv);
     this.tv.event = function(selector, event_name, args){
-      self.io.push("__multiscreen__event", {selector: selector, event: event_name, args: args});
+      self.io.push("__multiscreen__event", {selector: selector, event: event_name, args: args, options: self.options});
     };
     this.tv.$ = function(selector){
       return {
@@ -44,7 +47,7 @@ var MultiScreen = function(cometio, options){
   if(options.type == "tv"){
     this.remote = {};
     this.remote.push = function(event_name, args){
-      self.io.push("__multiscreen__event", {event: event_name, args: args});
+      self.io.push("__multiscreen__event", {event: event_name, args: args, options: self.options});
     };
     this.io.on("__multiscreen__event", function(data){
       if(typeof data.selector === 'undefined') return;

data/lib/sinatra/application.rb

@@ -1,7 +1,45 @@
+
+
 module Sinatra
 
   class Application
 
+    CometIO.on :__multiscreen__event do |data, from|
+      opts = data["options"]
+      raise ArgumentError, 'option is empty'  if !opts or opts.empty?
+      raise ArgumentError, 'channel is empty' if opts["channel"].empty?
+      raise ArgumentError, 'type must be "tv" or "remote"' unless ["tv","remote"].include? opts["type"]
+      unless MultiScreen.channels[opts["channel"]][opts["type"]].include? from
+        raise StandardError, "client <#{from}> is not member of channel <#{opts['channel']}>"
+      end
+      type = case opts["type"]
+             when "tv"
+               "remote"
+             when "remote"
+               "tv"
+             end
+      MultiScreen.channels[opts["channel"]][type].each do |session_id|
+        CometIO.push :__multiscreen__event, data, {:to => session_id}
+      end
+    end
+
+    CometIO.on :__multiscreen__options do |opts, from|
+      raise ArgumentError, 'channel is empty' if opts["channel"].empty?
+      raise ArgumentError, 'type must be "tv" or "remote"' unless ["tv","remote"].include? opts["type"]
+      MultiScreen.channels[opts["channel"]][opts["type"]] << from
+      MultiScreen.emit :connect, {:session => from, :channel => opts["channel"], :type => opts["type"]}
+    end
+
+    CometIO.on :disconnect do |session_id|
+      MultiScreen.channels.each do |channel_id, h|
+        ["tv", "remote"].each do |type|
+          next unless h[type].include? session_id
+          h[type].delete session_id
+          MultiScreen.emit :disconnect, {:session => session_id, :channel => channel_id, :type => type}
+        end
+      end
+    end
+
     helpers do
       def multi_screen_js
         "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}/cometio/multiscreen.js"

data/lib/sinatra/multi_screen.rb

@@ -2,7 +2,17 @@ require File.expand_path '../sinatra-multi-screen', File.dirname(__FILE__)
 require 'sinatra/cometio'
 require File.expand_path 'application', File.dirname(__FILE__)
 
+class MultiScreen
+
+  def self.channels
+    @@channels ||= Hash.new{|h,channel_id|
+      h[channel_id] = {
+        'tv' => [],
+        'remote' => []
+      }
+    }
+  end
 
-CometIO.on :__multiscreen__event do |data, from|
-  CometIO.push :__multiscreen__event, data
 end
+
+EventEmitter.apply MultiScreen

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

@@ -1,5 +1,3 @@
-module Sinatra
-  module MultiScreen
-    VERSION = "0.0.1"
-  end
+module SinatraMultiScreen
+  VERSION = "0.0.2"
 end

data/lib/sinatra-multi-screen.rb

@@ -1,6 +1,4 @@
 require "sinatra-multi-screen/version"
 
-module Sinatra
-  module MultiScreen
-  end
+module SinatraMultiScreen
 end

data/sample/Gemfile.lock

@@ -0,0 +1,58 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    backports (2.8.2)
+    daemons (1.1.9)
+    event_emitter (0.2.2)
+    eventmachine (1.0.0)
+    foreman (0.61.0)
+      thor (>= 0.13.6)
+    haml (4.0.0)
+      tilt
+    json (1.7.7)
+    rack (1.5.2)
+    rack-protection (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    sass (3.2.5)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    sinatra-cometio (0.1.3)
+      event_emitter (>= 0.2.0)
+      eventmachine (>= 1.0.0)
+      json (>= 1.7.0)
+      rack
+      sinatra (>= 1.3.3)
+      sinatra-contrib (>= 1.3.2)
+    sinatra-contrib (1.3.2)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.3.0)
+      tilt (~> 1.3)
+    thin (1.5.0)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    thor (0.17.0)
+    tilt (1.3.3)
+    youtube_search (0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  foreman
+  haml
+  json
+  rack
+  sass
+  sinatra
+  sinatra-cometio
+  sinatra-contrib
+  thin
+  youtube_search

data/sample/main.rb

@@ -8,8 +8,14 @@ helpers do
   end
 end
 
-CometIO.on :connect do |session|
-  puts "new client <#{session}>"
+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
 
 before '/*' do
@@ -20,11 +26,13 @@ get '/' do
   haml :index
 end
 
-get '/tv' do
+get '/tv/:channel' do
+  @channel = params[:channel]
   haml :tv
 end
 
-get '/remote' do
+get '/remote/:channel' do
+  @channel = params[:channel]
   haml :remote
 end
 

data/sample/public/js/remote.js

@@ -1,5 +1,5 @@
 var io = new CometIO().connect();
-var screen = new MultiScreen(io, {type: "remote"});
+var screen = new MultiScreen(io, {type: "remote", channel: channel});
 var tv = screen.tv;
 
 io.on("connect", function(session){
@@ -11,8 +11,9 @@ io.on("connect", function(session){
     tv.$("#btn_search").click();
   });
 
-  $("#text_search").keydown(function(e){
+  $("#text_search").keyup(function(e){
     var word = $("#text_search").val();
+    console.log(word);
     tv.$("#text_search").val(word);
   });
 

data/sample/public/js/tv.js

@@ -1,5 +1,5 @@
 var io = new CometIO().connect();
-var screen = new MultiScreen(io, {type: "tv"});
+var screen = new MultiScreen(io, {type: "tv", channel: channel});
 var remote = screen.remote;
 
 io.on("connect", function(session){

data/sample/views/index.haml

@@ -6,6 +6,6 @@
 %div#main
   %ul
     %li
-      %a{:href => "#{app_root}/tv"} TV
+      %a{:href => "#{app_root}/tv/1"} TV
     %li
-      %a{:href => "#{app_root}/remote"} Remote
+      %a{:href => "#{app_root}/remote/1"} Remote

data/sample/views/remote.haml

@@ -1,5 +1,7 @@
 - content_for :html_head do
   %title= @title
+  :javascript
+    var channel = "#{@channel}";
 
 - content_for :html_foot do
   %script{:src => "#{app_root}/js/jquery.js"}

data/sample/views/tv.haml

@@ -2,6 +2,7 @@
   %title= @title
   :javascript
     var search_api = "#{app_root}/search.json";
+    var channel = "#{@channel}"
 
 - content_for :html_foot do
   %script{:src => "#{app_root}/js/jquery.js"}

data/sinatra-multi-screen.gemspec

@@ -1,11 +1,10 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sinatra-multi-screen/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "sinatra-multi-screen"
-  gem.version       = Sinatra::MultiScreen::VERSION
+  gem.version       = SinatraMultiScreen::VERSION
   gem.authors       = ["Sho Hashimoto"]
   gem.email         = ["hashimoto@shokai.org"]
   gem.description   = %q{Sinatra Plugin for Multi-Screen Application.}
@@ -17,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency 'sinatra', '>= 1.3.3'
-  gem.add_dependency 'sinatra-cometio', '>= 0.1.1'
+  gem.add_dependency 'sinatra-cometio', '>= 0.1.3', '< 0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-multi-screen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -34,7 +34,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +45,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Sinatra Plugin for Multi-Screen Application.
 email:
 - hashimoto@shokai.org
@@ -63,6 +69,7 @@ files:
 - lib/sinatra/multi_screen.rb
 - sample/.gitignore
 - sample/Gemfile
+- sample/Gemfile.lock
 - sample/Procfile
 - sample/README.md
 - sample/config.ru