wee 0.7.0 → 0.8.0

data/lib/wee/core/decoration.rb

@@ -44,8 +44,8 @@ class Wee::Decoration < Wee::Presenter
 
   # Forwards method call to the next decoration in the chain.
 
-  def process_callbacks(callback_stream)
-    @owner.process_callbacks(callback_stream)
+  def process_callbacks(&block)
+    @owner.process_callbacks(&block)
   end
 
   # Forwards method call to the next decoration in the chain.
@@ -93,8 +93,8 @@ class Wee::Delegate < Wee::Decoration
   # Forwards method to the corresponding top-level *chain* method of the
   # _delegate_ component.
 
-  def process_callbacks(callback_stream)
-    @delegate.process_callbacks_chain(callback_stream)
+  def process_callbacks(&block)
+    @delegate.process_callbacks_chain(&block)
   end
 
   # Forwards method to the corresponding top-level *chain* method of the
@@ -128,7 +128,7 @@ class Wee::AnswerDecoration < Wee::Decoration
 
   attr_accessor :on_answer
 
-  def process_callbacks(callback_stream)
+  def process_callbacks(&block)
     args = catch(:wee_answer) { super; nil }
     if args != nil
       # return to the calling component 

data/lib/wee/core/presenter.rb

@@ -75,30 +75,12 @@ class Wee::Presenter
 
   # Process all callbacks specified for this presenter. 
   #
-  # At first, this method invokes all input callbacks of this presenter, then
-  # it calls the block if one was given (used by subclasses). Finally, the
-  # action callback is invoked (there's only one per request).
-  #
-  # NOTE: Input callbacks should never call other components!
-  #
-  # [+callback_stream+]
-  #    An object of class CallbackStream
-
-  def process_callbacks(callback_stream) # :yields:
-    # invoke input callbacks
-    callback_stream.with_callbacks_for(self, :input) { |callback, value|
-      callback.call(value)
-    }
-
-    # enable subclasses to add behaviour, e.g. a Component class will invoke
-    # process_callbacks_chain for each child in the block.
-    yield if block_given?
-
-    # invoke action callback. only the first action callback is invoked.
-    callback_stream.with_callbacks_for(self, :action) { |callback, value|
-      callback.call
-      throw :wee_back_to_session
-    }
+  # [+block+]
+  #    Specifies the action to be taken (e.g. whether to invoke input or action
+  #    callbacks).
+
+  def process_callbacks(&block)
+    block.call(self)
   end
 
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -129,17 +111,51 @@ class Wee::Presenter
     Wee::Session.current
   end
 
+  # Send a premature response. 
+
+  protected
+
+  def send_response(response)
+    throw :wee_send_response, response
+  end
+
+  # Call the block inside a rendering environment, then send the response prematurely.
+
+  def send_render_response(&block)
+    # Generate a response
+    response = Wee::GenericResponse.new('text/html', '')
+
+    # Get the current context we are in
+    context = session.current_context
+
+    # A rendering context is needed to use 'r' (if you want, you can simply
+    # omit this and just return the response with some html/xml filled in.
+    rendering_context = Wee::RenderingContext.new(
+      context.request, 
+      context.response, 
+      session.current_callbacks, 
+      Wee::HtmlWriter.new(response.content))
+
+    with_renderer_for(rendering_context, &block)
+
+    send_response(response)
+  end
+
+
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   # :section: Properties
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-  attr_accessor :properties
+  public
+
+  def properties() @__properties end
+  def properties=(props) @__properties = props end
 
   # Returns an "owned" property.
 
   def get_property(prop)
-    if @properties
-      @properties[prop]
+    if self.properties
+      self.properties[prop]
     else
       nil
     end

data/lib/wee/core/valueholder.rb

@@ -1,6 +1,6 @@
 # Implements a value holder. Useful for backtracking the reference assigned to
 # an instance variable (not the object itself!). An example where this is used
-# is the <tt>@decoration</tt> attribute of class Wee::Component.
+# is the <tt>@__decoration</tt> attribute of class Wee::Component.
 
 class Wee::ValueHolder 
   attr_accessor :value

data/lib/wee/databases/og/scaffolder.rb

@@ -5,7 +5,6 @@ class OgScaffolder < Wee::Component
   def initialize(domain_class)
     super()
     @domain_class = domain_class
-    # DON'T use @properties here as it is already used by Wee
     @props = @domain_class.__props.reject {|a| a.name == 'oid'}
   end
 

data/lib/wee/pageless/application.rb

@@ -1,9 +1,13 @@
+require 'cgi'
+
 class Wee::PagelessApplication < Wee::Application
   def request_handler_expired(context)
-    context.response = Wee::RedirectResponse.new(context.request.application_path)
-    # TODO: depends on WEBrick
-    cookie = WEBrick::Cookie.new('SID', '')
-    cookie.max_age = 0
+    context.response = Wee::RedirectResponse.new(context.request.build_url(
+                                                 :request_handler_id => nil,
+                                                 :page_id => nil))
+    
+    cookie = CGI::Cookie.new('SID', '')
+    cookie.expires = Time.at(0)
     context.response.cookies << cookie
   end
 end

data/lib/wee/pageless/request.rb

@@ -1,15 +1,27 @@
 class Wee::PagelessRequest < Wee::Request
+  private
 
-  def build_url(request_handler_id=nil, page_id=nil, callback_id=nil)
-    url = "" 
-    url << @app_path
-    url << ('?' + callback_id) if callback_id
-    return url
+  def pageless?
+    true
+  end
+
+  def make_request_path(request_handler_id, page_id)
+    ""
   end
 
   def parse_path
     if sid = @cookies.find {|c| c.name == 'SID'}
       @request_handler_id = sid.value
     end
+
+    full_app_path = @path
+
+    if full_app_path == @app_path
+      @info = nil
+    elsif full_app_path[0, @app_path.size] == @app_path and full_app_path[@app_path.size] == ?/
+      @info = full_app_path[@app_path.size+1..-1] 
+    else
+      raise "dispatched to wrong handler" 
+    end
   end
 end

data/lib/wee/pageless/session.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'cgi'
 
 # A session class, which does not have a page-store and as such cannot
 # backtrack.
@@ -10,77 +11,62 @@ class Wee::PagelessSession < Wee::Session
   attr_accessor :callbacks
   alias current_callbacks callbacks
 
-  def initialize(&block)
-    Thread.current[:wee_session] = self
-
-    # to serialize the requests we need a mutex
-    @mutex = Mutex.new    
-
-    block.call(self)
-
-    raise ArgumentError, "No root component specified" if @root_component.nil?
-    
-    super()
-  ensure
-    Thread.current[:wee_session] = nil
+  def setup(&block)
+    with_session do
+      block.call(self) if block
+      raise ArgumentError, "No root component specified" if @root_component.nil?
+    end
   end
 
-  def process_request
-      p @context.request.fields if $DEBUG
-
-      if @context.request.fields.empty?
-
-        # 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
+  # The main routine where the request is processed.
 
-        new_callbacks = Wee::CallbackRegistry.new(Wee::SimpleIdGenerator.new)
-        respond(@context, new_callbacks)                    # render
-        self.callbacks = new_callbacks
-
-      else
+  def process_request
+    handle_existing_page
+  end
 
-        # Actions/inputs were specified.
-        #
-        # We process the request and invoke actions/inputs. Then we generate a
-        # new page view. 
+  def handle_existing_page
+    p @context.request.fields if $DEBUG
 
-        callback_stream = Wee::CallbackStream.new(self.callbacks, @context.request.fields) 
+    if @context.request.render?
+      handle_render_phase
+    else
+      handle_callback_phase
+    end
+  end
 
-        if callback_stream.all_of_type(:action).size > 1 
-          raise "Not allowed to specify more than one action callback"
-        end
+  def handle_render_phase
+    new_callbacks = Wee::CallbackRegistry.new(Wee::SimpleIdGenerator.new)
+    respond(@context, new_callbacks)   # render
+    self.callbacks = new_callbacks
+  end
 
-        live_update_response = catch(:wee_live_update) {
-          catch(:wee_back_to_session) {
-            @root_component.process_callbacks_chain(callback_stream)
-          }
-          nil
-        }
+  def handle_callback_phase
+    # Actions/inputs were specified.
+    #
+    # We process the request and invoke actions/inputs. Then we generate a
+    # new page view. 
 
-        if live_update_response
-          @context.response = live_update_response
-        else
-          handle_new_page_view(@context)
-        end
+    callback_stream = Wee::CallbackStream.new(self.callbacks, @context.request.fields) 
+    send_response = invoke_callbacks(callback_stream)
 
-      end
+    post_callbacks_hook()
 
+    if send_response
+      set_response(@context, send_response)    # @context.response = send_response
+    else
+      handle_new_page_view(@context)
+    end
   end
 
   private
 
   def handle_new_page_view(context)
-    redirect_url = context.request.build_url(context.request.request_handler_id, nil)
+    redirect_url = context.request.build_url
     set_response(context, Wee::RedirectResponse.new(redirect_url))
   end
 
   def set_response(context, response)
-    # TODO: depends on WEBrick!
-    response.cookies << WEBrick::Cookie.new('SID', self.id)
+    response.cookies << CGI::Cookie.new('SID', self.id)
     response.header.delete('Expire')
     response.header['Pragma'] = 'No-Cache'
     super

data/lib/wee/renderer/html/brushes.rb

@@ -151,6 +151,12 @@ class Brush::GenericTagBrush < Brush
     onclick("javascript: document.location.href='#{ url }';")          
   end
 
+  def onclick_update(update_id, symbol=nil, *args, &block)
+    raise ArgumentError if symbol and block
+    url = @canvas.url_for_callback(to_callback(symbol, args, block))
+    onclick("javascript: new Ajax.Updater('#{ update_id }', '#{ url }', {method:'get'});")
+  end
+
   # This method construct the css-class attribute by looking up the property
   # from the current component.
 
@@ -455,7 +461,7 @@ class Brush::FormTag < Brush::GenericTagBrush
     unless @attributes.has_key?('action')
       req = @canvas.rendering_context.request
       # TODO?
-      @attributes['action'] = req.build_url(req.request_handler_id, req.page_id) 
+      @attributes['action'] = req.build_url
     end
     super
   end

data/lib/wee/renderer/html/canvas.rb

@@ -76,7 +76,7 @@ class HtmlCanvas < Canvas
 
   def url_for_callback_id(callback_id)
     req = self.rendering_context.request
-    url = req.build_url(req.request_handler_id, req.page_id, callback_id)
+    url = req.build_url(:callback_id => callback_id)
     return url
   end
 

data/lib/wee/request.rb

@@ -6,12 +6,16 @@
 
 class Wee::Request
 
-  DELIM = '=/'
+  DELIM = '/___/'
 
   attr_accessor :request_handler_id
   attr_reader :page_id, :fields, :cookies
 
+  # The part of the URL that is user-defineable
+  attr_accessor :info
+
   def initialize(app_path, path, headers, fields, cookies)
+    raise ArgumentError if app_path[-1] == ?/
     @app_path, @path, @headers, @cookies = app_path, path, headers, cookies
     parse_fields(fields)
     parse_path
@@ -21,17 +25,51 @@ class Wee::Request
     @app_path
   end
 
-  def build_url(request_handler_id=nil, page_id=nil, callback_id=nil)
+  # Is this an action request?
+  def action?
+    not render?
+  end
+
+  # Is this a render request?
+  def render?
+    self.fields.empty?
+  end
+
+  def build_url(hash={})
+    default = {
+      :request_handler_id => self.request_handler_id,
+      :page_id => self.page_id,
+      :info => self.info
+    }
+    hash = default.update(hash)
+
+    request_handler_id = hash[:request_handler_id]
+    page_id = hash[:page_id]
+    callback_id = hash[:callback_id]
+    info = hash[:info]
+
     raise ArgumentError if request_handler_id.nil? and not page_id.nil?
+    if not pageless?
+      raise ArgumentError if page_id.nil? and not callback_id.nil?
+    end
 
-    arr = [request_handler_id, page_id].compact
+    # build request path, e.g. /___/req-id/page-id
+    req_path = make_request_path(request_handler_id, page_id)
 
-    url = "" 
+    # build the whole url
+    url = ""
     url << @app_path
-    unless arr.empty?
-      url << '/' if url[-1,1] != '/'  # /appXXX -> /app/XXX
-      url << (DELIM + arr.join('/'))
+
+    raise if url[-1] == ?/  # sanity check
+
+    if info
+      url << '/'
+      url << info
     end
+    url << req_path 
+
+    url << '/' if info.nil? and req_path.empty? 
+
     url << ('?' + callback_id) if callback_id
 
     return url
@@ -39,6 +77,20 @@ class Wee::Request
 
   private
 
+  def pageless?
+    false
+  end
+
+  def make_request_path(request_handler_id, page_id)
+    arr = [request_handler_id, page_id].compact
+    req_path = 
+    if arr.empty?
+      ""
+    else
+      DELIM + arr.join('/')
+    end
+  end
+
   def parse_fields(fields)
     fields ||= Hash.new
     @fields = Hash.new
@@ -62,6 +114,15 @@ class Wee::Request
 
   def parse_path
     full_app_path, req_path = @path.split(DELIM, 2)
+
+    if full_app_path == @app_path
+      @info = nil
+    elsif full_app_path[0, @app_path.size] == @app_path and full_app_path[@app_path.size] == ?/
+      @info = full_app_path[@app_path.size+1..-1] 
+    else
+      raise "dispatched to wrong handler" 
+    end
+
     @request_handler_id = @page_id = nil
     @request_handler_id, @page_id = req_path.split('/', 2) if req_path
   end