warchat 0.0.5 → 0.0.6

data/README.rdoc

@@ -10,6 +10,10 @@ This project aims to create a simple ruby interface for connecting to Blizzard's
 * Whispers
 * Presence notifications
 
+= Acknowledgements
+
+A big thanks to Eike Siewertsen (http://www.github.com/fry), without whom this probably wouldn't be possible.  
+
 = Simple Usage example
 
 This is a simple chat client that will let you talk in guild chat and receive messages.

data/lib/warchat.rb

@@ -1,5 +1,4 @@
 require 'active_support/inflector'
-require 'andand'
 
 module Warchat  
 end

data/lib/warchat/chat/client.rb

@@ -20,11 +20,11 @@ module Warchat
       end
 
       def session_error response
-        on_fail.andand.call(response["body"]) if response.target == "/chat-login"
+        on_fail and on_fail.call(response["body"]) if response.target == "/chat-login"
       end
 
       def session_establish response
-        on_establish.andand.call(response)
+        on_establish and on_establish.call(response)
       end
 
       def session_receive response
@@ -44,8 +44,8 @@ module Warchat
 
       def chat_logout response
         puts 'Logged out of chat'
-        @timer.andand.stop
-        on_chat_logout.andand.call response
+        @timer and @timer.stop
+        on_chat_logout and on_chat_logout.call response
         session.close
       end
 
@@ -60,10 +60,11 @@ module Warchat
           
         elsif response.message?
           message = Message.new(response)
-          on_message.andand.call(message)
-          send("on_message_#{message.type}".to_sym).andand.call(message)
+          on_message and on_message.call(message)
+          m = "on_message_#{message.type}".to_sym
+          send(m) and send(m).call(message)
         elsif response.presence?
-          on_presence.andand.call(Presence.new(response))
+          on_presence and on_presence.call(Presence.new(response))
         else
           puts "unhandled chat type: #{response.chat_type}"
         end

data/lib/warchat/chat/message.rb

@@ -25,11 +25,11 @@ module Warchat
       end
 
       def character_name
-        @character_id.andand.split(':')[-2]
+        @character_id and @character_id.split(':')[-2]
       end
 
       def realm_id
-        @character_id.andand.split(':').last
+        @character_id and @character_id.split(':').last
       end
     end
   end

data/lib/warchat/chat/presence.rb

@@ -10,7 +10,7 @@ module Warchat
       end
 
       def offline?
-        @type.andand.include? 'offline'
+        @type and @type.include? 'offline'
       end
 
       def type 

data/lib/warchat/network/connection.rb

@@ -32,7 +32,7 @@ module Warchat
       def close reason = ""
         return if is_closed?
 
-        on_close.andand.call(reason)
+        on_close and on_close.call(reason)
         
         @mutex.synchronize do 
           @closed = true
@@ -54,7 +54,7 @@ module Warchat
       def handle_responses
         until is_closed?
           response = Response.new(@socket)
-          on_receive.andand.call(response) unless is_closed?
+          on_receive and on_receive.call(response) unless is_closed?
           sleep 0.01
         end
       rescue Exception => e
@@ -71,7 +71,7 @@ module Warchat
               unless is_closed?
                 request.stream @socket
                 @socket.flush
-                on_send.andand.call(request) 
+                on_send and on_send.call(request) 
               end
             end
           end

data/lib/warchat/network/session.rb

@@ -50,7 +50,7 @@ module Warchat
       end
       
       def send_request request
-        @connection.andand.send_request(request)
+        @connection and @connection.send_request(request)
       end
 
       def stage_1 response
@@ -64,13 +64,13 @@ module Warchat
       
       def stage_3 response
         @established = true 
-        on_establish.andand.call(response)
+        on_establish and on_establish.call(response)
       end
 
       def connection_receive response
         m = "stage_#{response['stage']}".to_sym
         if response.ok?
-          respond_to? m and send(m,response) or on_receive.andand.call(response)
+          respond_to? m and send(m,response) or on_receive and on_receive.call(response)
         else
           error = response["body"]
           puts("error: " + error)
@@ -79,7 +79,7 @@ module Warchat
       end
 
       def connection_close reason
-        on_close.andand.call(reason)
+        on_close and on_close.call(reason)
       end
     end
   end

data/lib/warchat/timer.rb

@@ -1,6 +1,7 @@
 require 'monitor'
 
-module Warchat  class Timer
+module Warchat  
+  class Timer
     def initialize(interval, &handler)
       
       raise ArgumentError, "Illegal interval" if interval < 0

data/lib/warchat/version.rb

@@ -1,3 +1,3 @@
 module Warchat  
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/warchat.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "warchat"
   
+  s.add_dependency('i18n','>= 0.5.0')
   s.add_dependency('activesupport','>= 3.0.0')
-  s.add_dependency('andand')
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warchat
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  hash: 19
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Zachary Gavin
@@ -19,33 +19,35 @@ date: 2011-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: i18n
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
-        - 3
         - 0
+        - 5
         - 0
-        version: 3.0.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: andand
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 description: "A simple interface to World of Warcraft Remote Guild Chat in Ruby.  Supports whispers, guild chat, officer chat, and presence notifications.  Many thanks to Eike Siewertsen (https://github.com/fry) for his work deciphering the protocol.  "
@@ -108,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: warchat
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple interface to World of Warcraft Remote Guild Chat based off Eike Siewertsen's C# implementation