Changeset 246

Show
Ignore:
Timestamp:
05/31/07 09:34:42 (2 years ago)
Author:
e.@brainspl.at
Message:

fix bug in route generation so they dont get overwritten

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Rakefile

    r245 r246  
    3030 
    3131 
    32 #Rake::RDocTask.new do |rdoc| 
    33 #  rdoc.rdoc_dir = 'doc/rdoc' 
    34 #  rdoc.options += RDOC_OPTS 
    35 #  rdoc.main = "README" 
    36 #  rdoc.title = "Merb Documentation" 
    37 #  rdoc.rdoc_files.add ['README', 'LICENSE', 'TODO', 'lib/**/*.rb'] 
    38 #end 
    3932Rake::RDocTask.new do |rdoc| 
    4033     files =['README', 'LICENSE', 'TODO', 'lib/**/*.rb'] 
    …… 
    155148 
    156149STATS_DIRECTORIES = [ 
    157   %w(Code               liib/), 
     150  %w(Code               lib/), 
    158151  %w(Unit\ tests        specs), 
    159152].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) } 

  • trunk/lib/merb/core_ext.rb

    r223 r246  
    1111    merb_numeric 
    1212    merb_symbol 
    13      
    1413  ].each {|fn| require File.join(corelib, fn)} 

  • trunk/lib/merb/merb_router.rb

    r244 r246  
    200200 
    201201      def generate(name, options = {}) 
    202         path = @paths[name] 
     202        path = @paths[name].dup 
    203203        while path =~ Router::SECTION_REGEXP 
    204204          path.sub!(Router::SECTION_REGEXP, options[$~[1].intern].to_s) 

  • trunk/tools/allison/cache/BODY

    r241 r246  
    1 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" rel="stylesheet" media="screen" href="%style_url%"/><script type="text/javascript"> 
     1<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" media="screen" href="%style_url%" rel="stylesheet"/><script type="text/javascript"> 
    22// Javascript for Allison RDoc template 
    33// Copyright 2006 Cloudburst LLC 
    …… 
    402402</div> 
    403403ENDIF:methods 
    404 <div id="spacer"></div><div class="navigation dark index" id="class_wrapper"><div class="list_header"><h3>All classes</h3></div><div class="list_header_link"><a onclick="toggle('class'); toggleText('class_link'); return false;" id="class_link" href="#">Hide...</a></div><div class="clear"></div><div id="class"><form><label for="filter_class">Filter:&nbsp;&nbsp;</label><input type="text" onKeyUp="return filterList('class', this.value, event);" id="filter_class" onKeyPress="return disableSubmit(event);"></input></form></div></div><div class="navigation dark index" id="file_wrapper"><div class="list_header"><h3>All files</h3></div><div class="list_header_link"><a onclick="toggle('file'); toggleText('file_link'); return false;" id="file_link" href="#">Hide...</a></div><div class="clear"></div><div id="file"><form><label for="filter_file">Filter:&nbsp;&nbsp;</label><input type="text" onKeyUp="return filterList('file', this.value, event);" id="filter_file" onKeyPress="return disableSubmit(event);"></input></form></div></div><div class="navigation dark index" id="method_wrapper"><div class="list_header"><h3>All methods</h3></div><div class="list_header_link"><a onclick="toggle('method'); toggleText('method_link'); return false;" id="method_link" href="#">Show...</a></div><div class="clear"></div><div id="method"><form><label for="filter_method">Filter:&nbsp;&nbsp;</label><input type="text" onKeyUp="return filterList('method', this.value, event);" id="filter_method" onKeyPress="return disableSubmit(event);"></input></form></div></div><div class="curve" id="left_curve_0"></div><div class="curve" id="left_curve_1"></div><div class="curve" id="left_curve_2"></div><div class="curve" id="left_curve_3"></div><div class="curve" id="left_curve_4"></div><div class="curve" id="left_curve_5"></div><div class="curve" id="left_curve_6"></div><div class="curve" id="left_curve_7"></div><div class="curve" id="left_curve_8"></div><div class="curve" id="left_curve_9"></div></div><div id="content"> 
     404<div id="spacer"></div><div class="navigation dark index" id="class_wrapper"><div class="list_header"><h3>All classes</h3></div><div class="list_header_link"><a href="#" id="class_link" onclick="toggle('class'); toggleText('class_link'); return false;">Hide...</a></div><div class="clear"></div><div id="class"><form><label for="filter_class">Filter:&nbsp;&nbsp;</label><input type="text" onKeyUp="return filterList('class', this.value, event);" onKeyPress="return disableSubmit(event);" id="filter_class"></input></form></div></div><div class="navigation dark index" id="file_wrapper"><div class="list_header"><h3>All files</h3></div><div class="list_header_link"><a href="#" id="file_link" onclick="toggle('file'); toggleText('file_link'); return false;">Hide...</a></div><div class="clear"></div><div id="file"><form><label for="filter_file">Filter:&nbsp;&nbsp;</label><input type="text" onKeyUp="return filterList('file', this.value, event);" onKeyPress="return disableSubmit(event);" id="filter_file"></input></form></div></div><div class="navigation dark index" id="method_wrapper"><div class="list_header"><h3>All methods</h3></div><div class="list_header_link"><a href="#" id="method_link" onclick="toggle('method'); toggleText('method_link'); return false;">Show...</a></div><div class="clear"></div><div id="method"><form><label for="filter_method">Filter:&nbsp;&nbsp;</label><input type="text" onKeyUp="return filterList('method', this.value, event);" onKeyPress="return disableSubmit(event);" id="filter_method"></input></form></div></div><div class="curve" id="left_curve_0"></div><div class="curve" id="left_curve_1"></div><div class="curve" id="left_curve_2"></div><div class="curve" id="left_curve_3"></div><div class="curve" id="left_curve_4"></div><div class="curve" id="left_curve_5"></div><div class="curve" id="left_curve_6"></div><div class="curve" id="left_curve_7"></div><div class="curve" id="left_curve_8"></div><div class="curve" id="left_curve_9"></div></div><div id="content"> 
    405405IF:title 
    406406<h1 id="item_name">%title%</h1> 
    …… 
    428428 
    429429IF:constants 
    430 <h1>Constants</h1><p><table><tr><th class="first"> </th><th>Name</th><th>Value</th><th class="description" colspan="2">Description</th></tr> 
     430<h1>Constants</h1><p><table><tr><th class="first"> </th><th>Name</th><th>Value</th><th colspan="2" class="description">Description</th></tr> 
    431431START:constants 
    432432<tr><td class="first"> </td> 
    …… 
    464464 
    465465IF:aliases 
    466 <h1>Aliases</h1><p><table><tr><th class="first"> </th><th>Old name</th><th>New name</th><th class="description" colspan="2">Description</th></tr> 
     466<h1>Aliases</h1><p><table><tr><th class="first"> </th><th>Old name</th><th>New name</th><th colspan="2" class="description">Description</th></tr> 
    467467START:aliases 
    468468<tr><td class="first"> </td> 
    …… 
    500500 
    501501IF:attributes 
    502 <h1>Attributes</h1><p><table><tr><th class="first"> </th><th>Name</th><th>Read/write?</th><th class="description" colspan="2">Description</th></tr> 
     502<h1>Attributes</h1><p><table><tr><th class="first"> </th><th>Name</th><th>Read/write?</th><th colspan="2" class="description">Description</th></tr> 
    503503START:attributes 
    504504<tr><td class="first"> </td> 
    …… 
    572572 
    573573IF:sourcecode 
    574 <p class="source_link" id="%aref%-show-link"><a onclick="toggle('%aref%-source'); toggleText('%aref%-link'); return false;" id="%aref%-link" href="#">Show source...</a></p><div class="source" id="%aref%-source"><pre>%sourcecode%</pre></div> 
     574<p class="source_link" id="%aref%-show-link"><a href="#" id="%aref%-link" onclick="toggle('%aref%-source'); toggleText('%aref%-link'); return false;">Show source...</a></p><div class="source" id="%aref%-source"><pre>%sourcecode%</pre></div> 
    575575ENDIF:sourcecode 
    576576</div></div> 

  • trunk/tools/allison/cache/INDEX

    r210 r246  
    1 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" rel="stylesheet" media="screen" href="rdoc-style.css"/><meta content="0;url=%initial_page%" http-equiv="refresh"/></head><body><div id="container"><div class="curve" id="preheader_curve_0"></div><div class="curve" id="preheader_curve_1"></div><div class="curve" id="preheader_curve_2"></div><div class="curve" id="preheader_curve_3"></div><div class="curve" id="preheader_curve_4"></div><div class="curve" id="preheader_curve_5"></div><div class="curve" id="preheader_curve_6"></div><div class="curve" id="preheader_curve_7"></div><div class="curve" id="preheader_curve_8"></div><div class="curve" id="preheader_curve_9"></div><div id="header"><span id="title"><p>&nbsp;</p><h1>Ruby Documentation</h1></span></div><div class="clear"></div><div id="redirect"><a href="%initial_page%"><h1>Redirect</h1></a></div></div></body></html> 
     1<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta content="text/html; charset=utf-8" http-equiv="Content-Type"/><title>%title%</title><link type="text/css" media="screen" href="rdoc-style.css" rel="stylesheet"/><meta content="0;url=%initial_page%" http-equiv="refresh"/></head><body><div id="container"><div class="curve" id="preheader_curve_0"></div><div class="curve" id="preheader_curve_1"></div><div class="curve" id="preheader_curve_2"></div><div class="curve" id="preheader_curve_3"></div><div class="curve" id="preheader_curve_4"></div><div class="curve" id="preheader_curve_5"></div><div class="curve" id="preheader_curve_6"></div><div class="curve" id="preheader_curve_7"></div><div class="curve" id="preheader_curve_8"></div><div class="curve" id="preheader_curve_9"></div><div id="header"><span id="title"><p>&nbsp;</p><h1>Ruby Documentation</h1></span></div><div class="clear"></div><div id="redirect"><a href="%initial_page%"><h1>Redirect</h1></a></div></div></body></html>