warchat 0.0.3 → 0.0.4

data/README.rdoc

@@ -0,0 +1,57 @@
+= Warchat
+
+This project aims to create a simple ruby interface for connecting to Blizzard's Mobile Guild Chat.
+
+= Features
+
+At the moment there is only a very basic set of features, but the main hurdle of
+authenticating with the mobile armory server is mostly solved.
+
+* SRP authentication
+* Guild Chat
+* Officer Chat
+* Whispers
+* Presence notifications
+
+= Simple Usage example
+
+This is a simple chat client that will let you talk in guild chat and receive messages.
+
+  require 'rubygems'
+  require 'warchat'
+
+  USERNAME = ''
+  PASSWORD = ''
+  CHARACTER_NAME = ''
+  CHARACTER_REALM = ''
+
+  client = Warchat::Chat::Client.new
+
+  client.on_establish = Proc.new do |response|
+    client.character_name = CHARACTER_NAME
+    client.character_realm = CHARACTER_REALM
+    client.login
+  end
+
+  client.on_message = Proc.new do |message|
+    case message.type
+      when Warchat::Chat::Message::CHAT_MSG_TYPE_GUILD_CHAT
+        puts "[Guild] #{message.character_name}: #{message.body}"
+      when Warchat::Chat::Message::CHAT_MSG_TYPE_GUILD_MOTD
+        puts "MOTD: #{message.body}"
+      when Warchat::Chat::Message::CHAT_MSG_TYPE_OFFICER_CHAT
+        puts "[Officer] #{message.character_name}: #{message.body}"
+      when Warchat::Chat::Message::CHAT_MSG_TYPE_WHISPER
+        puts "[Whisper] #{message.character_name}: #{message.body}"
+    end
+  end
+
+  begin
+    client.start(USERNAME,PASSWORD)
+    loop do 
+      msg = gets.chomp 
+      client.message msg,Warchat::Chat::Message::CHAT_MSG_TYPE_GUILD_CHAT
+    end
+  rescue Interrupt => e
+    client.close
+  end

data/lib/warchat.rb

@@ -4,4 +4,4 @@ require 'andand'
 module Warchat  
 end
 
-[['*.rb'],['network','*.rb'],['srp','*.rb'],['chat','*.rb']].each do |p| Dir.glob(File.join(File.expand_path('../wow_chat',__FILE__)),*p).each &method(:require) end
+[['*.rb'],['network','*.rb'],['srp','*.rb'],['chat','*.rb']].each do |p| Dir.glob(File.join(File.expand_path('../warchat',__FILE__),*p)).each &method(:require) end

data/lib/warchat/chat/chat_response.rb

@@ -1,4 +1,5 @@
-module Warchat  module Chat
+module Warchat  
+  module Chat
     module ChatResponse
       def presence?
         chat_type == 'wow_presence'

data/lib/warchat/chat/client.rb

@@ -62,17 +62,21 @@ module Warchat
           on_message.andand.call(message)
           send("on_message_#{message.type}".to_sym).andand.call(message)
         elsif response.presence?
-          puts
           on_presence.andand.call(Presence.new(response))
         else
           puts "unhandled chat type: #{response.chat_type}"
         end
       end
 
-      def close
+      def close_nonblock
         request = Warchat::Network::Request.new("/chat-logout",:chatSessionId=>@chat_session_id)
         session.send_request(request)
       end
+      
+      def close
+        close_nonblock
+        sleep(0.1) until session.is_closed?
+      end
 
       def keep_alive
         request = Warchat::Network::Request("/ah-mail")

data/lib/warchat/chat/message.rb

@@ -12,7 +12,7 @@ module Warchat
       CHAT_MSG_TYPE_OFFICER_CHAT = "officer_chat"
       CHAT_MSG_TYPE_WHISPER = "whisper"
 
-      attr_reader :type,:body,:from_type,:character_id
+      attr_reader :type,:body,:from_type,:character_id,:from
       
       def initialize response
         @type = response["messageType"]
@@ -21,7 +21,6 @@ module Warchat
         if @from
           @from_type = from["chatIdType"]
           @character_id = from["characterId"]
-          @character_name = from['characterName']
         end
       end
 

data/lib/warchat/network/connection.rb

@@ -38,7 +38,7 @@ module Warchat
           @closed = true
           @socket.close
         end     
-        [@request_thread,@response_thread].each &:join
+        ([@request_thread,@response_thread]-[Thread.current]).each &:join
       end
 
       def is_closed? 

data/lib/warchat/network/session.rb

@@ -42,7 +42,11 @@ module Warchat
       end
 
       def close reason=''
-        @connection.andand.close reason
+        @connection.close reason
+      end
+      
+      def is_closed?
+        @connection.is_closed?
       end
       
       def send_request request

data/lib/warchat/version.rb

@@ -1,3 +1,3 @@
 module Warchat  
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warchat
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Zachary Gavin
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- README.rdoc
 - Rakefile
 - lib/warchat.rb
 - lib/warchat/byte_string.rb