unageanu-jiji 1.1.4 → 1.2.1

data/html/test/jsspec/diff_match_patch.js

@@ -0,0 +1 @@
+function diff_match_patch(){this.Diff_Timeout=1.0;this.Diff_EditCost=4;this.Diff_DualThreshold=32;this.Match_Balance=0.5;this.Match_Threshold=0.5;this.Match_MinLength=100;this.Match_MaxLength=1000;this.Patch_Margin=4;function getMaxBits(){var maxbits=0;var oldi=1;var newi=2;while(oldi!=newi){maxbits++;oldi=newi;newi=newi<<1}return maxbits}this.Match_MaxBits=getMaxBits()}var DIFF_DELETE=-1;var DIFF_INSERT=1;var DIFF_EQUAL=0;diff_match_patch.prototype.diff_main=function(text1,text2,opt_checklines){if(text1==text2){return[[DIFF_EQUAL,text1]]}if(typeof opt_checklines=='undefined'){opt_checklines=true}var checklines=opt_checklines;var commonlength=this.diff_commonPrefix(text1,text2);var commonprefix=text1.substring(0,commonlength);text1=text1.substring(commonlength);text2=text2.substring(commonlength);commonlength=this.diff_commonSuffix(text1,text2);var commonsuffix=text1.substring(text1.length-commonlength);text1=text1.substring(0,text1.length-commonlength);text2=text2.substring(0,text2.length-commonlength);var diffs=this.diff_compute(text1,text2,checklines);if(commonprefix){diffs.unshift([DIFF_EQUAL,commonprefix])}if(commonsuffix){diffs.push([DIFF_EQUAL,commonsuffix])}this.diff_cleanupMerge(diffs);return diffs};diff_match_patch.prototype.diff_compute=function(text1,text2,checklines){var diffs;if(!text1){return[[DIFF_INSERT,text2]]}if(!text2){return[[DIFF_DELETE,text1]]}var longtext=text1.length>text2.length?text1:text2;var shorttext=text1.length>text2.length?text2:text1;var i=longtext.indexOf(shorttext);if(i!=-1){diffs=[[DIFF_INSERT,longtext.substring(0,i)],[DIFF_EQUAL,shorttext],[DIFF_INSERT,longtext.substring(i+shorttext.length)]];if(text1.length>text2.length){diffs[0][0]=diffs[2][0]=DIFF_DELETE}return diffs}longtext=shorttext=null;var hm=this.diff_halfMatch(text1,text2);if(hm){var text1_a=hm[0];var text1_b=hm[1];var text2_a=hm[2];var text2_b=hm[3];var mid_common=hm[4];var diffs_a=this.diff_main(text1_a,text2_a,checklines);var diffs_b=this.diff_main(text1_b,text2_b,checklines);return diffs_a.concat([[DIFF_EQUAL,mid_common]],diffs_b)}if(checklines&&text1.length+text2.length<250){checklines=false}var linearray;if(checklines){var a=this.diff_linesToChars(text1,text2);text1=a[0];text2=a[1];linearray=a[2]}diffs=this.diff_map(text1,text2);if(!diffs){diffs=[[DIFF_DELETE,text1],[DIFF_INSERT,text2]]}if(checklines){this.diff_charsToLines(diffs,linearray);this.diff_cleanupSemantic(diffs);diffs.push([DIFF_EQUAL,'']);var pointer=0;var count_delete=0;var count_insert=0;var text_delete='';var text_insert='';while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_INSERT){count_insert++;text_insert+=diffs[pointer][1]}else if(diffs[pointer][0]==DIFF_DELETE){count_delete++;text_delete+=diffs[pointer][1]}else{if(count_delete>=1&&count_insert>=1){var a=this.diff_main(text_delete,text_insert,false);diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert);pointer=pointer-count_delete-count_insert;for(var j=a.length-1;j>=0;j--){diffs.splice(pointer,0,a[j])}pointer=pointer+a.length}count_insert=0;count_delete=0;text_delete='';text_insert=''}pointer++}diffs.pop()}return diffs};diff_match_patch.prototype.diff_linesToChars=function(text1,text2){var linearray=[];var linehash={};linearray.push('');function diff_linesToCharsMunge(text){var chars='';while(text){var i=text.indexOf('\n');if(i==-1){i=text.length}var line=text.substring(0,i+1);text=text.substring(i+1);if(linehash.hasOwnProperty?linehash.hasOwnProperty(line):(linehash[line]!==undefined)){chars+=String.fromCharCode(linehash[line])}else{linearray.push(line);linehash[line]=linearray.length-1;chars+=String.fromCharCode(linearray.length-1)}}return chars}var chars1=diff_linesToCharsMunge(text1);var chars2=diff_linesToCharsMunge(text2);return[chars1,chars2,linearray]};diff_match_patch.prototype.diff_charsToLines=function(diffs,linearray){for(var x=0;x<diffs.length;x++){var chars=diffs[x][1];var text=[];for(var y=0;y<chars.length;y++){text.push(linearray[chars.charCodeAt(y)])}diffs[x][1]=text.join('')}};diff_match_patch.prototype.diff_map=function(text1,text2){var ms_end=(new Date()).getTime()+this.Diff_Timeout*1000;var max_d=text1.length+text2.length-1;var doubleEnd=this.Diff_DualThreshold*2<max_d;var v_map1=[];var v_map2=[];var v1={};var v2={};v1[1]=0;v2[1]=0;var x,y;var footstep;var footsteps={};var done=false;var hasOwnProperty=!!(footsteps.hasOwnProperty);var front=(text1.length+text2.length)%2;for(var d=0;d<max_d;d++){if(this.Diff_Timeout>0&&(new Date()).getTime()>ms_end){return null}v_map1[d]={};for(var k=-d;k<=d;k+=2){if(k==-d||k!=d&&v1[k-1]<v1[k+1]){x=v1[k+1]}else{x=v1[k-1]+1}y=x-k;if(doubleEnd){footstep=x+','+y;if(front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(!front){footsteps[footstep]=d}}while(!done&&x<text1.length&&y<text2.length&&text1.charAt(x)==text2.charAt(y)){x++;y++;if(doubleEnd){footstep=x+','+y;if(front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(!front){footsteps[footstep]=d}}}v1[k]=x;v_map1[d][x+','+y]=true;if(x==text1.length&&y==text2.length){return this.diff_path1(v_map1,text1,text2)}else if(done){v_map2=v_map2.slice(0,footsteps[footstep]+1);var a=this.diff_path1(v_map1,text1.substring(0,x),text2.substring(0,y));return a.concat(this.diff_path2(v_map2,text1.substring(x),text2.substring(y)))}}if(doubleEnd){v_map2[d]={};for(var k=-d;k<=d;k+=2){if(k==-d||k!=d&&v2[k-1]<v2[k+1]){x=v2[k+1]}else{x=v2[k-1]+1}y=x-k;footstep=(text1.length-x)+','+(text2.length-y);if(!front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(front){footsteps[footstep]=d}while(!done&&x<text1.length&&y<text2.length&&text1.charAt(text1.length-x-1)==text2.charAt(text2.length-y-1)){x++;y++;footstep=(text1.length-x)+','+(text2.length-y);if(!front&&(hasOwnProperty?footsteps.hasOwnProperty(footstep):(footsteps[footstep]!==undefined))){done=true}if(front){footsteps[footstep]=d}}v2[k]=x;v_map2[d][x+','+y]=true;if(done){v_map1=v_map1.slice(0,footsteps[footstep]+1);var a=this.diff_path1(v_map1,text1.substring(0,text1.length-x),text2.substring(0,text2.length-y));return a.concat(this.diff_path2(v_map2,text1.substring(text1.length-x),text2.substring(text2.length-y)))}}}}return null};diff_match_patch.prototype.diff_path1=function(v_map,text1,text2){var path=[];var x=text1.length;var y=text2.length;var last_op=null;for(var d=v_map.length-2;d>=0;d--){while(1){if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty((x-1)+','+y):(v_map[d][(x-1)+','+y]!==undefined)){x--;if(last_op===DIFF_DELETE){path[0][1]=text1.charAt(x)+path[0][1]}else{path.unshift([DIFF_DELETE,text1.charAt(x)])}last_op=DIFF_DELETE;break}else if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty(x+','+(y-1)):(v_map[d][x+','+(y-1)]!==undefined)){y--;if(last_op===DIFF_INSERT){path[0][1]=text2.charAt(y)+path[0][1]}else{path.unshift([DIFF_INSERT,text2.charAt(y)])}last_op=DIFF_INSERT;break}else{x--;y--;if(last_op===DIFF_EQUAL){path[0][1]=text1.charAt(x)+path[0][1]}else{path.unshift([DIFF_EQUAL,text1.charAt(x)])}last_op=DIFF_EQUAL}}}return path};diff_match_patch.prototype.diff_path2=function(v_map,text1,text2){var path=[];var x=text1.length;var y=text2.length;var last_op=null;for(var d=v_map.length-2;d>=0;d--){while(1){if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty((x-1)+','+y):(v_map[d][(x-1)+','+y]!==undefined)){x--;if(last_op===DIFF_DELETE){path[path.length-1][1]+=text1.charAt(text1.length-x-1)}else{path.push([DIFF_DELETE,text1.charAt(text1.length-x-1)])}last_op=DIFF_DELETE;break}else if(v_map[d].hasOwnProperty?v_map[d].hasOwnProperty(x+','+(y-1)):(v_map[d][x+','+(y-1)]!==undefined)){y--;if(last_op===DIFF_INSERT){path[path.length-1][1]+=text2.charAt(text2.length-y-1)}else{path.push([DIFF_INSERT,text2.charAt(text2.length-y-1)])}last_op=DIFF_INSERT;break}else{x--;y--;if(last_op===DIFF_EQUAL){path[path.length-1][1]+=text1.charAt(text1.length-x-1)}else{path.push([DIFF_EQUAL,text1.charAt(text1.length-x-1)])}last_op=DIFF_EQUAL}}}return path};diff_match_patch.prototype.diff_commonPrefix=function(text1,text2){if(!text1||!text2||text1.charCodeAt(0)!==text2.charCodeAt(0)){return 0}var pointermin=0;var pointermax=Math.min(text1.length,text2.length);var pointermid=pointermax;var pointerstart=0;while(pointermin<pointermid){if(text1.substring(pointerstart,pointermid)==text2.substring(pointerstart,pointermid)){pointermin=pointermid;pointerstart=pointermin}else{pointermax=pointermid}pointermid=Math.floor((pointermax-pointermin)/2+pointermin)}return pointermid};diff_match_patch.prototype.diff_commonSuffix=function(text1,text2){if(!text1||!text2||text1.charCodeAt(text1.length-1)!==text2.charCodeAt(text2.length-1)){return 0}var pointermin=0;var pointermax=Math.min(text1.length,text2.length);var pointermid=pointermax;var pointerend=0;while(pointermin<pointermid){if(text1.substring(text1.length-pointermid,text1.length-pointerend)==text2.substring(text2.length-pointermid,text2.length-pointerend)){pointermin=pointermid;pointerend=pointermin}else{pointermax=pointermid}pointermid=Math.floor((pointermax-pointermin)/2+pointermin)}return pointermid};diff_match_patch.prototype.diff_halfMatch=function(text1,text2){var longtext=text1.length>text2.length?text1:text2;var shorttext=text1.length>text2.length?text2:text1;if(longtext.length<10||shorttext.length<1){return null}var dmp=this;function diff_halfMatchI(longtext,shorttext,i){var seed=longtext.substring(i,i+Math.floor(longtext.length/4));var j=-1;var best_common='';var best_longtext_a,best_longtext_b,best_shorttext_a,best_shorttext_b;while((j=shorttext.indexOf(seed,j+1))!=-1){var prefixLength=dmp.diff_commonPrefix(longtext.substring(i),shorttext.substring(j));var suffixLength=dmp.diff_commonSuffix(longtext.substring(0,i),shorttext.substring(0,j));if(best_common.length<suffixLength+prefixLength){best_common=shorttext.substring(j-suffixLength,j)+shorttext.substring(j,j+prefixLength);best_longtext_a=longtext.substring(0,i-suffixLength);best_longtext_b=longtext.substring(i+prefixLength);best_shorttext_a=shorttext.substring(0,j-suffixLength);best_shorttext_b=shorttext.substring(j+prefixLength)}}if(best_common.length>=longtext.length/2){return[best_longtext_a,best_longtext_b,best_shorttext_a,best_shorttext_b,best_common]}else{return null}}var hm1=diff_halfMatchI(longtext,shorttext,Math.ceil(longtext.length/4));var hm2=diff_halfMatchI(longtext,shorttext,Math.ceil(longtext.length/2));var hm;if(!hm1&&!hm2){return null}else if(!hm2){hm=hm1}else if(!hm1){hm=hm2}else{hm=hm1[4].length>hm2[4].length?hm1:hm2}var text1_a,text1_b,text2_a,text2_b;if(text1.length>text2.length){text1_a=hm[0];text1_b=hm[1];text2_a=hm[2];text2_b=hm[3]}else{text2_a=hm[0];text2_b=hm[1];text1_a=hm[2];text1_b=hm[3]}var mid_common=hm[4];return[text1_a,text1_b,text2_a,text2_b,mid_common]};diff_match_patch.prototype.diff_cleanupSemantic=function(diffs){var changes=false;var equalities=[];var lastequality=null;var pointer=0;var length_changes1=0;var length_changes2=0;while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_EQUAL){equalities.push(pointer);length_changes1=length_changes2;length_changes2=0;lastequality=diffs[pointer][1]}else{length_changes2+=diffs[pointer][1].length;if(lastequality!==null&&(lastequality.length<=length_changes1)&&(lastequality.length<=length_changes2)){diffs.splice(equalities[equalities.length-1],0,[DIFF_DELETE,lastequality]);diffs[equalities[equalities.length-1]+1][0]=DIFF_INSERT;equalities.pop();equalities.pop();pointer=equalities.length?equalities[equalities.length-1]:-1;length_changes1=0;length_changes2=0;lastequality=null;changes=true}}pointer++}if(changes){this.diff_cleanupMerge(diffs)}this.diff_cleanupSemanticLossless(diffs)};diff_match_patch.prototype.diff_cleanupSemanticLossless=function(diffs){function diff_cleanupSemanticScore(one,two,three){var whitespace=/\s/;var score=0;if(one.charAt(one.length-1).match(whitespace)||two.charAt(0).match(whitespace)){score++}if(two.charAt(two.length-1).match(whitespace)||three.charAt(0).match(whitespace)){score++}return score}var pointer=1;while(pointer<diffs.length-1){if(diffs[pointer-1][0]==DIFF_EQUAL&&diffs[pointer+1][0]==DIFF_EQUAL){var equality1=diffs[pointer-1][1];var edit=diffs[pointer][1];var equality2=diffs[pointer+1][1];var commonOffset=this.diff_commonSuffix(equality1,edit);if(commonOffset){var commonString=edit.substring(edit.length-commonOffset);equality1=equality1.substring(0,equality1.length-commonOffset);edit=commonString+edit.substring(0,edit.length-commonOffset);equality2=commonString+equality2}var bestEquality1=equality1;var bestEdit=edit;var bestEquality2=equality2;var bestScore=diff_cleanupSemanticScore(equality1,edit,equality2);while(edit.charAt(0)===equality2.charAt(0)){equality1+=edit.charAt(0);edit=edit.substring(1)+equality2.charAt(0);equality2=equality2.substring(1);var score=diff_cleanupSemanticScore(equality1,edit,equality2);if(score>=bestScore){bestScore=score;bestEquality1=equality1;bestEdit=edit;bestEquality2=equality2}}if(diffs[pointer-1][1]!=bestEquality1){diffs[pointer-1][1]=bestEquality1;diffs[pointer][1]=bestEdit;diffs[pointer+1][1]=bestEquality2}}pointer++}};diff_match_patch.prototype.diff_cleanupEfficiency=function(diffs){var changes=false;var equalities=[];var lastequality='';var pointer=0;var pre_ins=false;var pre_del=false;var post_ins=false;var post_del=false;while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_EQUAL){if(diffs[pointer][1].length<this.Diff_EditCost&&(post_ins||post_del)){equalities.push(pointer);pre_ins=post_ins;pre_del=post_del;lastequality=diffs[pointer][1]}else{equalities=[];lastequality=''}post_ins=post_del=false}else{if(diffs[pointer][0]==DIFF_DELETE){post_del=true}else{post_ins=true}if(lastequality&&((pre_ins&&pre_del&&post_ins&&post_del)||((lastequality.length<this.Diff_EditCost/2)&&(pre_ins+pre_del+post_ins+post_del)==3))){diffs.splice(equalities[equalities.length-1],0,[DIFF_DELETE,lastequality]);diffs[equalities[equalities.length-1]+1][0]=DIFF_INSERT;equalities.pop();lastequality='';if(pre_ins&&pre_del){post_ins=post_del=true;equalities=[]}else{equalities.pop();pointer=equalities.length?equalities[equalities.length-1]:-1;post_ins=post_del=false}changes=true}}pointer++}if(changes){this.diff_cleanupMerge(diffs)}};diff_match_patch.prototype.diff_cleanupMerge=function(diffs){diffs.push([DIFF_EQUAL,'']);var pointer=0;var count_delete=0;var count_insert=0;var text_delete='';var text_insert='';var commonlength;while(pointer<diffs.length){if(diffs[pointer][0]==DIFF_INSERT){count_insert++;text_insert+=diffs[pointer][1];pointer++}else if(diffs[pointer][0]==DIFF_DELETE){count_delete++;text_delete+=diffs[pointer][1];pointer++}else{if(count_delete!==0||count_insert!==0){if(count_delete!==0&&count_insert!==0){commonlength=this.diff_commonPrefix(text_insert,text_delete);if(commonlength!==0){if((pointer-count_delete-count_insert)>0&&diffs[pointer-count_delete-count_insert-1][0]==DIFF_EQUAL){diffs[pointer-count_delete-count_insert-1][1]+=text_insert.substring(0,commonlength)}else{diffs.splice(0,0,[DIFF_EQUAL,text_insert.substring(0,commonlength)]);pointer++}text_insert=text_insert.substring(commonlength);text_delete=text_delete.substring(commonlength)}commonlength=this.diff_commonSuffix(text_insert,text_delete);if(commonlength!==0){diffs[pointer][1]=text_insert.substring(text_insert.length-commonlength)+diffs[pointer][1];text_insert=text_insert.substring(0,text_insert.length-commonlength);text_delete=text_delete.substring(0,text_delete.length-commonlength)}}if(count_delete===0){diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert,[DIFF_INSERT,text_insert])}else if(count_insert===0){diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert,[DIFF_DELETE,text_delete])}else{diffs.splice(pointer-count_delete-count_insert,count_delete+count_insert,[DIFF_DELETE,text_delete],[DIFF_INSERT,text_insert])}pointer=pointer-count_delete-count_insert+(count_delete?1:0)+(count_insert?1:0)+1}else if(pointer!==0&&diffs[pointer-1][0]==DIFF_EQUAL){diffs[pointer-1][1]+=diffs[pointer][1];diffs.splice(pointer,1)}else{pointer++}count_insert=0;count_delete=0;text_delete='';text_insert=''}}if(diffs[diffs.length-1][1]===''){diffs.pop()}var changes=false;pointer=1;while(pointer<diffs.length-1){if(diffs[pointer-1][0]==DIFF_EQUAL&&diffs[pointer+1][0]==DIFF_EQUAL){if(diffs[pointer][1].substring(diffs[pointer][1].length-diffs[pointer-1][1].length)==diffs[pointer-1][1]){diffs[pointer][1]=diffs[pointer-1][1]+diffs[pointer][1].substring(0,diffs[pointer][1].length-diffs[pointer-1][1].length);diffs[pointer+1][1]=diffs[pointer-1][1]+diffs[pointer+1][1];diffs.splice(pointer-1,1);changes=true}else if(diffs[pointer][1].substring(0,diffs[pointer+1][1].length)==diffs[pointer+1][1]){diffs[pointer-1][1]+=diffs[pointer+1][1];diffs[pointer][1]=diffs[pointer][1].substring(diffs[pointer+1][1].length)+diffs[pointer+1][1];diffs.splice(pointer+1,1);changes=true}}pointer++}if(changes){this.diff_cleanupMerge(diffs)}};diff_match_patch.prototype.diff_addIndex=function(diffs){var i=0;for(var x=0;x<diffs.length;x++){diffs[x].push(i);if(diffs[x][0]!==DIFF_DELETE){i+=diffs[x][1].length}}};diff_match_patch.prototype.diff_xIndex=function(diffs,loc){var chars1=0;var chars2=0;var last_chars1=0;var last_chars2=0;var x;for(x=0;x<diffs.length;x++){if(diffs[x][0]!==DIFF_INSERT){chars1+=diffs[x][1].length}if(diffs[x][0]!==DIFF_DELETE){chars2+=diffs[x][1].length}if(chars1>loc){break}last_chars1=chars1;last_chars2=chars2}if(diffs.length!=x&&diffs[x][0]===DIFF_DELETE){return last_chars2}return last_chars2+(loc-last_chars1)};diff_match_patch.prototype.diff_prettyHtml=function(diffs){this.diff_addIndex(diffs);var html=[];for(var x=0;x<diffs.length;x++){var m=diffs[x][0];var t=diffs[x][1];var i=diffs[x][2];t=t.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');t=t.replace(/\n/g,'&para;<BR>');if(m===DIFF_DELETE){html.push('<DEL STYLE="background:#FFE6E6;" TITLE="i=',i,'">',t,'</DEL>')}else if(m===DIFF_INSERT){html.push('<INS STYLE="background:#E6FFE6;" TITLE="i=',i,'">',t,'</INS>')}else{html.push('<SPAN TITLE="i=',i,'">',t,'</SPAN>')}}return html.join('')};diff_match_patch.prototype.diff_text1=function(diffs){var txt=[];for(var x=0;x<diffs.length;x++){if(diffs[x][0]!==DIFF_INSERT){txt.push(diffs[x][1])}}return txt.join('')};diff_match_patch.prototype.diff_text2=function(diffs){var txt=[];for(var x=0;x<diffs.length;x++){if(diffs[x][0]!==DIFF_DELETE){txt.push(diffs[x][1])}}return txt.join('')};diff_match_patch.prototype.diff_toDelta=function(diffs){var txt=[];for(var x=0;x<diffs.length;x++){switch(diffs[x][0]){case DIFF_DELETE:txt.push('-',diffs[x][1].length,'\t');break;case DIFF_EQUAL:txt.push('=',diffs[x][1].length,'\t');break;case DIFF_INSERT:txt.push('+',encodeURI(diffs[x][1]),'\t');break;default:alert('Invalid diff operation in diff_toDelta()')}}return txt.join('').replace(/%20/g,' ')};diff_match_patch.prototype.diff_fromDelta=function(text1,delta){var diffs=[];var pointer=0;var tokens=delta.split(/\t/g);for(var x=0;x<tokens.length;x++){var param=tokens[x].substring(1);switch(tokens[x].charAt(0)){case'-':case'=':var n=parseInt(param,10);if(isNaN(n)||n<0){alert('Invalid number in diff_fromDelta()')}else{var text=text1.substring(pointer,pointer+=n);if(tokens[x].charAt(0)=='='){diffs.push([DIFF_EQUAL,text])}else{diffs.push([DIFF_DELETE,text])}}break;case'+':diffs.push([DIFF_INSERT,decodeURI(param)]);break;default:if(tokens[x]){alert('Invalid diff operation in diff_fromDelta()')}}}if(pointer!=text1.length){alert('Text length mismatch in diff_fromDelta()')}return diffs};diff_match_patch.prototype.match_main=function(text,pattern,loc){loc=Math.max(0,Math.min(loc,text.length-pattern.length));if(text==pattern){return 0}else if(text.length===0){return null}else if(text.substring(loc,loc+pattern.length)==pattern){return loc}else{return this.match_bitap(text,pattern,loc)}};diff_match_patch.prototype.match_bitap=function(text,pattern,loc){if(pattern.length>this.Match_MaxBits){return alert('Pattern too long for this browser.')}var s=this.match_alphabet(pattern);var score_text_length=text.length;score_text_length=Math.max(score_text_length,this.Match_MinLength);score_text_length=Math.min(score_text_length,this.Match_MaxLength);var dmp=this;function match_bitapScore(e,x){var d=Math.abs(loc-x);return(e/pattern.length/dmp.Match_Balance)+(d/score_text_length/(1.0-dmp.Match_Balance))}var score_threshold=this.Match_Threshold;var best_loc=text.indexOf(pattern,loc);if(best_loc!=-1){score_threshold=Math.min(match_bitapScore(0,best_loc),score_threshold)}best_loc=text.lastIndexOf(pattern,loc+pattern.length);if(best_loc!=-1){score_threshold=Math.min(match_bitapScore(0,best_loc),score_threshold)}var matchmask=1<<(pattern.length-1);best_loc=null;var bin_min,bin_mid;var bin_max=Math.max(loc+loc,text.length);var last_rd;for(var d=0;d<pattern.length;d++){var rd=Array(text.length);bin_min=loc;bin_mid=bin_max;while(bin_min<bin_mid){if(match_bitapScore(d,bin_mid)<score_threshold){bin_min=bin_mid}else{bin_max=bin_mid}bin_mid=Math.floor((bin_max-bin_min)/2+bin_min)}bin_max=bin_mid;var start=Math.max(0,loc-(bin_mid-loc)-1);var finish=Math.min(text.length-1,pattern.length+bin_mid);if(text.charAt(finish)==pattern.charAt(pattern.length-1)){rd[finish]=(1<<(d+1))-1}else{rd[finish]=(1<<d)-1}for(var j=finish-1;j>=start;j--){if(d===0){rd[j]=((rd[j+1]<<1)|1)&s[text.charAt(j)]}else{rd[j]=((rd[j+1]<<1)|1)&s[text.charAt(j)]|((last_rd[j+1]<<1)|1)|((last_rd[j]<<1)|1)|last_rd[j+1]}if(rd[j]&matchmask){var score=match_bitapScore(d,j);if(score<=score_threshold){score_threshold=score;best_loc=j;if(j>loc){start=Math.max(0,loc-(j-loc))}else{break}}}}if(match_bitapScore(d+1,loc)>score_threshold){break}last_rd=rd}return best_loc};diff_match_patch.prototype.match_alphabet=function(pattern){var s=Object();for(var i=0;i<pattern.length;i++){s[pattern.charAt(i)]=0}for(var i=0;i<pattern.length;i++){s[pattern.charAt(i)]|=1<<(pattern.length-i-1)}return s};diff_match_patch.prototype.patch_addContext=function(patch,text){var pattern=text.substring(patch.start2,patch.start2+patch.length1);var padding=0;while(text.indexOf(pattern)!=text.lastIndexOf(pattern)&&pattern.length<this.Match_MaxBits-this.Patch_Margin-this.Patch_Margin){padding+=this.Patch_Margin;pattern=text.substring(patch.start2-padding,patch.start2+patch.length1+padding)}padding+=this.Patch_Margin;var prefix=text.substring(patch.start2-padding,patch.start2);if(prefix!==''){patch.diffs.unshift([DIFF_EQUAL,prefix])}var suffix=text.substring(patch.start2+patch.length1,patch.start2+patch.length1+padding);if(suffix!==''){patch.diffs.push([DIFF_EQUAL,suffix])}patch.start1-=prefix.length;patch.start2-=prefix.length;patch.length1+=prefix.length+suffix.length;patch.length2+=prefix.length+suffix.length};diff_match_patch.prototype.patch_make=function(text1,text2,opt_diffs){var diffs;if(typeof opt_diffs!='undefined'){diffs=opt_diffs}else{diffs=this.diff_main(text1,text2,true);if(diffs.length>2){this.diff_cleanupSemantic(diffs);this.diff_cleanupEfficiency(diffs)}}if(diffs.length===0){return[]}var patches=[];var patch=new patch_obj();var char_count1=0;var char_count2=0;var prepatch_text=text1;var postpatch_text=text1;for(var x=0;x<diffs.length;x++){var diff_type=diffs[x][0];var diff_text=diffs[x][1];if(patch.diffs.length===0&&diff_type!==DIFF_EQUAL){patch.start1=char_count1;patch.start2=char_count2}if(diff_type===DIFF_INSERT){patch.diffs.push(diffs[x]);patch.length2+=diff_text.length;postpatch_text=postpatch_text.substring(0,char_count2)+diff_text+postpatch_text.substring(char_count2)}else if(diff_type===DIFF_DELETE){patch.length1+=diff_text.length;patch.diffs.push(diffs[x]);postpatch_text=postpatch_text.substring(0,char_count2)+postpatch_text.substring(char_count2+diff_text.length)}else if(diff_type===DIFF_EQUAL&&diff_text.length<=2*this.Patch_Margin&&patch.diffs.length!==0&&diffs.length!=x+1){patch.diffs.push(diffs[x]);patch.length1+=diff_text.length;patch.length2+=diff_text.length}if(diff_type===DIFF_EQUAL&&diff_text.length>=2*this.Patch_Margin){if(patch.diffs.length!==0){this.patch_addContext(patch,prepatch_text);patches.push(patch);patch=new patch_obj();prepatch_text=postpatch_text}}if(diff_type!==DIFF_INSERT){char_count1+=diff_text.length}if(diff_type!==DIFF_DELETE){char_count2+=diff_text.length}}if(patch.diffs.length!==0){this.patch_addContext(patch,prepatch_text);patches.push(patch)}return patches};diff_match_patch.prototype.patch_apply=function(patches,text){this.patch_splitMax(patches);var results=[];var delta=0;for(var x=0;x<patches.length;x++){var expected_loc=patches[x].start2+delta;var text1=this.diff_text1(patches[x].diffs);var start_loc=this.match_main(text,text1,expected_loc);if(start_loc===null){results.push(false)}else{results.push(true);delta=start_loc-expected_loc;var text2=text.substring(start_loc,start_loc+text1.length);if(text1==text2){text=text.substring(0,start_loc)+this.diff_text2(patches[x].diffs)+text.substring(start_loc+text1.length)}else{var diffs=this.diff_main(text1,text2,false);this.diff_cleanupSemanticLossless(diffs);var index1=0;var index2;for(var y=0;y<patches[x].diffs.length;y++){var mod=patches[x].diffs[y];if(mod[0]!==DIFF_EQUAL){index2=this.diff_xIndex(diffs,index1)}if(mod[0]===DIFF_INSERT){text=text.substring(0,start_loc+index2)+mod[1]+text.substring(start_loc+index2)}else if(mod[0]===DIFF_DELETE){text=text.substring(0,start_loc+index2)+text.substring(start_loc+this.diff_xIndex(diffs,index1+mod[1].length))}if(mod[0]!==DIFF_DELETE){index1+=mod[1].length}}}}}return[text,results]};diff_match_patch.prototype.patch_splitMax=function(patches){for(var x=0;x<patches.length;x++){if(patches[x].length1>this.Match_MaxBits){var bigpatch=patches[x];patches.splice(x,1);var patch_size=this.Match_MaxBits;var start1=bigpatch.start1;var start2=bigpatch.start2;var precontext='';while(bigpatch.diffs.length!==0){var patch=new patch_obj();var empty=true;patch.start1=start1-precontext.length;patch.start2=start2-precontext.length;if(precontext!==''){patch.length1=patch.length2=precontext.length;patch.diffs.push([DIFF_EQUAL,precontext])}while(bigpatch.diffs.length!==0&&patch.length1<patch_size-this.Patch_Margin){var diff_type=bigpatch.diffs[0][0];var diff_text=bigpatch.diffs[0][1];if(diff_type===DIFF_INSERT){patch.length2+=diff_text.length;start2+=diff_text.length;patch.diffs.push(bigpatch.diffs.shift());empty=false}else{diff_text=diff_text.substring(0,patch_size-patch.length1-this.Patch_Margin);patch.length1+=diff_text.length;start1+=diff_text.length;if(diff_type===DIFF_EQUAL){patch.length2+=diff_text.length;start2+=diff_text.length}else{empty=false}patch.diffs.push([diff_type,diff_text]);if(diff_text==bigpatch.diffs[0][1]){bigpatch.diffs.shift()}else{bigpatch.diffs[0][1]=bigpatch.diffs[0][1].substring(diff_text.length)}}}precontext=this.diff_text2(patch.diffs);precontext=precontext.substring(precontext.length-this.Patch_Margin);var postcontext=this.diff_text1(bigpatch.diffs).substring(0,this.Patch_Margin);if(postcontext!==''){patch.length1+=postcontext.length;patch.length2+=postcontext.length;if(patch.diffs.length!==0&&patch.diffs[patch.diffs.length-1][0]===DIFF_EQUAL){patch.diffs[patch.diffs.length-1][1]+=postcontext}else{patch.diffs.push([DIFF_EQUAL,postcontext])}}if(!empty){patches.splice(x++,0,patch)}}}}};diff_match_patch.prototype.patch_toText=function(patches){var text=[];for(var x=0;x<patches.length;x++){text.push(patches[x])}return text.join('')};diff_match_patch.prototype.patch_fromText=function(textline){var patches=[];var text=textline.split('\n');while(text.length!==0){var m=text[0].match(/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/);if(!m){return alert('Invalid patch string:\n'+text[0])}var patch=new patch_obj();patches.push(patch);patch.start1=parseInt(m[1],10);if(m[2]===''){patch.start1--;patch.length1=1}else if(m[2]=='0'){patch.length1=0}else{patch.start1--;patch.length1=parseInt(m[2],10)}patch.start2=parseInt(m[3],10);if(m[4]===''){patch.start2--;patch.length2=1}else if(m[4]=='0'){patch.length2=0}else{patch.start2--;patch.length2=parseInt(m[4],10)}text.shift();while(text.length!==0){var sign=text[0].charAt(0);var line=decodeURIComponent(text[0].substring(1));if(sign=='-'){patch.diffs.push([DIFF_DELETE,line])}else if(sign=='+'){patch.diffs.push([DIFF_INSERT,line])}else if(sign==' '){patch.diffs.push([DIFF_EQUAL,line])}else if(sign=='@'){break}else if(sign===''){}else{return alert('Invalid patch mode: "'+sign+'"\n'+line)}text.shift()}}return patches};function patch_obj(){this.diffs=[];this.start1=null;this.start2=null;this.length1=0;this.length2=0}patch_obj.prototype.toString=function(){var coords1,coords2;if(this.length1===0){coords1=this.start1+',0'}else if(this.length1==1){coords1=this.start1+1}else{coords1=(this.start1+1)+','+this.length1}if(this.length2===0){coords2=this.start2+',0'}else if(this.length2==1){coords2=this.start2+1}else{coords2=(this.start2+1)+','+this.length2}var txt=['@@ -',coords1,' +',coords2,' @@\n'];for(var x=0;x<this.diffs.length;x++){switch(this.diffs[x][0]){case DIFF_DELETE:txt.push('-');break;case DIFF_EQUAL:txt.push(' ');break;case DIFF_INSERT:txt.push('+');break;default:alert('Invalid diff operation in patch_obj.toString()')}txt.push(encodeURI(this.diffs[x][1]),'\n')}return txt.join('').replace(/%20/g,' ')};

data/html/test/utils_spec.js

@@ -0,0 +1,111 @@
+
+describe('util.PathUtils#basenameの動作確認', {
+  '"aaa/bbb.txt" → "bbb.txt" ': function() {
+    value_of(util.PathUtils.basename("aaa/bbb.txt")).should_be("bbb.txt");
+  },
+  '"/aaa/ccc/bbb" → "bbb" ': function() {
+    value_of(util.PathUtils.basename("/aaa/ccc/bbb")).should_be("bbb");
+  },
+  '"aaa/日本語" → "日本語" ': function() {
+    value_of(util.PathUtils.basename("aaa/日本語")).should_be("日本語");
+  },
+  '"日本語" (スラッシュを含まない) → "日本語" ': function() {
+    value_of(util.PathUtils.basename("日本語")).should_be("日本語");
+  },
+  '"日本語/" (スラッシュが末尾) → "" ': function() {
+    value_of(util.PathUtils.basename("日本語/")).should_be("");
+  },
+  '"/" (スラッシュのみ) → "" ': function() {
+    value_of(util.PathUtils.basename("/")).should_be("");
+  },
+  '"" (空文字列) → "" ': function() {
+    value_of(util.PathUtils.basename("")).should_be("");
+  },
+  'null → "" ': function() {
+    value_of(util.PathUtils.basename(null)).should_be("");
+  },
+  'undefined → "" ': function() {
+    value_of(util.PathUtils.basename(undefined)).should_be("");
+  }
+});
+
+describe('util.PathUtils#dirnameの動作確認', {
+  '"aaa/bbb.txt" → "aaa" ': function() {
+    value_of(util.PathUtils.dirname("aaa/bbb.txt")).should_be("aaa");
+  },
+  '"/aaa/ccc/bbb" → "/aaa/ccc" ': function() {
+    value_of(util.PathUtils.dirname("/aaa/ccc/bbb")).should_be("/aaa/ccc");
+  },
+  '"/a/日本語/日本語" → "/a/日本語" ': function() {
+    value_of(util.PathUtils.dirname("/a/日本語/日本語")).should_be("/a/日本語");
+  },
+  '"日本語" (スラッシュを含まない) → "" ': function() {
+    value_of(util.PathUtils.dirname("日本語")).should_be("");
+  },
+  '"日本語/" (スラッシュが末尾) → "" ': function() {
+    value_of(util.PathUtils.dirname("日本語/")).should_be("日本語");
+  },
+  '"/" (スラッシュのみ) → "" ': function() {
+    value_of(util.PathUtils.dirname("/")).should_be("");
+  },
+  '"" (空文字列) → "" ': function() {
+    value_of(util.PathUtils.dirname("")).should_be("");
+  },
+  'null → "" ': function() {
+    value_of(util.PathUtils.dirname(null)).should_be("");
+  },
+  'undefined → "" ': function() {
+    value_of(util.PathUtils.dirname(undefined)).should_be("");
+  }
+});
+
+describe('util.PathUtils#isChildの動作確認', {
+  'path:"aaa/bbb/ccc", dir:"aaa/bbb",  → true ': function() {
+    value_of(util.PathUtils.isChild("aaa/bbb/ccc", "aaa/bbb")).should_be(true);
+  },
+  'path:"aaa/bbb/ccc", dir:"aaa",  → true ': function() {
+    value_of(util.PathUtils.isChild("aaa/bbb/ccc", "aaa")).should_be(true);
+  },
+  'path:"aaa/bbb/ccc", dir:"aaa/ccc",  → false ': function() {
+    value_of(util.PathUtils.isChild("aaa/bbb/ccc", "aaa/ccc")).should_be(false);
+  },
+  'path:"aaa/bbb/ccc", dir:"aaa/bbbb",  → false': function() {
+    value_of(util.PathUtils.isChild("aaa/bbb/ccc", "aaa/bbbb")).should_be(false);
+  },
+  'path:"aaa/bbb/ccc", dir:"aaa/bb",  → false': function() {
+    value_of(util.PathUtils.isChild("aaa/bbb/ccc", "aaa/bb")).should_be(false);
+  },
+  'path:"日本語/ccc", dir:"日本語",  → true': function() {
+    value_of(util.PathUtils.isChild("日本語/ccc", "日本語")).should_be(true);
+  },
+  'path:"/日本語/ccc", dir:"",  → true': function() {
+    value_of(util.PathUtils.isChild("/日本語/ccc", "")).should_be(true);
+  },
+  'path:"", dir:"",  → true': function() {
+    value_of(util.PathUtils.isChild("", "")).should_be(false);
+  }
+});
+
+describe('util.PathUtils#normarizeの動作確認', {
+  '基本のパターン': function() {
+    value_of(util.PathUtils.normarize([
+      "aaa/bbb",
+      "aaa",
+      "aa",
+      "aa/xx",
+      "aa/cc/dd",
+      "aa/cc",
+      "bb/dd/ss",
+      "bb/dd",
+      "cc/xx"
+    ])).should_be([
+      "aa",
+      "aaa",
+      "bb/dd",
+      "cc/xx"
+    ]);
+  },
+  '空の配列': function() {
+    value_of(util.PathUtils.normarize([])).should_be([]);
+  }
+});

data/lib/jiji/agent/agent.rb

@@ -4,26 +4,65 @@ require "jiji/models"
 require 'jiji/util/util'
 require 'jiji/operator'
 require 'jiji/output'
+require 'jiji/util/include_proxy'
 
 module JIJI
   
-  # エージェントを示すマーカーモジュール
+  #===エージェントを示すマーカーモジュール
+  #JIJIではこのモジュールをincludeしたクラスがエージェントとして認識されます。
+  #
   module Agent
-    # プロパティ設定後に呼び出される。
+    
+    module Shared #:nodoc:
+      @@deleates = {}
+      def self.const_missing(id)
+        super unless @@deleates
+        result = nil
+        @@deleates.each_pair{|k,v|
+          if v.const_defined?(id)
+            result = v.const_get(id)
+            break
+          end
+        }
+        result ? result : super
+      end
+      def self.method_missing(name,*args, &block)
+        super unless @@deleates
+        target = nil
+        @@deleates.each_pair{|k,v|
+          if v.respond_to?(name)
+            target = v
+            break
+          end
+        }
+        target ? target.send( name, *args, &block ) : super
+      end
+      def self._delegates
+        @@deleates
+      end
+    end
+    
+    #====エージェントの登録後に1度だけ呼び出される関数。
+    #必要に応じてオーバーライドしてください。コンストラクタと違いこのメソッドではoperatorやoutput,loggerが使用可能です。
     def init( )
     end    
-    # 次のレートを受け取る
+    #====レート情報が通知されるメソッドです。
+    #エージェントが動作している間順次呼び出されます。 
+    #このメソッドをオーバーライドして、シグナルの計算や取り引きを行うロジックを実装してください
+    #rates:: JIJI::Rates
     def next_rates( rates )
     end
-    # 設定可能なプロパティの一覧を返す
+    #====設定可能なプロパティの一覧を返します。
+    #必要に応じてオーバーライドしてください。
+    #戻り値:: JIJI::Agent::Propertyの配列
     def property_infos
       []
     end
-    # 設定されたプロパティを取得する
+    #====設定されたプロパティを取得します。
     def properties
       @properties
     end    
-    # プロパティを設定する
+    #====プロパティを設定します。
     def properties=( properties )
       @properties = properties
       properties.each_pair {|k,v|
@@ -31,7 +70,8 @@ module JIJI
       }
     end
     
-    # エージェントの説明を返す
+    #====エージェントの説明を返します。
+    #必要に応じてオーバーライドしてください。
     def description
       ""
     end
@@ -43,28 +83,41 @@ module JIJI
     # データの出力先
     attr :output, true
         
-    # エージェントのプロパティ
+    #===エージェントのプロパティ
     class Property
       include JIJI::Util::Model
       include JIJI::Util::JsonSupport
+      #====コンストラクタ
+      #id:: プロパティID
+      #name:: UIでの表示名
+      #default_value:: プロパティの初期値
+      #type:: 種類
       def initialize( id, name, default_value=nil, type=:string )
         @id = id
         @name = name
         @default = default_value
         @type = type
       end
+      #プロパティID。
+      #JIJI::Agent#properties=(props)で渡されるハッシュのキーになります。設定必須です。
       attr :id, true
-      attr :name, true    # UIでの表示用の名前
-      attr :default, true # 初期値
+      # UIでの表示名。設定必須です。
+      attr :name, true
+      # プロパティの初期値。
+      attr :default, true
+      # 種類。:string or :numberが指定可能。指定しない場合、:stringが指定されたものとみなされます。
       attr :type, true
     end    
   
   end
   
-  
-  # 一定期間ごとに通知を受け取るエージェントの基底クラス。
+  #===一定期間ごとに通知を受け取るエージェントの基底クラス。
   class PeriodicallyAgent
     include JIJI::Agent
+    include_proxy JIJI::Agent::Shared
+    
+    #====コンストラクタ
+    #period:: レートの通知を受け取る間隔(分)の初期値
     def initialize( period=10 )
       @period = period
       @start = nil
@@ -85,6 +138,10 @@ module JIJI
     def property_infos
       super() + [Property.new(:period, "レートの通知を受け取る間隔(分)", 10, :number)]
     end
+    #====レート情報が通知されるメソッドです。
+    #エージェントが動作している間順次呼び出されます。 
+    #このメソッドをオーバーライドして、シグナルの計算や取り引きを行うロジックを実装してください
+    #rates:: JIJI::PeriodicallyRates
     def next_period_rates( rates )
     end
   end

data/lib/jiji/agent/agent_manager.rb

@@ -15,12 +15,17 @@ module JIJI
 
     include JIJI::AgentUtil
     include Enumerable
-    State = Struct.new( :agent, :output, :active )
-
-    def initialize( id, registry, logger, failsafe=true )
-      @id = id
+    State = Struct.new( :agent, :output, :operator, :active )
+
+    #コンストラクタ
+    #process_id:: プロセスID
+    #agent_registry:: エージェントレジストリ
+    #logger:: ロガー
+    #failsafe:: レートを通知した際にエージェントで発生したエラーを無視するかどうか?
+    def initialize( process_id, agent_registry, logger, failsafe=true )
+      @process_id = process_id
       @agents = {}
-      @agent_registry = registry
+      @agent_registry = agent_registry
       @logger = logger
       # エージェントでエラーが発生した場合にエラーを無視し実行を継続するか
       # true の場合、ログ出力後エラーを握って処理を継続(RMTはこちらで動作する)
@@ -29,19 +34,20 @@ module JIJI
     end
 
     # エージェントを追加する
-    def add( id, agent, name="" )
-      if @agents.key? id
-        raise UserError.new( JIJI::ERROR_ALREADY_EXIST, "agent is already exist. id=#{id}")
+    def add( agent_id, agent, agent_name="" )
+      if @agents.key? agent_id
+        raise UserError.new( JIJI::ERROR_ALREADY_EXIST, "agent is already exist. id=#{agent_id}")
       end
-      output = @registry.output( @id, id )
-      op = AgentOperator.new( @operator, name )
+      output = @output_manager.create( @process_id, agent_id )
+      output.agent_name = agent_name
+      op = AgentOperator.new( @operator, agent_name )
       safe( conf.get( [:agent,:safe_level], 4) ){
         agent.operator = op
         agent.logger = @logger
         agent.output = output
         agent.init
       }
-      @agents[id] = State.new( agent, output, true )
+      @agents[agent_id] = State.new( agent, output, op, true )
     end
 
     # エージェントを破棄する
@@ -126,7 +132,7 @@ module JIJI
     attr :trade_result_dao, true
     attr :operator, true
     attr :conf, true
-    attr :registry, true
+    attr :output_manager, true
   end
 
 end

data/lib/jiji/agent/agent_registry.rb

@@ -4,40 +4,10 @@ require 'jiji/agent/agent'
 require 'jiji/agent/util'
 require 'jiji/util/file_lock'
 require 'set'
+require 'logger'
 
 module JIJI
-  
-  module Agent
-    module Shared
-      @@deleates = {}
-      def self.const_missing(id)
-        super unless @@deleates
-        result = nil
-        @@deleates.each_pair{|k,v|
-          if v.const_defined?(id)
-            result = v.const_get(id)
-            break
-          end
-        }
-        result ? result : super
-      end
-      def self.method_missing(name,*args, &block)
-        super unless @@deleates
-        target = nil
-        @@deleates.each_pair{|k,v|
-          if v.respond_to?(name)
-            target = v
-            break
-          end
-        }
-        target ? target.send( name, *args, &block ) : super
-      end
-      def self._delegates
-        @@deleates
-      end
-    end
-  end
-  
+
   #==エージェントレジストリ
   class AgentRegistry
 
@@ -46,10 +16,7 @@ module JIJI
 
     def initialize( agent_dir, shared_lib_dir )
       @agent_dir = agent_dir
-      FileUtils.mkdir_p @agent_dir
       @shared_lib_dir = shared_lib_dir
-      FileUtils.mkdir_p @shared_lib_dir
-
       @agents = {}
     end
 
@@ -78,7 +45,7 @@ module JIJI
         raise UserError.new( JIJI::ERROR_NOT_FOUND,
           "agent class not found. name=#{name}")
       end
-      m = @agents[$2]
+      m = @agents["agents/#{$2}"]
       unless m
         raise UserError.new( JIJI::ERROR_NOT_FOUND,
           "agent class not found. name=#{name}")
@@ -126,118 +93,64 @@ module JIJI
       }
     end
 
-    # ファイル名の一覧を得る。
-    def files( type=:agent )
-      lock(type) {
-        Dir.glob( "#{dir(type)}/*.rb" ).map {|item|
-          { "name"  =>File.basename(item),
-            "update"=>File.mtime(item).to_i }
-        }.sort_by {|item| item["name"]  }
-      }
-    end
-
-    # エージェントファイルの本文を取得する。
-    def get_file(file, type=:agent )
-      lock(type) {
-        file = "#{dir(type)}/#{file}"
-        unless File.exist? file
-          raise UserError.new( JIJI::ERROR_NOT_FOUND,
-            "#{type} file not found. file_name=#{file}}")
-        end
-        IO.read(file)
-      }
-    end
-
     # エージェント置き場から、エージェントをロードする。
+    # 起動時に一度だけ呼ばれる。
     def load_all
-      lock(:shared_lib) {
-        Dir.glob( "#{@shared_lib_dir}/*.rb" ) {|shared_lib_file|
-          inner_load( shared_lib_file, :shared_lib )
-        }
-      }
-      lock(:agent) {
-        Dir.glob( "#{@agent_dir}/*.rb" ) {|agent_file|
-          inner_load( agent_file, :agent )
+      [@agent_dir,@shared_lib_dir].each {|d|
+        @file_dao.list( d, true ).each {|item|
+          next if item[:type] == :directory
+          begin
+            inner_load( item[:path] )
+          rescue Exception
+            # ログ出力のみ行い、例外は握る。
+            server_logger.error( $! )
+          end
         }
       }
     end
 
     # 特定のファイルをロードする。
     def load(file)
-      file = "#{@agent_dir}/#{file}"
-      unless File.exist? file
-        raise UserError.new( JIJI::ERROR_NOT_FOUND,
-          "agent file not found. file_name=#{file}}")
-      end
-      lock(:agent) { inner_load( file ) }
+      inner_load( file )
     end
 
-    # ファイルを追加/更新する。
-    def add_file( file_name, body, type=:agent )
-      lock(type) {
-        file = "#{dir(type)}/#{file_name}"
-        File.open( file, "w" ) {|f|
-          f.puts body
-        }
-        inner_load( file, type )
-      }
-    end
-
-    # ファイルを破棄する
-    def remove_file( file_name, type=:agent )
-      lock(type) {
-        file = "#{dir(type)}/#{file_name}"
-        unless File.exist? file
-          raise UserError.new( JIJI::ERROR_NOT_FOUND,
-            "#{type} file not found. file_name=#{file_name}")
-        end
-        FileUtils.rm_rf file
-        @agents.delete file_name if type==:agent
-      }
+    # 特定のファイルをアンロードする。
+    def unload(file)
+      if file =~ /^#{@agent_dir}\/.*/
+        @agents.delete file
+      else
+        JIJI::Agent::Shared._delegates.delete file
+      end
     end
 
     attr :conf, true
-
+    attr :file_dao, true
+    attr :server_logger, true
   private
 
-    # 種別に対応するディレクトリ名を得る。
-    def dir( type )
-      return type == :agent ? @agent_dir : @shared_lib_dir
-    end
-
-    def inner_load( file, type=:agent )
-      error = nil
-      body = IO.read(file).taint
+    def inner_load( file )
+      body = @file_dao.get(file).taint
       m = Module.new.taint
-      if type == :agent
-        @agents[ File.basename(file) ] = m
+      if file =~ /^#{@agent_dir}\/.*/
+        @agents[ file ] = m
+      elsif file =~ /^#{@shared_lib_dir}\/.*/
+        JIJI::Agent::Shared._delegates[ file ] = m
       else
-        JIJI::Agent::Shared._delegates[ File.basename(file) ] = m
+        return # agent,shared_lib配下のファイル以外は読み込まない。
       end
       safe( conf.get( [:agent,:safe_level], 4) ){
-        begin
-          m.module_eval( body, file, 1 )
-        rescue Exception => e
-          # エラーになっても読み込みは継続。
-          # 戻り値としてエラーの情報を返す
-          error = e.to_s
-        end
+        m.module_eval( body, file, 1 )
       }
-      return error ? error : :success
     end
 
-    def lock( type=:agent )
-      DirLock.new( dir(type) ).writelock {
-        yield if block_given?
-      }
-    end
     def find_agent( file, m, checked, &block )
       return if checked.include? m
       checked << m
       m.constants.each {|name|
         cl = m.const_get name
-        begin 
-          block.call( "#{get_name(cl.name)}@#{file}" ) if cl.kind_of?(Class) && cl < JIJI::Agent
+        agent_file = file.sub( /^#{@agent_dir}\/?/, "" )
+        begin
+          block.call( "#{get_name(cl.name)}@#{agent_file}" ) if cl.kind_of?(Class) && cl < JIJI::Agent
         rescue Exception
         end
         find_agent( file, cl, checked, &block ) if cl.kind_of?(Module)
@@ -246,6 +159,7 @@ module JIJI
     def get_name( name )
       name.split("::", 2)[1]
     end
+
   end
 
 end

data/lib/jiji/collector.rb

@@ -111,12 +111,7 @@ module JIJI
           @end_mutex.synchronize { @alive = false }
 
           # リスナに通知
-          @listeners.each {|l|
-            begin
-              l.on_finished( @state, Time.at(@now) ) if l.respond_to? :on_finished
-            rescue Exception
-            end
-          }
+          callback( :on_finished, @state, Time.at(@now || Time.now) )
         }
       end
     end
@@ -136,6 +131,14 @@ module JIJI
         }
       end
     end
+    # リスナにイベントを通知する
+    def callback( method, *args )
+      @listeners.each {|l|
+        JIJI::Util.log_if_error( @logger ) {
+          l.send(method, *args ) if l.respond_to? method
+        }
+      }
+    end
   end
 
   #
@@ -156,12 +159,17 @@ module JIJI
     end
     def collect
       JIJI::Util.log_if_error_and_throw( @logger ) {
+        callback( :on_progress_changed, @progress )
         begin
           pairs =  @dao.list_pairs
           if pairs.length > 0
             @start_date = @start_date || Time.at( @dao.dao(pairs[0]).first_time(:raw) )
             @end_date = @end_date || Time.at( @dao.dao(pairs[0]).last_time(:raw) )
+          else
+            @start_date = @start_date || 0
+            @end_date = @end_date || Time.now
           end
+          @now = @start_date.to_i
           @dao.each_all_pair_rates(:raw, @start_date, @end_date ) {|rates|
             each_rate(rates)
             # キャンセルチェック
@@ -174,6 +182,7 @@ module JIJI
           @state_mutex.synchronize {
             @progress = 100
           }
+          callback( :on_progress_changed, @progress )
         end
       }
     end
@@ -207,6 +216,7 @@ module JIJI
             all = @end_date.to_i - @start_date.to_i
             @progress = ( current*100 / all ).to_i
           }
+          callback( :on_progress_changed, @progress )
         end
       end
     end