serverside 0.2.0 → 0.2.5

data/CHANGELOG

@@ -1,5 +1,31 @@
+*0.2.5*
+
+* Added template serving to static file module.
+
+* Wrote a simple ERB template system.
+
+* More documentation tweaks.
+
+* Changed how response cookies are formatted for somewhat better performance.
+
+* Updated documentation.
+
+* Removed deprecated code in lib/serverside/application.rb.
+
+* Added HTTP cookie functionality (parse, set and delete.)
+
+* Updated rakefile to include a spec task, as well as an rcov task. Updated test task to include spec and rcov tasks.
+
+* Started writing RSpec tests. This looks like a very interesting concept.
+
+* Added /test/spec directory.
+
 *0.2.0*
 
+* Updated RFuzz script to work, but it doesn't still do anything interesting.
+
+* Added a serve command to serverside script.
+
 * Changed substition of embedded parameters from (.*) to (.+).
 
 * Added rule compilation after setting the default handler.

data/README

@@ -5,47 +5,64 @@ as easy as possible to use. ServerSide includes a full-featured HTTP server, a
 controller-view system and a bunch of other tools to easily create servers and
 clusters of servers.
 
-== Installation
+== Resources
+
+* {Project page}[http://code.google.com/p/serverside/]
+* {Source code}[http://serverside.googlecode.com/svn/]
+* {Bug tracking}[http://code.google.com/p/serverside/issues/list]
+* {RubyForge page}[http://rubyforge.org/projects/serverside/]
 
-<tt>sudo gem install serverside</tt>
+To check out the repository, just perform:
+  
+  svn co {http://serverside.googlecode.com/svn/}[http://serverside.googlecode.com/svn/]
 
-== Source Code
+== Installation
 
-http://serverside.googlecode.com/svn/
+  sudo gem install serverside
 
-== The Daemon
+== Usage
 
 Once you have the ServerSide gem installed, you can use the <tt>serverside</tt>
 script to control servers. For example:
 
-<tt>serverside -p 8000 start .</tt>
+  serverside start .
+
+will start an HTTP server on port 8000, serving the content of the working 
+directory. You can stop the server by running <tt>serverside stop .</tt>
 
-will start an HTTP server, serving the content of the working directory. You can
-stop the server by running <tt>serverside stop .</tt>
+To run the server without forking, use the 'serve' command:
+
+  serverside serve .
+
+== Serving ERb Templates
+
+ServerSide can render ERb[http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/] 
+templates in a fashion similar to PHP. You can store templates in .rhtml files, 
+and ServerSide takes care of all the rest. ServerSide is also smart enough to 
+allow you to use nice looking URL's with your templates, and automatically adds 
+the .rhtml extension if the file is there.
  
 == Serving Dynamic Content
 
-You can use the ServerSide::Application and ServerSide::Controller classes to
-create dynamic web applications. The ServerSide framework also lets you route
-requests based on any attribute of incoming requests, such as host name, path,
-URL parameters etc.
-
-To start your app, you can either supply the <tt>serverside</tt> script with 
-your Ruby code file:
+By default ServerSide serves static files, but you can change the behavior by
+creating custom {routing rules}[classes/ServerSide/Connection/Router.html].
+Here's a simple routing rule:
 
-<tt>serverside start ~/myapp/myapp.rb</tt>
+  ServerSide.route(:path => '/hello/:name') {
+    send_response(200, 'text', "Hello #{@parameters[:name]}!")
+  }
 
-Or you can put your code in a file called <tt>serverside.rb</tt> and tell the
-<tt>serverside</tt> script the directory path:
+The ServerSide framework also lets you route requests based on any attribute of
+incoming requests, such as host name, path, URL parameters etc.
 
-<tt>serverside start /home/nc/reality/production</tt>
+To run your custom rules, you can either put them in a file called serverside.rb,
+or tell serverside to explicitly load a specific file:
 
-The script will then load <tt>/home/nc/reality/production/serverside.rb</tt> and
-take care of everything else.
+  serverside start ~/myapp/myapp.rb
 
 == Running a Cluster of Servers
 
 ServerSide makes it easy to control a cluster of servers. Just supply a range of
 ports instead of a single port:
 
-<tt>serverside -p 8000..8009 start .</tt>
+  serverside -p 8000..8009 start .

data/Rakefile

@@ -7,7 +7,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "serverside"
-VERS = "0.2.0"
+VERS = "0.2.5"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 RDOC_OPTS = ['--quiet', '--title', "ServerSide Documentation",
   "--opname", "index.html",
@@ -68,7 +68,7 @@ task :uninstall => [:clean] do
 end
 
 task :doc_rforge do
-  sh %{rake doc}
+  Rake::Task['doc'].execute
   sh %{scp -r doc/rdoc/* ciconia@rubyforge.org:/var/www/gforge-projects/serverside}
 end
 
@@ -86,6 +86,16 @@ Rake::TestTask.new('test_functional') do |t|
   t.verbose = true
 end
 
+desc 'Run specification tests'
+task :spec do
+  sh %{spec test/spec/*_spec.rb}
+end
+
+desc 'Run rcov'
+task :rcov do
+  sh %{rcov test/unit/*_test.rb test/functional/*_test.rb}
+end
+
 desc 'Run all tests'
 Rake::TestTask.new('test') do |t|
   t.libs << 'test'
@@ -93,6 +103,12 @@ Rake::TestTask.new('test') do |t|
   t.verbose = true
 end
 
+desc 'Run all tests, specs and finish with rcov'
+task :aok do
+  Rake::Task['rcov'].execute
+  Rake::Task['spec'].execute
+end
+
 ##############################################################################
 # Statistics
 ##############################################################################

data/bin/serverside

@@ -10,10 +10,15 @@ $cmd_config = {
 }
 
 opts = OptionParser.new do |opts|
-  opts.banner = "Usage: serverside start|stop|restart [app1 app2 ...]"
+  opts.banner = "Usage: serverside start|stop|restart|serve [app1]"
   opts.define_head "ServerSide, a fast and simple web framework for ruby."
   opts.separator ""
-  opts.separator "The supplied app paths can be directory or file references."
+  opts.separator "The supplied app path can be directory or file references. \
+If the path refers to a directory the system will try to load serverside.rb in \
+that directory. If no path is given, the current working directory is assumed."
+  opts.separator ""
+  opts.separator "* The start, stop and restart commands are used to control the daemon."
+  opts.separator "* The serve command is used to start the server without forking."
   opts.separator ""
   opts.separator "Options:"
 
@@ -47,8 +52,8 @@ if ARGV.length < 1
 end
 
 $cmd = ARGV.shift
-unless %w(start stop restart).include?($cmd)
-  puts "Invalid command specified. Known commands are: start, stop, restart."
+unless %w(start stop restart serve).include?($cmd)
+  puts "Invalid command specified. Known commands are: start, stop, restart, serve."
   exit
 end
 
@@ -63,4 +68,15 @@ unless ServerSide::Connection::Router.has_routes?
   ServerSide.route_default {serve_static('.'/@path)}
 end
 
-ServerSide::Application.daemonize($cmd_config, $cmd)
+if $cmd == 'serve'
+  if $cmd_config[:ports].begin != $cmd_config[:ports].end
+    puts "Please specify a single port."
+    exit
+  end
+  puts "Serving at #{$cmd_config[:host]}:#{$cmd_config[:ports].begin}..."
+  trap('INT') {exit}
+  ServerSide::Server.new($cmd_config[:host], $cmd_config[:ports].begin,
+    ServerSide::Connection::Router)
+else
+  ServerSide::Application.daemonize($cmd_config, $cmd)
+end

data/doc/rdoc/classes/ServerSide/Application.html

@@ -80,8 +80,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000027">config=</a>&nbsp;&nbsp;
-      <a href="#M000028">daemonize</a>&nbsp;&nbsp;
+      <a href="#M000028">config=</a>&nbsp;&nbsp;
+      <a href="#M000029">daemonize</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -92,13 +92,6 @@
 
     <div id="section">
 
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Class <a href="Application/Base.html" class="link">ServerSide::Application::Base</a><br />
-Class <a href="Application/Static.html" class="link">ServerSide::Application::Static</a><br />
-
-    </div>
 
 
 
@@ -110,19 +103,19 @@ Class <a href="Application/Static.html" class="link">ServerSide::Application::St
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000027" class="method-detail">
-        <a name="M000027"></a>
+      <div id="method-M000028" class="method-detail">
+        <a name="M000028"></a>
 
         <div class="method-heading">
-          <a href="#M000027" class="method-signature">
+          <a href="#M000028" class="method-signature">
           <span class="method-name">config=</span><span class="method-args">(c)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000027-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000027-source">
+            onclick="toggleCode('M000028-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000028-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/serverside/application.rb, line 9</span>
  9:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">config=</span>(<span class="ruby-identifier">c</span>)
@@ -133,19 +126,19 @@ Class <a href="Application/Static.html" class="link">ServerSide::Application::St
         </div>
       </div>
 
-      <div id="method-M000028" class="method-detail">
-        <a name="M000028"></a>
+      <div id="method-M000029" class="method-detail">
+        <a name="M000029"></a>
 
         <div class="method-heading">
-          <a href="#M000028" class="method-signature">
+          <a href="#M000029" class="method-signature">
           <span class="method-name">daemonize</span><span class="method-args">(config, cmd)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000028-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000028-source">
+            onclick="toggleCode('M000029-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000029-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/serverside/application.rb, line 13</span>
 13:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">daemonize</span>(<span class="ruby-identifier">config</span>, <span class="ruby-identifier">cmd</span>)