wee 0.5.0 → 0.6.0

data/examples/live-update.rb

@@ -30,7 +30,7 @@ class LiveUpdateTest < Wee::Component
     # 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_page.callbacks, 
+      context.response, session.current_callbacks, 
       Wee::HtmlWriter.new(response.content))
 
     with_renderer_for(rendering_context) do 

data/install.rb

@@ -0,0 +1,14 @@
+require 'rbconfig'
+require 'ftools'
+
+# Install lib
+dst_dir = Config::CONFIG['sitelibdir']
+Dir.chdir('lib') { 
+  Dir['**/*'].reject {|f| f =~ /\.svn($|\/)/ or not File.file?(f) }.each {|file|
+    File.mkpath File.join(dst_dir, File.dirname(file)), true
+    File.install file, File.join(dst_dir, file), 0644, true
+  }
+}
+
+# Install bin
+File.install 'bin/wee', File.join(Config::CONFIG['bindir'], 'wee'), 0755, true

data/lib/wee.rb

@@ -1,5 +1,6 @@
 module Wee
-  Version = "0.5.0"
+  Version = "0.6.0"
+  LibPath = File.dirname(__FILE__)
 end
 
 require 'wee/core'
@@ -14,9 +15,12 @@ require 'wee/session'
 require 'wee/components'
 require 'wee/snapshot_ext'
 
+require 'wee/template'
+
 require 'wee/renderer/html/writer'
 require 'wee/renderer/html/brushes'
 require 'wee/renderer/html/canvas'
 Wee::DefaultRenderer = Wee::HtmlCanvas
 
-require 'wee/idgen'
+require 'wee/idgen/simple'
+require 'wee/idgen/md5'

data/lib/wee/adaptors/webrick.rb

@@ -13,6 +13,7 @@ require 'webrick'
 #
 #   require 'wee/adaptors/webrick'
 #   Wee::WEBrickAdaptor.
+#     request_class(Wee::Request).      # this is the default!
 #     register('/app' => application).
 #     register('/cnt' => application2).
 #     mount('/', WEBrick::HTTPServlet::FileHandler, '.').
@@ -28,8 +29,8 @@ class Wee::WEBrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
     server = WEBrick::HTTPServer.new({:Port => 2000}.update(options))
     trap("INT") { server.shutdown }
 
-    (@apps||[]).each do |path, app|
-      server.mount(path, self, path, app)
+    (@apps||[]).each do |path, app, request_class|
+      server.mount(path, self, path, app, request_class)
     end
 
     (@mounts||[]).each do |args, block|
@@ -42,11 +43,18 @@ class Wee::WEBrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
     server
   end
 
+  # Sets the used request_class for all following calls to #register
+
+  def self.request_class(request_class)
+    @request_class = request_class
+    self
+  end
+
   # Convenience method
   def self.register(hash)
     @apps ||= []
     hash.each do |path, application|
-      @apps << [path, application]
+      @apps << [path, application, @request_class]
     end
     self
   end
@@ -58,18 +66,22 @@ class Wee::WEBrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
     self
   end
 
-  def initialize(server, mount_path, application)
+  def initialize(server, mount_path, application, request_class=Wee::Request)
     super(server)
     @mount_path = mount_path
     @application = application
+    @request_class = request_class || Wee::Request
   end
 
   def handle_request(req, res)
-    context = Wee::Context.new(Wee::Request.new(@mount_path, req.path, req.header, req.query))
+    context = Wee::Context.new(@request_class.new(@mount_path, req.path, req.header, req.query, req.cookies))
     @application.handle_request(context)
     res.status = context.response.status
     res.body = context.response.content
     context.response.header.each { |k,v| res.header[k] = v }
+    if context.response.cookies?
+      context.response.cookies.each {|c| res.cookies << c } 
+    end
   end
 
   alias do_GET handle_request

data/lib/wee/application.rb

@@ -76,7 +76,8 @@ class Wee::Application
         @request_handlers[request_handler_id] = request_handler
       }
 
-      context.response = Wee::RedirectResponse.new(context.request.build_url(request_handler_id))
+      context.request.request_handler_id = request_handler_id 
+      handle_request(context)
       return
 
     elsif request_handler.nil?

data/lib/wee/continuation/session.rb

@@ -1,16 +1,6 @@
-require 'wee/page'
-require 'thread'
 require 'timeout'
 
-class Wee::Session < Wee::RequestHandler
-  attr_accessor :root_component, :page_store
-
-  def self.current
-    sess = Thread.current[:wee_session]
-    raise "not in session" if sess.nil?
-    return sess
-  end
-
+class Wee::Session
   def initialize(&block)
     Thread.current[:wee_session] = self
 
@@ -30,11 +20,6 @@ class Wee::Session < Wee::RequestHandler
     Thread.current[:wee_session] = nil
   end
 
-  def snapshot
-    @root_component.backtrack_state_chain(snap = Wee::Snapshot.new)
-    return snap.freeze
-  end
-
   # called by application to send the session a request
   def handle_request(context)
     super
@@ -84,134 +69,4 @@ class Wee::Session < Wee::RequestHandler
     }
   end
 
-  def create_page(snapshot)
-    idgen = Wee::SimpleIdGenerator.new
-    page = Wee::Page.new(snapshot, Wee::CallbackRegistry.new(idgen))
-  end
-
-  # Is called before process_request is invoked
-  # Can be used to setup e.g. a database connection.
-  def awake
-  end
-
-  # Is called after process_request is run
-  # Can be used to release e.g. a database connection.
-  def sleep
-  end
-
-  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)
-
-    elsif @page = @page_store.fetch(@context.request.page_id, false)
-
-      # A valid page_id was specified and the corresponding page exists.
-
-      @page.snapshot.restore
-
-      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
-
-        @page = create_page(@page.snapshot)  # remove all action/input handlers
-        respond(@context, @page.callbacks)                    # render
-        @page_store[@context.request.page_id] = @page         # store
-
-      else
-
-        # Actions/inputs were specified.
-        #
-        # We process the request and invoke actions/inputs. Then we generate a
-        # new page view. 
-
-        callback_stream = Wee::CallbackStream.new(@page.callbacks, @context.request.fields) 
-
-        if callback_stream.all_of_type(:action).size > 1 
-          raise "Not allowed to specify more than one action callback"
-        end
-
-        live_update_response = catch(:wee_live_update) {
-          catch(:wee_back_to_session) {
-            @root_component.process_callbacks_chain(callback_stream)
-          }
-          nil
-        }
-
-        if live_update_response
-          # replace existing page with new snapshot
-          @page.snapshot = self.snapshot
-          @page_store[@context.request.page_id] = @page
-          @context.response = live_update_response
-        else
-          handle_new_page_view(@context)
-        end
-
-      end
-
-    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"
-
-    end
-  end
-
-  def current_context
-    @context
-  end
-
-  def current_page
-    @page
-  end
-
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # :section: Properties
-  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-  attr_accessor :properties
-
-  # Returns an "owned" property for the given +klass+.
-
-  def get_property(prop, klass)
-    if @properties
-      @properties.fetch(klass, {})[prop]
-    else
-      nil
-    end
-  end
-
-  private
-
-  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
-    redirect_url = context.request.build_url(context.request.request_handler_id, new_page_id)
-    context.response = Wee::RedirectResponse.new(redirect_url)
-  end
-
-  def respond(context, callbacks)
-    context.response = 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
-
 end

data/lib/wee/core/callback.rb

@@ -17,9 +17,15 @@ class Wee::CallbackRegistry
   # Register +callback+ for +object+ under +type+ and return a unique callback id. 
 
   def register_for(object, type, callback)
+    register_named_for(object, type, callback, @idgen.next)
+  end
+
+  # Register +callback+ for +object+ under +type+ with the id +named_id+.
+
+  def register_named_for(object, type, callback, named_id)
+    cid = named_id.to_s
     c = (@callbacks[type] ||= Hash.new)
     o = (@obj_to_id_map[type] ||= Hash.new) 
-    cid = @idgen.next.to_s
     raise "duplicate callback id" if c.has_key?(cid)
     c[cid] = callback
     (o[object] ||= []) << cid  
@@ -98,14 +104,14 @@ end
 
 # A serializable callback. 
 class Wee::LiteralMethodCallback
-  def initialize(obj, method_id=:call, *additional_args)
+  def initialize(obj, method_id=:call, *args)
     @obj, @method_id = obj, method_id
-    @additional_args = additional_args unless additional_args.empty?
+    @args = args unless args.empty?
   end
 
   def call(*args)
-    if @additional_args
-      @obj.send(@method_id, *(args+@additional_args))
+    if @args
+      @obj.send(@method_id, *(@args+args))
     else
       @obj.send(@method_id, *args)
     end

data/lib/wee/core/component.rb

@@ -152,6 +152,8 @@ class Wee::Component < Wee::Presenter
   # A global decoration is added in front of the decoration chain, a local
   # decoration is added in front of all other local decorations but after all
   # global decorations.
+  #
+  # Returns: +self+
 
   def add_decoration(d)
     if d.global?
@@ -176,6 +178,8 @@ class Wee::Component < Wee::Presenter
         last_global.owner = d 
       end
     end
+
+    return self
   end
 
   # Remove decoration +d+ from the decoration chain. 
@@ -288,13 +292,12 @@ class Wee::Component < Wee::Presenter
   #   Either a symbol or any object that responds to #call. If it's a symbol,
   #   then the corresponding method of the current component will be called.
   #
-  # [+additional_args+]
-  #   Additional arguments that are passed (after the arguments given in
-  #   #answer) to the +return_callback+
+  # [+args+]
+  #   Arguments that are passed to the +return_callback+ before the 'onanswer'
+  #   arguments.
   #
   # <b>How it works</b>
   # 
-  
   # The component to be called is wrapped with an AnswerDecoration and the
   # +return_callback+ parameter is assigned to it's +on_answer+ attribute (not
   # directly as there are cleanup actions to be taken before the
@@ -313,26 +316,27 @@ class Wee::Component < Wee::Presenter
   # AnswerDecoration. The AnswerDecoration then invokes the +on_answer+
   # callback which cleans up the decorations we added during #call, and finally
   # passes control to the +return_callback+. 
+  #
 
-  def call(component, return_callback=nil, *additional_args)
+  def call(component, return_callback=nil, *args)
     add_decoration(delegate = Wee::Delegate.new(component))
     component.add_decoration(answer = Wee::AnswerDecoration.new)
     answer.on_answer = OnAnswer.new(self, component, delegate, answer, 
-                                    return_callback, additional_args)
+                                    return_callback, args)
     throw :wee_back_to_session
   end
 
   class OnAnswer < Struct.new(:calling_component, :called_component, :delegate, 
-                              :answer, :return_callback, :additional_args)
+                              :answer, :return_callback, :args)
 
-    def call(*args)
+    def call(*answer_args)
       calling_component.remove_decoration(delegate)
       called_component.remove_decoration(answer)
       return if return_callback.nil?
       if return_callback.respond_to?(:call)
-        return_callback.call(*(args + additional_args))
+        return_callback.call(*(args + answer_args))
       else
-        calling_component.send(return_callback, *(args + additional_args))
+        calling_component.send(return_callback, *(args + answer_args))
       end
     end
   end

data/lib/wee/databases/og.rb

@@ -1,114 +1,4 @@
 require 'og'
-
-class OgApplication < Wee::Application
-  attr_accessor :db
-end
-
-class OgSession < Wee::Session
-  def awake
-    application.db.get_connection
-  end
-
-  def sleep
-    application.db.put_connection
-  end
-end
-
-class OgScaffolder < Wee::Component
-  def initialize(domain_class)
-    super()
-    @domain_class = domain_class
-    @attributes = domain_class.__props.map {|a| a.name}.reject {|a| a == 'oid'}
-  end
-
-  def delete(obj)
-    call Wee::MessageBox.new('Really delete?'), :confirm_delete, obj
-  end
-
-  def confirm_delete(confirmed, obj)
-    if confirmed
-      @objs.delete(obj)
-      obj.delete!
-    end
-  end
-
-  def edit(obj)
-    @edit = obj
-  end
-
-  def save(obj)
-    obj.save!
-    @edit = nil
-  end
- 
-  def cancel
-    @objs.delete(@edit) if @edit and @edit.oid.nil?
-    @edit = nil
-  end
-
-  def refresh
-    @objs = @domain_class.all || []
-  end
-
-  def create
-    @objs << (@edit = @domain_class.new)
-  end
-
-  def render
-    refresh if @objs.nil?
-
-    r.h1 "#{ @domain_class } List"
-    r.anchor.callback { refresh }.with("Refresh")
-
-    r.form do
-      r.table.border(1).with {
-
-        r.table_row.with {
-          @attributes.each {|a|
-            r.table_header.with {
-              r.bold(a.capitalize)
-            }
-          }
-          r.table_header.with(" ")
-        }
-
-        @objs.each {|o| 
-          r.table_row.with do 
-            if @edit == o
-
-              @attributes.each { |attr|
-                r.table_data.with { r.text_input.callback {|v| o.send(attr+"=",v) }.value(o.send(attr)) }
-              } 
-
-              r.table_data.with {
-                r.submit_button.callback { save(o) }.value("Save")
-                r.space
-                r.submit_button.callback { cancel() }.value("Cancel")
-                r.space
-                r.anchor.callback { delete(o) }.with("Delete")
-              }
-
-            else
-
-              @attributes.each { |attr|
-                r.table_data(o.send(attr))
-              } 
-
-              r.table_data.with {
-                r.anchor.callback { edit(o) }.with("Edit")
-                r.space
-                r.anchor.callback { delete(o) }.with("Delete")
-              }
-
-            end
-          end 
-        }
-      }
-    end
-
-    r.anchor.callback { create() }.with("Add new #{ @domain_class }")
-
-  end
-
-end
-
+require 'wee/databases/og/application'
+require 'wee/databases/og/session'
+require 'wee/databases/og/scaffolder'