dango 0.0.29 → 0.0.30

data/lib/dango/client_framework.rb

@@ -152,6 +152,16 @@ class DangoClientFramework
   def dango_receive__notice_system_message(rec_obj)
   end
   
+  # ハートビートなら
+  def dango_receive__heart_beat(rec_obj)
+  end
+  
+  # 必要に応じて追加するメソッド
+  def method_missing(name, *args)
+    logger.info "method not found. #{name.inspect} #{args.inspect}"
+    raise(NameError, "method not found. #{name.inspect} #{args.inspect}")
+  end
+  
   # ユーザーが終了させたい時に呼び出すメソッド（セッションを切る）
   def dango_client_close
     client_quit() # クライアントの終了処理
@@ -253,8 +263,6 @@ class DangoClientFramework
         raise(DangoFrameworkError, "received data is none") 
       end
       
-      #remove_method(instance_method_name) # 定義したインスタンスメソッドを削除しておく
-      
       send_return_shared[action_name]
     end
   end

data/lib/dango/server_framework.rb

@@ -556,7 +556,7 @@ class DangoServerFramework
 #              sock = socket_list[sid]
 #              logger.debug "heart_beat_thread_start:sid=#{sid} #{sock} #{sock.closed?}"
 #              dango_send_data(sock, {})
-              logger.debug "heart_beat_thread_start:sid=#{sid}"
+#              logger.debug "heart_beat_thread_start:sid=#{sid}"
               send_notice(sid, "_heart_beat", {}, {:timeout=>@heart_beat_response_wait_sec})
             end
           end
@@ -679,7 +679,7 @@ class DangoServerFramework
               end # catch 終わり
               
               if !have_came_response # 戻ってきたデータがあるかどうかチェック
-                logger.warn "!!! received data is none:#{notice_name} #{sid} #{Time.now_to_s}"
+                logger.warn "!!! received data is none:#{notice_name} #{sid} #{send_obj_dup['_id']} #{Time.now_to_s}"
               end
             end
           end # mutex

data/lib/dango/tester/dango_tester_client.rb

@@ -122,19 +122,19 @@ class TestClient < DangoClientFramework
     raise(ArgumentError, ":proc is not Proc class.") if trap_proc && ! trap_proc.is_a?(Proc)
     
     # 戻ってきたデータのチェックメソッド
-    notice_name_sym = (notice_name.class == Symbol) ? (":"+notice_name.to_s) : ('"'+notice_name+'"')
     
-    if ! @receive_methods.include?(notice_name_sym)
+#    if ! @receive_methods.include?(notice_name_sym)
+      notice_name_sym = (notice_name.class == Symbol) ? (":"+notice_name.to_s) : ('"'+notice_name+'"')
       instance_method_name = "dango_receive_#{notice_name}"
       expr = <<-EOF
         def self.#{instance_method_name}(ret_obj)
-          logger.debug "ret_obj:" + ret_obj.inspect + " " + Time.now_to_s
+          logger.debug "ret_obj:#{notice_name_sym}:" + ret_obj.inspect + " " + Time.now_to_s
           send_receive_shared[#{notice_name_sym}] = ret_obj
         end
       EOF
       instance_eval expr
-      @receive_methods.push(notice_name_sym)
-    end
+#      @receive_methods.push(notice_name_sym)
+#    end
     
     # @trap_thread_hashにスレッド登録
     if ! @trap_thread_hash.has_key?(notice_name)
@@ -157,7 +157,7 @@ class TestClient < DangoClientFramework
             
             # 戻ってきたデータがあれば
             if send_receive_shared[notice_name]
-              logger.debug "notice_name:#{send_receive_shared[notice_name].inspect} #{Time.now_to_s}"
+              logger.debug "notice_name:#{notice_name}:#{send_receive_shared[notice_name].inspect} #{Time.now_to_s}"
               break 
             end
             
@@ -173,18 +173,28 @@ class TestClient < DangoClientFramework
           if trap_proc
             logger.debug "trap_receive_data:trap_proc:#{trap_proc.inspect} #{Time.now_to_s}"
             trap_proc.call(send_receive_shared[notice_name])
+            send_receive_shared[notice_name] = nil
             break if ! trap_loop # loopする必要がなければスレッド終了
             
           # :procが設定されていなければ、wait用に@receive_arrに入れておく
           else
             @receive_mutex.synchronize do
               logger.debug "notice_name:#{notice_name}:#{send_receive_shared[notice_name].inspect} #{Time.now_to_s}"
-              @receive_arr.push([notice_name, send_receive_shared[notice_name]])
+              @receive_arr.push([notice_name.deep_dup, send_receive_shared[notice_name].deep_dup])
+              send_receive_shared[notice_name] = nil
             end
             break # スレッド終了
             
           end
         end # loop
+        
+        # メソッドの削除
+        instance_method_name = "dango_receive_#{notice_name}"
+        expr = <<-EOF
+          def self.#{instance_method_name}(ret_obj); end
+        EOF
+        instance_eval expr
+        
       end # Thread
       
       @trap_thread_hash[notice_name] = th
@@ -201,13 +211,21 @@ class TestClient < DangoClientFramework
     
     # trapスレッドの削除
     if @trap_thread_hash[notice_name] 
+      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:#{Time.now_to_s}"
       @trap_thread_hash[notice_name].kill
+      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:#{Time.now_to_s}"
       @trap_thread_hash[notice_name].join
+      logger.debug "cancel_trap_receive:#{@trap_thread_hash[notice_name].status }:#{Time.now_to_s}"
       
       @trap_thread_hash.delete(notice_name)
     end
     
-    send_receive_shared[notice_name] = nil # 受信データのごみを削除
+    # 受信データのごみを削除
+    send_receive_shared[notice_name] = nil 
+    
+    @receive_mutex.synchronize do
+      @receive_arr.delete_if{|r| r[0] == notice_name}
+    end
   end
   
   # wait_receive

data/lib/dango/version.rb

@@ -2,7 +2,7 @@ module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 29
+    TINY  = 30
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.29
-date: 2007-11-07 00:00:00 +09:00
+  version: 0.0.30
+date: 2007-11-09 00:00:00 +09:00
 summary: Realtime communications network framework for Ruby and Flash on Rails.
 require_paths: 
 - lib