dango_generator 0.5.0 → 0.5.1

data/templates/as3/org/rubyforge/dango/DangoAS3Mode.as

@@ -14,6 +14,7 @@ package org.rubyforge.dango {
 		
 		private var dango_client:DangoClientFramework;
 		public var all_sid_list:Array = []; //接続しているクライアントのsidの一覧
+		public var sid:int;
 		
 		/**
 		 * DangoAS3Mode
@@ -33,6 +34,8 @@ package org.rubyforge.dango {
 				trace(error.message);
 			}
 			
+			this.sid = dango_client.sid;
+			
 			// エラー時のイベントリスナー
 			dango_client.addEventListener("DangoError", connection_error);
 			
@@ -68,6 +71,7 @@ package org.rubyforge.dango {
 		 * @return Array
 		 */
 		private function dango__connect(evt:DangoReceiveEvent):void {
+			this.sid = dango_client.sid;
 			this.dispatchEvent(new DangoAS3ModeReceiveEvent("dango__connect", {}));
 		}
 		

data/templates/sample_as3mode/dango/client_swf/bin-debug/AC_OETags.js

@@ -155,10 +155,24 @@ function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
 
 function AC_AddExtension(src, ext)
 {
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
+  var qIndex = src.indexOf('?');
+  if ( qIndex != -1)
+  {
+    // Add the extention (if needed) before the query params
+    var path = src.substring(0, qIndex);
+    if (path.length >= ext.length && path.lastIndexOf(ext) == (path.length - ext.length))
+      return src;
+    else
+      return src.replace(/\?/, ext+'?'); 
+  }
   else
-    return src + ext;
+  {
+    // Add the extension (if needed) to the end of the URL
+    if (src.length >= ext.length && src.lastIndexOf(ext) == (src.length - ext.length))
+      return src;  // Already have extension
+    else
+      return src + ext;
+  }
 }
 
 function AC_Generateobj(objAttrs, params, embedAttrs) 

data/templates/sample_as3mode/dango/client_swf/bin-debug/sample_as3mode.html

@@ -33,11 +33,11 @@ body { margin: 0px; overflow:hidden }
 // -----------------------------------------------------------------------------
 // Globals
 // Major version of Flash required
-var requiredMajorVersion = 9;
+var requiredMajorVersion = 10;
 // Minor version of Flash required
 var requiredMinorVersion = 0;
 // Minor version of Flash required
-var requiredRevision = 124;
+var requiredRevision = 2;
 // -----------------------------------------------------------------------------
 // -->
 </script>

data/templates/sample_as3mode/dango/client_swf/src/sample_as3mode.mxml

@@ -16,7 +16,7 @@
 			public function app_complete():void{
 				// Dangoの接続処理
 				try{
-					dango_as3mode = new DangoAS3Mode({"server_host":"localhost", "server_port":15000});
+					dango_as3mode = new DangoAS3Mode({"server_host":"localhost", "server_port":15000, "debug":true});
 				} catch (err:DangoError) {
 					trace("接続エラー:failed to socket initialize.");
 				}
@@ -38,17 +38,19 @@
 			
 			// 接続完了時に、テキストエリアに「接続完了」と表示します。
 			private function dango__connect(evt:DangoAS3ModeReceiveEvent):void{
-				log.text += "接続完了\n"
+				log.text += "接続完了" + dango_as3mode.sid + "\n"
 			}
 			
 			// メッセージを受け取った時に、テキストエリアに受け取ったメッセージを表示します。
 			private function dango_as3mode_receive(evt:DangoAS3ModeReceiveEvent):void{
+				trace("dango_as3mode_receive");
 				log.text += evt.receive_data["chat"] + "\n"
 			}
 			
 			// ボタンをクリックした時に全クライアントにchatメッセージを送信します
 			public function click():void{
-				dango_as3mode.send_object({"chat":input.text}, dango_as3mode.all_sid_list);
+				// 第2引数はsid一覧、空配列だと接続中の全クライアント
+				dango_as3mode.send_object({"chat":input.text}, []); 
 			}
 		]]>
 	</mx:Script>

data/templates/sample_as3mode/dango/server/99_dango_server.rb

@@ -11,31 +11,44 @@ class DangoServer < DangoServerFramework
   
   # クライアント接続時に呼び出されるメソッド
   def dango_connect() 
+    current_sids = []
     shared.transaction(:sids) do |sids|
       sids.push(session[:sid])
+      current_sids = sids.deep_dup
       shared.commit(sids)
     end
     
-    send_obj = {:sids => shared[:sids]} # 全員に現在のsid一覧を送る
-    send_notice(:notice_current_sids, shared[:sids], send_obj)
+    send_obj = {:sids => current_sids} # 全員に現在のsid一覧を送る
+    send_notice(:notice_current_sids, current_sids, send_obj)
   end
   
   # クライアント接続解除時に呼び出されるメソッド
   def dango_close() 
+    current_sids = []
     shared.transaction(:sids) do |sids|
       sids.delete(session[:sid])
+      current_sids = sids.deep_dup
       shared.commit(sids)
     end
     
-    send_obj = {:sids => shared[:sids]} # 全員に現在のsid一覧を送る
-    send_notice(:notice_current_sids, shared[:sids], send_obj)
+    send_obj = {:sids => current_sids} # 全員に現在のsid一覧を送る
+    send_notice(:notice_current_sids, current_sids, send_obj)
   end
   
   # オブジェクトを特定sidに送信する
   def dango_receive_send_object(rec_obj)
     send_obj = rec_obj["object"]
-    send_obj[:_from_sid] = session[:sid]
-    send_notice(:notice_send_object, rec_obj["sids"], send_obj)
+    to_sids = rec_obj["sids"]
+    current_sids = shared[:sids]
+    if to_sids.is_a?(Array)
+      if to_sids == []
+        to_sids = current_sids
+      else
+        to_sids.delete_if {|sid| !current_sids.include?(sids) }
+      end
+      send_obj[:_from_sid] = session[:sid]
+      send_notice(:notice_send_object, to_sids, send_obj)
+    end
   end
 end
 

data/templates/sample_servermode_chat/dango/client_swf/bin-debug/AC_OETags.js

@@ -155,10 +155,24 @@ function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
 
 function AC_AddExtension(src, ext)
 {
-  if (src.indexOf('?') != -1)
-    return src.replace(/\?/, ext+'?'); 
+  var qIndex = src.indexOf('?');
+  if ( qIndex != -1)
+  {
+    // Add the extention (if needed) before the query params
+    var path = src.substring(0, qIndex);
+    if (path.length >= ext.length && path.lastIndexOf(ext) == (path.length - ext.length))
+      return src;
+    else
+      return src.replace(/\?/, ext+'?'); 
+  }
   else
-    return src + ext;
+  {
+    // Add the extension (if needed) to the end of the URL
+    if (src.length >= ext.length && src.lastIndexOf(ext) == (src.length - ext.length))
+      return src;  // Already have extension
+    else
+      return src + ext;
+  }
 }
 
 function AC_Generateobj(objAttrs, params, embedAttrs) 

data/templates/sample_servermode_chat/dango/client_swf/bin-debug/sample_servermode_chat.html

@@ -33,11 +33,11 @@ body { margin: 0px; overflow:hidden }
 // -----------------------------------------------------------------------------
 // Globals
 // Major version of Flash required
-var requiredMajorVersion = 9;
+var requiredMajorVersion = 10;
 // Minor version of Flash required
 var requiredMinorVersion = 0;
 // Minor version of Flash required
-var requiredRevision = 124;
+var requiredRevision = 2;
 // -----------------------------------------------------------------------------
 // -->
 </script>

data/templates/script/dango_server

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-CanReadOptionServer = %w(host max_connections log_file log_level log_max_size log_shift_age gserver_log_file)
+CanReadOptionServer = %w(host max_connections log_file log_level log_max_size log_shift_age gserver_log_file no_start_log daemon)
 CanReadOptionNetwork = %w(host port)
 
 # コマンドラインオプション取得とコンフィグの上書き

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango_generator
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-05 00:00:00 +09:00
+date: 2008-12-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency