dazeus 0.0.1.201306161619 → 0.0.1.201306161750

data/lib/dazeus/connection.rb

@@ -9,7 +9,11 @@ module Dazeus
     end
 
     def send(message)
-      @socket.sendmsg(dazeusify message)
+      if !@socket.closed?
+        @socket.sendmsg(dazeusify message)
+      else
+        false
+      end
     end
 
     def receive
@@ -19,22 +23,37 @@ module Dazeus
         message = message.strip
 
         while message.length > 0
-          digits = ""
-          while message[0] =~ /\d/
-            digits += message.slice! 0
-          end
-          @cache.push JSON.parse(message.slice!(0, digits.to_i))
-          message = message.strip
+          message = dezeusify(message)
         end
       end
       @cache.shift
     end
 
+    def dezeusify(message)
+      digits = ""
+      while message[0] =~ /\d/
+        digits += message.slice! 0
+      end
+      current = message.slice!(0, digits.to_i)
+      # puts "<- " + current
+      @cache.push JSON.parse(current)
+      message.strip
+    end
+
     def dazeusify(message)
       msg = JSON.dump(message)
+      # puts "-> " + msg
       msg.bytesize.to_s + msg
     end
 
+    def close
+      @socket.close
+    end
+
+    def closed?
+      @socket.closed?
+    end
+
     private
       def create_socket(address)
         if address.start_with? 'tcp://'

data/lib/dazeus/dazeus.rb

@@ -68,7 +68,7 @@ module Dazeus
     def names(network, channel, &block)
       fn = lambda do |response|
         block.call(response)
-        unsubscribe &fn
+        unsubscribe('NAMES', &fn)
       end
       subscribe('NAMES', &fn)
       send_names(network, channel)
@@ -82,7 +82,7 @@ module Dazeus
     def whois(network, nick, &block)
       fn = lambda do |response|
         block.call(response)
-        unsubscribe &fn
+        unsubscribe('WHOIS', &fn)
       end
       subscribe('WHOIS', &fn)
       send_whois(network, nick)
@@ -194,19 +194,28 @@ module Dazeus
     end
 
     def run
+
       loop do
+        break if conn.closed?
         handle_event conn.receive
       end
     end
 
+    def stop
+      conn.close
+    end
+
     private
       def send_receive(message)
         conn.send message
         response = nil
         loop do
+          break if conn.closed?
           response = conn.receive
           break unless handle_event response
         end
+
+        return {} if response == nil
         response
       end
 

data/lib/dazeus/event/names.rb

@@ -3,7 +3,15 @@ require 'dazeus/event/event'
 module Dazeus
   module Event
     class Names < Event
+      attr_accessor :names, :network, :server, :channel
 
+      def post_init
+        super
+        @network = @params[0]
+        @server = @params[1]
+        @channel = @params[2]
+        @names = @params[3..-1]
+      end
     end
   end
 end

data/lib/dazeus/event/whois.rb

@@ -3,7 +3,14 @@ require 'dazeus/event/event'
 module Dazeus
   module Event
     class Whois < Event
-
+      attr_accessor :network, :server, :nick, :secure
+      def post_init
+        super
+        @network = @params[0]
+        @server = @params[1]
+        @nick = @params[2]
+        @secure = @params[3]
+      end
     end
   end
 end

data/lib/dazeus/version.rb

@@ -1,3 +1,3 @@
 module Dazeus
-    VERSION = "0.0.1.201306161619"
+    VERSION = "0.0.1.201306161750"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dazeus
 version: !ruby/object:Gem::Version
-  version: 0.0.1.201306161619
+  version: 0.0.1.201306161750
   prerelease: 
 platform: ruby
 authors:
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4211769068045469357
+      hash: -899128978511928206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4211769068045469357
+      hash: -899128978511928206
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25