wee 0.7.0 → 0.8.0

data/lib/wee/response.rb

@@ -1,7 +1,7 @@
 require 'time'
 
 class Wee::Response
-  DEFAULT_HEADER = { 'Content-Type' => 'text/html' }.freeze
+  DEFAULT_HEADER = {}.freeze
 
   attr_accessor :status, :content
   attr_reader :header
@@ -17,6 +17,7 @@ class Wee::Response
   def initialize(mime_type = 'text/html', content='')
     @status = 200
     @header = DEFAULT_HEADER.dup
+    self.content_type = mime_type
     @content = content 
   end
 

data/lib/wee/session.rb

@@ -1,195 +1,194 @@
+require 'wee/abstractsession'
 require 'wee/page'
-require 'thread'
 
-class Wee::Session < Wee::RequestHandler
-  attr_accessor :root_component, :page_store
+class Wee::Session < Wee::AbstractSession
 
-  def self.current
-    sess = Thread.current[:wee_session]
-    raise "not in session" if sess.nil?
-    return sess
-  end
+  attr_accessor :root_component
+  attr_accessor :page_store
 
   def initialize(&block)
-    Thread.current[:wee_session] = self
-
-    @idgen = Wee::SimpleIdGenerator.new
-
-    # to serialize the requests we need a mutex
-    @mutex = Mutex.new    
-
-    block.call(self)
-
-    raise ArgumentError, "No root component specified" if @root_component.nil?
-    raise ArgumentError, "No page_store specified" if @page_store.nil?
-    
-    @initial_snapshot = snapshot()
-
     super()
-  ensure
-    Thread.current[:wee_session] = nil
+    setup(&block)
   end
 
-  def snapshot
-    @root_component.backtrack_state_chain(snap = Wee::Snapshot.new)
-    return snap.freeze
+  def current_callbacks
+    @page.callbacks
   end
 
-  # called by application to send the session a request
-
-  def handle_request(context)
-    @mutex.synchronize do
-      begin
-        Thread.current[:wee_session] = self
-        @context = context
-        super
-        awake
-        process_request
-        sleep
-      rescue Exception => exn
-        set_response(context, Wee::ErrorResponse.new(exn))
-      ensure
-        Thread.current[:wee_session] = nil
-        @context = nil
-        @page = nil
-      end
-    end
-  end
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # :section: Request processing/handling
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-  def create_page(snapshot)
-    idgen = Wee::SimpleIdGenerator.new
-    page = Wee::Page.new(snapshot, Wee::CallbackRegistry.new(idgen))
-  end
+  protected
 
-  # Is called before process_request is invoked
-  # Can be used to setup e.g. a database connection.
-  def awake
-  end
+  def setup(&block)
+    @idgen = Wee::SimpleIdGenerator.new
 
-  # Is called after process_request is run
-  # Can be used to release e.g. a database connection.
-  def sleep
+    with_session do
+      block.call(self) if block
+      raise ArgumentError, "No root component specified" if @root_component.nil?
+      raise ArgumentError, "No page_store specified" if @page_store.nil?
+    
+      @initial_snapshot = snapshot()
+    end
   end
 
+  # The main routine where the request is processed.
+
   def process_request
     if @context.request.page_id.nil?
 
       # No page_id was specified in the URL. This means that we start with a
       # fresh component and a fresh page_id, then redirect to render itself.
 
-      handle_new_page_view(@context, @initial_snapshot)
+      handle_new_page
 
     elsif @page = @page_store.fetch(@context.request.page_id, false)
 
       # A valid page_id was specified and the corresponding page exists.
 
-      @page.snapshot.restore if @context.request.page_id != @snapshot_page_id 
-
-      p @context.request.fields if $DEBUG
-
-      if @context.request.fields.empty?
+      handle_existing_page
 
-        # No action/inputs were specified -> render page
-        #
-        # 1. Reset the action/input fields (as they are regenerated in the
-        #    rendering process).
-        # 2. Render the page (respond).
-        # 3. Store the page back into the store
-
-        @page = create_page(@page.snapshot)  # remove all action/input handlers
-        respond(@context, @page.callbacks)                    # render
-        @page_store[@context.request.page_id] = @page         # store
-
-      else
+    else
 
-        # Actions/inputs were specified.
-        #
-        # We process the request and invoke actions/inputs. Then we generate a
-        # new page view. 
+      # A page_id was specified in the URL, but there's no page for it in the
+      # page store. Either the page has timed out, or an invalid page_id was
+      # specified. 
 
-        callback_stream = Wee::CallbackStream.new(@page.callbacks, @context.request.fields) 
+      handle_invalid_page
 
-        if callback_stream.all_of_type(:action).size > 1 
-          raise "Not allowed to specify more than one action callback"
-        end
+    end
+  end
 
-        live_update_response = catch(:wee_live_update) {
-          catch(:wee_back_to_session) {
-            @root_component.process_callbacks_chain(callback_stream)
-          }
-          nil
-        }
+  def handle_new_page
+    handle_new_page_view(@context, @initial_snapshot)
+  end
 
-        if live_update_response
-          # replace existing page with new snapshot
-          @page.snapshot = self.snapshot
-          @page_store[@context.request.page_id] = @page
-          @snapshot_page_id = @context.request.page_id  
-          set_response(@context, live_update_response) 
-        else
-          handle_new_page_view(@context)
-        end
+  def handle_existing_page
+    @page.snapshot.restore if @context.request.page_id != @snapshot_page_id 
 
-      end
+    p @context.request.fields if $DEBUG
 
+    if @context.request.render?
+      handle_render_phase
     else
-
-      # A page_id was specified in the URL, but there's no page for it in the
-      # page store.  Either the page has timed out, or an invalid page_id was
-      # specified. 
-      #
-      # TODO:: Display an "invalid page or page timed out" message, which
-      # forwards to /app/session-id
-
-      raise "Not yet implemented"
-
+      handle_callback_phase
     end
   end
 
-  def current_context
-    @context
+  def handle_invalid_page
+    # TODO:: Display an "invalid page or page timed out" message, which
+    # forwards to /app/session-id
+    raise "Not yet implemented"
   end
 
-  def current_callbacks
-    @page.callbacks
+  def handle_render_phase
+    # No action/inputs were specified -> render page
+    #
+    # 1. Reset the action/input fields (as they are regenerated in the
+    #    rendering process).
+    # 2. Render the page (respond).
+    # 3. Store the page back into the store
+
+    @page = create_page(@page.snapshot)  # remove all action/input handlers
+    respond(@context, @page.callbacks)                    # render
+    @page_store[@context.request.page_id] = @page         # store
   end
 
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # :section: Properties
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  def handle_callback_phase
+    # Actions/inputs were specified.
+    #
+    # We process the request and invoke actions/inputs. Then we generate a
+    # new page view. 
 
-  attr_accessor :properties
+    callback_stream = Wee::CallbackStream.new(@page.callbacks, @context.request.fields) 
+    send_response = invoke_callbacks(callback_stream)
 
-  # Returns an "owned" property for the given +klass+.
+    post_callbacks_hook()
 
-  def get_property(prop, klass)
-    if @properties
-      @properties.fetch(klass, {})[prop]
+    if send_response
+      # replace existing page with new snapshot
+      @page.snapshot = self.snapshot
+      @page_store[@context.request.page_id] = @page
+      @snapshot_page_id = @context.request.page_id  
+
+      # and send response
+      set_response(@context, send_response) 
     else
-      nil
+      handle_new_page_view(@context)
     end
   end
 
-  private
+  # This method triggers two tree traversals of process_callbacks on the root
+  # component.  First, all input callbacks are invoked, then in the second
+  # traversal, the first found action callback is invoked (there's only ever
+  # one per request) and then the traversal is stopped 
+  #
+  # NOTE: Input callbacks should never call other components!
+  #
+  # Returns nil or send_response in case of a premature response.
+
+  def invoke_callbacks(callback_stream)
+    if callback_stream.all_of_type(:action).size > 1 
+      raise "Not allowed to specify more than one action callback"
+    end
+
+    send_response = catch(:wee_send_response) { 
+      catch(:wee_back_to_session) { 
+          # invoke input callbacks
+          @root_component.process_callbacks_chain {|this|
+            callback_stream.with_callbacks_for(this, :input) { |callback, value|
+              callback.call(value)
+            }
+          }
+
+          # invoke first found action callback. only the first action callback is invoked.
+          @root_component.process_callbacks_chain {|this|
+            callback_stream.with_callbacks_for(this, :action) { |callback, value|
+              callback.call
+              throw :wee_back_to_session
+            }
+          }
+      }
+      nil
+    }
+  end
 
   def handle_new_page_view(context, snapshot=nil)
     new_page_id = @idgen.next.to_s
     new_page = create_page(snapshot || self.snapshot())
     @page_store[new_page_id] = new_page
     @snapshot_page_id = new_page_id 
-    redirect_url = context.request.build_url(context.request.request_handler_id, new_page_id)
+    redirect_url = context.request.build_url(:page_id => new_page_id)
     set_response(context, Wee::RedirectResponse.new(redirect_url))
   end
 
-  def set_response(context, response)
-    context.response = response
-  end
-
   def respond(context, callbacks)
+    pre_respond_hook
     set_response(context, Wee::GenericResponse.new('text/html', ''))
 
     rctx = Wee::RenderingContext.new(context.request, context.response, callbacks, Wee::HtmlWriter.new(context.response.content))
     @root_component.do_render_chain(rctx)
   end
 
+  def pre_respond_hook
+  end
+
+  def post_callbacks_hook
+  end
+
+  # Take a snapshot of the root component and return it.
+
+  def snapshot
+    @root_component.backtrack_state_chain(snap = Wee::Snapshot.new)
+    return snap.freeze
+  end
+
+  # Return a new Wee::Page object with the given snapshot assigned.
+
+  def create_page(snapshot)
+    idgen = Wee::SimpleIdGenerator.new
+    page = Wee::Page.new(snapshot, Wee::CallbackRegistry.new(idgen))
+  end
+
 end

data/test/test_request.rb

@@ -5,10 +5,38 @@ require 'wee/request'
 class Test_Request < Test::Unit::TestCase
   def test_parse
     d = Wee::Request::DELIM
-    req = Wee::Request.new('/app', "/app/...#{d}req_handler_id/page_id", nil, nil, nil)
+    req = Wee::Request.new('/app', "/app/info#{d}req_handler_id/page_id", nil, nil, nil)
+    assert_equal 'info', req.info
     assert_equal 'req_handler_id', req.request_handler_id
     assert_equal 'page_id', req.page_id
-    assert_equal "/app/#{d}a/b?c", req.build_url('a', 'b', 'c')
-    assert_equal "/app/#{d}req_handler_id/b", req.build_url('req_handler_id', 'b')
+  end
+
+  def test_fields
+    fields = {
+      'a' => 1, 
+      'b' => 2,
+      'a.x' => 3,
+      'a.y' => 4,
+    }
+
+    parsed = { 
+      'a' => {nil => 1, 'x' => 3, 'y' => 4},
+      'b' => 2
+    }
+
+    req = Wee::Request.new('/app', "/app", nil, fields, nil)
+    assert_equal parsed, req.fields
+  end
+
+  def test_build_url
+    d = Wee::Request::DELIM
+    req = Wee::Request.new('/app', "/app/info#{d}req_handler_id/page_id", nil, nil, nil)
+
+    assert_equal "/app/info#{d}req_handler_id/page_id?c", req.build_url(:callback_id => 'c')
+
+    assert_equal "/app/info#{d}a/b?c", req.build_url(:request_handler_id => 'a', :page_id => 'b', :callback_id => 'c')
+    assert_equal "/app/info#{d}req_handler_id/b", req.build_url(:request_handler_id => 'req_handler_id', :page_id => 'b')
+
+    assert_equal "/app/info", req.build_url(:request_handler_id => nil, :page_id => nil)
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: wee
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2005-02-01
+  version: 0.8.0
+date: 2005-04-04
 summary: Wee is a framework for building highly dynamic web applications.
 require_paths: 
   - lib
@@ -33,8 +33,8 @@ files:
   - bin
   - benchmark
   - examples
-  - wee.gemspec
   - Rakefile
+  - wee.gemspec
   - TODO
   - INSTALL
   - ChangeLog
@@ -44,8 +44,8 @@ files:
   - test/components
   - test/stressed_application.rb
   - test/test_html_canvas.rb
-  - test/test_html_writer.rb
   - test/stress_and_measure.rb
+  - test/test_html_writer.rb
   - test/test_component.rb
   - test/stress.rb
   - test/test_request.rb
@@ -80,8 +80,8 @@ files:
   - doc/rdoc/files/lib/wee/pageless
   - doc/rdoc/files/lib/wee/renderer
   - doc/rdoc/files/lib/wee/continuation
-  - doc/rdoc/files/lib/wee/adaptors
   - doc/rdoc/files/lib/wee/rendering
+  - doc/rdoc/files/lib/wee/adaptors
   - doc/rdoc/files/lib/wee/skeleton
   - doc/rdoc/files/lib/wee/idgen
   - doc/rdoc/files/lib/wee/databases
@@ -121,32 +121,32 @@ files:
   - doc/rdoc/files/lib/wee/core/callback_rb.html
   - doc/rdoc/files/lib/wee/core/snapshot_rb.html
   - doc/rdoc/files/lib/wee/core/component_rb.html
-  - doc/rdoc/files/lib/wee/core/presenter_rb.html
   - doc/rdoc/files/lib/wee/core/decoration_rb.html
+  - doc/rdoc/files/lib/wee/core/presenter_rb.html
   - doc/rdoc/files/lib/wee/pageless/application_rb.html
   - doc/rdoc/files/lib/wee/pageless/session_rb.html
   - doc/rdoc/files/lib/wee/pageless/request_rb.html
   - doc/rdoc/files/lib/wee/renderer/html
-  - doc/rdoc/files/lib/wee/renderer/html/canvas_rb.html
   - doc/rdoc/files/lib/wee/renderer/html/brushes_rb.html
+  - doc/rdoc/files/lib/wee/renderer/html/canvas_rb.html
   - doc/rdoc/files/lib/wee/renderer/html/writer_rb.html
   - doc/rdoc/files/lib/wee/continuation/core
   - doc/rdoc/files/lib/wee/continuation/session_rb.html
   - doc/rdoc/files/lib/wee/continuation/core/component_rb.html
-  - doc/rdoc/files/lib/wee/adaptors/webrick_rb.html
   - doc/rdoc/files/lib/wee/rendering/html
   - doc/rdoc/files/lib/wee/rendering/html/brushes_rb.html
   - doc/rdoc/files/lib/wee/rendering/html/canvas_rb.html
   - doc/rdoc/files/lib/wee/rendering/html/writer_rb.html
+  - doc/rdoc/files/lib/wee/adaptors/webrick_rb.html
   - doc/rdoc/files/lib/wee/skeleton/og
   - doc/rdoc/files/lib/wee/skeleton/simple
   - doc/rdoc/files/lib/wee/skeleton/og/models
-  - doc/rdoc/files/lib/wee/skeleton/og/conf
   - doc/rdoc/files/lib/wee/skeleton/og/components
+  - doc/rdoc/files/lib/wee/skeleton/og/conf
   - doc/rdoc/files/lib/wee/skeleton/og/run_rb.html
   - doc/rdoc/files/lib/wee/skeleton/og/models/recipe_rb.html
-  - doc/rdoc/files/lib/wee/skeleton/og/conf/db_rb.html
   - doc/rdoc/files/lib/wee/skeleton/og/components/main_rb.html
+  - doc/rdoc/files/lib/wee/skeleton/og/conf/db_rb.html
   - doc/rdoc/files/lib/wee/skeleton/simple/components
   - doc/rdoc/files/lib/wee/skeleton/simple/run_rb.html
   - doc/rdoc/files/lib/wee/skeleton/simple/components/main_rb.html
@@ -191,22 +191,22 @@ files:
   - doc/rdoc/classes/Wee/PageDecoration.html
   - doc/rdoc/classes/Wee/RequestHandler.html
   - doc/rdoc/classes/Wee/Decoration.html
-  - doc/rdoc/classes/Wee/WEBrickAdaptor.html
+  - doc/rdoc/classes/Wee/AnswerDecoration.html
   - doc/rdoc/classes/Wee/MessageBox.html
   - doc/rdoc/classes/Wee/Response.html
   - doc/rdoc/classes/Wee/Snapshot.html
-  - doc/rdoc/classes/Wee/CallbackStream.html
   - doc/rdoc/classes/Wee/HtmlWriter.html
-  - doc/rdoc/classes/Wee/PagelessApplication.html
-  - doc/rdoc/classes/Wee/AnswerDecoration.html
+  - doc/rdoc/classes/Wee/WEBrickAdaptor.html
+  - doc/rdoc/classes/Wee/PagelessRequest.html
+  - doc/rdoc/classes/Wee/CallbackStream.html
   - doc/rdoc/classes/Wee/StateRegistry.html
   - doc/rdoc/classes/Wee/Delegate.html
   - doc/rdoc/classes/Wee/ValueHolder.html
-  - doc/rdoc/classes/Wee/FormDecoration.html
   - doc/rdoc/classes/Wee/Canvas.html
-  - doc/rdoc/classes/Wee/PagelessRequest.html
-  - doc/rdoc/classes/Wee/StateHolder.html
+  - doc/rdoc/classes/Wee/FormDecoration.html
   - doc/rdoc/classes/Wee/RedirectResponse.html
+  - doc/rdoc/classes/Wee/StateHolder.html
+  - doc/rdoc/classes/Wee/PagelessApplication.html
   - doc/rdoc/classes/Wee/RenderingContext.html
   - doc/rdoc/classes/Wee/Brush.html
   - doc/rdoc/classes/Wee/Context.html
@@ -221,8 +221,8 @@ files:
   - doc/rdoc/classes/Wee/Utils.html
   - doc/rdoc/classes/Wee/Component.html
   - doc/rdoc/classes/Wee/Application.html
-  - doc/rdoc/classes/Wee/PagelessSession.html
   - doc/rdoc/classes/Wee/Presenter.html
+  - doc/rdoc/classes/Wee/PagelessSession.html
   - doc/rdoc/classes/Wee/ErrorResponse.html
   - doc/rdoc/classes/Wee/Md5IdGenerator.html
   - doc/rdoc/classes/Wee/Utils/LRUCache.html
@@ -298,6 +298,7 @@ files:
   - lib/wee/utils.rb
   - lib/wee/pageless.rb
   - lib/wee/template.rb
+  - lib/wee/abstractsession.rb
   - lib/wee/continuation.rb
   - lib/wee/page.rb
   - lib/wee/skeleton/og
@@ -322,14 +323,14 @@ files:
   - lib/wee/idgen/md5.rb
   - lib/wee/databases/og
   - lib/wee/databases/og.rb
+  - lib/wee/databases/og/old_scaffolder.rb
   - lib/wee/databases/og/application.rb
   - lib/wee/databases/og/session.rb
-  - lib/wee/databases/og/old_scaffolder.rb
   - lib/wee/databases/og/scaffolder.rb
   - lib/wee/core/component.rb
   - lib/wee/core/snapshot.rb
-  - lib/wee/core/presenter.rb
   - lib/wee/core/decoration.rb
+  - lib/wee/core/presenter.rb
   - lib/wee/core/valueholder.rb
   - lib/wee/core/callback.rb
   - lib/wee/utils/autoreload.rb
@@ -339,12 +340,13 @@ files:
   - lib/wee/pageless/session.rb
   - lib/wee/pageless/request.rb
   - lib/wee/renderer/html
-  - lib/wee/renderer/html/canvas.rb
   - lib/wee/renderer/html/brushes.rb
+  - lib/wee/renderer/html/canvas.rb
   - lib/wee/renderer/html/writer.rb
   - lib/wee/continuation/core
   - lib/wee/continuation/session.rb
   - lib/wee/continuation/core/component.rb
+  - lib/wee/adaptors/fastcgi.rb
   - lib/wee/adaptors/webrick.rb
   - lib/cache/cache.rb
   - bin/wee
@@ -358,19 +360,22 @@ files:
   - benchmark/Centrino1300/result.2000.counter.render
   - benchmark/Centrino1300/result.2000.filehandler
   - benchmark/Centrino600/result.2000.counter.action
-  - benchmark/Centrino600/result.2000.filehandler
   - benchmark/Centrino600/result.2000.counter.render
+  - benchmark/Centrino600/result.2000.filehandler
+  - examples/ajax
   - examples/og-test.rb
   - examples/draw.rb
   - examples/hw.rb
   - examples/test.rb
   - examples/live-update.rb
-  - examples/cc.rb
   - examples/window.rb
+  - examples/cc.rb
   - examples/ObjectSpaceBrowser.rb
-  - examples/calendar.rb
   - examples/calculator.rb
+  - examples/calendar.rb
   - examples/example.rb
+  - examples/ajax/ajax.rb
+  - examples/ajax/ajax.js
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []