juggernaut 0.5.1 → 0.5.2

data/lib/juggernaut.rb

@@ -4,7 +4,7 @@ require 'json'
 $:.unshift(File.dirname(__FILE__))
 
 module Juggernaut
-  VERSION   = '0.5.1'
+  VERSION   = '0.5.2'
 
   class JuggernautError < StandardError #:nodoc:
   end

data/lib/juggernaut/server.rb

@@ -110,6 +110,9 @@ module Juggernaut
       
       @request.symbolize_keys!
       
+      # For debugging
+      @request[:ip] = client_ip
+      
       @request[:channels] = (@request[:channels] || []).compact.select {|c| !!c && c != '' }.uniq
       
       if @request[:client_ids] 
@@ -121,15 +124,15 @@ module Juggernaut
         when :subscribe: subscribe_command
         when :query:     query_command
       else
-        raise InvalidCommand, @request[:command]
+        raise InvalidCommand, @request
       end
     
     rescue JuggernautError => e
-      logger.error e
+      logger.error("#{e} - #{e.message.inspect}")
       close_connection
-    # # So as to stop em quitting
-    # rescue => e
-    #   logger ? logger.error(e) : puts(e)
+    # So as to stop em quitting
+    rescue => e
+      logger ? logger.error(e) : puts(e)
     end
     
     def unbind
@@ -273,7 +276,7 @@ module Juggernaut
             query_needs :channels
             publish Juggernaut::Client.find_by_channels(@request[:channels]).to_json
         else
-          raise MalformedQuery, @request[:type]
+          raise MalformedQuery, @request
         end
       end
     
@@ -312,29 +315,29 @@ module Juggernaut
       
       def broadcast_needs(*args)
         args.each do |arg|
-          raise MalformedBroadcast unless @request.has_key?(arg)
+          raise MalformedBroadcast, @request unless @request.has_key?(arg)
         end
       end
       
       def subscribe_needs(*args)
         args.each do |arg|
-          raise MalformedSubscribe unless @request.has_key?(arg)
+          raise MalformedSubscribe, @request unless @request.has_key?(arg)
         end
       end
       
       def query_needs(*args)
         args.each do |arg|
-          raise MalformedQuery unless @request.has_key?(arg)
+          raise MalformedQuery, @request unless @request.has_key?(arg)
         end
       end
       
       def authenticate_broadcast_or_query
-        if options[:allowed_ips] and peername = get_peername
+        if options[:allowed_ips]
           return true if options[:allowed_ips].include?(client_ip)
-        elsif !request[:secret_key]
+        elsif !@request[:secret_key]
           return true if broadcast_query_request
         elsif options[:secret_key]
-          return true if request[:secret_key] == @options[:secret_key]
+          return true if @request[:secret_key] == @options[:secret_key]
         end
         if !options[:allowed_ips] and !options[:secret_key] and !options[:broadcast_query_login_url]
           return true

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: juggernaut
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2008-02-02 00:00:00 +00:00
+  version: 0.5.2
+date: 2008-03-29 00:00:00 +00:00
 summary: FIX (describe your package)
 require_paths: 
 - lib
@@ -82,5 +82,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.1
     version: