sinatra-rocketio 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e83f8cf2d3ec769975e49a8c87cbce77e55eb02
-  data.tar.gz: 35d737b0f6b92ee4ea41486cb262e5fc2ae8ad5f
+  metadata.gz: 574c09d0944df2356c86d057c1e80eb81496845b
+  data.tar.gz: 237b7b7762880c7e1d875dbea7e1443731ae36ec
 SHA512:
-  metadata.gz: 1a5cd2031b22d2119780cc0eb95ce9ff85418af7c4c97f632afe89e9ead697c6a4843c21e32f61fac130791dda4e61b5818715d477ce51b4effb2f89e25dec06
-  data.tar.gz: c16dab7e6f2ed676be4dff89180d7f9a74a3c87919fbf732f2f5c2439b1709312e2c970f38c7b7e1c4b476ee8008863847b9e1d7cfb217d290852591274e2cb1
+  metadata.gz: 5b05e9851fc7213cd9a486aecd761830fc1449a264d0f9a68869e4a474673e15a0d22708b054b6665515be74c2831ebd9b868e1c236a620eba8da8619cfc1c4d
+  data.tar.gz: 1d4f6b5018b2921baf2176b9a528fd5fd7f09255f2afcde4b844c652e8dbfa12455b2d70c455bd06f49fb4ea07b913b58a65ee25970b6693b164e49119d438a1

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.5 2013-05-26
+
+* add function RocketIO::Client#wait
+* enable/disable websocket by ENV["WEBSOCKET"]=disable
+
 === 0.2.4 2013-05-23
 
 * bugfix RocketIO start process

data/README.md

@@ -32,7 +32,7 @@ Server Side
 require 'sinatra'
 require 'sinatra/rocketio'
 set :cometio, :timeout => 120, :post_interval => 2
-set :websocketio, :port => 8080
+set :websocketio, :port => 5001
 set :rocketio, :websocket => true, :comet => true # enable WebSocket and Comet
 
 run Sinatra::Application
@@ -182,6 +182,18 @@ end
 ```
 
 
+### Config with ENV[]
+
+configure with ENV variables.
+
+    % export WS_PORT=9000
+    % export WEBSOCKET=disable
+    % export COMET=enable
+    % bundle exec rackup config.ru  #=> start sinatra app
+
+disable comet and enable websocket on port 9000.
+
+
 Sample App
 ----------
 

data/lib/sinatra-rocketio/options.rb

@@ -11,8 +11,14 @@ module Sinatra
 
     def self.default_options
       {
-        :comet => [true, lambda{|v| [true, false].include? v }],
-        :websocket => [true, lambda{|v| [true, false].include? v }]
+        :comet     => [
+                       (ENV["COMET"].to_s =~ /^(false|disable)$/i ? false : true),
+                       lambda{|v| [true, false].include? v }
+                      ],
+        :websocket => [
+                       (ENV["WEBSOCKET"].to_s =~ /^(false|disable)$/i ? false : true),
+                       lambda{|v| [true, false].include? v }
+                      ]
       }
     end
 

data/lib/sinatra-rocketio/version.rb

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

data/lib/sinatra/rocketio/client.rb

@@ -90,6 +90,13 @@ module Sinatra
         @io.push type, data if @io
       end
 
+      def wait(&block)
+        loop do
+          sleep 1
+          yield if block_given?
+        end
+      end
+
       def method_missing(name, *args)
         @io.__send__ name, *args
       end

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.4"
-  gem.add_dependency "sinatra-websocketio", ">= 0.2.9"
+  gem.add_dependency "sinatra-cometio", ">= 0.5.6"
+  gem.add_dependency "sinatra-websocketio", ">= 0.3.0"
   gem.add_dependency "sinatra"
   gem.add_dependency "eventmachine", ">= 1.0.0"
   gem.add_dependency "event_emitter", ">= 0.2.5"

data/test/app/config.ru

@@ -6,6 +6,4 @@ $:.unshift File.expand_path '../../lib', File.dirname(__FILE__)
 require 'sinatra/rocketio'
 require File.dirname(__FILE__)+'/main'
 
-set :websocketio, :port => ENV['WS_PORT'].to_i
-
 run TestApp

data/test/test_channel.rb

@@ -1,6 +1,6 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestChannel < MiniTest::Unit::TestCase
+class TestChannel < MiniTest::Test
 
   def test_channel
     ## client1(comet, channel "aaa") --> server --> client3(websocket, channel "aaa")

data/test/test_push_multi_client.rb

@@ -1,6 +1,6 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestPushMultiClient < MiniTest::Unit::TestCase
+class TestPushMultiClient < MiniTest::Test
 
   def test_push_multi
     ## client1(comet) --> server --> client2(comet) & client3(websocket)

data/test/test_rocketio.rb

@@ -1,6 +1,6 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestRocketIO < MiniTest::Unit::TestCase
+class TestRocketIO < MiniTest::Test
 
   def test_websocket_to_comet
     ## websocket --> server --> comet

data/test/test_settings.rb

@@ -1,6 +1,6 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestSettingsIO < MiniTest::Unit::TestCase
+class TestSettingsIO < MiniTest::Test
 
   def test_settings
     res = JSON.parse HTTParty.get("#{App.url}/rocketio/settings").body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rocketio
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-26 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.4
+        version: 0.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.6
 - !ruby/object:Gem::Dependency
   name: sinatra-websocketio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement