em-rocketio-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 73c3e96f63c492b52c174596344048f96502f8d4
-  data.tar.gz: 78e0270cd3237bed4b15ae2ba97e5672c92da047
-SHA512: 
-  metadata.gz: 65d4c4fd36d901dd438582f71cbbfb4dfcad06b0ecabe39dcc211d8bd8353d6ab200274e5a750d5d1fdefdc2b834a94ad02ecd022028abf876582dd26b00fc71
-  data.tar.gz: 4aab374035d2a010300d929a994f8ae7683b4d27996c9a3462a59734a097d28103e002bddb0855bf92085a035b63b3c61efcac6582931da8a25784ddd4009f42
+---
+SHA1:
+  metadata.gz: ea217c13dfc2f0babb7a69266abf890151b20766
+  data.tar.gz: 2d0fb7c526e0e137b8f1c1266876da36ee7ff38d
+SHA512:
+  metadata.gz: 083d68b20a111a0504a7b5581bd4fb1c6ff23fe013877720a448745f01f7175a392cf11e174e3646a183106c5f2f23e594e77f7612e3ff898f35ac216a2ba9e6
+  data.tar.gz: 1b75d74437a43e6977230aed0ef6e33d75f64ad004d889f7479c91ef990a2fa37c89baf970d11672b170314052a69be98bb8b35ab4f579507a38ca554956cb56

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.2 2013-07-12
+
+* cache /settings
+
 === 0.1.1 2013-04-01
 
 * bugfix for duplicative comet "connect" event

data/README.md

@@ -21,8 +21,8 @@ EM::run do
   io = EM::RocketIO::Client.new('http://localhost:5000').connect
   # io = EM::RocketIO::Client.new('http://localhost:5000', :type => :comet).connect
   # io = EM::RocketIO::Client.new('http://localhost:5000', :channel => '1').connect
-  io.on :connect do |session|
-    puts "#{io.type} connect!! (sessin_id:#{session})"
+  io.on :connect do
+    puts "#{io.type} connect!! (sessin_id:#{io.session})"
   end
 
   io.on :disconnect do
@@ -51,10 +51,11 @@ Sample
 
 start [chat server](https://github.com/shokai/rocketio-chat-sample)
 
-    % git clone git://github.com/shokai/rocketio-chat-sample.git
-    % cd rocketio-chat-sample
+    % git clone git://github.com/shokai/sinatra-rocketio.git
+    % cd sinatra-rocketio
     % bundle install
-    % foreman start
+    % cd sample/classic_style
+    % rackup config.ru -p 5000
 
 => http://localhost:5000
 
@@ -64,7 +65,6 @@ sample chat client
     % ruby sample/cui_chat_client.rb
     % ruby sample/cui_chat_client.rb http://localhost:5000 comet
     % ruby sample/cui_chat_client.rb http://localhost:5000 websocket
-    % ruby sample/cui_chat_client.rb http://rocketio-chat.herokuapp.com
 
 
 Test
@@ -76,7 +76,7 @@ Test
 start server
 
     % export PORT=5000
-    % export WS_PORT=8080
+    % export WS_PORT=9000
     % rake test_server
 
 run test

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

@@ -7,6 +7,10 @@ module EventMachine
       include EventEmitter
       attr_reader :settings, :type, :io, :channel
 
+      def self.settings
+        @@settings ||= {}
+      end
+
       public
       def initialize(url, opt={:type => :websocket, :channel => nil})
         @url = url
@@ -25,11 +29,17 @@ module EventMachine
 
       private
       def get_settings
+        if self.class.settings[@url].kind_of? Hash
+          @settings = self.class.settings[@url]
+          emit :__settings
+          return
+        end
         url = "#{@url}/rocketio/settings"
         http = EM::HttpRequest.new(url).get
         http.callback do |res|
           begin
             @settings = JSON.parse res.response
+            self.class.settings[@url] = @settings
             emit :__settings
           rescue => e
             emit :error, "#{e} (#{url})"

data/lib/em-rocketio-client/version.rb

@@ -1,7 +1,7 @@
 module EventMachine
   module RocketIO
     class Client
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/test/app.rb

@@ -9,7 +9,7 @@ class App
   end
 
   def self.ws_port
-    ENV['WS_PORT'] || 8080
+    ENV['WS_PORT'] || 9000
   end
 
   def self.url

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")
@@ -34,11 +34,10 @@ class TestChannel < MiniTest::Unit::TestCase
       end
 
       EM::defer do
-        50.times do
+        80.times do
           break if res != nil and res3 != nil
           sleep 0.1
         end
-        client.close
         EM::stop
       end
     end

data/test/test_em_rocketio_client.rb

@@ -1,6 +1,6 @@
 require File.expand_path 'test_helper', File.dirname(__FILE__)
 
-class TestEmRocketioClient < MiniTest::Unit::TestCase
+class TestEmRocketioClient < MiniTest::Test
 
   def test_websocket_to_comet
     ## websocket --> server --> comet
@@ -39,17 +39,19 @@ class TestEmRocketioClient < MiniTest::Unit::TestCase
       end
 
       EM::defer do
-        50.times do
+        80.times do
           break if res != nil
           sleep 0.1
         end
-        client.close
+        EM::add_timer 1 do
+          EM::stop
+        end
       end
     end
     assert res2 != nil, 'server not respond'
-    assert res2["time"] == post_data[:time]
-    assert res2["msg"] == post_data[:msg]
-    assert res == nil
+    assert_equal res2["time"], post_data[:time]
+    assert_equal res2["msg"], post_data[:msg]
+    assert_equal res, nil
   end
 
   def test_comet_to_websocket
@@ -83,20 +85,19 @@ class TestEmRocketioClient < MiniTest::Unit::TestCase
       end
 
       EM::defer do
-        50.times do
+        80.times do
           break if res != nil
           sleep 0.1
         end
-        client.close
         EM::add_timer 1 do
           EM::stop
         end
       end
     end
     assert res2 != nil, 'server not respond'
-    assert res2["time"] == post_data[:time]
-    assert res2["msg"] == post_data[:msg]
-    assert res == nil
+    assert_equal res2["time"], post_data[:time]
+    assert_equal res2["msg"], post_data[:msg]
+    assert_equal res, nil
   end
 
 end

metadata

@@ -1,111 +1,162 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-rocketio-client
-version: !ruby/object:Gem::Version 
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id003 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra-rocketio
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-rocketio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: em-cometio-client
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-cometio-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: em-websocketio-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-websocketio-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: event_emitter
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: event_emitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sinatra RocketIO client for eventmachine
-email: 
+email:
 - hashimoto@shokai.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - History.txt
@@ -124,29 +175,30 @@ files:
 - test/test_em_rocketio_client.rb
 - test/test_helper.rb
 homepage: https://github.com/shokai/em-rocketio-client
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sinatra RocketIO client for eventmachine
-test_files: 
+test_files:
 - test/app.rb
 - test/app/config.ru
 - test/app/main.rb