Capcode 0.8.9 → 0.9.0

data/doc/rdoc/classes/Capcode/Helpers/Authorization.html

@@ -111,7 +111,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000026">http_authentication</a>&nbsp;&nbsp;
+      <a href="#M000021">http_authentication</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -133,11 +133,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000026" class="method-detail">
-        <a name="M000026"></a>
+      <div id="method-M000021" class="method-detail">
+        <a name="M000021"></a>
 
         <div class="method-heading">
-          <a href="#M000026" class="method-signature">
+          <a href="#M000021" class="method-signature">
           <span class="method-name">http_authentication</span><span class="method-args">( opts = {}, &amp;b )</span>
           </a>
         </div>
@@ -173,8 +173,8 @@ The block must return a Hash of username =&gt; password like that :
   }
 </pre>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000026-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000026-source">
+            onclick="toggleCode('M000021-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000021-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/capcode/helpers/auth.rb, line 105</span>
 105:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">http_authentication</span>( <span class="ruby-identifier">opts</span> = {}, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span> )

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Mon, 21 Dec 2009 19:39:41 +0100
+Thu, 07 Jan 2010 00:27:00 +0100

data/doc/rdoc/files/README_rdoc.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Dec 21 15:36:14 +0100 2009</td>
+      <td>Thu Jan 07 00:23:27 +0100 2010</td>
     </tr>
     </table>
   </div>
@@ -91,6 +91,46 @@ href="http://www.algorithmique.net/capcode">www.algorithmique.net/capcode</a>/
 <a href="../classes/Capcode.html">Capcode</a> is a web microframework
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.9.0</h3>
+<ul>
+<li><b>IMPORTANT</b>
+
+<ul>
+<li>THIS VERSION IS A MAJOR ENHANCEMENT : YOU MUST UNINSTALL ALL PREVIOUS
+VERSIONS !!!
+
+</li>
+</ul>
+<p>
+gem uninstall Capode &#8212;version &#8217;&lt; 0.9.0&#8216;
+</p>
+<ul>
+<li>Renderers and database accessors have been extracted and are now in the <a
+href="http://github.com/glejeune/Capcode.more">plugins repository</a>. Each
+plugin is a gem that&#8216;s can be installed separately.
+
+</li>
+</ul>
+</li>
+<li><b>Important, but less!</b>
+
+<ul>
+<li>Add <a href="http://jashkenas.github.com/coffee-script/">Coffee-Script</a>
+renderer
+
+</li>
+<li>Update renderers options
+
+</li>
+<li>Rewrite configuration
+
+</li>
+<li>Bug corrections in all DB modules
+
+</li>
+</ul>
+</li>
+</ul>
 <h3>0.8.9</h3>
 <ul>
 <li>Add Thin support
@@ -556,7 +596,7 @@ for complete examples.
     # !!! Render file from /Users/greg/temp !!!
     class WebDav &lt; Route '/temp'
       def get
-        render :webdav =&gt; &quot;/Users/greg&quot;
+        render :webdav =&gt; &quot;/Users/greg/temp&quot;
       end
 
       def method_missing(id, *a, &amp;b)

data/doc/rdoc/files/lib/capcode/configuration_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Dec 03 14:22:22 +0100 2009</td>
+      <td>Tue Jan 05 17:04:58 +0100 2010</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/capcode/render/text_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Oct 19 10:33:08 +0200 2009</td>
+      <td>Mon Dec 28 14:01:05 +0100 2009</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/capcode_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Dec 11 21:04:01 +0100 2009</td>
+      <td>Tue Jan 05 17:03:42 +0100 2010</td>
     </tr>
     </table>
   </div>
@@ -107,6 +107,19 @@ Please read the README.rdoc file !
 
 
 
+    <div id="aliases-list">
+      <h3 class="section-bar">External Aliases</h3>
+
+      <div class="name-list">
+                        <table summary="aliases">
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">"<<"</td>
+          <td>-&gt;</td>
+          <td class="context-item-value">write</td>
+        </tr>
+                        </table>
+      </div>
+    </div>
 
 
       

data/doc/rdoc/fr_class_index.html

@@ -22,10 +22,10 @@
   <div id="index-entries">
     <a href="classes/Capcode.html">Capcode</a><br />
     <a href="classes/Capcode/Base.html">Capcode::Base</a><br />
+    <a href="classes/Capcode/Configuration.html">Capcode::Configuration</a><br />
     <a href="classes/Capcode/HTTPError.html">Capcode::HTTPError</a><br />
     <a href="classes/Capcode/Helpers.html">Capcode::Helpers</a><br />
     <a href="classes/Capcode/Helpers/Authorization.html">Capcode::Helpers::Authorization</a><br />
-    <a href="classes/Capcode/Mab.html">Capcode::Mab</a><br />
     <a href="classes/Capcode/Resource.html">Capcode::Resource</a><br />
     <a href="classes/Capcode/Views.html">Capcode::Views</a><br />
   </div>

data/doc/rdoc/fr_file_index.html

@@ -27,20 +27,7 @@
     <a href="files/lib/capcode/base/db_rb.html">lib/capcode/base/db.rb</a><br />
     <a href="files/lib/capcode/configuration_rb.html">lib/capcode/configuration.rb</a><br />
     <a href="files/lib/capcode/helpers/auth_rb.html">lib/capcode/helpers/auth.rb</a><br />
-    <a href="files/lib/capcode/render/binary_rb.html">lib/capcode/render/binary.rb</a><br />
-    <a href="files/lib/capcode/render/email_rb.html">lib/capcode/render/email.rb</a><br />
-    <a href="files/lib/capcode/render/erb_rb.html">lib/capcode/render/erb.rb</a><br />
-    <a href="files/lib/capcode/render/haml_rb.html">lib/capcode/render/haml.rb</a><br />
-    <a href="files/lib/capcode/render/json_rb.html">lib/capcode/render/json.rb</a><br />
-    <a href="files/lib/capcode/render/markaby_rb.html">lib/capcode/render/markaby.rb</a><br />
-    <a href="files/lib/capcode/render/mustache_rb.html">lib/capcode/render/mustache.rb</a><br />
-    <a href="files/lib/capcode/render/none_rb.html">lib/capcode/render/none.rb</a><br />
-    <a href="files/lib/capcode/render/redirect_rb.html">lib/capcode/render/redirect.rb</a><br />
-    <a href="files/lib/capcode/render/sass_rb.html">lib/capcode/render/sass.rb</a><br />
-    <a href="files/lib/capcode/render/static_rb.html">lib/capcode/render/static.rb</a><br />
     <a href="files/lib/capcode/render/text_rb.html">lib/capcode/render/text.rb</a><br />
-    <a href="files/lib/capcode/render/webdav_rb.html">lib/capcode/render/webdav.rb</a><br />
-    <a href="files/lib/capcode/render/xml_rb.html">lib/capcode/render/xml.rb</a><br />
   </div>
 </div>
 </body>

data/doc/rdoc/fr_method_index.html

@@ -21,30 +21,28 @@
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
     <a href="classes/Capcode.html#M000001">Route (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000019">URL (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000018">URL (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000010">application (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000014">args (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000015">args= (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode.html#M000013">config (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000020">content_for (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000013">args (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000014">args= (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000019">content_for (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000003">env (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000022">erb_path= (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000023">haml_path= (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Configuration.html#M000023">get (Capcode::Configuration)</a><br />
     <a href="classes/Capcode.html#M000009">http_authentication (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers/Authorization.html#M000026">http_authentication (Capcode::Helpers::Authorization)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000017">json (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers/Authorization.html#M000021">http_authentication (Capcode::Helpers::Authorization)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000016">json (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000007">map (Capcode)</a><br />
+    <a href="classes/Capcode/Configuration.html#M000024">options (Capcode::Configuration)</a><br />
     <a href="classes/Capcode.html#M000002">params (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000018">redirect (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000016">render (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000025">render_webdav (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000017">redirect (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000015">render (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000005">request (Capcode)</a><br />
     <a href="classes/Capcode.html#M000006">response (Capcode)</a><br />
     <a href="classes/Capcode.html#M000011">run (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000024">sass_path= (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000004">session (Capcode)</a><br />
+    <a href="classes/Capcode/Configuration.html#M000022">set (Capcode::Configuration)</a><br />
     <a href="classes/Capcode.html#M000012">set (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000021">static (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000020">static (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000008">use (Capcode)</a><br />
   </div>
 </div>

data/examples/render-image.rb

@@ -1,7 +1,7 @@
 $:.unshift( "../lib" )
 require 'capcode'
-require 'capcode/render/markaby'
 require 'rubygems'
+require 'capcode/render/markaby'
 require 'graphviz'
 require 'base64'
 

data/examples/render-text.rb

@@ -2,6 +2,9 @@ $:.unshift( "../lib" )
 require 'capcode'
 
 module Capcode
+  set :server, :webrick
+  set :port, 1111
+
   class Index < Route '/'
     def get
       render "Hello World"
@@ -9,4 +12,4 @@ module Capcode
   end  
 end
 
-Capcode.run( )
+Capcode.run( :port => 2222 )

data/examples/rest.rb

@@ -1,5 +1,6 @@
 $:.unshift( "../lib" )
 require 'capcode'
+require 'rubygems'
 require 'capcode/render/markaby'
 
 module Capcode

data/examples/sample.rb

@@ -1,12 +1,10 @@
 $:.unshift( "../lib" )
-require 'rubygems'
 require 'capcode'
+require 'rubygems'
 require 'capcode/render/markaby'
 require 'capcode/render/haml'
-Capcode::Helpers.haml_path = "haml"
 require 'capcode/render/json'
 require 'capcode/render/erb'
-Capcode::Helpers.erb_path = "erb"
 
 module Capcode
   module Helpers
@@ -17,6 +15,9 @@ module Capcode
 end
 
 module Capcode
+  set :haml, "haml"
+  set :erb, "erb"
+  
   class HTTPError
     def r404(f)
       "Pas glop !!! #{f} est inconnu !!!"
@@ -63,6 +64,7 @@ module Capcode
   
   class ContentFor < Route '/cf'
     def get
+      @time = Time.now
       render( :erb => :cf, :layout => :cf_layout )
     end
   end

data/examples/upload.rb

@@ -1,5 +1,6 @@
 $:.unshift( "../lib" )
 require 'capcode'
+require 'rubygems'
 require 'capcode/render/markaby'
 require 'capcode/render/static'
 require 'fileutils'

data/lib/capcode.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'rack'
 require 'json' ## DELETE THIS IN 1.0.0
 require 'logger'
+Logger.class_eval { alias :write :"<<" } unless Logger.instance_methods.include? "write"
 require 'optparse'
 require 'irb'
 require 'mime/types'
@@ -527,30 +528,13 @@ module Capcode
       end      
     end
   
-    def configuration( args = {} ) #:nodoc:
-      {
-        :port => args[:port]||Capcode.get(:port)||3000, 
-        :host => args[:host]||Capcode.get(:host)||"0.0.0.0",
-        :server => args[:server]||Capcode.get(:server)||nil,
-        :log => args[:log]||Capcode.get(:log)||$stdout,
-        :session => args[:session]||Capcode.get(:session)||{},
-        :pid => args[:pid]||Capcode.get(:pid)||"#{$0}.pid",
-        :daemonize => args[:daemonize]||Capcode.get(:daemonize)||false,
-        :db_config => File.expand_path(args[:db_config]||Capcode.get(:db_config)||"database.yml"),
-        :root => args[:root]||Capcode.get(:root)||File.expand_path(File.dirname($0)),
-        :static => args[:static]||Capcode.get(:static)||args[:root]||File.expand_path(File.dirname($0)),
-        :verbose => args[:verbose]||Capcode.get(:verbose)||false,
-        :console => false
-      }
-    end
-    
     # Return the Rack App.
     # 
-    # Options : see Capcode.set
+    # Options : see Capcode::Configuration.set
     #
     # Options set here replace the ones set globally
     def application( args = {} )
-      conf = configuration(args)
+      Capcode::Configuration.configuration(args)
       
       Capcode.constants.each do |k|
         begin
@@ -570,21 +554,21 @@ module Capcode
       
       # Set Static directory
       #@@__STATIC_DIR = (conf[:static][0].chr == "/")?conf[:static]:"/"+conf[:static] unless conf[:static].nil?
-      Capcode.static = (conf[:static][0].chr == "/")?conf[:static]:"/"+conf[:static] unless conf[:static].nil?
+      Capcode.static = (Capcode::Configuration.get(:static)[0].chr == "/")?Capcode::Configuration.get(:static):"/"+Capcode::Configuration.get(:static) unless Capcode::Configuration.get(:static).nil?
       
       # Initialize Rack App
-      puts "** Map routes." if conf[:verbose]
+      puts "** Map routes." if Capcode::Configuration.get(:verbose)
       #app = Rack::URLMap.new(@@__ROUTES)
       app = Rack::URLMap.new(Capcode.routes)
-      puts "** Initialize static directory (#{conf[:static]})" if conf[:verbose]
+      puts "** Initialize static directory (#{Capcode::Configuration.get(:static)})" if Capcode::Configuration.get(:verbose)
       app = Rack::Static.new( 
         app, 
         #:urls => [@@__STATIC_DIR], 
         :urls => [Capcode.static], 
-        :root => File.expand_path(conf[:root]) 
-      ) unless conf[:static].nil?
-      puts "** Initialize session" if conf[:verbose]
-      app = Rack::Session::Cookie.new( app, conf[:session] )
+        :root => File.expand_path(Capcode::Configuration.get(:root)) 
+      ) unless Capcode::Configuration.get(:static).nil?
+      puts "** Initialize session" if Capcode::Configuration.get(:verbose)
+      app = Rack::Session::Cookie.new( app, Capcode::Configuration.get(:session) )
       app = Capcode::HTTPError.new(app)
       app = Rack::ContentLength.new(app)
       app = Rack::Lint.new(app)
@@ -594,7 +578,7 @@ module Capcode
       
       middlewares.each do |mw|
         middleware, args, block = mw
-        puts "** Load middleware #{middleware}" if conf[:verbose]
+        puts "** Load middleware #{middleware}" if Capcode::Configuration.get(:verbose)
         if block
           app = middleware.new( app, *args, &block )
         else
@@ -604,7 +588,7 @@ module Capcode
       
       # Start database
       if self.methods.include? "db_connect"
-        db_connect( conf[:db_config], conf[:log] )
+        db_connect( Capcode::Configuration.get(:db_config), Capcode::Configuration.get(:log) )
       end
       
       if block_given?
@@ -616,11 +600,11 @@ module Capcode
     
     # Start your application.
     # 
-    # Options : see Capcode.set
+    # Options : see Capcode::Configuration.set
     #
     # Options set here replace the ones set globally
     def run( args = {} )
-      conf = configuration(args)
+      Capcode::Configuration.configuration(args)
       
       # Parse options
       opts = OptionParser.new do |opts|
@@ -629,22 +613,22 @@ module Capcode
         opts.separator "Specific options:"
 
         opts.on( "-C", "--console", "Run in console mode with IRB (default: false)" ) { 
-          conf[:console] = true
+          Capcode::Configuration.set :console, true
         }
-        opts.on( "-h", "--host HOSTNAME", "Host for web server to bind to (default: #{conf[:host]})" ) { |h|
-          conf[:host] = h
+        opts.on( "-h", "--host HOSTNAME", "Host for web server to bind to (default: #{Capcode::Configuration.get(:host)})" ) { |h|
+          Capcode::Configuration.set :host, h
         }
-        opts.on( "-p", "--port NUM", "Port for web server (default: #{conf[:port]})" ) { |p|
-          conf[:port] = p
+        opts.on( "-p", "--port NUM", "Port for web server (default: #{Capcode::Configuration.get(:port)})" ) { |p|
+          Capcode::Configuration.set :port, p
         }
-        opts.on( "-d", "--daemonize [true|false]", "Daemonize (default: #{conf[:daemonize]})" ) { |d|
-          conf[:daemonize] = d
+        opts.on( "-d", "--daemonize [true|false]", "Daemonize (default: #{Capcode::Configuration.get(:daemonize)})" ) { |d|
+          Capcode::Configuration.set :daemonize, d
         }
-        opts.on( "-r", "--root PATH", "Working directory (default: #{conf[:root]})" ) { |w|
-          conf[:root] = w
+        opts.on( "-r", "--root PATH", "Working directory (default: #{Capcode::Configuration.get(:root)})" ) { |w|
+          Capcode::Configuration.set :root, w
         }
-        opts.on( "-s", "--static PATH", "Static directory -- relative to the root directory (default: #{conf[:static]})" ) { |r|
-          conf[:static] = r
+        opts.on( "-s", "--static PATH", "Static directory -- relative to the root directory (default: #{Capcode::Configuration.get(:static)})" ) { |r|
+          Capcode::Configuration.set :static, r
         }
 
         opts.separator ""
@@ -659,7 +643,7 @@ module Capcode
           exit
         end  
         opts.on_tail( "-V", "--verbose", "Run in verbose mode" ) do
-          conf[:verbose] = true
+          Capcode::Configuration.set :verbose, true
         end
       end
       
@@ -672,22 +656,22 @@ module Capcode
       end
       
       # Run in the Working directory
-      puts "** Go on root directory (#{File.expand_path(conf[:root])})" if conf[:verbose]
-      Dir.chdir( conf[:root] ) do
+      puts "** Go on root directory (#{File.expand_path(Capcode::Configuration.get(:root))})" if Capcode::Configuration.get(:verbose)
+      Dir.chdir( Capcode::Configuration.get(:root) ) do
         
         # Check that mongrel exists 
-        if conf[:server].nil? || conf[:server] == "mongrel"
+        if Capcode::Configuration.get(:server).nil? || Capcode::Configuration.get(:server) == "mongrel"
           begin
             require 'mongrel'
-            conf[:server] = "mongrel"
+            Capcode::Configuration.set :server, :mongrel
           rescue LoadError 
             puts "!! could not load mongrel. Falling back to webrick."
-            conf[:server] = "webrick"
+            Capcode::Configuration.set :server, :webrick
           end
         end
         
         # From rackup !!!
-        if conf[:daemonize]
+        if Capcode::Configuration.get(:daemonize)
           if /java/.match(RUBY_PLATFORM).nil?
             if RUBY_VERSION < "1.9"
               exit if fork
@@ -705,39 +689,39 @@ module Capcode
             puts "!! daemonize option unavailable on #{RUBY_PLATFORM} platform."
           end
         
-          File.open(conf[:pid], 'w'){ |f| f.write("#{Process.pid}") }
-          at_exit { File.delete(conf[:pid]) if File.exist?(conf[:pid]) }
+          File.open(Capcode::Configuration.get(:pid), 'w'){ |f| f.write("#{Process.pid}") }
+          at_exit { File.delete(Capcode::Configuration.get(:pid)) if File.exist?(Capcode::Configuration.get(:pid)) }
         end
         
         app = nil
         if block_given?
-          app = application(conf) { yield( self ) }
+          app = application(Capcode::Configuration.get) { yield( self ) }
         else
-          app = application(conf)
+          app = application(Capcode::Configuration.get)
         end
-        app = Rack::CommonLogger.new( app, Logger.new(conf[:log]) )
+        app = Rack::CommonLogger.new( app, Logger.new(Capcode::Configuration.get(:log)) )
         
-        if conf[:console]
+        if Capcode::Configuration.get(:console)
           puts "Run console..."
           IRB.start
           exit
         end
         
         # Start server
-        case conf[:server].to_s
+        case Capcode::Configuration.get(:server).to_s
         when "mongrel"
-          puts "** Starting Mongrel on #{conf[:host]}:#{conf[:port]}"
-          Rack::Handler::Mongrel.run( app, {:Port => conf[:port], :Host => conf[:host]} ) { |server|
+          puts "** Starting Mongrel on #{Capcode::Configuration.get(:host)}:#{Capcode::Configuration.get(:port)}"
+          Rack::Handler::Mongrel.run( app, {:Port => Capcode::Configuration.get(:port), :Host => Capcode::Configuration.get(:host)} ) { |server|
             trap "SIGINT", proc { server.stop }
           }
         when "webrick"
-          puts "** Starting WEBrick on #{conf[:host]}:#{conf[:port]}"
-          Rack::Handler::WEBrick.run( app, {:Port => conf[:port], :BindAddress => conf[:host]} ) { |server|
+          puts "** Starting WEBrick on #{Capcode::Configuration.get(:host)}:#{Capcode::Configuration.get(:port)}"
+          Rack::Handler::WEBrick.run( app, {:Port => Capcode::Configuration.get(:port), :BindAddress => Capcode::Configuration.get(:host)} ) { |server|
             trap "SIGINT", proc { server.shutdown }
           }
         when "thin"
-          puts "** Starting Thin on #{conf[:host]}:#{conf[:port]}"
-          Rack::Handler::Thin.run( app, {:Port => conf[:port], :Host => conf[:host]} ) { |server|
+          puts "** Starting Thin on #{Capcode::Configuration.get(:host)}:#{Capcode::Configuration.get(:port)}"
+          Rack::Handler::Thin.run( app, {:Port => Capcode::Configuration.get(:port), :Host => Capcode::Configuration.get(:host)} ) { |server|
             trap "SIGINT", proc { server.stop }
           }
         end