wee 0.7.0 → 0.8.0

data/examples/ajax/ajax.rb

@@ -0,0 +1,31 @@
+require 'rubygems'
+require 'wee'
+require 'wee/adaptors/webrick' 
+require 'wee/utils'
+
+class AjaxTest < Wee::Component
+
+  def render
+    r.html {
+      r.head {
+        r.title("Ajax+Wee")
+        r.javascript.src('/js/ajax.js')
+      }
+      r.body {
+        r.h1 "Hello World from Wee!"
+        r.anchor.id('tag').onclick_update('tag', :update).with('Halllllllooooo')
+      }
+    }
+  end
+
+  def update
+    send_render_response {
+      r.text "Live-updates works! This is no. #{ @live_updates += 1}" 
+    }
+  end
+end
+
+Wee::WEBrickAdaptor.
+  register('/app' => Wee::Utils.app_for(AjaxTest)).
+  mount('/js', WEBrick::HTTPServlet::FileHandler, '.').
+  start 

data/examples/calculator.rb

@@ -60,9 +60,7 @@ if __FILE__ == $0
   require 'wee/utils'
 
   app = Wee::Utils.app_for { 
-    comp = RpnCalculator.new
-    comp.add_decoration(Wee::PageDecoration.new('RPN Calculator'))
-    comp
+    RpnCalculator.new.add_decoration(Wee::PageDecoration.new('RPN Calculator'))
   }
 
   Wee::WEBrickAdaptor.register('/calc' => app).start 

data/examples/cc.rb

@@ -1,8 +1,6 @@
 $LOAD_PATH.unshift << "../lib"
 require 'wee'
-require 'wee/webrick'
-require 'wee/utils/cache'
-
+require 'wee/continuation'
 
 class MessageBox < Wee::Component
   def initialize(text)
@@ -14,9 +12,9 @@ class MessageBox < Wee::Component
     r.break
     r.text(@text)
     r.form do 
-      r.submit_button.value('OK').action(:answer, true)
+      r.submit_button.value('OK').callback(:answer, true)
       r.space
-      r.submit_button.value('Cancel').action(:answer, false)
+      r.submit_button.value('Cancel').callback(:answer, false)
     end
     r.break
   end
@@ -61,34 +59,16 @@ class MainPage < Wee::Component
     r.page.title("Draw Test").with do 
 
       r.break
-      r.anchor.action(:click).with('show')
-      r.render @msgbox
+      r.anchor.callback(:click).with('show')
     end 
   end
 
 end
 
-class MySession < Wee::Session
-  def initialize
-    super do
-      self.root_component = MainPage.new
-      self.page_store = Wee::Utils::LRUCache.new(10) # backtrack up to 10 pages
-    end
-  end
-end
-
-class MyApplication < Wee::Application
-  def shutdown
-  end
-end
-
 if __FILE__ == $0
-  File.open('pid', 'w+') {|f| f << $$}
-  MyApplication.new {|app|
-    app.name = 'Counter'
-    app.path = '/app'
-    app.session_class = MySession
-    app.session_store = Wee::Utils::LRUCache.new(100)
-    app.dumpfile = ''
-  }.start
+  require 'wee/adaptors/webrick' 
+  require 'wee/utils'
+
+  app = Wee::Utils.app_for(MainPage)
+  Wee::WEBrickAdaptor.register('/app' => app).start 
 end

data/examples/live-update.rb

@@ -38,7 +38,7 @@ class LiveUpdateTest < Wee::Component
       render_live_update
     end
 
-    throw :wee_live_update, response
+    send_response(response)
   end
 end
 

data/examples/test.rb

@@ -1,6 +1,5 @@
 $LOAD_PATH.unshift << "../lib"
 require 'wee'
-require 'wee/utils/cache'
 
 class Counter < Wee::Component
   def initialize(cnt)
@@ -53,11 +52,12 @@ class MySession < Wee::Session
 end
 
 if __FILE__ == $0
+  require 'wee/utils'
+  require 'wee/adaptors/webrick'
   app = Wee::Application.new {|app|
     app.default_request_handler { MySession.new }
     app.id_generator = Wee::SimpleIdGenerator.new(rand(1_000_000))
     app.max_request_handlers = 2
   }
-  require 'wee/adaptors/webrick'
   Wee::WEBrickAdaptor.register('/app' => app).start
 end

data/examples/window.rb

@@ -9,7 +9,7 @@ class Wee::Window < Wee::Component
     @pos = pos
   end
 
-  def process_callbacks(callback_stream)
+  def process_callbacks(&block)
     return if @status == :closed
     super
   end

data/lib/wee.rb

@@ -1,5 +1,5 @@
 module Wee
-  Version = "0.7.0"
+  Version = "0.8.0"
   LibPath = File.dirname(__FILE__)
 end
 

data/lib/wee/abstractsession.rb

@@ -0,0 +1,96 @@
+require 'thread'
+
+class Wee::AbstractSession < Wee::RequestHandler
+
+  def self.current
+    Thread.current[:wee_session] || (raise "Not in session")
+  end
+
+  def initialize
+    # to serialize the requests we need a mutex
+    @mutex = Mutex.new    
+
+    super()
+  end
+
+  # Returns the current context.
+
+  def current_context
+    @context
+  end
+
+  # Called by Wee::Application to send the session a request.
+
+  def handle_request(context)
+    with_session { 
+      @mutex.synchronize {
+        begin
+          @context = context
+          super
+          awake
+          process_request
+          sleep
+        ensure
+          @context = nil   # clean up
+        end
+      }
+    }
+  rescue Exception => exn
+    set_response(context, Wee::ErrorResponse.new(exn))
+  end
+
+  protected
+
+  def set_response(context, response)
+    context.response = response
+  end
+
+  protected
+
+  # Is called before process_request is invoked.
+  # Can be used to setup e.g. a database connection.
+  # 
+  # OVERWRITE IT (if you like)!
+
+  def awake
+  end
+
+  # Is called after process_request is run.
+  # Can be used to release e.g. a database connection.
+  # 
+  # OVERWRITE IT (if you like)!
+
+  def sleep
+  end
+
+  private
+
+  # The block is run inside a session.
+
+  def with_session
+    Thread.current[:wee_session] = self
+    yield
+  ensure
+    Thread.current[:wee_session] = nil
+  end
+
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # :section: Properties
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+  public
+
+  def properties() @__properties end
+  def properties=(props) @__properties = props end
+
+  # Returns an "owned" property for the given +klass+.
+
+  def get_property(prop, klass)
+    if self.properties
+      self.properties.fetch(klass, {})[prop]
+    else
+      nil
+    end
+  end
+
+end

data/lib/wee/adaptors/fastcgi.rb

@@ -0,0 +1,76 @@
+require 'fcgi'
+
+Socket.do_not_reverse_lookup = true
+
+# A FastCGI adaptor for Wee.
+# 
+# Depends on ruby-fcgi (http://raa.ruby-lang.org/list.rhtml?name=fcgi) or via
+# Rubygems (gem install fcgi).
+#
+# Example of usage:
+# 
+#   require 'wee/adaptors/fastcgi'
+#   Wee::FastCGIAdaptor.start('/app', application)
+#
+# == Setup FastCGI with Lighttpd
+#
+#   # lighttpd.conf
+#   server.modules = (
+#   "mod_fastcgi"
+#   )
+#   
+#   fastcgi.server = (
+#   "/app" =>
+#     ( "fcgi" =>
+#       (
+#         "host" => 127.0.0.1",
+#         "port" => 3000,
+#         "check-local" => "disable"
+#       )
+#     )
+#   )
+# 
+# Now start the Wee application (the file must be executable):
+# 
+#   spawn-fcgi -f ./run.rb -p 3000
+#
+# Finally start the lighttpd server:
+# 
+#   lighttpd -D -f lighttpd.conf
+#
+
+class Wee::FastCGIAdaptor
+  def self.start(mount_path, application, request_class=Wee::Request)
+    FCGI.each_cgi {|cgi|
+      query = Hash.new
+
+      # TODO: WEBrick like: return a string which has a to_list method!
+      cgi.params.each {|k, v|
+        raise if v.empty?
+        obj = v.first
+        obj.instance_variable_set("@__as_list", v)
+        def obj.as_list() @__as_list end
+
+        query[k] = obj
+      } 
+
+      # TODO
+      header = []
+
+      context = Wee::Context.new(request_class.new(mount_path, 
+        cgi.script_name, header, query, cgi.cookies))
+
+      application.handle_request(context)
+      
+      header = {}
+      header['status'] = context.response.status.to_s
+
+      context.response.header.each { |k,v| header[k] = v }
+      if context.response.cookies?
+        header['cookie'] = context.response.cookies
+      end
+
+      cgi.out(header) { context.response.content }
+    }
+  end
+end

data/lib/wee/adaptors/webrick.rb

@@ -1,10 +1,12 @@
 require 'webrick'
 
+Socket.do_not_reverse_lookup = true
+
 # Example of usage: 
 #
 #   require 'wee/adaptors/webrick'
 #   s = WEBrick::HTTPServer.new(:Port => 2000) 
-#   s.mount '/app', Wee::WEBrickAdaptor, application
+#   s.mount '/app', Wee::WEBrickAdaptor, '/app', application
 #
 #   trap("INT") { s.shutdown; exit }
 #   s.start
@@ -20,8 +22,6 @@ require 'webrick'
 #     start(:Port => 2000)
 #
 
-Socket.do_not_reverse_lookup = true
-
 class Wee::WEBrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
 
   # Convenience method

data/lib/wee/application.rb

@@ -107,13 +107,14 @@ class Wee::Application
   # :section: Properties
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-  attr_accessor :properties
+  def properties() @__properties end
+  def properties=(props) @__properties = props end
 
   # Returns an "owned" property for the given +klass+.
 
   def get_property(prop, klass)
-    if @properties
-      @properties.fetch(klass, {})[prop]
+    if self.properties
+      self.properties.fetch(klass, {})[prop]
     else
       nil
     end
@@ -136,7 +137,9 @@ class Wee::Application
   end
 
   def request_handler_expired(context)
-    context.response = Wee::RefreshResponse.new("Invalid or expired request handler!", context.request.application_path)
+    context.response = Wee::RefreshResponse.new("Invalid or expired request handler!",
+                       context.request.build_url(:request_handler_id => nil,
+                                                 :page_id => nil))
   end
 
 end

data/lib/wee/core/callback.rb

@@ -104,6 +104,8 @@ end
 
 # A serializable callback. 
 class Wee::LiteralMethodCallback
+  attr_reader :obj
+
   def initialize(obj, method_id=:call, *args)
     @obj, @method_id = obj, method_id
     @args = args unless args.empty?

data/lib/wee/core/component.rb

@@ -40,28 +40,27 @@ class Wee::Component < Wee::Presenter
   # #process_callbacks of the first decoration or the component itself if no
   # decorations were specified.
   #
-  # [+callback_stream+]
-  #    An object of class CallbackStream
+  # [+block+]
+  #    Specifies the action to be taken (e.g. whether to invoke input or action
+  #    callbacks).
 
-  def process_callbacks_chain(callback_stream)
-    decoration.process_callbacks(callback_stream)
+  def process_callbacks_chain(&block)
+    decoration.process_callbacks(&block)
   end
 
   # Process and invoke all callbacks specified for this component and all of
   # it's child components. 
   #
-  # All input callbacks of this component and it's child components are
-  # processed/invoked before any of the action callbacks are processed/invoked.
-  #
-  # [+callback_stream+]
-  #    An object of class CallbackStream
-
-  def process_callbacks(callback_stream)
-    super do
-      # process callbacks of all children
-      children.each do |child|
-        child.process_callbacks_chain(callback_stream)
-      end
+  # [+block+]
+  #    Specifies the action to be taken (e.g. whether to invoke input or action
+  #    callbacks).
+
+  def process_callbacks(&block)
+    block.call(self)
+
+    # process callbacks of all children
+    children.each do |child|
+      child.process_callbacks_chain(&block)
     end
   end
 
@@ -77,20 +76,37 @@ class Wee::Component < Wee::Presenter
   # +super+, before setting up anything else! 
 
   def initialize() # :notnew:
-    @decoration = Wee::ValueHolder.new(self)
-    @children = []
+    @__decoration = Wee::ValueHolder.new(self)
+    @__children = []
+    @__parent = nil
   end
 
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  # :section: Children
+  # :section: Children/Composite
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+  public
+
+  # Returns the parent component (or nil if it's the root component).  Note
+  # that if you #call a component, the parent attribute will not be set
+  # automatically.
+
+  def parent
+    @__parent
+  end
+
+  # Reparents the component. You should not call this method yourself!
+
+  def parent=(new_parent)
+    @__parent = new_parent
+  end
+
   protected
 
   # Returns all direct child components collected in an array.
  
   def children
-    @children
+    @__children
   end
 
   # Add a child to the component. Example:
@@ -111,8 +127,14 @@ class Wee::Component < Wee::Presenter
   #     snapshot.add(self.children)
   #   end
   #
+  # NOTE: Each component has exactly one parent component (or none in the case
+  # of the root component or when using #call). As such, you can't (and should
+  # not!) add a child more than once to another component.
+  #
 
   def add_child(child)
+    raise "Child already has a parent!" if not child.parent.nil?
+    child.parent = self
     self.children << child
     child
   end
@@ -127,13 +149,13 @@ class Wee::Component < Wee::Presenter
   # +self+ if no decorations were specified for the component.
 
   def decoration
-    @decoration.value
+    @__decoration.value
   end
 
   # Set the pointer to the first decoration to +d+. 
 
   def decoration=(d) 
-    @decoration.value = d
+    @__decoration.value = d
   end
 
   # Iterates over all decorations (note that the component itself is excluded). 
@@ -248,7 +270,7 @@ class Wee::Component < Wee::Presenter
   # <i>marshal_load</i>). Overwrite them if you want to define special
   # behaviour. 
   #
-  # By default only <tt>@decoration</tt> is backtracked (which actually is a
+  # By default only <tt>@__decoration</tt> is backtracked (which actually is a
   # ValueHolder, as only the pointer changes not the decoration-object
   # itself!).
   #
@@ -270,7 +292,7 @@ class Wee::Component < Wee::Presenter
   #    An object of class Snapshot
 
   def backtrack_state(snapshot)
-    snapshot.add(@decoration)
+    snapshot.add(@__decoration)
     children.each do |child| child.backtrack_state_chain(snapshot) end
   end