dango_generator 0.2.6 → 0.3.0

data/dango_generator.rb

@@ -40,14 +40,14 @@ class DangoGenerator < Rails::Generator::NamedBase
         m.template "dango/client_swf/DangoConfig.as" , "dango/client_swf/DangoConfig.as"
         
         # dangoコンフィグ
-        m.directory 'dango/config'
+        m.directory 'config/dango'
         %w(
           development.yml
           test.yml
           production.yml
           system_message.yml
         ).each do |as3_file|
-          m.template "dango/config/#{as3_file}", "dango/config/#{as3_file}"
+          m.template "config/dango/#{as3_file}", "config/dango/#{as3_file}"
         end
         
         # dangoのas3ライブラリ

data/lib/dango_generator.rb

@@ -0,0 +1,7 @@
+# == About dango.rb
+#
+# show http://dango-net.org/page/demo
+#
+
+require "dango_generator/version.rb"
+

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

@@ -27,6 +27,8 @@ package org.rubyforge.dango {
 		private var socket:Socket;								//ソケット
 		private var dispatcher:EventDispatcher; 	// Event送出用
 		
+		private var default_encode_type:uint = 0;	// 送信データのエンコードタイプはJSON
+		
 		private var is_debug:Boolean; 						// Debugモードかどうかのフラグ
 		private var is_connect:Boolean = false; 	// 接続完了しているかどうか
 		
@@ -85,12 +87,17 @@ package org.rubyforge.dango {
 //			var policy_file_port:uint 			 = config.policy_file_port;
 			var policy_file_path:String 		 = config.policy_file_path;
 			
+			if(is_debug){ trace("flash player: "     + Capabilities.version); }
+			if(is_debug){ trace("isDebugger: "       + Capabilities.isDebugger); }
+			if(is_debug){ trace("language: "         + Capabilities.language); }
+			if(is_debug){ trace("os: "               + Capabilities.os); }
+			if(is_debug){ trace("frame_rate: "       + frame_rate); }
 			
 			// Event送出用
 			dispatcher = new EventDispatcher(this); 
 			
 			// Security.sandboxType
-			trace("Security.sandboxType:" + Security.sandboxType);
+			if(is_debug){ trace("Security.sandboxType:" + Security.sandboxType); }
 			
 			// policy_file
 //			if(!policy_file_protocol){ policy_file_protocol  = "http" };
@@ -118,17 +125,17 @@ package org.rubyforge.dango {
 //				url_load_policy_file = "xmlsocket://" + server_host + ":" + server_port;
 //				url_load_policy_file = "http://aiarebaba.hi-fi-net.com/crossdomain.xml";
 				url_load_policy_file = "http://" + server_host + policy_file_path;
-				trace("url_load_policy_file=" + url_load_policy_file);
+				if(is_debug){ trace("url_load_policy_file=" + url_load_policy_file); }
 				Security.loadPolicyFile(url_load_policy_file);
 			}
 			
 			// 接続
 			try{
-				trace("connectiong... host=" + server_host + " port=" + server_port);
+				if(is_debug){ trace("connectiong... host=" + server_host + " port=" + server_port); }
 				socket.connect(server_host, server_port);
-				trace("connected host=" + server_host + " port=" + server_port);
+				if(is_debug){ trace("connected host=" + server_host + " port=" + server_port); }
 			} catch(err:Error){
-				trace("connect error err=" + err + " name=" + err.name + " message=" + err.message);
+				if(is_debug){ trace("connect error err=" + err + " name=" + err.name + " message=" + err.message); }
 				return(void);
 			}
 			
@@ -283,7 +290,7 @@ package org.rubyforge.dango {
 			
 			// 前回から時間がかかりすぎている（処理落ちしかけている場合は）スキップ
 			var start_date:Date = new Date();
-			if(recv_do_last_date.time > start_date.time - (Number(recv_do_timer_msec) * 1.3)){ 
+			if(recv_do_last_date.time > start_date.time - (Number(recv_do_timer_msec) * 1.4)){ 
 				if(recv_wait_do_cache.length > 0){
 					var recv_arr:Array = recv_wait_do_cache.shift();
 					var notice_name:String = recv_arr[0];
@@ -299,6 +306,7 @@ package org.rubyforge.dango {
 						if(is_debug){ trace("DangoClientFramework:dispatchEvent:dango_" + notice_name + " server_time=" + server_time); }
 						this.dispatchEvent(new DangoReceiveEvent("dango__before_filter", recv_data, count_no));
 						this.dispatchEvent(new DangoReceiveEvent("dango_" + notice_name, recv_data, count_no));
+						this.dispatchEvent(new DangoReceiveEvent("dango__after_filter", recv_data, count_no));
 					}
 				}
 			}
@@ -403,7 +411,7 @@ package org.rubyforge.dango {
 		public function send_data_to_server( send_obj:Array ):void {
 //			if(is_debug){ trace("DangoClientFramework:send_data_to_server:send_obj=" + ObjectUtil.toString(send_obj)); }
 			
-			var type:int = 0;
+			var encode_type:uint = default_encode_type;
 			
 			// データが空ならJSONencodeしない
 			var send_obj_str:String;
@@ -415,11 +423,11 @@ package org.rubyforge.dango {
 
 			var send_obj_size:int = DangoUtil.string_byte_length(send_obj_str);
 			
-//			if(is_debug){ trace("DangoClientFramework:send:" + type + ":" + send_obj_size + ":" + send_obj_str); }
+//			if(is_debug){ trace("DangoClientFramework:send:" + encode_type + ":" + send_obj_size + ":" + send_obj_str); }
 
 			// 長さ送信
 			var byte_array:ByteArray = new ByteArray;
-			byte_array.writeByte(type);
+			byte_array.writeByte(encode_type);
 			byte_array.writeUnsignedInt(send_obj_size);
 
 			socket.writeBytes(byte_array, 0, 5);
@@ -469,7 +477,7 @@ package org.rubyforge.dango {
 					return([]);
 				}
 				
-				var type:int = byte_array_size.readByte();
+				var encode_type:int = byte_array_size.readByte();
 				recv_not_yet_size = byte_array_size.readUnsignedInt();
 				var crlf:String = byte_array.readUTFBytes(1);
 				byte_read_size -= 6;

data/templates/script/dango_server

@@ -3,28 +3,37 @@
 puts "Booting DangoServer..."
 require File.dirname(__FILE__) + '/../config/boot'
 
-require "yaml"
-require "getoptlong"
-
-# 環境によるコンフィグ読み込み
-env = ENV['RAILS_ENV'] || 'development'
-env = ARGV[0] if ARGV[0]
-config = YAML.load(open("dango/config/#{env}.yml", "rb"){|fh| fh.read})
-puts "environment=#{env}"
+CanReadOptionServer = %w(host max_connections log_file log_level log_max_size log_shift_age gserver_log_file)
+CanReadOptionNetwork = %w(host port)
 
-# コマンドラインオプション取得
+# コマンドラインオプション取得とコンフィグの上書き
+require 'getoptlong.rb'
 opt_parser = GetoptLong.new
 
-# コマンドラインオプションによるコンフィグの上書き
-options_arr = ["dango"]
-config["server"].each{|k, v| options_arr.push("server:#{k}") }
-config["network"].each{|k, v| options_arr.push("network:#{k}") }
-options_set_options = options_arr.uniq.collect{|o| ["--#{o}", GetoptLong::OPTIONAL_ARGUMENT]}
+options_arr = []
+#config["server"].each{|k, v| options_arr.push("server:#{k}") }
+#config["network"].each{|k, v| options_arr.push("network:#{k}") }
+CanReadOptionServer.each{|k, v| options_arr.push("server:#{k}") }
+CanReadOptionNetwork.each{|k, v| options_arr.push("network:#{k}") }
+
+options_set_options = options_arr.uniq.collect{|o| ["--#{o}", GetoptLong::OPTIONAL_ARGUMENT] }
+options_set_options << ["--dango", GetoptLong::OPTIONAL_ARGUMENT]
+options_set_options << ["-e", GetoptLong::OPTIONAL_ARGUMENT]
+
 opt_parser.set_options(*options_set_options)
 
 start_options = {}
 opt_parser.each_option{|n,a| start_options[n] = a}
 
+
+# 環境によるコンフィグ読み込み
+require "yaml"
+ENV['RAILS_ENV'] = start_options['-e'] if start_options['-e']
+env = ENV['RAILS_ENV'] || 'development'
+config_file = "config/dango/#{env}.yml"
+puts "loading config file:#{config_file}"
+config = YAML.load(open(config_file, "rb"){|fh| fh.read})
+
 # rubygems
 require 'rubygems'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango_generator
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-15 00:00:00 +09:00
+date: 2008-06-20 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - README.txt
 - LICENSE
 - dango_generator.rb
+- lib/dango_generator.rb
 - templates/script/dango_server
 - templates/lib/dango_monitor_client.rb
 - templates/lib/dango_tester_client.rb
@@ -34,10 +35,10 @@ files:
 - templates/public/crossdomain.xml
 - templates/dango/server/99_dango_server.rb
 - templates/dango/client_swf/DangoConfig.as
-- templates/dango/config/development.yml
-- templates/dango/config/test.yml
-- templates/dango/config/production.yml
-- templates/dango/config/system_message.yml
+- templates/config/dango/development.yml
+- templates/config/dango/test.yml
+- templates/config/dango/production.yml
+- templates/config/dango/system_message.yml
 - templates/as3/org/rubyforge/dango/DangoClientFramework.as
 - templates/as3/org/rubyforge/dango/DangoError.as
 - templates/as3/org/rubyforge/dango/DangoErrorCode.as