sinatra-websocketio 0.1.7 → 0.2.0

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sinatra-websocketio.gemspec
 gemspec
-gem 'minitest'
-gem 'thin'

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.0 2013-03-23
+
+* add Sinatra::WebSocketIO::Client
+* use gem.add_development_dependency
+* delete sample/Gemfile
+
 === 0.1.7 2013-03-21
 
 * emit "error" on push before websocket connect

data/lib/sinatra/websocketio/client.rb

@@ -0,0 +1,97 @@
+require File.expand_path '../../sinatra-websocketio/version', File.dirname(__FILE__)
+require 'websocket-client-simple'
+require 'event_emitter'
+require 'json'
+require 'timeout'
+
+module Sinatra
+  module WebSocketIO
+    class Client
+      class Error < StandardError
+      end
+
+      include EventEmitter
+      attr_reader :url, :session
+      attr_accessor :running, :connecting, :timeout
+
+      def initialize(url)
+        @url = url
+        @session = nil
+        @websocket = nil
+        @connecting = false
+        @running = false
+        @timeout = 5
+
+        on :__session_id do |session_id|
+          @session = session_id
+          emit :connect, @session
+        end
+      end
+
+      def connect
+        return self if connecting
+        this = self
+        @running = true
+        url = @session ? "#{@url}/session=#{@session}" : @url
+        @websocket = nil
+        begin
+          @websocket = WebSocket::Client::Simple::Client.new url
+        rescue StandardError, Timeout::Error => e
+          Thread.new do
+            sleep 5
+            connect
+          end
+        end
+        return self unless @websocket
+
+        @websocket.on :message do |msg|
+          begin
+            data = JSON.parse msg.data
+            this.emit data['type'], data['data']
+          rescue => e
+            this.emit :error, e
+          end
+        end
+
+        @websocket.on :close do |e|
+          if this.connecting
+            this.connecting = false
+            this.emit :disconnect, e
+          end
+          if this.running
+            Thread.new do
+              sleep 5
+              this.connect
+            end
+          end
+        end
+
+        @websocket.on :open do
+          this.connecting = true
+        end
+
+        return self
+      end
+
+      def close
+        @running = false
+        @websocket.close
+      end
+
+      def push(type, data)
+        if !@connecting
+          emit :error, 'websocket not connecting'
+          return
+        end
+        begin
+          Timeout::timeout @timeout do
+            @websocket.send({:type => type, :data => data, :session => @session}.to_json)
+          end
+        rescue Timeout::Error, StandardError => e
+          emit :error, e
+        end
+      end
+
+    end
+  end
+end

data/lib/sinatra-websocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module WebSocketIO
-    VERSION = "0.1.7"
+    VERSION = "0.2.0"
   end
 end

data/lib/sinatra-websocketio/websocketio.rb

@@ -6,7 +6,6 @@ module Sinatra
       @@running
     end
 
-
     def self.start
       return if running?
       @@running = true

data/sample/README.md

@@ -8,13 +8,13 @@ WebSocket Chat
 Install Dependencies
 --------------------
 
-    % gem install bundler foreman
+    % gem install bundler
     % bundle install
 
 
 Run
 ---
 
-    % foreman start
+    % rackup config.ru -p 5000
 
 => http://localhost:5000

data/sample/bin/cui_chat_client.rb

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

data/sample/config.ru

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 Bundler.require
+require 'sinatra'
 require 'sinatra/base'
 if development?
   $stdout.sync = true

data/sinatra-websocketio.gemspec

@@ -15,11 +15,18 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'thin'
+  gem.add_development_dependency 'haml'
+  gem.add_development_dependency 'sass'
+  gem.add_development_dependency 'rack'
+
   gem.add_dependency 'sinatra-contrib', '>= 1.3.2'
   gem.add_dependency 'sinatra', '>= 1.3.0'
-  gem.add_dependency 'em-websocket-client', '>= 0.1.1'
   gem.add_dependency 'em-websocket', '>= 0.5.0'
   gem.add_dependency 'eventmachine', '>= 1.0.0'
   gem.add_dependency 'json', '>= 1.7.0'
   gem.add_dependency 'event_emitter', '>= 0.2.4'
+  gem.add_dependency 'websocket-client-simple'
 end

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'minitest/autorun'
-require 'em-websocketio-client'
+require 'sinatra/websocketio/client'
 require File.expand_path 'app', File.dirname(__FILE__)
 
 

data/test/test_websocketio.rb

@@ -13,30 +13,25 @@ class TestWebSocketIO < MiniTest::Unit::TestCase
   def test_simple
     res = nil
     post_data = {:time => Time.now.to_s, :msg => 'hello!!'}
-    EM::run do
-      client = EM::WebSocketIO::Client.new(App.websocketio_url).connect
+    client = Sinatra::WebSocketIO::Client.new(App.websocketio_url).connect
 
-      client.on :broadcast do |data|
-        res = data
-        client.close
-      end
+    client.on :broadcast do |data|
+      res = data
+      client.close
+    end
 
-      client.on :disconnect do
-        EM.stop_event_loop
-      end
+    client.on :disconnect do
+    end
 
-      client.on :connect do |session|
-        push :broadcast, post_data
-      end
+    client.on :connect do |session|
+      push :broadcast, post_data
+    end
 
-      EM::defer do
-        50.times do
-          break if res != nil
-          sleep 0.1
-        end
-        client.close
-      end
+    50.times do
+      break if res != nil
+      sleep 0.1
     end
+    client.close
     assert res != nil, 'server not respond'
     assert res["time"] == post_data[:time]
     assert res["msg"] == post_data[:msg]
@@ -47,37 +42,29 @@ class TestWebSocketIO < MiniTest::Unit::TestCase
     post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
     res = nil
     res2 = nil
-    EM::run do
-      client = EM::WebSocketIO::Client.new(App.websocketio_url).connect
-      client.on :message do |data|
-        res = data
-      end
-
-      client.on :disconnect do
-        EM.stop_event_loop
-      end
+    client = Sinatra::WebSocketIO::Client.new(App.websocketio_url).connect
+    client.on :message do |data|
+      res = data
+    end
 
-      client.on :connect do |session|
-        client2 = EM::WebSocketIO::Client.new(App.websocketio_url).connect
-        client2.on :connect do |session2|
-          post_data['to'] = session2
-          client.push :message, post_data
-        end
-        client2.on :message do |data|
-          res2 = data
-          client2.close
-          client.close
-        end
+    client.on :connect do |session|
+      client2 = Sinatra::WebSocketIO::Client.new(App.websocketio_url).connect
+      client2.on :connect do |session2|
+        post_data['to'] = session2
+        client.push :message, post_data
       end
-
-      EM::defer do
-        50.times do
-          break if res != nil
-          sleep 0.1
-        end
+      client2.on :message do |data|
+        res2 = data
+        client2.close
         client.close
       end
     end
+
+    50.times do
+      break if res != nil
+      sleep 0.1
+    end
+    client.close
     assert res2 != nil, 'server not respond'
     assert res2["time"] == post_data[:time]
     assert res2["msg"] == post_data[:msg]
@@ -91,35 +78,27 @@ class TestWebSocketIO < MiniTest::Unit::TestCase
     res = nil
     res2 = nil
 
-    EM::run do
-      client = EM::WebSocketIO::Client.new(App.websocketio_url).connect
-      client.on :broadcast do |data|
-        res = data
-      end
+    client = Sinatra::WebSocketIO::Client.new(App.websocketio_url).connect
+    client.on :broadcast do |data|
+      res = data
+    end
 
-      client.on :disconnect do
-        EM.stop_event_loop
+    client.on :connect do |session|
+      client2 = Sinatra::WebSocketIO::Client.new(App.websocketio_url).connect
+      client2.on :connect do |session2|
+        client.push :broadcast, post_data
       end
-
-      client.on :connect do |session|
-        client2 = EM::WebSocketIO::Client.new(App.websocketio_url).connect
-        client2.on :connect do |session2|
-          client.push :broadcast, post_data
-        end
-        client2.on :broadcast do |data|
-          res2 = data
-          client2.close
-        end
+      client2.on :broadcast do |data|
+        res2 = data
+        client2.close
       end
+    end
 
-      EM::defer do
-        50.times do
-          break if res != nil and res2 != nil
-          sleep 0.1
-        end
-        client.close
-      end
+    50.times do
+      break if res != nil and res2 != nil
+      sleep 0.1
     end
+    client.close
 
     assert res != nil, 'server not respond'
     assert res["time"] == post_data[:time]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocketio
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,32 +9,96 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +106,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
-  name: em-websocket-client
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.4
+- !ruby/object:Gem::Dependency
+  name: websocket-client-simple
+  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: WebSocket component for Sinatra RocketIO
 email:
 - hashimoto@shokai.org
@@ -136,8 +216,6 @@ 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,10 +226,8 @@ files:
 - lib/sinatra-websocketio/version.rb
 - lib/sinatra-websocketio/websocketio.rb
 - lib/sinatra/websocketio.rb
+- lib/sinatra/websocketio/client.rb
 - lib/sinatra/websocketio_nostart.rb
-- sample/Gemfile
-- sample/Gemfile.lock
-- sample/Procfile
 - sample/README.md
 - sample/bin/cui_chat_client.rb
 - sample/config.ru

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

@@ -1,62 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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/sample/Gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'foreman'
-gem 'sinatra-contrib'
-gem 'sinatra'
-gem 'thin'
-gem 'rack'
-gem 'event_emitter'
-gem 'json'
-gem 'haml'
-gem 'sass'
-gem 'em-websocket'
-gem 'em-websocket-client'

data/sample/Gemfile.lock

@@ -1,63 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.3)
-    backports (3.1.1)
-    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.4)
-    eventmachine (1.0.3)
-    foreman (0.62.0)
-      thor (>= 0.13.6)
-    haml (4.0.0)
-      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.5.0)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    sass (3.2.7)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    sinatra-contrib (1.3.2)
-      backports (>= 2.0)
-      eventmachine
-      rack-protection
-      rack-test
-      sinatra (~> 1.3.0)
-      tilt (~> 1.3)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.17.0)
-    tilt (1.3.6)
-    websocket (1.0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  em-websocket
-  em-websocket-client
-  event_emitter
-  foreman
-  haml
-  json
-  rack
-  sass
-  sinatra
-  sinatra-contrib
-  thin

data/sample/Procfile

@@ -1 +0,0 @@
-web: bundle exec rackup config.ru -p $PORT