Merge pull request websocket-rails#193 from maharifu/master

Add verification of parsing results in Event.

Author: DanKnox

lib/websocket_rails/event.rb

@@ -71,6 +71,11 @@ def self.new_from_json(encoded_data, connection)
       case encoded_data
       when String
         event_name, data = JSON.parse encoded_data
+
+        unless event_name.is_a?(String) && data.is_a?(Hash)
+          raise UnknownDataType
+        end
+
         data = data.merge(:connection => connection).with_indifferent_access
         Event.new event_name, data
         # when Array

spec/unit/event_spec.rb

@@ -9,6 +9,7 @@ module WebsocketRails
     let(:channel_encoded_message_string) { '["new_message",{"id":"1234","channel":"awesome_channel","user_id":null,"data":"this is a message","success":null,"result":null,"token":null,"server_token":"1234"}]' }
     let(:synchronizable_encoded_message) { '["new_message",{"id":"1234","data":{"message":"this is a message"},"server_token":"1234"}]' }
     let(:connection) { double('connection') }
+    let(:wrongly_encoded_message) { '["new_message",[{"id":"1234","data":{"message":"this is a message"}}]]' }
 
     before { connection.stub!(:id).and_return(1) }
 
@@ -31,6 +32,13 @@ module WebsocketRails
           event.data[:message].should == 'this is a message'
         end
       end
+
+      context "invalid messages" do
+        it "should return an invalid event if data is wrongly encoded" do
+          event = Event.new_from_json( wrongly_encoded_message, connection )
+          event.is_invalid?.should be_true
+        end
+      end
     end
 
     describe ".new_on_open" do