serverside 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,4 +1,10 @@
-==0.3.0
+*0.3.1*
+
+* Removed application.rb file and fixed serverside script.
+
+* Fixed bug in Caching.validate_stamp where the expiry stamp would be the file stamp + max_age - leading to stale resources.
+
+*0.3.0*
 
 * Disabled cluster_spec and parts of daemon_spec for now due to strange forking behavior.
 
@@ -20,13 +26,13 @@
 
 * Added String.underscore method.
 
-* Renamed ServerSide::Controller.process to response. 
+* Renamed ServerSide::Controller.process to response.
 
 * Improved HTTP caching code to better conform to the HTTP spec. Also improved the validate_cache method to work without a block as well.
 
 * Removed unit tests that were converted to specs.
 
-* Router now excepts handlers to return non-nil if the request was handled. Otherwise, the request goes to the next handler with an appropriate rule.
+* Router now expects handlers to return non-nil if the request was handled. Otherwise, the request goes to the next handler with an appropriate rule.
 
 * Improved spec coverage for caching.
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "serverside"
-VERS = "0.3.0"
+VERS = "0.3.1"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "ServerSide Documentation",
   "--opname", "index.html",

data/bin/serverside

@@ -64,7 +64,7 @@ else
   fn = File.join(path, 'serverside.rb')
   require fn if File.file?(fn)
 end
-unless ServerSide::Router.has_routes?
+unless ServerSide::Router.routes_defined?
   ServerSide::Router.default_route {serve_static('.'/@path)}
 end
 
@@ -78,5 +78,15 @@ if $cmd == 'serve'
   ServerSide::HTTP::Server.new($cmd_config[:host], $cmd_config[:ports].begin,
     ServerSide::Router).start
 else
-  ServerSide::Application.daemonize($cmd_config, $cmd)
+  daemon_class = Class.new(Daemon::Cluster) do
+    meta_def(:pid_fn) {Daemon::WorkingDirectory/'serverside.pid'}
+    meta_def(:server_loop) do |port|
+      ServerSide::HTTP::Server.new(
+        $cmd_config[:host], port, ServerSide::Router).start
+    end
+    meta_def(:ports) {$cmd_config[:ports]}
+  end
+  Daemon.control(daemon_class, $cmd)
+
+#  ServerSide::Application.daemonize($cmd_config, $cmd)
 end

data/lib/serverside/caching.rb

@@ -75,7 +75,7 @@ module ServerSide
           @response_headers[ETAG] = ETAG_QUOTE_FORMAT %
             [etag || expiry_etag(stamp, max_age)]
           @response_headers[LAST_MODIFIED] = stamp.httpdate
-          @response_headers[EXPIRES] = (stamp + max_age).httpdate
+          @response_headers[EXPIRES] = (Time.now + max_age).httpdate
           @response_headers[CACHE_CONTROL] = cache_control if cache_control
           @response_headers[VARY] = vary if vary
           block ? block.call : nil

data/lib/serverside/routing.rb

@@ -23,6 +23,7 @@ module ServerSide
   # from the general to the specific.
   class Router < HTTP::Request
     @@rules = []
+    @@default_route = nil
   
     # Returns true if routes were defined.
     def self.routes_defined?

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: serverside
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 date: 2006-11-27 00:00:00 +02:00
 summary: Performance-oriented web framework.
 require_paths: 
@@ -33,7 +33,6 @@ files:
 - README
 - Rakefile
 - bin/serverside
-- doc/rdoc
 - spec/core_ext_spec.rb
 - spec/connection_spec.rb
 - spec/caching_spec.rb