bivouac 0.0.8 → 0.0.9

data/README

@@ -12,6 +12,16 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 
 == FEATURES/PROBLEMS:
 
+=== 0.0.9:
+* Upgrade to simple-daemon >=0.1.2
+* Better migration support! And migrate is now migration ! That's better no ?
+* Add MySQL, PostgreSQL, ... support. See 
+	$ bivouac -h
+* Add tests support with mosquito[http://mosquito.rubyforge.org/] :
+	$ ruby script/generate test my_test_name
+  To run a test, juste do :
+	$ ruby test/test_my_test_name.rb
+
 === 0.0.8:
 * Bivouac now work with WEBrick -- Bug correction
 * Markaby::Builder.set(:indent, 2)
@@ -58,8 +68,7 @@ Bivouac is a simple generator for camping[http://code.whytheluckystiff.net/campi
 == TODO:
 
 * add test with mosquito[http://code.whytheluckystiff.net/camping/wiki/MosquitoForBugFreeCamping]
-* test with Apache and Lighttpd
-* add mysql, postgresql, oracle, ... support 
+* more helpers...
 
 == SYNOPSIS:
 

data/bin/bivouac

@@ -13,7 +13,10 @@ require 'fileutils'
 require 'bivouac/template'
 include Bivouac::Template
 
-@conf = OpenStruct.new( :db => "sqlite3", :orgtype => "GOH", :port => 3301, :address => "0.0.0.0" )
+database_configuration = {
+  :adapter => "sqlite3"
+}
+@conf = OpenStruct.new( :db => "{\n\t:adapter => 'sqlite3'\n\t:database => 'db/bivouac.db'\n}", :orgtype => "GOH", :port => 3301, :address => "0.0.0.0" )
 
 opts = OptionParser.new do |opts|
 	opts.banner = "Usage: bivouac [options] app"
@@ -21,8 +24,33 @@ opts = OptionParser.new do |opts|
 	opts.separator ""
 	opts.separator "Specific options:"
 	
-	
-  #opts.on("-d", "--database NAME", "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).") { |@conf.db| }
+  opts.on("-d", "--database NAME", "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).") { |dbtype| 
+    database_configuration = {
+      :adapter => dbtype
+    }
+    
+    case dbtype
+    when "mysql"
+      database_configuration[:username] = ""
+      database_configuration[:password] = ""
+      database_configuration[:host] = "localhost"
+    when "postgresql"
+      database_configuration[:username] = "root"
+      database_configuration[:password] = ""
+      database_configuration[:host] = "localhost"
+    when "oracle"
+      database_configuration[:username] = ""
+      database_configuration[:password] = ""
+    when "sqlite2"
+      database_configuration[:adapter] = "sqlite"
+    when "sqlite3"
+    else
+      puts opts
+      exit
+    end
+
+    @conf.db = "{\n\t:adapter => '#{dbtype}'\n\t:database => 'db/bivouac.db'\n}"
+  }
 	opts.on("-P", "--port PORT", "Which port to bind to (3301)") { |@conf.port| }
 	opts.on("-a", "--address ADDR", "Address to bind to (0.0.0.0)") { |@conf.address| }
   opts.on("-o", "--organize TYPE", "Type or organisation (options: JOF:Just On File/GOH:Get Out of Hand/ERB:use Eruby or Erb)") { |@conf.orgtype|
@@ -61,6 +89,13 @@ name = ARGV.dup
 @conf.appname = name[0].classify
 @conf.appdir  = @conf.appname.underscore
 
+if database_configuration[:adapter] =~ /sqlite/
+  database_configuration[:database] = "db/" + @conf.appdir + ".db"
+else
+  database_configuration[:database] = @conf.appdir
+end
+@conf.db = database_configuration.inspect
+
 @appname = @conf.appname
 
 createDir( @conf.appdir )

data/doc/rdoc/classes/BivouacHelpers/BaseView.html

@@ -103,6 +103,44 @@ bivouac/helpers/view/html
 
 <h2 class="ruled">Methods</h2>
 <h4 class="ruled">Public Instance method: 
+<strong><a name="M000027">partial( partial, options = {} )</a></strong> <a href="#M000027"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: partial" /></a></h4>
+
+<p>
+Alias for <a href="BaseView.html#M000026">render</a>
+</p>
+
+<h4 class="ruled">Public Instance method: 
+<strong><a name="M000028">public_to_str( file )</a></strong> <a href="#M000028"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: public_to_str" /></a></h4>
+
+<p>
+Return the content of a public file as string
+</p>
+<pre>
+  public_to_str( &quot;/stylesheets/autocomplete.css&quot; )
+  #=&gt; &quot;div.autocomplete {\n position:absolute;\n...&quot;
+</pre>
+
+<div class="sourcecode">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000028_source')" id="l_M000028_source">show source</a> ]</p>
+  <div id="M000028_source" class="dyn-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/base.rb, line 22</span>
+22:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">public_to_str</span>( <span class="ruby-identifier">file</span> )
+23:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">file</span>.<span class="ruby-identifier">include?</span> <span class="ruby-value str">&quot;..&quot;</span>
+24:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+25:       <span class="ruby-keyword kw">end</span>
+26:       
+27:       <span class="ruby-identifier">file</span> = <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'BIVOUAC_ROOT'</span>] <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;/public/&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">file</span>
+28:       <span class="ruby-identifier">open</span>( <span class="ruby-identifier">file</span> ) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
+29:         <span class="ruby-identifier">data</span> = <span class="ruby-identifier">f</span>.<span class="ruby-identifier">read</span>
+30:       <span class="ruby-keyword kw">end</span>
+31:       
+32:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">data</span>
+33:     <span class="ruby-keyword kw">end</span>
+</pre>
+  </div>
+</div>
+<h4 class="ruled">Public Instance method: 
 <strong><a name="M000026">render( partial, options = {} )</a></strong> <a href="#M000026"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: render" /></a></h4>
 
 <pre>

data/doc/rdoc/classes/BivouacHelpers/FormView.html

@@ -103,7 +103,7 @@ bivouac/helpers/view/html
 
 <h2 class="ruled">Methods</h2>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000040">auto_complete_field( field_id, options = nil )</a></strong> <a href="#M000040"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: auto_complete_field" /></a></h4>
+<strong><a name="M000042">auto_complete_field( field_id, options = nil )</a></strong> <a href="#M000042"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: auto_complete_field" /></a></h4>
 
 <p>
 Adds AJAX autocomplete functionality to the text input field with the DOM
@@ -111,8 +111,8 @@ ID specified by <tt>field_id</tt>.
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000040_source')" id="l_M000040_source">show source</a> ]</p>
-  <div id="M000040_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000042_source')" id="l_M000042_source">show source</a> ]</p>
+  <div id="M000042_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/form.rb, line 6</span>
  6:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">auto_complete_field</span>( <span class="ruby-identifier">field_id</span>, <span class="ruby-identifier">options</span> = <span class="ruby-keyword kw">nil</span> )
@@ -131,7 +131,7 @@ ID specified by <tt>field_id</tt>.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000042">button_to_function(name, *args, &amp;block)</a></strong> <a href="#M000042"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: button_to_function" /></a></h4>
+<strong><a name="M000044">button_to_function(name, *args, &amp;block)</a></strong> <a href="#M000044"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: button_to_function" /></a></h4>
 
 <p>
 Returns a button that&#8216;ll trigger a JavaScript function using the
@@ -144,8 +144,8 @@ making an Ajax request first).
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000042_source')" id="l_M000042_source">show source</a> ]</p>
-  <div id="M000042_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000044_source')" id="l_M000044_source">show source</a> ]</p>
+  <div id="M000044_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/form.rb, line 63</span>
 63:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">button_to_function</span>(<span class="ruby-identifier">name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
@@ -163,7 +163,7 @@ making an Ajax request first).
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000045">form_remote_tag(options = {}, &amp;block)</a></strong> <a href="#M000045"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: form_remote_tag" /></a></h4>
+<strong><a name="M000047">form_remote_tag(options = {}, &amp;block)</a></strong> <a href="#M000047"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: form_remote_tag" /></a></h4>
 
 <p>
 Returns a form tag that will submit using XMLHttpRequest in the background
@@ -185,15 +185,15 @@ Example:
 </pre>
 <p>
 The Hash passed to the :html key is equivalent to the options (2nd)
-argument in the <a href="FormView.html#M000044">form_tag</a> method.
+argument in the <a href="FormView.html#M000046">form_tag</a> method.
 </p>
 <p>
 By default the fall-through action is the same as the one specified in the
 :url (and the default method is :post).
 </p>
 <p>
-<a href="FormView.html#M000045">form_remote_tag</a> takes a block, like <a
-href="FormView.html#M000044">form_tag</a>:
+<a href="FormView.html#M000047">form_remote_tag</a> takes a block, like <a
+href="FormView.html#M000046">form_tag</a>:
 </p>
 <pre>
   form_remote_tag :url =&gt; '/posts' do
@@ -202,8 +202,8 @@ href="FormView.html#M000044">form_tag</a>:
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000045_source')" id="l_M000045_source">show source</a> ]</p>
-  <div id="M000045_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000047_source')" id="l_M000047_source">show source</a> ]</p>
+  <div id="M000047_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/form.rb, line 159</span>
 159:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">form_remote_tag</span>(<span class="ruby-identifier">options</span> = {}, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
@@ -220,7 +220,7 @@ href="FormView.html#M000044">form_tag</a>:
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000044">form_tag(url, options = {}) {|| ...}</a></strong> <a href="#M000044"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: form_tag" /></a></h4>
+<strong><a name="M000046">form_tag(url, options = {}) {|| ...}</a></strong> <a href="#M000046"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: form_tag" /></a></h4>
 
 <p>
 Starts a form tag that points the action to an url. The method for the form
@@ -230,11 +230,11 @@ defaults to POST.
 Examples:
 </p>
 <ul>
-<li><tt><a href="FormView.html#M000044">form_tag</a>(&#8217;/posts&#8217;)
+<li><tt><a href="FormView.html#M000046">form_tag</a>(&#8217;/posts&#8217;)
 =&gt; &lt;form action=&quot;/posts&quot; method=&quot;post&quot;&gt;</tt>
 
 </li>
-<li><tt><a href="FormView.html#M000044">form_tag</a>(&#8217;/upload&#8217;,
+<li><tt><a href="FormView.html#M000046">form_tag</a>(&#8217;/upload&#8217;,
 :multipart =&gt; true) =&gt; &lt;form action=&quot;/upload&quot;
 method=&quot;post&quot; enctype=&quot;multipart/form-data&quot;&gt;</tt>
 
@@ -273,8 +273,8 @@ either &quot;get&quot; or &quot;post&quot;.
 </ul>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000044_source')" id="l_M000044_source">show source</a> ]</p>
-  <div id="M000044_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000046_source')" id="l_M000046_source">show source</a> ]</p>
+  <div id="M000046_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/form.rb, line 109</span>
 109:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">form_tag</span>(<span class="ruby-identifier">url</span>, <span class="ruby-identifier">options</span> = {}, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
@@ -306,18 +306,18 @@ either &quot;get&quot; or &quot;post&quot;.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000043">submit_to_remote(name, value, options = {})</a></strong> <a href="#M000043"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: submit_to_remote" /></a></h4>
+<strong><a name="M000045">submit_to_remote(name, value, options = {})</a></strong> <a href="#M000045"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: submit_to_remote" /></a></h4>
 
 <p>
 Returns a button input tag that will submit form using XMLHttpRequest in
 the background instead of regular reloading POST arrangement.
 <tt>options</tt> argument is the same as in <tt><a
-href="FormView.html#M000045">form_remote_tag</a></tt>.
+href="FormView.html#M000047">form_remote_tag</a></tt>.
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000043_source')" id="l_M000043_source">show source</a> ]</p>
-  <div id="M000043_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000045_source')" id="l_M000045_source">show source</a> ]</p>
+  <div id="M000045_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/form.rb, line 78</span>
 78:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">submit_to_remote</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">value</span>, <span class="ruby-identifier">options</span> = {})
@@ -335,7 +335,7 @@ href="FormView.html#M000045">form_remote_tag</a></tt>.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000041">text_field(field_name, value = &quot;&quot;, options = {})</a></strong> <a href="#M000041"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: text_field" /></a></h4>
+<strong><a name="M000043">text_field(field_name, value = &quot;&quot;, options = {})</a></strong> <a href="#M000043"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: text_field" /></a></h4>
 
 <p>
 Autocomplete options :
@@ -355,8 +355,8 @@ them here, in the usual {field: &#8216;value&#8217;,another:
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000041_source')" id="l_M000041_source">show source</a> ]</p>
-  <div id="M000041_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000043_source')" id="l_M000043_source">show source</a> ]</p>
+  <div id="M000043_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/form.rb, line 30</span>
 30:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">text_field</span>(<span class="ruby-identifier">field_name</span>, <span class="ruby-identifier">value</span> = <span class="ruby-value str">&quot;&quot;</span>, <span class="ruby-identifier">options</span> = {})

data/doc/rdoc/classes/BivouacHelpers/HtmlView.html

@@ -103,7 +103,7 @@ bivouac/helpers/view/html
 
 <h2 class="ruled">Methods</h2>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000038">image_tag( source, options = {} )</a></strong> <a href="#M000038"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: image_tag" /></a></h4>
+<strong><a name="M000040">image_tag( source, options = {} )</a></strong> <a href="#M000040"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: image_tag" /></a></h4>
 
 <p>
 Returns an html image tag for the <tt>source</tt>. The <tt>source</tt> must
@@ -121,8 +121,8 @@ without the extension)
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000038_source')" id="l_M000038_source">show source</a> ]</p>
-  <div id="M000038_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000040_source')" id="l_M000040_source">show source</a> ]</p>
+  <div id="M000040_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/html.rb, line 73</span>
 73:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">image_tag</span>( <span class="ruby-identifier">source</span>, <span class="ruby-identifier">options</span> = {} )
@@ -135,7 +135,7 @@ without the extension)
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000037">javascript_include_tag( *sources )</a></strong> <a href="#M000037"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: javascript_include_tag" /></a></h4>
+<strong><a name="M000039">javascript_include_tag( *sources )</a></strong> <a href="#M000039"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: javascript_include_tag" /></a></h4>
 
 <p>
 Returns an html script tag for each of the <tt>sources</tt> provided. You
@@ -154,8 +154,8 @@ libraries in your application, pass :defaults as the source.
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000037_source')" id="l_M000037_source">show source</a> ]</p>
-  <div id="M000037_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000039_source')" id="l_M000039_source">show source</a> ]</p>
+  <div id="M000039_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/html.rb, line 43</span>
 43:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">javascript_include_tag</span>( <span class="ruby-operator">*</span><span class="ruby-identifier">sources</span> )
@@ -180,7 +180,7 @@ libraries in your application, pass :defaults as the source.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000039">link_to(name, address, options = {})</a></strong> <a href="#M000039"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: link_to" /></a></h4>
+<strong><a name="M000041">link_to(name, address, options = {})</a></strong> <a href="#M000041"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: link_to" /></a></h4>
 
 <p>
 Creates a link tag of the given <tt>name</tt> using <tt>address</tt> has
@@ -213,8 +213,8 @@ You can mix and match the <tt>options</tt>.
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000039_source')" id="l_M000039_source">show source</a> ]</p>
-  <div id="M000039_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000041_source')" id="l_M000041_source">show source</a> ]</p>
+  <div id="M000041_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/html.rb, line 99</span>
  99:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">link_to</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">address</span>, <span class="ruby-identifier">options</span> = {})
@@ -227,7 +227,7 @@ You can mix and match the <tt>options</tt>.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000036">stylesheet_link_tag( *data )</a></strong> <a href="#M000036"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: stylesheet_link_tag" /></a></h4>
+<strong><a name="M000038">stylesheet_link_tag( *data )</a></strong> <a href="#M000038"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: stylesheet_link_tag" /></a></h4>
 
 <p>
 Returns a stylesheet link tag for the sources specified as arguments. If
@@ -247,8 +247,8 @@ You can modify the link attributes by passing a hash as the last argument.
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000036_source')" id="l_M000036_source">show source</a> ]</p>
-  <div id="M000036_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000038_source')" id="l_M000038_source">show source</a> ]</p>
+  <div id="M000038_source" class="dyn-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/html.rb, line 20</span>
 20:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">stylesheet_link_tag</span>( <span class="ruby-operator">*</span><span class="ruby-identifier">data</span> )

data/doc/rdoc/classes/BivouacHelpers/JavaScriptView.html

@@ -103,7 +103,7 @@ bivouac/helpers/view/html
 
 <h2 class="ruled">Methods</h2>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000027">escape_javascript(javascript)</a></strong> <a href="#M000027"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: escape_javascript" /></a></h4>
+<strong><a name="M000029">escape_javascript(javascript)</a></strong> <a href="#M000029"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: escape_javascript" /></a></h4>
 
 <p>
 Escape carrier returns and single and double quotes for JavaScript
@@ -111,8 +111,8 @@ segments.
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000027_source')" id="l_M000027_source">show source</a> ]</p>
-  <div id="M000027_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000029_source')" id="l_M000029_source">show source</a> ]</p>
+  <div id="M000029_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 202</span>
 202:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">escape_javascript</span>(<span class="ruby-identifier">javascript</span>)
@@ -122,7 +122,7 @@ segments.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000028">javascript_tag( content, options = {} )</a></strong> <a href="#M000028"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: javascript_tag" /></a></h4>
+<strong><a name="M000030">javascript_tag( content, options = {} )</a></strong> <a href="#M000030"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: javascript_tag" /></a></h4>
 
 <p>
 Returns a JavaScript tag with the <tt>block</tt> inside. Example:
@@ -142,8 +142,8 @@ Returns:
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000028_source')" id="l_M000028_source">show source</a> ]</p>
-  <div id="M000028_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000030_source')" id="l_M000030_source">show source</a> ]</p>
+  <div id="M000030_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 218</span>
 218:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">javascript_tag</span>( <span class="ruby-identifier">content</span>, <span class="ruby-identifier">options</span> = {} )
@@ -156,7 +156,7 @@ Returns:
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000031">link_to_function( name, *args, &amp;block )</a></strong> <a href="#M000031"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: link_to_function" /></a></h4>
+<strong><a name="M000033">link_to_function( name, *args, &amp;block )</a></strong> <a href="#M000033"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: link_to_function" /></a></h4>
 
 <p>
 Returns a link that will trigger a JavaScript function using the onclick
@@ -164,7 +164,7 @@ handler and return false after the fact.
 </p>
 <p>
 The function argument can be omitted in favor of an <a
-href="JavaScriptView.html#M000029">update_page</a> block, which evaluates
+href="JavaScriptView.html#M000031">update_page</a> block, which evaluates
 to a string when the template is rendered (instead of making an Ajax
 request first).
 </p>
@@ -213,8 +213,8 @@ Produces:
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000031_source')" id="l_M000031_source">show source</a> ]</p>
-  <div id="M000031_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000033_source')" id="l_M000033_source">show source</a> ]</p>
+  <div id="M000033_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 273</span>
 273:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">link_to_function</span>( <span class="ruby-identifier">name</span>, <span class="ruby-operator">*</span><span class="ruby-identifier">args</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span> )
@@ -234,7 +234,7 @@ Produces:
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000032">link_to_remote(name, options = {}, html_options = {})</a></strong> <a href="#M000032"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: link_to_remote" /></a></h4>
+<strong><a name="M000034">link_to_remote(name, options = {}, html_options = {})</a></strong> <a href="#M000034"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: link_to_remote" /></a></h4>
 
 <p>
 Returns a link to a remote action defined by <tt>options[:url]</tt>
@@ -358,8 +358,8 @@ the ID of a table row or any other DOM element.
 </table>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000032_source')" id="l_M000032_source">show source</a> ]</p>
-  <div id="M000032_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000034_source')" id="l_M000034_source">show source</a> ]</p>
+  <div id="M000034_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 371</span>
 371:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">link_to_remote</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">options</span> = {}, <span class="ruby-identifier">html_options</span> = {})  
@@ -369,7 +369,7 @@ the ID of a table row or any other DOM element.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000034">observe_field(field_id, options = {})</a></strong> <a href="#M000034"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: observe_field" /></a></h4>
+<strong><a name="M000036">observe_field(field_id, options = {})</a></strong> <a href="#M000036"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: observe_field" /></a></h4>
 
 <p>
 Observes the field with the DOM ID specified by <tt>field_id</tt> and makes
@@ -419,12 +419,12 @@ radio buttons and checkboxes. With this, you can specify it instead to be
 </table>
 <p>
 Additionally, you may specify any of the options documented in <a
-href="JavaScriptView.html#M000032">link_to_remote</a>.
+href="JavaScriptView.html#M000034">link_to_remote</a>.
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000034_source')" id="l_M000034_source">show source</a> ]</p>
-  <div id="M000034_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000036_source')" id="l_M000036_source">show source</a> ]</p>
+  <div id="M000036_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 420</span>
 420:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">observe_field</span>(<span class="ruby-identifier">field_id</span>, <span class="ruby-identifier">options</span> = {})
@@ -438,7 +438,7 @@ href="JavaScriptView.html#M000032">link_to_remote</a>.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000033">periodically_call_remote(options = {})</a></strong> <a href="#M000033"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: periodically_call_remote" /></a></h4>
+<strong><a name="M000035">periodically_call_remote(options = {})</a></strong> <a href="#M000035"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: periodically_call_remote" /></a></h4>
 
 <p>
 Periodically calls the specified url (<tt>options[:url]</tt>) every
@@ -446,12 +446,12 @@ Periodically calls the specified url (<tt>options[:url]</tt>) every
 update a specified div (<tt>options[:update]</tt>) with the results of the
 remote call. The options for specifying the target with :url and defining
 callbacks is the same as <a
-href="JavaScriptView.html#M000032">link_to_remote</a>.
+href="JavaScriptView.html#M000034">link_to_remote</a>.
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000033_source')" id="l_M000033_source">show source</a> ]</p>
-  <div id="M000033_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000035_source')" id="l_M000035_source">show source</a> ]</p>
+  <div id="M000035_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 380</span>
 380:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">periodically_call_remote</span>(<span class="ruby-identifier">options</span> = {})
@@ -463,11 +463,11 @@ href="JavaScriptView.html#M000032">link_to_remote</a>.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000035">remote_function(options)</a></strong> <a href="#M000035"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: remote_function" /></a></h4>
+<strong><a name="M000037">remote_function(options)</a></strong> <a href="#M000037"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: remote_function" /></a></h4>
 
 <p>
 Returns the JavaScript needed for a remote function. Takes the same
-arguments as <a href="JavaScriptView.html#M000032">link_to_remote</a>.
+arguments as <a href="JavaScriptView.html#M000034">link_to_remote</a>.
 </p>
 <p>
 Example:
@@ -486,8 +486,8 @@ Example:
 </pre>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000035_source')" id="l_M000035_source">show source</a> ]</p>
-  <div id="M000035_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000037_source')" id="l_M000037_source">show source</a> ]</p>
+  <div id="M000037_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 442</span>
 442:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">remote_function</span>(<span class="ruby-identifier">options</span>)
@@ -521,7 +521,7 @@ Example:
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000029">update_page( &amp;block )</a></strong> <a href="#M000029"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: update_page" /></a></h4>
+<strong><a name="M000031">update_page( &amp;block )</a></strong> <a href="#M000031"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: update_page" /></a></h4>
 
 <p>
 Yields a <a href="../JavaScriptGenerator.html">JavaScriptGenerator</a> and
@@ -532,8 +532,8 @@ information.
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000029_source')" id="l_M000029_source">show source</a> ]</p>
-  <div id="M000029_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000031_source')" id="l_M000031_source">show source</a> ]</p>
+  <div id="M000031_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 228</span>
 228:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_page</span>( <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span> )
@@ -543,18 +543,18 @@ information.
   </div>
 </div>
 <h4 class="ruled">Public Instance method: 
-<strong><a name="M000030">update_page_tag( options = {}, &amp;block )</a></strong> <a href="#M000030"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: update_page_tag" /></a></h4>
+<strong><a name="M000032">update_page_tag( options = {}, &amp;block )</a></strong> <a href="#M000032"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: update_page_tag" /></a></h4>
 
 <p>
-Works like <a href="JavaScriptView.html#M000029">update_page</a> but wraps
+Works like <a href="JavaScriptView.html#M000031">update_page</a> but wraps
 the generated JavaScript in a &lt;script&gt; tag. See <a
 href="../JavaScriptGenerator.html">JavaScriptGenerator</a> for more
 information.
 </p>
 
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000030_source')" id="l_M000030_source">show source</a> ]</p>
-  <div id="M000030_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000032_source')" id="l_M000032_source">show source</a> ]</p>
+  <div id="M000032_source" class="dyn-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/bivouac/helpers/view/goh/javascript.rb, line 234</span>
 234:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">update_page_tag</span>( <span class="ruby-identifier">options</span> = {}, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span> )

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Thu, 20 Sep 2007 19:42:20 +0200
+Thu, 11 Oct 2007 18:31:41 +0200

data/doc/rdoc/files/README.html

@@ -87,7 +87,7 @@ end</strong>
     <div id="README" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">README / Wed Sep 19 09:25:49 +0200 2007</div>
+  <div class="path">README / Thu Oct 11 18:31:28 +0200 2007</div>
 </div>
 
 <h1>Bivouac</h1>
@@ -112,6 +112,35 @@ Bivouac is a simple generator for <a
 href="http://code.whytheluckystiff.net/camping">camping</a>.
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.0.9:</h3>
+<ul>
+<li>Upgrade to simple-daemon &gt;=0.1.2
+
+</li>
+<li>Better migration support! And migrate is now migration ! That&#8216;s
+better no ?
+
+</li>
+<li>Add MySQL, PostgreSQL, &#8230; support. See
+
+<pre>
+      $ bivouac -h
+</pre>
+</li>
+<li>Add tests support with <a
+href="http://mosquito.rubyforge.org/">mosquito</a> :
+
+<pre>
+      $ ruby script/generate test my_test_name
+</pre>
+<p>
+To run a test, juste do :
+</p>
+<pre>
+      $ ruby test/test_my_test_name.rb
+</pre>
+</li>
+</ul>
 <h3>0.0.8:</h3>
 <ul>
 <li>Bivouac now work with WEBrick &#8212; Bug correction
@@ -228,10 +257,7 @@ change <tt>do_GET(req, res)</tt> to <tt>do_GET(req, resp)</tt>
 href="http://code.whytheluckystiff.net/camping/wiki/MosquitoForBugFreeCamping">mosquito</a>
 
 </li>
-<li>test with Apache and Lighttpd
-
-</li>
-<li>add mysql, postgresql, oracle, &#8230; support
+<li>more helpers&#8230;
 
 </li>
 </ul>

data/doc/rdoc/files/lib/bivouac/helpers/view/goh/base_rb.html

@@ -87,7 +87,7 @@ end</strong>
     <div id="lib/bivouac/helpers/view/goh/base.rb" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">lib/bivouac/helpers/view/goh/base.rb / Thu Sep 06 14:25:18 +0200 2007</div>
+  <div class="path">lib/bivouac/helpers/view/goh/base.rb / Thu Oct 11 12:06:08 +0200 2007</div>
 </div>
 
 <p>

data/doc/rdoc/rdoc-style.css

@@ -91,16 +91,16 @@
       
     }
     .source-link     { text-align: right; font-size: 8pt; }
-    .ruby-comment    { color: green; font-style: italic }
-    .ruby-constant   { color: #CCDDFF; font-weight: bold; }
-    .ruby-identifier { color: #CCCCCC;  }
-    .ruby-ivar       { color: #BBCCFF; }
-    .ruby-keyword    { color: #EEEEFF; font-weight: bold }
+    .ruby-comment    { color: black; font-style: italic }
+    .ruby-constant   { color: #123456; font-weight: bold; }
+    .ruby-identifier { color: #005599;  }
+    .ruby-ivar       { color: orange; }
+    .ruby-keyword    { color: red; font-weight: bold }
     .ruby-node       { color: #FFFFFF; }
-    .ruby-operator   { color: #CCCCCC;  }
+    .ruby-operator   { color: #055005;  }
     .ruby-regexp     { color: #DDFFDD; }
     .ruby-value      { color: #FFAAAA; font-style: italic }
-    .kw { color: #DDDDFF; font-weight: bold }
-    .cmt { color: #CCFFCC; font-style: italic }
+    .kw { color: red; font-weight: bold }
+    .cmt { color: green; font-style: italic }
     .str { color: #EECCCC; font-style: italic }
     .re  { color: #EECCCC; }

data/lib/bivouac/commands/generate.rb

@@ -7,6 +7,8 @@ require 'optparse'
 require 'ostruct'
 require 'bivouac/template'
 require 'active_support'
+require 'active_record'
+require 'find'
 require File.dirname($0) + '/../config/environment.rb'
 
 module Bivouac
@@ -14,17 +16,17 @@ module Bivouac
     include Bivouac::Template
     
     def initialize( argv )
-      # Generator type (controller, model, migrate, view, ...)
+      # Generator type (controller, model, migration, view, ...)
       @generator_type = argv.shift 
       
       # Generator options
-      @options = OpenStruct.new( :noview => false, :default_route => true, :routes => [] )
+      @options = OpenStruct.new( :noview => false, :notest => false, :default_route => true, :routes => [] )
       @opts = OptionParser.new do |opts|
       	opts.banner = "Usage: script/generate generator [options] [args]"
 
       	opts.separator ""
         opts.separator "Generators"
-        opts.separator "  Builtin: controller, model, migrate, view, scaffold"
+        opts.separator "  Builtin: controller, model, migration, view, test, scaffold"
 
         opts.separator ""
       	opts.separator "controller generator options:"
@@ -49,7 +51,14 @@ module Bivouac
     	    end
       	  @options.routes = routes.split(',')
       	}
-
+        opts.on("-t", "--no-test", "Do not generate any test for the controller") { |@options.notest|
+      	  if @generator_type != 'controller'
+      	    puts @opts
+      	    exit
+    	    end
+    	    @options.notest = true
+      	}
+        
       	opts.separator ""
       	opts.separator "Common options:"
       	opts.on_tail("-h", "--help", "Show this message") do
@@ -82,8 +91,16 @@ module Bivouac
       # Application name for the generator, passed to the template
       @generation_app_name = @app.environment.appname
       
+      @generation_app_dir = @app.environment.appdir
+      
       # Application organisation (goh, jof or erb)
       @generation_type = @app.environment.orgtype
+      
+      # Database configuration
+      @database_configuration = @app.environment.db
+      if @database_configuration[:adapter] =~ /sqlite/
+        @database_configuration[:database] = File.expand_path( File.dirname( $0 ) + "/../" + @database_configuration[:database] )
+      end
     end
     
     def run
@@ -102,10 +119,10 @@ module Bivouac
       @destination_file = File.dirname( $0 ) + "/../app/controllers/" + @generation_file_name.underscore + ".rb"
       @generation_view_name = @generation_class_name.underscore
       
-      default_route = '/' + @generation_view_name
+      default_route = @generation_view_name
       @options.routes << default_route if @options.default_route and @options.routes.include?( default_route ) == false
       @generation_routes = if @options.routes.size > 0
-        " < R '" + @options.routes.join("', '") + "'"
+        " < R '/" + @options.routes.join("', '/") + "'"
       else
         ""
       end
@@ -115,14 +132,46 @@ module Bivouac
       end
       
       view( ) if @options.noview == false
+      test( ) if @options.notest == false
     end
     
-    def migrate
+    def migration( from_model = false )
+      # Get old and new version
+      old_version = 0.0
+      begin
+        ActiveRecord::Base.establish_connection @database_configuration
+        conn = ActiveRecord::Base.connection
+        table = nil
+        conn.tables.each { |t| table = t if t =~ /_schema_infos$/ }
+        version_info = conn.select_all( "select * from #{table}" )
+        old_version = version_info[0]['version'].to_f
+      rescue
+      end
+      @new_version = old_version + 1
+      
+      # Get prefix for file
+      files = []
+      Find.find( File.dirname( $0 ) + "/../db/migrate/" ) do |f|
+        fn = File.basename( f )
+        files << fn if fn =~ /^\d\d\d/
+      end
+      file_prefix = "001"
+      if files.size > 0
+        files = files.sort {|x,y| y[0,3] <=> x[0,3]}
+        file_prefix = sprintf( "%03d", (files[0][0,3].to_i + 1) )
+      end
+      
+      puts "\t* Migration from version #{old_version} to version #{@new_version}" if old_version > 0.0
+      
       @generation_table_name = (@generation_app_name.downcase + "_" + @generation_name).tableize
       
-      @destination_file = File.dirname( $0 ) + "/../db/migrate/" + @generation_file_name.underscore + ".rb"
+      @destination_file = File.dirname( $0 ) + "/../db/migrate/" + file_prefix + "_" + @generation_file_name.underscore + ".rb"
       createFile( @destination_file ) do |io|
-        io.puts template( "generate/migrate", binding )
+        if from_model
+          io.puts template( "generate/migrate", binding )
+        else
+          io.puts template( "generate/migration", binding )
+        end
       end
       
       @destination_file = File.dirname( $0 ) + "/../db/create.rb"
@@ -137,7 +186,7 @@ module Bivouac
         io.puts template( "generate/model", binding )
       end
       
-      migrate( )
+      migration( true )
     end
     
     def view
@@ -153,6 +202,17 @@ module Bivouac
       end
     end
     
+    def test
+      @destination_file = File.dirname( $0 ) + "/../test/test_" + @generation_file_name.underscore + ".rb"
+      createFile( @destination_file ) do |io|
+        io.puts template( "generate/test_begin", binding )
+        @options.routes.each do |@test_route|
+          io.puts template( "generate/test_views", binding )
+        end
+        io.puts template( "generate/test_end", binding )
+      end
+    end
+    
     def scaffold
       @generation_view_name = @generation_class_name.underscore
       

data/lib/bivouac/helpers/view/goh/base.rb

@@ -12,5 +12,24 @@ module BivouacHelpers
       end
       self.send( partial.to_sym )
     end
+    
+    alias_method :partial, :render
+    
+    # Return the content of a public file as string
+    # 
+    #   public_to_str( "/stylesheets/autocomplete.css" )
+    #   #=> "div.autocomplete {\n position:absolute;\n..."
+    def public_to_str( file )
+      if file.include? ".."
+        return nil
+      end
+      
+      file = ENV['BIVOUAC_ROOT'] + "/public/" + file
+      open( file ) do |f|
+        data = f.read
+      end
+      
+      return data
+    end
   end
 end

data/lib/bivouac/template/application/postamble.rb

@@ -8,14 +8,20 @@
 require 'simple-daemon'
 
 DIRNAME = File.expand_path( File.dirname(__FILE__) )
-SimpleDaemon::WorkingDirectory = DIRNAME + "/../log/"
+SimpleDaemon::WORKING_DIRECTORY = DIRNAME + "/../log/"
+
 class <%= @appname %>Daemon < SimpleDaemon::Base
   @@server = nil
   
   def self.start
     config = Bivouac::Environment.new( )
     
-    <%= @appname %>::Models::Base.establish_connection :adapter => 'sqlite3', :database => DIRNAME + "/../db/<%= @appname %>.db"
+    database_connection = config.environment.db
+    if database_connection[:adapter] =~ /sqlite/
+      database_connection[:database] = DIRNAME + "/../" + database_connection[:database]
+    end
+    <%= @appname %>::Models::Base.establish_connection database_connection
+                  # :adapter => 'sqlite3', :database => DIRNAME + "/../db/<%= @appname %>.db"
     <%= @appname %>::Models::Base.logger = Logger.new(DIRNAME + "/../log/<%= @appname %>.log")
     <%= @appname %>::Models::Base.threaded_connections = false
     <%= @appname %>.create if <%= @appname %>.respond_to? :create

data/lib/bivouac/template/environment.rb

@@ -20,6 +20,9 @@ module Bivouac
         # Application port
         :port     => <%= @conf.port %>,
         
+        # Database configuration
+        :db       => <%= @conf.db %>,
+        
         # Name of the application
         # DO NOT CHANGE IT, OR YOU REALLY KNOW WHAT YOU ARE DOING!
         :appname  => "<%= @conf.appname %>",

data/lib/bivouac/template/generate/create.rb

@@ -4,5 +4,6 @@ end
 
 def <%= @generation_app_name %>.create
   Camping::Models::Session.create_schema
-  <%= @generation_app_name %>::Models.create_schema :assume => (<%= @generation_app_name %>::Models::<%= @generation_class_name %>.table_exists? ? 1.0 : 0.0)
+  <%= @generation_app_name %>::Models.create_schema 
+    # :assume => (<%= @generation_app_name %>::Models::<%= @generation_class_name %>.table_exists? ? 1.0 : 0.0)
 end

data/lib/bivouac/template/generate/migrate.rb

@@ -1,11 +1,12 @@
 module <%= @generation_app_name %>::Models
-  class Create<%= @generation_class_name %> < V 1.0
+  class Create<%= @generation_class_name %> < V <%= @new_version %>
     def self.up
       create_table :<%= @generation_table_name %> do |t|
         t.column :id, :integer, :null => false
         # ...
       end
     end
+    
     def self.down
       drop_table :<%= @generation_table_name %>
     end

data/lib/bivouac/template/generate/migration.rb

@@ -0,0 +1,9 @@
+module <%= @generation_app_name %>::Models
+  class <%= @generation_class_name %> < V <%= @new_version %>
+    def self.up
+    end
+    
+    def self.down
+    end
+  end
+end

data/lib/bivouac/template/generate/test_begin.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'mosquito'
+
+ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
+require ENV['BIVOUAC_ROOT'] + "/app/<%= @generation_app_dir %>"
+
+<%= @generation_app_name %>.create if <%= @generation_app_name %>.respond_to? :create
+include <%= @generation_app_name %>::Models
+
+class Test<%= @generation_app_name %> < Camping::FunctionalTest

data/lib/bivouac/template/generate/test_end.rb

@@ -0,0 +1 @@
+end

data/lib/bivouac/template/generate/test_views.rb

@@ -0,0 +1,4 @@
+  def test_<%= @test_route %>
+    get '/<%= @test_route %>'
+    assert_response :success
+  end

data/lib/bivouac/template/server.rb

@@ -2,4 +2,5 @@
 require 'rubygems'
 app = File.dirname(__FILE__) + "/../app/<%= @conf.appdir %>.rb"
 
+ENV['BIVOUAC_ROOT'] = File.expand_path( File.dirname(__FILE__) + "/../" )
 system "ruby #{app} #{ARGV.join(' ')}"

data/lib/bivouac.rb

@@ -1,6 +1,9 @@
 module Bivouac
   def files( xPath, *options, &block )
     path = File.dirname($0) + "/" + xPath.to_s + "/*.rb"
+    if ENV['BIVOUAC_ROOT']
+      path = ENV['BIVOUAC_ROOT'] + "/app/" + xPath.to_s + "/*.rb"
+    end
     
     Dir[path].each do |file|
       if options[0]

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: bivouac
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
-date: 2007-09-20 00:00:00 +02:00
+  version: 0.0.9
+date: 2007-10-11 00:00:00 +02:00
 summary: Developpe with Camping like you do with Rails
 require_paths: 
 - lib
@@ -93,6 +93,7 @@ files:
 - lib/bivouac/template/generate/controller.rb
 - lib/bivouac/template/generate/create.rb
 - lib/bivouac/template/generate/migrate.rb
+- lib/bivouac/template/generate/migration.rb
 - lib/bivouac/template/generate/model.rb
 - lib/bivouac/template/generate/scaffold_controller_create.rb
 - lib/bivouac/template/generate/scaffold_controller_list.rb
@@ -103,6 +104,9 @@ files:
 - lib/bivouac/template/generate/scaffold_view_list_goh.rb
 - lib/bivouac/template/generate/scaffold_view_view_erb.rb
 - lib/bivouac/template/generate/scaffold_view_view_goh.rb
+- lib/bivouac/template/generate/test_begin.rb
+- lib/bivouac/template/generate/test_end.rb
+- lib/bivouac/template/generate/test_views.rb
 - lib/bivouac/template/generate/view_erb.rb
 - lib/bivouac/template/generate/view_goh.rb
 - lib/bivouac/template/generate.rb
@@ -350,5 +354,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mosquito
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
     version: