socketio-client 0.0.1 → 0.0.2

data/.gitignore

@@ -0,0 +1 @@
+/Gemfile.lock

data/Gemfile

@@ -1,4 +1,8 @@
 source "http://rubygems.org"
 
+group :development do
+  gem "rspec"
+end
+
 # Specify your gem's dependencies in socket.io-client.gemspec
 gemspec

data/README.md

@@ -15,9 +15,9 @@ This client currently supports:
 ## How to use:
 
 ```ruby
-require 'socketIO'
+require 'SocketIO'
 
-client = SocketIO.connect("localhost") do
+client = SocketIO.connect("http://localhost") do
   before_start do
     on_message {|message| puts "incoming message: #{message}"}
     on_event('news') { |data| puts data.first} # data is an array fo things.
@@ -32,9 +32,9 @@ You can start the socket io syncronously and then continue with your work
 this crates threads so be careful.
 
 ```ruby
-require 'socketIO'
+require 'SocketIO'
 
-client = SocketIO.connect("localhost", sync: true) do
+client = SocketIO.connect("http://localhost", sync: true) do
   before_start do
     on_message {|message| puts message}
     on_disconnect {puts "I GOT A DISCONNECT"}
@@ -55,4 +55,4 @@ end
 ## Examples
 
 examples can be found in the examples/ folder. 
-A corrosponding server can be found in the examples/servers
+A corrosponding server can be found in the examples/servers

data/lib/SocketIO.rb

@@ -5,18 +5,20 @@ require 'parser'
 
 module SocketIO
 
-  def self.connect(host, options = {}, &block)
-    response = RestClient.get "http://#{host}/socket.io/1/"
-    # resonse should be in the form of sessionid:heartbeattimeout:closetimeout:supported stuff
+  # params [URI, String] uri
+  def self.connect(uri, options = {}, &block)
+    uri = URI(uri)
+    # handshke
+    response = RestClient.get "#{uri.scheme}://#{uri.host}:#{uri.port}/socket.io/1/"
     response_array = response.split(':')
-    response_array = [host] + response_array << options
+    response_array = [uri] + response_array << options
     cli = Client.new(*response_array)
     cli.instance_eval(&block) if block
     cli.start
   end
 
   class Client
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
 
     [:INT, :TERM].each do |sig|
       Signal.trap(sig) do
@@ -29,8 +31,10 @@ module SocketIO
     # The state of the Socket.IO socket can be disconnected, disconnecting, connected and connecting.
     # The transport connection can be closed, closing, open, and opening.
 
-    def initialize(host, session_id, heartbeat_timeout, connection_timeout, supported_transports, options = {})
-      @host = host
+    def initialize(uri, session_id, heartbeat_timeout, connection_timeout, supported_transports, options = {})
+      @uri = uri
+      namespace = uri.path.sub(%r~^/~, '')
+      @namespace =  namespace.empty? ? "socket.io" : namespace
       @session_id = session_id
       @hb_timeout = heartbeat_timeout
       @connect_timeout = connection_timeout
@@ -51,7 +55,8 @@ module SocketIO
 
     def connect_transport
       if @supported_transports.include? "websocket"
-        @transport = WebSocket.new("ws://#{@host}/socket.io/1/websocket/#{@session_id}")
+        scheme = @uri.scheme == "https" ? "wss" : "ws"
+        @transport = WebSocket.new("#{scheme}://#{@uri.host}:#{@uri.port}/socket.io/1/websocket/#{@session_id}", origin: @uri.to_s)
       else
         raise "We only support WebSockets.. and this server doesnt like web sockets.. O NO!!"
       end
@@ -166,4 +171,4 @@ module SocketIO
     end
   end
 
-end
+end

data/socketio-client.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require 'socketIO'
+require 'SocketIO'
 
 Gem::Specification.new do |s|
   s.name        = "socketio-client"

data/spec/parser_spec.rb

@@ -1,4 +1,4 @@
-require 'socketIO'
+require 'SocketIO'
 
 describe Parser do
   
@@ -19,4 +19,4 @@ describe Parser do
     Parser.decode("9").should == {type: "0"}
   end
 
-end
+end

data/spec/socketio_spec.rb

@@ -1,7 +1,7 @@
 describe SocketIO do
   
   before :all do
-    @client = SocketIO.connect("localhost", :sync => true)
+    @client = SocketIO.connect("http://localhost", :sync => true)
   end
 
   it "can send a heartbeat" do
@@ -43,4 +43,4 @@ describe SocketIO do
 
   
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socketio-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2154912940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154912940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: uses a very simple web socket
 email:
 - lyon@delorum.com
@@ -29,6 +34,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -69,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: socketio-client
-rubygems_version: 1.8.11
+rubygems_version: 1.8.20
 signing_key: 
 specification_version: 3
 summary: A basic Socket.io client implememtation written for ruby
@@ -79,3 +85,4 @@ test_files:
 - spec/setup/start.rb
 - spec/setup/stop.rb
 - spec/socketio_spec.rb
+has_rdoc: