sinatra-rocketio 0.0.9 → 0.1.0

data/Gemfile

@@ -2,6 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sinatra-rocketio.gemspec
 gemspec
-gem 'minitest'
-gem 'thin'
-gem 'em-cometio-client'

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.0 2013-03-24
+
+* add ruby client library - Sinatra::RocketIO::Client
+* add route /rocketio/settings
+
 === 0.0.9 2013-03-21
 
 * bugfix javascrip websocket error in push() before connect

data/lib/sinatra-rocketio/application.rb

@@ -18,6 +18,15 @@ module Sinatra
           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]
         }

data/lib/sinatra-rocketio/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RocketIO
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/lib/sinatra/rocketio/client.rb

@@ -0,0 +1,62 @@
+require File.expand_path '../../sinatra-rocketio/version', File.dirname(__FILE__)
+require 'sinatra/cometio/client'
+require 'sinatra/websocketio/client'
+require 'httparty'
+require 'json'
+require 'event_emitter'
+
+module Sinatra
+  module RocketIO
+    class Client
+      class Error < StandardError
+      end
+
+      include EventEmitter
+      attr_reader :settings, :type, :io
+
+      def initialize(url, opt={:type => :websocket})
+        @settings = JSON.parse HTTParty.get("#{url}/rocketio/settings").body
+        type = opt[:type].to_sym
+
+        if type == :websocket and @settings['websocket']
+          @type = :websocket
+          @io = Sinatra::WebSocketIO::Client.new @settings['websocket']
+        elsif type == :comet and @settings['comet']
+          @type = :comet
+          @io = Sinatra::CometIO::Client.new @settings['comet']
+        else
+          raise Error, "cannot find #{type} IO #{url}"
+        end
+        this = self
+        if @io
+          @io.on :* do |event_name, *args|
+            if args.size > 1
+              this.emit event_name, args[0], args[1]
+            else
+              this.emit event_name, args[0]
+            end
+          end
+        end
+        self
+      end
+
+      def connect
+        @io.connect
+        self
+      end
+
+      def close
+        @io.close
+      end
+
+      def push(type, data)
+        @io.push type, data
+      end
+
+      def method_missing(name, *args)
+        @io.__send__ name, *args
+      end
+
+    end
+  end
+end

data/sample/README.md

@@ -8,7 +8,7 @@ WebSocket/Comet Chat
 Install Dependencies
 --------------------
 
-    % gem install bundler foreman
+    % gem install bundler
     % bundle install
 
 
@@ -17,6 +17,6 @@ Run
 
     % export PORT=5000
     % export WS_PORT=8080
-    % foreman start
+    % rackup config.ru -p 5000
 
 => http://localhost:5000

data/sample/bin/cui_chat_client.rb

@@ -2,37 +2,31 @@
 require 'rubygems'
 require 'bundler/setup'
 $:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
-require 'eventmachine'
-require 'em-websocketio-client'
+require 'sinatra/rocketio/client'
 
 name = `whoami`.strip || 'shokai'
 
-EM::run do
-  client = EM::WebSocketIO::Client.new('ws://localhost:8080').connect
+io = Sinatra::RocketIO::Client.new('http://localhost:5000').connect
+#io = Sinatra::RocketIO::Client.new('http://localhost:5000', :type => :comet).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
+io.on :connect do |session|
+  puts "#{io.type} connect!! (session_id:#{session})"
+end
 
-  client.on :disconnect do
-    puts "disconnected!!"
-  end
+io.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
+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

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 Bundler.require
+require 'sinatra'
 require 'sinatra/base'
 if development?
   $stdout.sync = true
@@ -8,6 +9,8 @@ if development?
   $:.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

data/sinatra-rocketio.gemspec

@@ -15,8 +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_dependency "sinatra-cometio", ">= 0.3.9"
-  gem.add_dependency "sinatra-websocketio", ">= 0.1.7"
+
+  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "minitest"
+  gem.add_development_dependency "thin"
+  gem.add_development_dependency "haml"
+  gem.add_development_dependency "sass"
+  gem.add_development_dependency "httparty"
+  gem.add_development_dependency "json"
+
+  gem.add_dependency "sinatra-cometio", ">= 0.4.0"
+  gem.add_dependency "sinatra-websocketio", ">= 0.2.0"
   gem.add_dependency "sinatra"
   gem.add_dependency "eventmachine", ">= 1.0.0"
   gem.add_dependency "event_emitter", ">= 0.2.4"

data/test/app.rb

@@ -14,6 +14,10 @@ class App
     ENV['WS_PORT'] || 8080
   end
 
+  def self.url
+    "http://localhost:#{port}"
+  end
+
   def self.websocketio_url
     "ws://localhost:#{ws_port}"
   end
@@ -22,7 +26,6 @@ class App
     "http://localhost:#{port}/cometio/io"
   end
 
-
   def self.pid_file
     ENV['PID_FILE'] || "/tmp/sinatra-rocketio-testapp.pid"
   end

data/test/test_helper.rb

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

data/test/test_rocketio.rb

@@ -15,37 +15,29 @@ class TestRocketIO < 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::RocketIO::Client.new(App.url, :type => :websocket).connect
+    client.on :message do |data|
+      res = data
+    end
 
-      client.on :connect do |session|
-        client2 = EM::CometIO::Client.new(App.cometio_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::RocketIO::Client.new(App.url, :type => :comet).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]
@@ -57,40 +49,29 @@ class TestRocketIO < MiniTest::Unit::TestCase
     post_data = {:time => Time.now.to_s, :msg => 'hello!!', :to => nil}
     res = nil
     res2 = nil
-    EM::run do
-      client = EM::CometIO::Client.new(App.cometio_url).connect
-      client.on :message do |data|
-        res = data
-      end
-
-      client.on :disconnect do
-        EM.stop_event_loop
-      end
+    client = Sinatra::RocketIO::Client.new(App.url, :type => :comet).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
-        client2.on :disconnect do
-          EM.stop_event_loop
-        end
+    client.on :connect do |session|
+      client2 = Sinatra::RocketIO::Client.new(App.url, :type => :websocket).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]

data/test/test_settings.rb

@@ -0,0 +1,19 @@
+require File.expand_path 'test_helper', File.dirname(__FILE__)
+
+class TestSettingsIO < MiniTest::Unit::TestCase
+
+  def setup
+    App.start
+  end
+
+  def teardown
+    App.stop
+  end
+
+  def test_settings
+    res = JSON.parse HTTParty.get("#{App.url}/rocketio/settings").body
+    assert App.websocketio_url == res['websocket']
+    assert App.cometio_url == res['comet']
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,136 @@ 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: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: minitest
+  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: thin
+  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: 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: httparty
+  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: json
+  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-cometio
   requirement: !ruby/object:Gem::Requirement
@@ -18,7 +146,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +154,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sinatra-websocketio
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +162,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +170,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -114,9 +242,7 @@ files:
 - lib/sinatra-rocketio/rocketio.rb
 - lib/sinatra-rocketio/version.rb
 - lib/sinatra/rocketio.rb
-- sample/Gemfile
-- sample/Gemfile.lock
-- sample/Procfile
+- lib/sinatra/rocketio/client.rb
 - sample/README.md
 - sample/bin/cui_chat_client.rb
 - sample/config.ru
@@ -130,6 +256,7 @@ files:
 - test/app/main.rb
 - test/test_helper.rb
 - test/test_rocketio.rb
+- test/test_settings.rb
 homepage: https://github.com/shokai/sinatra-rocketio
 licenses: []
 post_install_message: 
@@ -142,12 +269,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4356497738858812236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4356497738858812236
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -160,3 +293,4 @@ test_files:
 - test/app/main.rb
 - test/test_helper.rb
 - test/test_rocketio.rb
+- test/test_settings.rb

data/sample/Gemfile

@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'foreman'
-gem 'sinatra-cometio', '>= 0.3.9'
-gem 'sinatra-websocketio', '>= 0.1.7'
-gem 'sinatra'
-gem 'rack'
-gem 'thin'
-gem 'haml'
-gem 'sass'
-gem 'event_emitter'

data/sample/Gemfile.lock

@@ -1,81 +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.1)
-      tilt
-    http_parser.rb (0.5.3)
-    httparty (0.10.2)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    json (1.7.7)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    multi_json (1.7.1)
-    multi_xml (0.5.3)
-    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-cometio (0.3.9)
-      event_emitter (>= 0.2.4)
-      eventmachine (>= 1.0.0)
-      httparty (>= 0.10.2)
-      json (>= 1.7.0)
-      sinatra (>= 1.3.0)
-      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)
-    sinatra-websocketio (0.1.7)
-      em-websocket (>= 0.5.0)
-      em-websocket-client (>= 0.1.1)
-      event_emitter (>= 0.2.4)
-      eventmachine (>= 1.0.0)
-      json (>= 1.7.0)
-      sinatra (>= 1.3.0)
-      sinatra-contrib (>= 1.3.2)
-    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
-  event_emitter
-  foreman
-  haml
-  rack
-  sass
-  sinatra
-  sinatra-cometio (>= 0.3.9)
-  sinatra-websocketio (>= 0.1.7)
-  thin

data/sample/Procfile

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