sinatra-rocketio 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c72cddee0b691d449bb7f41ffdb7644fa55adf3
-  data.tar.gz: 2d7d82d2a7ba471e65f8cbc442fcc3aad3de0e5c
+  metadata.gz: 5e83f8cf2d3ec769975e49a8c87cbce77e55eb02
+  data.tar.gz: 35d737b0f6b92ee4ea41486cb262e5fc2ae8ad5f
 SHA512:
-  metadata.gz: 4a8a8202c6cae1f75b86e87efe6154d804c2d24493267507ba1102f1fbe6eb6353552bc452e6dcca47da0a33e6a4152b9edc77e360bb284932e365b014272bd1
-  data.tar.gz: 583f338b327e36a36bfb04e536fb638adc399c2dc9cd3b70dcde7d37fe7007cfbd5bb378ed783cd163b090e7ecb7df8571a390c9a7eac2c27dce49df1657e7c2
+  metadata.gz: 1a5cd2031b22d2119780cc0eb95ce9ff85418af7c4c97f632afe89e9ead697c6a4843c21e32f61fac130791dda4e61b5818715d477ce51b4effb2f89e25dec06
+  data.tar.gz: c16dab7e6f2ed676be4dff89180d7f9a74a3c87919fbf732f2f5c2439b1709312e2c970f38c7b7e1c4b476ee8008863847b9e1d7cfb217d290852591274e2cb1

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.4 2013-05-23
+
+* bugfix RocketIO start process
+* add classic style sample app
+* update gem dependencies
+
 === 0.2.3 2013-04-03
 
 * bugfix setting

data/README.md

@@ -184,10 +184,17 @@ end
 
 Sample App
 ----------
-chat app
 
+### hello world
+- https://github.com/shokai/rocketio-hello-world
+
+
+### chat app
 - https://github.com/shokai/sinatra-rocketio/tree/master/sample
 - https://github.com/shokai/rocketio-chat-sample
+
+
+### arduino integration
 - https://github.com/shokai/rocketio-arduino-sample
 
 

data/lib/sinatra-rocketio/application.rb

@@ -2,34 +2,27 @@ module Sinatra
   module RocketIO
 
     def self.registered(app)
-      app.helpers Sinatra::RocketIO::Helpers
+      app.register Sinatra::CometIO
+      app.register Sinatra::WebSocketIO
+      app.helpers  Sinatra::RocketIO::Helpers
+      app.get '/rocketio/settings' do
+        content_type 'application/json'
+        @setting_json ||= (
+                           setting = {}
+                           setting[:websocket] = websocketio_url if Sinatra::RocketIO.options[:websocket]
+                           setting[:comet] = cometio_url if Sinatra::RocketIO.options[:comet]
+                           setting.to_json
+                           )
+      end
+      app.get '/rocketio/rocketio.js' do
+        content_type 'application/javascript'
+        @js ||= ERB.new(Sinatra::RocketIO.javascript).result(binding)
+      end
       EM::defer do
         while !EM::reactor_running? do
           sleep 1
         end
-        if options[:comet]
-          app.register Sinatra::CometIO
-        end
-        if options[:websocket]
-          app.register Sinatra::WebSocketIO
-          Sinatra::WebSocketIO.start
-        end
-        app.get '/rocketio/rocketio.js' do
-          content_type 'application/javascript'
-          @js ||= ERB.new(Sinatra::RocketIO.javascript).result(binding)
-        end
-        app.get '/rocketio/settings' do
-          content_type 'application/json'
-          @setting_json ||= (
-                             setting = {}
-                             setting[:websocket] = websocketio_url if Sinatra::RocketIO.options[:websocket]
-                             setting[:comet] = cometio_url if Sinatra::RocketIO.options[:comet]
-                             setting.to_json
-                             )
-        end
-        app.routes["GET"].delete_if{|route|
-          "/cometio/cometio.js" =~ route[0] or "/websocketio/websocketio.js" =~ route[0]
-        }
+        Sinatra::WebSocketIO.start if Sinatra::RocketIO.options[:websocket]
         Sinatra::RocketIO.emit :start
       end
     end

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/sample/classic_style/config.ru

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require
+require 'sinatra'
+if development?
+  $stdout.sync = true
+  require 'sinatra/reloader'
+  $:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+end
+require 'sinatra/rocketio'
+require 'haml'
+require 'sass'
+require File.dirname(__FILE__)+'/main'
+
+set :haml, :escape_html => true
+set :cometio, :timeout => 120, :post_interval => 2
+set :websocketio, :port => (ENV['WS_PORT'] || 8080).to_i
+set :rocketio, :comet => true, :websocket => true
+
+case RUBY_PLATFORM
+when /linux/i then EM.epoll
+when /bsd/i then EM.kqueue
+end
+EM.set_descriptor_table_size 10000
+
+run Sinatra::Application

data/sample/classic_style/main.rb

@@ -0,0 +1,38 @@
+io = Sinatra::RocketIO
+
+io.once :start do
+  puts "RocketIO start!!!"
+end
+
+io.on :connect do |client|
+  puts "new client  - #{client}"
+  push :chat, {:name => "system", :message => "new #{client.type} client <#{client.session}>"}, :channel => client.channel
+  push :chat, {:name => "system", :message => "welcome <#{client.session}>"}, :to => client.session
+end
+
+io.on :disconnect do |client|
+  puts "disconnect client  - #{client}"
+  push :chat, {:name => "system", :message => "bye <#{client.session}>"}, :channel => client.channel
+end
+
+io.on :chat do |data, client|
+  puts "#{data['name']} : #{data['message']}  - #{client}"
+  push :chat, data, :channel => client.channel
+end
+
+io.on :error do |err|
+  STDERR.puts "error!! #{err}"
+end
+
+get '/' do
+  redirect '/chat/1'
+end
+
+get '/chat/:channel' do
+  @channel = params[:channel]
+  haml :chat
+end
+
+get '/:source.css' do
+  scss params[:source].to_sym
+end

data/sample/modular_style/README.md

@@ -0,0 +1,30 @@
+WebSocket/Comet Chat
+====================
+
+* Ruby 1.8.7 or 1.9.2 or 1.9.3 or 2.0.0
+* sinatra-rocketio with Sinatra1.3+
+
+
+Install Dependencies
+--------------------
+
+    % gem install bundler
+    % bundle install
+
+
+Run
+---
+
+    % export PORT=5000
+    % export WS_PORT=8080
+    % rackup config.ru -p 5000
+
+=> http://localhost:5000
+
+
+Ruby Client
+-----------
+
+    % ruby bin/cui_chat_client.rb
+    % ruby bin/cui_chat_client.rb http://localhost:5000 websocket
+    % ruby bin/cui_chat_client.rb http://localhost:5000 comet

data/sample/modular_style/bin/cui_chat_client.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'bundler/setup'
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+require 'sinatra/rocketio/client'
+
+name = `whoami`.strip || 'shokai'
+url = ARGV.shift || 'http://localhost:5000'
+type = ARGV.shift || :websocket
+
+io = Sinatra::RocketIO::Client.new(url, :type => type, :channel => "1").connect
+#io = Sinatra::RocketIO::Client.new('http://localhost:5000', :type => :comet).connect
+
+io.on :connect do
+  puts "#{io.type} connect!! (session_id:#{io.session})"
+end
+
+io.on :chat do |data|
+  puts "<#{data['name']}> #{data['message']}"
+end
+
+io.on :error do |err|
+  STDERR.puts err
+end
+
+io.on :disconnect do
+  puts "disconnected!!"
+end
+
+loop do
+  line = STDIN.gets.strip
+  next if line.empty?
+  io.push :chat, {:message => line, :name => name}
+end

data/sample/{config.ru → modular_style/config.ru}

@@ -6,7 +6,7 @@ require 'sinatra/base'
 if development?
   $stdout.sync = true
   require 'sinatra/reloader'
-  $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+  $:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
 end
 require 'sinatra/rocketio'
 require 'haml'
@@ -15,7 +15,7 @@ require File.dirname(__FILE__)+'/main'
 
 set :haml, :escape_html => true
 set :cometio, :timeout => 120, :post_interval => 2
-set :websocketio, :port => (ENV['WS_PORT'].to_i || 8080)
+set :websocketio, :port => (ENV['WS_PORT'] || 8080).to_i
 set :rocketio, :comet => true, :websocket => true
 
 case RUBY_PLATFORM

data/sample/modular_style/public/js/chat.js

@@ -0,0 +1,38 @@
+var io = new RocketIO({channel: channel}).connect();
+
+$(function(){
+  $("#chat #btn_send").click(post);
+  $("#chat #message").keydown(function(e){
+    if(e.keyCode == 13) post();
+  });
+});
+
+io.on("chat", function(data){
+  var m = $("<li>").text(data.name + " : " +data.message);
+  $("#chat #timeline").prepend(m);
+});
+
+io.on("connect", function(){
+  console.log("connect!! "+io.session);
+  $("#type").text("type : "+io.type);
+});
+
+io.on("disconnect", function(){
+  console.log("disconnect!!");
+});
+
+io.on("*", function(event, data){ // catch all events
+  console.log(event + " - " + JSON.stringify(data));
+});
+
+io.on("error", function(err){
+  console.error(err);
+});
+
+var post = function(){
+  var name = $("#chat #name").val();
+  var message = $("#chat #message").val();
+  if(message.length < 1) return;
+  io.push("chat", {name: name, message: message});
+  $("#chat #message").val("");
+};

data/sample/modular_style/views/chat.haml

@@ -0,0 +1,29 @@
+!!! XHTML
+%html
+  %head
+    %meta{'http-equiv' => 'Content-Type', :content => 'text/html', :charset => 'UTF-8'}
+    %title sinatra-rocketio chat
+    %link{:rel => 'stylesheet', :href => "/main.css", :type => 'text/css'}
+    :javascript
+      var channel = "#{@channel}";
+    %script{:type => 'text/javascript', :src => "//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"}
+    %script{:type => 'text/javascript', :src => rocketio_js}
+    %script{:type => 'text/javascript', :src => "/js/chat.js"}
+
+  %body
+    %div#content
+      %div#header
+        %h1 rocketio chat [ch:#{@channel}]
+        %span#type
+      %div#main
+        %div#chat
+          %input{:id => 'name', :value => 'name', :size => 20}
+          %input{:id => 'message', :value => 'hello!!', :size => 80}
+          %input{:id => 'btn_send', :type => 'button', :value => 'post'}
+          %ul#timeline
+
+      %hr
+      %div#footer
+        sinatra-rocketio v#{Sinatra::RocketIO::VERSION} -
+        - src_url = 'https://github.com/shokai/sinatra-rocketio'
+        %a{:href => src_url} #{src_url}

data/sample/modular_style/views/main.scss

@@ -0,0 +1,15 @@
+
+$font_black : #222;
+
+@mixin content {
+  div {
+    margin : 10px;
+    font-size : 95%;
+  }
+}
+
+body {
+  @include content;
+  background-color : #EEE;
+  color : $font_black;
+}

data/sinatra-rocketio.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "httparty"
   gem.add_development_dependency "json"
 
-  gem.add_dependency "sinatra-cometio", ">= 0.5.3"
-  gem.add_dependency "sinatra-websocketio", ">= 0.2.6"
+  gem.add_dependency "sinatra-cometio", ">= 0.5.4"
+  gem.add_dependency "sinatra-websocketio", ">= 0.2.9"
   gem.add_dependency "sinatra"
   gem.add_dependency "eventmachine", ">= 1.0.0"
   gem.add_dependency "event_emitter", ">= 0.2.5"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: sinatra-websocketio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -232,13 +232,20 @@ files:
 - lib/sinatra-rocketio/version.rb
 - lib/sinatra/rocketio.rb
 - lib/sinatra/rocketio/client.rb
-- sample/README.md
-- sample/bin/cui_chat_client.rb
-- sample/config.ru
-- sample/main.rb
-- sample/public/js/chat.js
-- sample/views/chat.haml
-- sample/views/main.scss
+- sample/classic_style/README.md
+- sample/classic_style/bin/cui_chat_client.rb
+- sample/classic_style/config.ru
+- sample/classic_style/main.rb
+- sample/classic_style/public/js/chat.js
+- sample/classic_style/views/chat.haml
+- sample/classic_style/views/main.scss
+- sample/modular_style/README.md
+- sample/modular_style/bin/cui_chat_client.rb
+- sample/modular_style/config.ru
+- sample/modular_style/main.rb
+- sample/modular_style/public/js/chat.js
+- sample/modular_style/views/chat.haml
+- sample/modular_style/views/main.scss
 - sinatra-rocketio.gemspec
 - test/app.rb
 - test/app/config.ru
@@ -280,3 +287,4 @@ test_files:
 - test/test_push_multi_client.rb
 - test/test_rocketio.rb
 - test/test_settings.rb
+has_rdoc: