serverside 0.1.59 → 0.2.0

data/test/functional/static_server_test.rb

@@ -3,14 +3,20 @@ require 'net/http'
 
 class StaticServerTest < Test::Unit::TestCase
   
+  class StaticServer < ServerSide::Connection::Base
+    def respond
+      serve_static('.'/@path)
+    end
+  end
+  
   def test_basic
-    t = Thread.new {ServerSide::Server.new('0.0.0.0', 17654, ServerSide::Connection::Static)}
+    t = Thread.new {ServerSide::Server.new('0.0.0.0', 17654, StaticServer)}
     sleep 0.1
 
     h = Net::HTTP.new('localhost', 17654)
     resp, data = h.get('/qqq.zzz', nil)
     assert_equal 404, resp.code.to_i
-    assert_equal "Couldn't open file /qqq.zzz.", data
+    assert_equal "File not found.", data
     
     h = Net::HTTP.new('localhost', 17654)
     resp, data = h.get("/#{__FILE__}", nil)

data/test/unit/connection_test.rb

@@ -190,4 +190,17 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal "HTTP/1.1 404\r\nConnection: close\r\nContent-Type: text/html\r\nSet-Cookie: abc=123\r\n\r\nhey there",
       r.conn.read
   end
+  
+  def test_redirect
+    r = DummyConnection3.new
+    r.conn = StringIO.new
+    r.redirect('http://mau.com/132')
+    r.conn.rewind
+    assert_equal "HTTP/1.1 302\r\nConnection: close\r\nLocation: http://mau.com/132\r\n\r\n", r.conn.read
+
+    r.conn = StringIO.new
+    r.redirect('http://www.google.com/search?q=meaning%20of%20life', true)
+    r.conn.rewind
+    assert_equal "HTTP/1.1 301\r\nConnection: close\r\nLocation: http://www.google.com/search?q=meaning%20of%20life\r\n\r\n", r.conn.read
+  end
 end

data/test/unit/core_ext_test.rb

@@ -29,4 +29,18 @@ class SymbolTest < Test::Unit::TestCase
     assert_equal 'yow_za', :yow_za.to_s
     assert_equal :yow_za.to_s.object_id, :yow_za.to_s.object_id
   end
+end
+
+class ProcTest < Test::Unit::TestCase
+  def test_proc_tag
+    l = lambda {puts "hello"}
+    assert_equal 'proc_' + l.object_id.to_s(36).sub('-', '_'), l.proc_tag
+  end
+end
+
+class ObjectTest < Test::Unit::TestCase
+  def test_const_tag
+    v = "mau mau"
+    assert_equal 'C' + v.object_id.to_s(36).upcase.sub('-', '_'), v.const_tag
+  end
 end

data/test/unit/routing_test.rb

@@ -0,0 +1,171 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'stringio'
+
+class ServerSide::Connection::Router
+  attr_accessor :t, :parameters
+  
+  def self.rules
+    @@rules
+  end
+  
+  def self.remove_rules
+    @@rules = nil
+  end
+  
+  def self.reset_rules
+    @@rules = []
+  end
+  
+  def self.reset_respond
+    define_method(:respond) {nil}
+  end
+end
+
+class RoutingTest < Test::Unit::TestCase
+  R = ServerSide::Connection::Router
+  
+  def test_has_routes?
+    R.remove_rules
+    assert_nil R.has_routes?
+    R.reset_rules
+    assert_equal false, R.has_routes?
+    R.route('/controller/:action/:id') {}
+    assert_equal true, R.has_routes?
+  end
+  
+  def test_route
+    l1 = lambda {1 + 1}
+    R.reset_rules
+    R.route('/controller/:action/:id', &l1)
+    assert_equal 1, R.rules.length
+    assert_equal({:path => '/controller/:action/:id'}, R.rules[0][0])
+    assert_equal l1, R.rules[0][1]
+    
+    l2 = lambda {2 + 2}
+    R.route(:host => '^static\..+', &l2)
+    assert_equal 2, R.rules.length
+    assert_equal({:host => '^static\..+'}, R.rules[0][0])
+    assert_equal l2, R.rules[0][1]
+    assert_equal({:path => '/controller/:action/:id'}, R.rules[1][0])
+    assert_equal l1, R.rules[1][1]
+    
+    l3 = lambda {3 + 3}
+    l4 = lambda {4 + 4}
+    
+    R.route(l3, &l4)
+    assert_equal 3, R.rules.length
+    assert_equal l3, R.rules[0][0]
+    assert_equal l4, R.rules[0][1]
+    assert_equal({:host => '^static\..+'}, R.rules[1][0])
+    assert_equal l2, R.rules[1][1]
+    assert_equal({:path => '/controller/:action/:id'}, R.rules[2][0])
+    assert_equal l1, R.rules[2][1]
+  end
+  
+  def test_compile_rules
+    R.reset_rules
+    R.reset_respond
+
+    assert_equal nil, R.new(StringIO.new).respond
+    R.rules << [{:t => 'abc'}, lambda{1}]
+    R.rules << [{:t => 'def'}, lambda{2}]
+    R.route_default {3}
+    R.compile_rules
+    r = R.new(StringIO.new)
+    r.t = 'abc'
+    assert_equal 1, r.respond
+    r.t = 'def'
+    assert_equal 2, r.respond
+    r.t = ''
+    assert_equal 3, r.respond
+  end
+  
+  def test_rule_to_statement
+    l1 = lambda {1 + 1}
+    l2 = lambda {2 + 2}
+    s = R.rule_to_statement(l1, l2)
+    assert_equal "return #{l2.proc_tag} if #{l1.proc_tag}\n" ,s
+    r = R.new(StringIO.new)
+    assert_equal true, r.respond_to?(l1.proc_tag)
+    assert_equal true, r.respond_to?(l2.proc_tag)
+    
+    l3 = lambda {3 + 3}
+    s = R.rule_to_statement({:path => '/.*'}, l3)
+    assert_not_nil s =~ /^return\s#{l3.proc_tag}\sif\s\(@path\s=~\s(.*)\)\n$/, s
+    assert_equal /\/.*/, eval("R::#{$1}")
+    assert_equal true, r.respond_to?(l3.proc_tag)
+    
+    l4 = lambda {4 + 4}
+    s = R.rule_to_statement({:path => '/controller', :host => 'static'}, l4)
+    assert_not_nil s =~ /^return\s#{l4.proc_tag}\sif\s\(.+\)&&\(.+\)\n$/
+    assert_not_nil s =~ /\(@path\s=~\s([^\)]+)\)/
+    assert_equal /\/controller/, eval("R::#{$1}")
+    assert_not_nil s =~ /\(@host\s=~\s([^\)]+)\)/
+    assert_equal /static/, eval("R::#{$1}")
+    assert_equal true, r.respond_to?(l4.proc_tag)
+    
+    l5 = lambda {5 + 5}
+    s = R.rule_to_statement({:path => ['/x', '/y']}, l5)
+    assert_not_nil s =~ /^return\s#{l5.proc_tag}\sif\s\(\(@path\s=~\s(.*)\)\|\|\(@path\s=~\s(.*)\)\)\n$/
+    assert_equal /\/x/, eval("R::#{$1}")
+    assert_equal /\/y/, eval("R::#{$2}")
+    assert_equal true, r.respond_to?(l5.proc_tag)
+  end
+  
+  def test_condition_part
+    s = R.condition_part(:t, 'abc')
+    assert_not_nil s =~ /^\(@t\s=~\s(.*)\)$/
+    assert_equal /abc/, eval("R::#{$1}")
+    
+    s = R.condition_part(:t, ':action/:id')
+    assert_not_nil s =~ /^\((.*)\)$/
+    tag = $1
+    r = R.new(StringIO.new)
+    assert_equal true, r.respond_to?(tag)
+    r.parameters = {}
+    r.t = 'abc'
+    assert_equal false, r.send(tag)
+    r.t = 'show/16'
+    assert_equal true, r.send(tag)
+    assert_equal 'show', r.parameters[:action]
+    assert_equal '16', r.parameters[:id]
+  end
+  
+  def test_define_proc
+    l1 = lambda {1 + 1}
+    tag = R.define_proc(&l1)
+    assert_kind_of Symbol, tag
+    assert_equal l1.proc_tag.to_sym, tag
+    r = R.new(StringIO.new)
+    assert 2, r.send(tag)
+  end
+  
+  def test_cache_constant
+    c = rand(100000)
+    tag = R.cache_constant(c)
+    assert_kind_of String, tag
+    assert_equal c.const_tag, tag
+    assert_equal c, eval("R::#{tag}")
+  end
+  
+  def test_route_default
+    R.route_default {'mau m'}
+    assert_equal 'mau m', R.new(StringIO.new).default_handler
+
+    R.route_default {654321}
+    assert_equal 654321, R.new(StringIO.new).default_handler
+  end
+  
+  def test_serverside_route
+    R.reset_rules
+    ServerSide.route(:path => 'abc') {1 + 1}
+    assert_equal 1, R.rules.length
+    assert_equal({:path => 'abc'}, R.rules[0][0])
+    assert_equal 2, R.rules[0][1].call
+  end
+  
+  def test_serverside_route_default
+    ServerSide.route_default {1234}
+    assert_equal 1234, R.new(StringIO.new).default_handler
+  end
+end

data/test/unit/static_test.rb

@@ -3,7 +3,7 @@ require 'stringio'
 require 'fileutils'
 
 class ConnectionTest < Test::Unit::TestCase
-  class Dummy < ServerSide::Connection::Static
+  class Dummy < ServerSide::Connection::Base
     def self.static_files
       @@static_files
     end
@@ -140,4 +140,37 @@ class ConnectionTest < Test::Unit::TestCase
       assert_not_nil resp =~ /<a href="#{dir/fn}">(#{fn})<\/a>/
     end
   end
+  
+  def test_serve_static
+    dir = File.dirname(__FILE__)
+  
+    c = Dummy.new
+    c.conn = StringIO.new
+    c.path = dir
+    c.serve_static(dir)
+    c.conn.rewind
+    resp = c.conn.read
+    
+    Dir.entries(dir).each do |fn|
+      next if fn == '.'
+      assert_not_nil resp =~ /<a href="#{dir/fn}">(#{fn})<\/a>/
+    end
+
+    c.conn = StringIO.new
+    c.serve_file(__FILE__)
+    c.conn.rewind
+    resp = c.conn.read
+    
+    # normal response
+    assert_equal '200', /HTTP\/1.1\s(.*)\r\n/.match(resp)[1]
+    fc = IO.read(__FILE__)
+    stat = File.stat(__FILE__)
+    etag = (ServerSide::StaticFiles::Const::ETagFormat % 
+      [stat.mtime.to_i, stat.size, stat.ino])
+    assert_equal etag, /ETag:\s(.*)\r\n/.match(resp)[1]
+    assert_equal ServerSide::StaticFiles::Const::MaxAge,
+      /Cache-Control:\s(.*)\r\n/.match(resp)[1]
+    assert_equal stat.size.to_s,
+      /Content-Length:\s(.*)\r\n/.match(resp)[1]
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: serverside
 version: !ruby/object:Gem::Version 
-  version: 0.1.59
-date: 2006-08-22 00:00:00 +03:00
+  version: 0.2.0
+date: 2006-08-28 00:00:00 +03:00
 summary: Performance-oriented web framework.
 require_paths: 
 - lib
@@ -54,7 +54,10 @@ files:
 - doc/rdoc/files/lib/serverside/connection_rb.html
 - doc/rdoc/files/lib/serverside/cluster_rb.html
 - doc/rdoc/files/lib/serverside/static_rb.html
+- doc/rdoc/files/lib/serverside/routing_rb.html
 - doc/rdoc/classes/Symbol.html
+- doc/rdoc/classes/Proc.html
+- doc/rdoc/classes/Object.html
 - doc/rdoc/classes/String.html
 - doc/rdoc/classes/Daemon.html
 - doc/rdoc/classes/Daemon
@@ -77,7 +80,7 @@ files:
 - doc/rdoc/classes/ServerSide/Application/Static.html
 - doc/rdoc/classes/ServerSide/Connection/Const.html
 - doc/rdoc/classes/ServerSide/Connection/Base.html
-- doc/rdoc/classes/ServerSide/Connection/Static.html
+- doc/rdoc/classes/ServerSide/Connection/Router.html
 - test/unit
 - test/test_helper.rb
 - test/functional
@@ -88,10 +91,13 @@ files:
 - test/unit/connection_test.rb
 - test/unit/cluster_test.rb
 - test/unit/static_test.rb
+- test/unit/routing_test.rb
 - test/functional/primitive_static_server_test.rb
 - test/functional/static_server_test.rb
 - test/functional/static_profile.rb
 - test/functional/static_rfuzz.rb
+- test/functional/routing_server.rb
+- test/functional/routing_server_test.rb
 - lib/serverside.rb
 - lib/serverside
 - lib/serverside/server.rb
@@ -101,6 +107,7 @@ files:
 - lib/serverside/connection.rb
 - lib/serverside/cluster.rb
 - lib/serverside/static.rb
+- lib/serverside/routing.rb
 - CHANGELOG
 test_files: []
 

data/doc/rdoc/classes/ServerSide/Connection/Static.html

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: ServerSide::Connection::Static</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">ServerSide::Connection::Static</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/lib/serverside/static_rb.html">
-                lib/serverside/static.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                <a href="Base.html">
-                Base
-               </a>
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <p>
-A connection type for serving static files.
-</p>
-
-    </div>
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000033">respond</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
-
-      <div id="includes-list">
-        <span class="include-name"><a href="../StaticFiles.html">StaticFiles</a></span>
-      </div>
-    </div>
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000033" class="method-detail">
-        <a name="M000033"></a>
-
-        <div class="method-heading">
-          <a href="#M000033" class="method-signature">
-          <span class="method-name">respond</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p>
-Responds with a file&#8217;s content or a directory listing. If the path
-does not exist, a 404 response is rendered.
-</p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000033-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000033-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/serverside/static.rb, line 83</span>
-83:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">respond</span>
-84:         <span class="ruby-identifier">fn</span> = <span class="ruby-value str">'./%s'</span> <span class="ruby-operator">%</span> <span class="ruby-ivar">@path</span>
-85:         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">file?</span>(<span class="ruby-identifier">fn</span>)
-86:           <span class="ruby-identifier">serve_file</span>(<span class="ruby-identifier">fn</span>)
-87:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>(<span class="ruby-identifier">fn</span>)
-88:           <span class="ruby-identifier">serve_dir</span>(<span class="ruby-identifier">fn</span>)
-89:         <span class="ruby-keyword kw">else</span>
-90:           <span class="ruby-identifier">send_response</span>(<span class="ruby-value">404</span>, <span class="ruby-value str">'text'</span>, <span class="ruby-constant">Const</span><span class="ruby-operator">::</span><span class="ruby-constant">FileNotFound</span> <span class="ruby-operator">%</span> <span class="ruby-ivar">@path</span>)
-91:         <span class="ruby-keyword kw">end</span>
-92:       <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>