wee 0.3.1 → 0.4.0

data/lib/wee/adaptors/webrick.rb

@@ -15,6 +15,7 @@ require 'webrick'
 #   Wee::WEBrickAdaptor.
 #     register('/app' => application).
 #     register('/cnt' => application2).
+#     mount('/', WEBrick::HTTPServlet::FileHandler, '.').
 #     start(:Port => 2000)
 #
 
@@ -48,7 +49,8 @@ class Wee::WEBrickAdaptor < WEBrick::HTTPServlet::AbstractServlet
     self
   end
 
-  def mount(*args, &block)
+  # Convenience method
+  def self.mount(*args, &block)
     @mounts ||= []
     @mounts << [args, block]
     self

data/lib/wee/application.rb

@@ -39,49 +39,85 @@ class Wee::Application
       raise ArgumentError, "No default request handler specified"
     end
     @mutex = Mutex.new
+
+    # start request-handler collecting thread
+    # run once every minute
+    @gc_thread = Thread.new {
+      sleep 60
+      @mutex.synchronize { garbage_collect_handlers }
+    }
   end
   
-  # TODO: we have to use mutexes here 
-  # NOTE that id_generator must be thread-safe!
-  # TODO: test for max_request_handlers
-
   def handle_request(context)
-    @mutex.synchronize do
-      request_handler_id = context.request.request_handler_id
-      request_handler = @request_handlers[request_handler_id]
+    request_handler_id = context.request.request_handler_id
+    request_handler = @mutex.synchronize { @request_handlers[request_handler_id] }
+
+    if request_handler_id.nil?
+
+      # No id was given -> check whether the maximum number of request-handlers
+      # limit is reached. if not, create new id and handler
+
+      @mutex.synchronize {
+        if @max_request_handlers != nil and @request_handlers.size >= @max_request_handlers
+          # limit reached -> remove non-alive handlers...
+          garbage_collect_handlers()
 
-      if request_handler_id.nil?
-        # No id was given -> create new id and handler
-        request_handler_id = unique_request_handler_id()
+          # ...and test again
+          if @request_handlers.size >= @max_request_handlers
+            # TODO: show a custom error message
+            raise "maximum number of request-handlers reached" 
+          end
+        end
+
+        request_handler_id =  unique_request_handler_id()
         request_handler = @default_request_handler.call  
         request_handler.id = request_handler_id
         request_handler.application = self
         @request_handlers[request_handler_id] = request_handler
+      }
+
+      context.response = Wee::RedirectResponse.new(context.request.build_url(request_handler_id))
+      return
+
+    elsif request_handler.nil?
+
+      # A false request handler id was given. This might indicate that a
+      # request handler has expired. 
 
-        context.response = Wee::RedirectResponse.new(context.request.build_url(request_handler_id))
-        return
+      request_handler_expired(context)
+      return
 
-      elsif request_handler.nil?
-        # A false request handler id was given. This might indicate that a
-        # request handler has expired. 
-        request_handler_expired(context)
-        return
-      end
+    elsif !request_handler.alive?
+
+      # The request_handler is not alive anymore.
+
+      request_handler_expired(context)
+      return
 
-      request_handler.handle_request(context)
     end
+
+    request_handler.handle_request(context)
+
   rescue => exn
     context.response = Wee::ErrorResponse.new(exn) 
   end
 
   private
 
+  # MUST be called while holding @mutex
+
   def unique_request_handler_id
     id = @id_generator.next.to_s
     raise "failed to create unique request handler id" if @request_handlers.include?(id)
     return id
   end
 
+  # MUST be called while holding @mutex
+
+  def garbage_collect_handlers
+    @request_handlers.delete_if {|id,rh| !rh.alive? }
+  end
+
   def request_handler_expired(context)
     context.response = Wee::RefreshResponse.new("Invalid or expired request handler!", context.request.application_path)
   end

data/lib/wee/components/page_decoration.rb

@@ -0,0 +1,14 @@
+class Wee::PageDecoration < Wee::Decoration
+  def initialize(title='')
+    @title = title
+    super()
+  end
+
+  def global?() true end
+
+  def do_render(rendering_context)
+    with_renderer_for(rendering_context) do
+      r.page.title(@title).with { super(rendering_context) }
+    end
+  end
+end

data/lib/wee/components.rb

@@ -0,0 +1 @@
+require 'wee/components/page_decoration'

data/lib/wee/core/callback.rb

@@ -50,7 +50,7 @@ class Wee::CallbackRegistry
     if c = @callbacks[type]
       c
     else
-      raise
+      []
     end
   end
 

data/lib/wee/core/component.rb

@@ -146,11 +146,35 @@ class Wee::Component < Wee::Presenter
     end
   end
   
-  # Adds decoration +d+ in front of the decoration chain.
+  # Adds decoration +d+ to the decoration chain.
+  #
+  # 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.
 
   def add_decoration(d)
-    d.owner = self.decoration
-    self.decoration = d
+    if d.global?
+      d.owner = self.decoration
+      self.decoration = d
+    else
+      last_global = nil
+      each_decoration {|i| 
+        if i.global?
+          last_global = i
+        else
+          break
+        end
+      }
+      if last_global.nil?
+        # no global decorations specified -> add in front
+        d.owner = self.decoration
+        self.decoration = d
+      else
+        # add after last_global
+        d.owner = last_global.owner
+        last_global.owner = d 
+      end
+    end
   end
 
   # Remove decoration +d+ from the decoration chain. 

data/lib/wee/core/decoration.rb

@@ -33,6 +33,15 @@ class Wee::Decoration < Wee::Presenter
 
   attr_accessor :owner   
 
+  # Is this decoration a global or a local one? By default all decorations are
+  # local unless this method is overwritten.
+  #
+  # 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.
+
+  def global?() false end
+
   # Forwards method call to the next decoration in the chain.
 
   def process_callbacks(callback_stream)

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

@@ -149,51 +149,32 @@ class Brush::InputTag < Brush::GenericTagBrush
   end
 end
 
-module Brush::CallbackMixin
-  private 
-
-  def register_callback(type, &block)
-    raise ArgumentError, "no callback block given" if block.nil?
-    @canvas.rendering_context.callbacks.register_for(@canvas.current_component, type, &block)
-  end
-end
-
 module Brush::InputCallbackMixin
-  include Brush::CallbackMixin
-
   public
 
   def callback(symbol=nil, &block)
     raise ArgumentError if symbol and block
     block = @canvas.current_component.method(symbol) unless block
-    name(register_callback(:input, &block))
+    name(@canvas.register_callback(:input, &block))
   end
 end
 
 module Brush::ActionCallbackMixin
-  include Brush::CallbackMixin
-
   public
 
   def callback(symbol=nil, &block)
     raise ArgumentError if symbol and block
     block = @canvas.current_component.method(symbol) unless block
-    name(register_callback(:action, &block))
+    name(@canvas.register_callback(:action, &block))
   end
 end
 
 # The callback id is listed in the URL (not as a form-data field)
 module Brush::ActionURLCallbackMixin
-  include Brush::CallbackMixin
-
   public
 
   def callback(symbol=nil, &block)
-    raise ArgumentError if symbol and block
-    block = @canvas.current_component.method(symbol) unless block
-    req = @canvas.rendering_context.request
-    url = req.build_url(req.request_handler_id, req.page_id, register_callback(:action, &block))
-    __set_url(url)
+    __set_url(@canvas.url_for_callback(symbol, &block))
   end
 end
 
@@ -310,6 +291,17 @@ class Brush::TextInputTag < Brush::InputTag
   end
 end
 
+class Wee::Brush::FileUploadTag < Wee::Brush::InputTag
+  include Brush::InputCallbackMixin
+
+  def initialize
+    super
+    type('file')
+  end
+end
+
+
+
 class Brush::SubmitButtonTag < Brush::InputTag
   include Brush::ActionCallbackMixin
 
@@ -327,7 +319,7 @@ end
 # generate a "name" fields in the request, to make this image-button work. 
 
 class Wee::Brush::ImageButtonTag < Wee::Brush::InputTag
-  include Wee::Brush::ActionCallbackMixin
+  include Brush::ActionCallbackMixin
 
   def initialize
     super
@@ -339,6 +331,7 @@ class Wee::Brush::ImageButtonTag < Wee::Brush::InputTag
   end
 end
 
+
 class Brush::TableDataTag < Brush::GenericTagBrush
   def initialize
     super('td')
@@ -370,6 +363,11 @@ class Brush::FormTag < Brush::GenericTagBrush
     self
   end
 
+  def enctype(typ)
+    @attributes['enctype'] = typ
+    self
+  end
+
   alias __set_url action
 
   def with(*args, &block)

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

@@ -42,14 +42,23 @@ class HtmlCanvas < Canvas
     @document = rendering_context.document
   end
 
-  def bold(*args, &block)
-    handle(Brush::GenericTagBrush.new("b"), *args, &block)
-  end
-
   def method_missing(id, *args, &block)
     handle(Brush::GenericTagBrush.new(id.to_s), *args, &block)
   end
 
+  def url_for_callback(symbol=nil, &block)
+    raise ArgumentError if symbol and block
+    block = self.current_component.method(symbol) unless block
+    req = self.rendering_context.request
+    url = req.build_url(req.request_handler_id, req.page_id, register_callback(:action, &block))
+    return url
+  end
+
+  def register_callback(type, &block)
+    raise ArgumentError, "no callback block given" if block.nil?
+    self.rendering_context.callbacks.register_for(self.current_component, type, &block)
+  end
+
   def table(*args, &block)
     handle(Brush::TableTag.new, *args, &block)
   end
@@ -98,6 +107,10 @@ class HtmlCanvas < Canvas
     handle(Wee::Brush::ImageButtonTag.new, *args, &block)
   end
 
+  def file_upload(*args, &block)
+    handle(Wee::Brush::FileUploadTag.new, *args, &block)
+  end
+
   def page(*args, &block)
     handle(Brush::Page.new, *args, &block)
   end 
@@ -110,6 +123,14 @@ class HtmlCanvas < Canvas
     set_brush(Brush::GenericTextBrush.new("&nbsp;"*n))
   end
 
+  def bold(*args, &block)
+    handle(Brush::GenericTagBrush.new("b"), *args, &block)
+  end
+
+  def paragraph
+    set_brush(Brush::GenericTagBrush.new("p"))
+  end
+
   def break
     set_brush(Brush::GenericTagBrush.new("br"))
   end

data/lib/wee/requesthandler.rb

@@ -70,6 +70,7 @@ class Wee::RequestHandler
  
   def initialize
     @last_access = @creation_time = Time.now 
+    @expire_after = 30*60                  # The default is 30 minutes of inactivity
     @request_count = 0
     @running = true
   end

data/lib/wee/session.rb

@@ -1,5 +1,6 @@
 require 'wee/page'
 require 'thread'
+require 'timeout'
 
 class Wee::Session < Wee::RequestHandler
   attr_accessor :root_component, :page_store
@@ -51,7 +52,25 @@ class Wee::Session < Wee::RequestHandler
     Thread.new {
       Thread.current[:wee_session] = self
       loop {
-        @context = @in_queue.pop
+        @context = nil
+
+        # get a request, check whether this session is alive after every 5
+        # seconds.
+        while @context.nil?
+          begin
+            Timeout.timeout(5) {
+              @context = @in_queue.pop
+            }
+          rescue Timeout::Error
+            break unless alive?
+          end
+        end
+
+        # abort thread if no longer alive
+        break if not alive?
+
+        raise "invalid request" if @context.nil?
+
         begin
           process_request
         rescue Exception => exn
@@ -59,6 +78,7 @@ class Wee::Session < Wee::RequestHandler
         end
         @out_queue.push(@context)
       }
+      p "session loop terminated" if $DEBUG
     }
   end
 

data/lib/wee/utils/autoreload.rb

@@ -0,0 +1,27 @@
+module Wee
+  module_function
+
+  def autoreload(check_interval=10)
+    Thread.new(Time.now) {|start_time|
+      file_mtime = {}
+      loop do
+        sleep check_interval 
+        $LOADED_FEATURES.each do |feature|
+          $LOAD_PATH.each do |lp|
+            file = File.join(lp, feature)
+            if (File.exists?(file) and 
+              File.stat(file).mtime > (file_mtime[file] || start_time))
+              file_mtime[file] = File.stat(file).mtime
+              STDERR.puts "reload #{ file }"
+              begin
+                load(file)
+              rescue Exception => e
+                STDERR.puts e.inspect
+              end
+            end
+          end
+        end
+      end
+    }
+  end
+end

data/lib/wee/utils/helper.rb

@@ -0,0 +1,15 @@
+require 'wee/utils/cache'
+
+module Wee::Helper
+  def self.app_for(component, page_cache_capacity=10, id_seed=rand(1_000_000))
+    Wee::Application.new {|app|
+      app.default_request_handler {
+        Wee::Session.new {|sess|
+          sess.root_component = component.new
+          sess.page_store = Wee::Utils::LRUCache.new(page_cache_capacity)
+        }
+      }
+      app.id_generator = Wee::SimpleIdGenerator.new(id_seed)
+    }
+  end
+end

data/lib/wee.rb

@@ -1,5 +1,5 @@
 module Wee
-  Version = "0.3.1"
+  Version = "0.4.0"
 end
 
 require 'wee/core'
@@ -11,6 +11,7 @@ require 'wee/request'
 require 'wee/response'
 require 'wee/session'
 
+require 'wee/components'
 require 'wee/snapshot_ext'
 
 require 'wee/renderer/html/writer'