Merge pull request #6 from jobseekerltd/jsm-860-update-name

fix: Avoid nameclash with gem parser

lib/socket_io.rb

@@ -1,7 +1,7 @@
 require 'socket_io/web_socket'
 require 'rest_client'
 require 'json'
-require 'parser'
+require 'socket_parser'
 
 module SocketIO
 
@@ -65,7 +65,7 @@ def connect_transport
     def start_recieve_loop
       @thread = Thread.new() do
         while data = @transport.receive()
-          decoded = Parser.decode(data)
+          decoded = SocketParser.decode(data)
           case decoded[:type]
           when '0'
             @on_disconnect.call if @on_disconnect

lib/parser.rb → lib/socket_parser.rb

@@ -1,4 +1,4 @@
-module Parser
+module SocketParser
   @regexp = /([^:]+):([0-9]+)?(\+)?:([^:]+)?:?([\s\S]*)?/
 
   # returns hash as {type: '1', id: '1', end_point: '4', data: [{key: value}]}
@@ -10,4 +10,4 @@ def self.decode(string)
     end
   end
 
-end
+end

socketio-client.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "socketio-client"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
   s.authors     = ["Lyon"]
   s.email       = ["lyon@delorum.com"]
   s.homepage    = "http://github.com/lyondhill/socket.io-ruby-client"

spec/socket_parser_spec.rb

@@ -0,0 +1,22 @@
+require 'socket_io'
+
+describe SocketParser do
+
+  it 'should be able to decode all valid messages' do
+    described_class.decode("0").should == {type: "0"}
+    described_class.decode("1::").should == {type: "1", id: nil, end_point: nil, data: ""}
+    described_class.decode("2::").should == {type: "2", id: nil, end_point: nil, data: ""}
+    described_class.decode("3:::hay you").should == {type: "3", id: nil, end_point: nil, data: "hay you"}
+    described_class.decode("4:::{\"can\":\"youcall\"}").should == {type: "4", id: nil, end_point: nil, data: "{\"can\":\"youcall\"}"}
+    described_class.decode("5:::hay you").should == {type: "5", id: nil, end_point: nil, data: "hay you"}
+    described_class.decode("6:::").should == {type: "6", id: nil, end_point: nil, data: ""}
+    described_class.decode("7:::there is an error").should == {type: "7", id: nil, end_point: nil, data: "there is an error"}
+    described_class.decode("8:::").should == {type: "8", id: nil, end_point: nil, data: ""}
+  end
+
+  it "should give a disconnect if bad input" do
+    described_class.decode("hay dude").should == {type: "0"}
+    described_class.decode("9").should == {type: "0"}
+  end
+
+end