@@ -11,13 +11,14 @@ module JsChat class User include JsChat::FloodProtection - attr_accessor :name, :connection, :rooms, :last_activity + attr_accessor :name, :connection, :rooms, :last_activity, :identified def initialize(connection) @name = nil @connection = connection @rooms = [] @last_activity = Time.now.utc + @identified = false end def to_json @@ -28,6 +29,7 @@ module JsChat if @connection and @connection.name_taken? name raise JsChat::Errors::InvalidName.new(:name_taken, 'Name taken') elsif User.valid_name?(name) + @identified = true @name = name else raise JsChat::Errors::InvalidName.new(:invalid_name, 'Invalid name') @@ -189,8 +191,10 @@ module JsChat # {"identify":"alex"} def identify(name, options = {}) - if name_taken? name - Error.new(:name_taken, 'Name already taken') + if @user and @user.identified + Error.new :already_identified, 'You have already identified' + elsif name_taken? name + Error.new :name_taken, 'Name already taken' else @user.name = name { 'display' => 'identified', 'identified' => @user } jschat.rb @@ -21,6 +21,7 @@ module JsChat 101 => :invalid_name, 104 => :not_online, 105 => :identity_required, + 106 => :already_identified, # 2xx: Room errors 200 => :already_joined, 201 => :invalid_room, lib/errors.rb @@ -58,6 +58,12 @@ class TestJsChat < Test::Unit::TestCase assert_equal JsChat::Errors::Codes.invert[:invalid_name], response['error']['code'] end + def test_identify_twice_fails + identify_as 'alex' + result = JSON.parse identify_as('alex') + assert_equal 106, result['error']['code'] + end + def test_ensure_nicks_are_unique identify_as 'alex' @@ -96,12 +102,6 @@ class TestJsChat < Test::Unit::TestCase assert_equal JsChat::Errors::Codes.invert[:already_joined], response['error']['code'] end - def test_identify_twice - identify_as 'nick' - response = JSON.parse @jschat.receive_data({ 'identify' => 'nick' }.to_json) - assert_equal JsChat::Errors::Codes.invert[:name_taken], response['error']['code'] - end - def test_names identify_as 'nick', '#oublinet' test/server_test.rb df91bf720736d334ff84bd8b27c06b86e9d99f5d My Name alex@helicoid.net http://github.com/alexyoung/jschat/commit/7d1b01152ab4813722ccfec4a3bfdf209360908c 7d1b01152ab4813722ccfec4a3bfdf209360908c 2009-05-24T03:29:53-07:00 2009-05-24T03:29:53-07:00 Users can no-longer identify twice. Closes #50. d93d8f13ce0153323a2a91a8886ee6231846752f My Name alex@helicoid.net