sinatra-multi-screen 0.0.6 → 0.0.7

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.7 2013-03-06
+
+* use Sinatra.register
+
 === 0.0.6 2013-02-27
 
 * Server push to TV or Remote

data/README.md

@@ -127,7 +127,7 @@ MultiScreen.push :foo, data, {:type => "tv"}  # to all TV
 MultiScreen.push :foo, data, {:type => "remote", :channel => "1"}
 ```
 
-TV or Remote
+TV or Remote Side
 ```javascript
 screen.on("foo", function(data){
   alert(data.message);

data/lib/sinatra-multi-screen.rb

@@ -1,4 +1,4 @@
-require "sinatra-multi-screen/version"
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-module SinatraMultiScreen
-end
+require 'sinatra-multi-screen/version'

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

@@ -0,0 +1,59 @@
+module Sinatra::MultiScreen
+
+  CometIO.on :__multiscreen__data 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
+    MultiScreen.emit data["event"], data["data"], {:session => from, :channel => opts["channel"], :type => opts["type"]}
+    type = case opts["type"]
+           when "tv"
+             "remote"
+           when "remote"
+             "tv"
+           end
+    MultiScreen.channels[opts["channel"]][type].each do |session_id|
+      CometIO.push :__multiscreen__data, 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"
+    end
+  end
+
+  get '/cometio/multiscreen.js' do
+    content_type 'application/javascript'
+    @js ||= (
+             js = ''
+             Dir.glob(File.expand_path '../js/*.js', File.dirname(__FILE__)).each do |i|
+               File.open(i) do |f|
+                 js += f.read
+               end
+             end
+             ERB.new(js).result(binding)
+             )
+  end
+
+end

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

@@ -1,3 +1,5 @@
-module SinatraMultiScreen
-  VERSION = "0.0.6"
+module Sinatra
+  module MultiScreen
+    VERSION = "0.0.7"
+  end
 end

data/lib/sinatra/multi_screen.rb

@@ -1,6 +1,8 @@
 require File.expand_path '../sinatra-multi-screen', File.dirname(__FILE__)
 require 'sinatra/cometio'
-require File.expand_path 'application', File.dirname(__FILE__)
+require File.expand_path '../sinatra-multi-screen/application', File.dirname(__FILE__)
+
+Sinatra.register Sinatra::MultiScreen
 
 class MultiScreen
 

data/sample/Gemfile.lock

@@ -1,17 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.0.3)
+    backports (3.1.0)
     daemons (1.1.9)
-    event_emitter (0.2.2)
-    eventmachine (1.0.0)
+    event_emitter (0.2.3)
+    eventmachine (1.0.1)
     foreman (0.61.0)
       thor (>= 0.13.6)
     haml (4.0.0)
       tilt
+    httparty (0.10.2)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
     json (1.7.7)
+    multi_json (1.6.1)
+    multi_xml (0.5.3)
     rack (1.5.2)
-    rack-protection (1.3.2)
+    rack-protection (1.4.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -20,9 +25,10 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    sinatra-cometio (0.1.3)
+    sinatra-cometio (0.1.8)
       event_emitter (>= 0.2.0)
       eventmachine (>= 1.0.0)
+      httparty
       json (>= 1.7.0)
       rack
       sinatra (>= 1.3.3)
@@ -39,7 +45,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.17.0)
-    tilt (1.3.3)
+    tilt (1.3.4)
 
 PLATFORMS
   ruby

data/sample/views/layout.haml

@@ -9,7 +9,7 @@
       != yield
       %hr
       %div#footer
-        source code : 
+        sinatra-multi-screen v#{Sinatra::MultiScreen::VERSION} -
         - src_url = 'https://github.com/shokai/sinatra-multi-screen'
         %a{:href => src_url} #{src_url}
     != yield_content :html_foot

data/sinatra-multi-screen.gemspec

@@ -4,7 +4,7 @@ require 'sinatra-multi-screen/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "sinatra-multi-screen"
-  gem.version       = SinatraMultiScreen::VERSION
+  gem.version       = Sinatra::MultiScreen::VERSION
   gem.authors       = ["Sho Hashimoto"]
   gem.email         = ["hashimoto@shokai.org"]
   gem.description   = %q{Sinatra Plugin for Multi-Screen Application.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-multi-screen
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -80,8 +80,8 @@ files:
 - Rakefile
 - lib/js/multiscreen.js
 - lib/sinatra-multi-screen.rb
+- lib/sinatra-multi-screen/application.rb
 - lib/sinatra-multi-screen/version.rb
-- lib/sinatra/application.rb
 - lib/sinatra/multi_screen.rb
 - sample/Gemfile
 - sample/Gemfile.lock

data/lib/sinatra/application.rb

@@ -1,63 +0,0 @@
-module Sinatra
-
-  class Application
-
-    CometIO.on :__multiscreen__data 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
-      MultiScreen.emit data["event"], data["data"], {:session => from, :channel => opts["channel"], :type => opts["type"]}
-      type = case opts["type"]
-             when "tv"
-               "remote"
-             when "remote"
-               "tv"
-             end
-      MultiScreen.channels[opts["channel"]][type].each do |session_id|
-        CometIO.push :__multiscreen__data, 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"
-      end
-    end
-
-    get '/cometio/multiscreen.js' do
-      content_type 'application/javascript'
-      @js ||= (
-               js = ''
-               Dir.glob(File.expand_path '../js/*.js', File.dirname(__FILE__)).each do |i|
-                 File.open(i) do |f|
-                   js += f.read
-                 end
-               end
-               ERB.new(js).result(binding)
-               )
-    end
-
-  end
-
-end