sinatra-websocketio 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.3 2013-03-09
+
+* add EM::WebSocketIO::Client
+
 === 0.0.2 2013-03-08
 
 * set :websocketio, :port => 8080

data/lib/em-websocketio-client/client.rb

@@ -0,0 +1,62 @@
+module EventMachine
+  module WebSocketIO
+    class Client
+      include EventEmitter
+      attr_reader :url, :session, :running
+      attr_accessor :timeout
+
+      def initialize(url)
+        raise ArgumentError, "invalid websocket URL \"#{url}\"" unless url =~ /^ws:\/\/.+/
+        @url = url
+        @running = false
+        @__reconnect_timer_id = nil
+        @ws = nil
+        self.on :__session_id do |session_id|
+          @session = session_id
+          self.emit :connect, session_id
+        end
+      end
+
+      def connect
+        url = @session ? "#{@url}/session=#{@session}" : @url
+        @ws = EventMachine::WebSocketClient.connect url
+        @running = true
+
+        @ws.stream do |msg|
+          data = JSON.parse msg
+          self.emit data['type'], data['data']
+        end
+
+        @ws.callback do
+          self.push :__session_id
+        end
+
+        @ws.errback do |err|
+          self.emit :error, err
+        end
+
+        @ws.disconnect do
+          self.emit :disconnect
+          if @running
+            @__reconnect_timer_id = EM::add_timer 10 do
+              connect
+            end
+          end
+        end
+
+        return self
+      end
+
+      def close
+        @running = false
+        @ws.close_connection if @ws
+        EM::cancel_timer @__reconnect_timer_id
+      end
+
+      def push(type, data={})
+        @ws.send_msg({:type => type, :data => data, :session => self.session}.to_json)
+      end
+
+    end
+  end
+end

data/lib/em-websocketio-client.rb

@@ -0,0 +1,6 @@
+require 'json'
+require 'eventmachine'
+require 'event_emitter'
+require 'em-websocket-client'
+require File.expand_path 'sinatra-websocketio/version', File.dirname(__FILE__)
+require File.expand_path 'em-websocketio-client/client', File.dirname(__FILE__)

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/sinatra-websocketio/websocketio.rb

@@ -66,5 +66,7 @@ class WebSocketIO
 
 end
 EventEmitter.apply WebSocketIO
-
+WebSocketIO.on :__session_id do |data, from|
+  WebSocketIO.push :__session_id, from, :to => from
+end
 

data/sample/Gemfile

@@ -11,3 +11,4 @@ gem 'json'
 gem 'haml'
 gem 'sass'
 gem 'em-websocket'
+gem 'em-websocket-client'

data/sample/Gemfile.lock

@@ -1,11 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.3)
     backports (3.0.3)
     daemons (1.1.9)
     em-websocket (0.5.0)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.5.3)
+    em-websocket-client (0.1.1)
+      eventmachine
+      libwebsocket
     event_emitter (0.2.3)
     eventmachine (1.0.1)
     foreman (0.61.0)
@@ -14,6 +18,9 @@ GEM
       tilt
     http_parser.rb (0.5.3)
     json (1.7.7)
+    libwebsocket (0.1.7.1)
+      addressable
+      websocket
     rack (1.5.2)
     rack-protection (1.4.0)
       rack
@@ -37,6 +44,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.17.0)
     tilt (1.3.4)
+    websocket (1.0.7)
 
 PLATFORMS
   ruby
@@ -44,6 +52,7 @@ PLATFORMS
 DEPENDENCIES
   backports (< 3.1.0)
   em-websocket
+  em-websocket-client
   event_emitter
   foreman
   haml

data/sample/bin/cui_chat_client.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'bundler/setup'
+$:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
+require 'eventmachine'
+require 'em-websocketio-client'
+
+name = `whoami`.strip || 'shokai'
+
+EM::run do
+  client = EM::WebSocketIO::Client.new('ws://localhost:8080').connect
+
+  client.on :connect do |session|
+    puts "connect!! (session_id:#{session})"
+  end
+
+  client.on :chat do |data|
+    puts "<#{data['name']}> #{data['message']}"
+  end
+
+  client.on :error do |err|
+    STDERR.puts err
+  end
+
+  client.on :disconnect do
+    puts "disconnected!!"
+  end
+
+  EM::defer do
+    loop do
+      line = STDIN.gets.strip
+      next if line.empty?
+      client.push :chat, {:message => line, :name => name}
+    end
+  end
+end
+
+

data/sinatra-websocketio.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json', '>= 1.7.0'
   gem.add_dependency 'event_emitter', '>= 0.2.0'
   gem.add_dependency 'em-websocket'
+  gem.add_dependency 'em-websocket-client'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-websocket-client
+  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: Node.js like WebSocket I/O plugin for Sinatra.
 email:
 - hashimoto@shokai.org
@@ -136,6 +152,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/em-websocketio-client.rb
+- lib/em-websocketio-client/client.rb
 - lib/js/event_emitter.js
 - lib/js/websocketio.js
 - lib/sinatra-websocketio.rb
@@ -148,6 +166,7 @@ files:
 - sample/Gemfile.lock
 - sample/Procfile
 - sample/README.md
+- sample/bin/cui_chat_client.rb
 - sample/config.ru
 - sample/main.rb
 - sample/public/js/index.js