RubyGems - wee - Versions diffs - 0.4.0 → 0.5.0 - Mend

wee 0.4.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (146) hide show

data/ChangeLog +75 -0
data/README +17 -9
data/Rakefile +2 -2
data/TODO +20 -0
data/benchmark/Makefile +14 -9
data/benchmark/counter.rb +11 -30
data/benchmark/report_req.rb +12 -0
data/doc/rdoc/classes/Array.html +12 -12
data/doc/rdoc/classes/Cache/StorageCache.html +38 -38
data/doc/rdoc/classes/Cache/Strategy/CapacityBounded.html +30 -30
data/doc/rdoc/classes/Cache/Strategy/LFU.html +24 -24
data/doc/rdoc/classes/Cache/Strategy/LRU.html +24 -24
data/doc/rdoc/classes/Cache/Strategy/Unbounded.html +24 -24
data/doc/rdoc/classes/Enumerable.html +6 -6
data/doc/rdoc/classes/Object.html +12 -12
data/doc/rdoc/classes/OgApplication.html +126 -0
data/doc/rdoc/classes/OgScaffolder.html +401 -0
data/doc/rdoc/classes/OgSession.html +172 -0
data/doc/rdoc/classes/String.html +12 -12
data/doc/rdoc/classes/Struct.html +12 -12
data/doc/rdoc/classes/Wee.html +5 -62
data/doc/rdoc/classes/Wee/AnswerDecoration.html +9 -9
data/doc/rdoc/classes/Wee/Application.html +107 -39
data/doc/rdoc/classes/Wee/Brush.html +22 -18
data/doc/rdoc/classes/Wee/Brush/ActionCallbackMixin.html +17 -11
data/doc/rdoc/classes/Wee/Brush/ActionURLCallbackMixin.html +18 -10
data/doc/rdoc/classes/Wee/Brush/AnchorTag.html +30 -64
data/doc/rdoc/classes/Wee/Brush/FileUploadTag.html +8 -10
data/doc/rdoc/classes/Wee/Brush/FormTag.html +27 -79
data/doc/rdoc/classes/Wee/Brush/GenericEncodedTextBrush.html +12 -12
data/doc/rdoc/classes/Wee/Brush/GenericSingleTagBrush.html +146 -0
data/doc/rdoc/classes/Wee/Brush/GenericTagBrush.html +179 -65
data/doc/rdoc/classes/Wee/Brush/GenericTextBrush.html +12 -12
data/doc/rdoc/classes/Wee/Brush/ImageButtonTag.html +16 -18
data/doc/rdoc/classes/Wee/Brush/ImageTag.html +203 -0
data/doc/rdoc/classes/Wee/Brush/InputCallbackMixin.html +17 -11
data/doc/rdoc/classes/Wee/Brush/InputTag.html +15 -15
data/doc/rdoc/classes/Wee/Brush/JavascriptTag.html +147 -0
data/doc/rdoc/classes/Wee/Brush/Page.html +17 -17
data/doc/rdoc/classes/Wee/Brush/SelectListTag.html +25 -50
data/doc/rdoc/classes/Wee/Brush/SelectOptionTag.html +7 -38
data/doc/rdoc/classes/Wee/Brush/SubmitButtonTag.html +7 -7
data/doc/rdoc/classes/Wee/Brush/TableDataTag.html +15 -16
data/doc/rdoc/classes/Wee/Brush/TableHeaderTag.html +7 -7
data/doc/rdoc/classes/Wee/Brush/TableRowTag.html +65 -50
data/doc/rdoc/classes/Wee/Brush/TableTag.html +7 -7
data/doc/rdoc/classes/Wee/Brush/TextAreaTag.html +14 -64
data/doc/rdoc/classes/Wee/Brush/TextInputTag.html +7 -7
data/doc/rdoc/classes/Wee/Brush/ToCallback.html +146 -0
data/doc/rdoc/classes/Wee/CallbackRegistry.html +40 -40
data/doc/rdoc/classes/Wee/CallbackStream.html +18 -18
data/doc/rdoc/classes/Wee/Canvas.html +24 -24
data/doc/rdoc/classes/Wee/Component.html +232 -149
data/doc/rdoc/classes/Wee/Component/OnAnswer.html +153 -0
data/doc/rdoc/classes/Wee/Decoration.html +42 -42
data/doc/rdoc/classes/Wee/Delegate.html +27 -27
data/doc/rdoc/classes/Wee/ErrorResponse.html +12 -12
data/doc/rdoc/classes/Wee/FormDecoration.html +148 -0
data/doc/rdoc/classes/Wee/GenericResponse.html +6 -6
data/doc/rdoc/classes/Wee/HtmlCanvas.html +296 -215
data/doc/rdoc/classes/Wee/HtmlWriter.html +83 -81
data/doc/rdoc/classes/Wee/LiteralMethodCallback.html +21 -16
data/doc/rdoc/classes/Wee/MessageBox.html +180 -0
data/doc/rdoc/classes/Wee/PageDecoration.html +30 -30
data/doc/rdoc/classes/Wee/Presenter.html +237 -69
data/doc/rdoc/classes/Wee/RedirectResponse.html +6 -6
data/doc/rdoc/classes/Wee/RefreshResponse.html +6 -6
data/doc/rdoc/classes/Wee/Request.html +18 -18
data/doc/rdoc/classes/Wee/RequestHandler.html +43 -39
data/doc/rdoc/classes/Wee/Response.html +24 -24
data/doc/rdoc/classes/Wee/Session.html +746 -72
data/doc/rdoc/classes/Wee/SimpleIdGenerator.html +18 -18
data/doc/rdoc/classes/Wee/Snapshot.html +19 -19
data/doc/rdoc/classes/Wee/Utils.html +138 -2
data/doc/rdoc/classes/Wee/Utils/LRUCache.html +7 -7
data/doc/rdoc/classes/Wee/ValueHolder.html +18 -18
data/doc/rdoc/classes/Wee/WEBrickAdaptor.html +43 -68
data/doc/rdoc/classes/Wee/WrapperDecoration.html +150 -0
data/doc/rdoc/created.rid +1 -1
data/doc/rdoc/files/README.html +29 -15
data/doc/rdoc/files/lib/wee/adaptors/webrick_rb.html +1 -1
data/doc/rdoc/files/lib/wee/application_rb.html +1 -1
data/doc/rdoc/files/lib/wee/components/form_decoration_rb.html +101 -0
data/doc/rdoc/files/lib/wee/components/messagebox_rb.html +101 -0
data/doc/rdoc/files/lib/wee/components/page_decoration_rb.html +1 -1
data/doc/rdoc/files/lib/wee/components/wrapper_decoration_rb.html +101 -0
data/doc/rdoc/files/lib/wee/components_rb.html +4 -1
data/doc/rdoc/files/lib/wee/continuation/core/component_rb.html +101 -0
data/doc/rdoc/files/lib/wee/continuation/session_rb.html +110 -0
data/doc/rdoc/files/lib/wee/continuation_rb.html +116 -0
data/doc/rdoc/files/lib/wee/core/callback_rb.html +1 -1
data/doc/rdoc/files/lib/wee/core/component_rb.html +1 -1
data/doc/rdoc/files/lib/wee/core/presenter_rb.html +1 -1
data/doc/rdoc/files/lib/wee/core_rb.html +3 -3
data/doc/rdoc/files/lib/wee/databases/og_rb.html +108 -0
data/doc/rdoc/files/lib/wee/renderer/html/brushes_rb.html +1 -1
data/doc/rdoc/files/lib/wee/renderer/html/canvas_rb.html +1 -1
data/doc/rdoc/files/lib/wee/renderer/html/writer_rb.html +1 -1
data/doc/rdoc/files/lib/wee/requesthandler_rb.html +1 -1
data/doc/rdoc/files/lib/wee/session_rb.html +1 -2
data/doc/rdoc/files/lib/wee/utils/autoreload_rb.html +1 -1
data/doc/rdoc/files/lib/wee/utils/cache_rb.html +1 -1
data/doc/rdoc/files/lib/wee/utils/helper_rb.html +1 -8
data/doc/rdoc/files/lib/wee/utils_rb.html +110 -0
data/doc/rdoc/files/lib/wee_rb.html +1 -1
data/doc/rdoc/fr_class_index.html +11 -1
data/doc/rdoc/fr_file_index.html +8 -0
data/doc/rdoc/fr_method_index.html +269 -228
data/examples/calculator.rb +69 -0
data/examples/calendar.rb +5 -17
data/examples/example.rb +2 -2
data/examples/hw.rb +17 -0
data/examples/live-update.rb +45 -0
data/examples/og-test.rb +51 -0
data/lib/wee.rb +1 -1
data/lib/wee/adaptors/webrick.rb +2 -0
data/lib/wee/application.rb +16 -0
data/lib/wee/components.rb +3 -0
data/lib/wee/components/form_decoration.rb +7 -0
data/{test → lib/wee}/components/messagebox.rb +1 -1
data/lib/wee/components/page_decoration.rb +5 -5
data/lib/wee/components/wrapper_decoration.rb +7 -0
data/lib/wee/continuation.rb +5 -0
data/lib/wee/continuation/core/component.rb +55 -0
data/lib/wee/continuation/session.rb +217 -0
data/lib/wee/core/callback.rb +11 -6
data/lib/wee/core/component.rb +45 -33
data/lib/wee/core/presenter.rb +68 -0
data/lib/wee/databases/og.rb +114 -0
data/lib/wee/renderer/html/brushes.rb +179 -98
data/lib/wee/renderer/html/canvas.rb +37 -13
data/lib/wee/renderer/html/writer.rb +34 -32
data/lib/wee/requesthandler.rb +6 -3
data/lib/wee/session.rb +73 -54
data/lib/wee/utils.rb +5 -0
data/lib/wee/utils/autoreload.rb +1 -1
data/lib/wee/utils/cache.rb +0 -2
data/lib/wee/utils/helper.rb +40 -8
data/test/components/calltest-cont.rb +16 -0
data/test/components/calltest.rb +15 -10
data/test/stress.rb +31 -28
data/test/stress_and_measure.rb +53 -0
data/test/stressed_application.rb +15 -0
data/test/test_html_writer.rb +9 -4
metadata +236 -195
data/benchmark/bench.sh +0 -24

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

@@ -36,27 +36,43 @@ class HtmlCanvas < Canvas
   attr_reader :document
   attr_accessor :current_component
+  def self.generic_tag(*attrs)
+    attrs.each { |a|
+      class_eval "
+        def #{ a }(*args, &block)
+          handle(Brush::GenericTagBrush.new('#{ a }'), *args, &block)
+        end
+      "
+    }
+  end
+  def self.generic_single_tag(*attrs)
+    attrs.each { |a|
+      class_eval "
+        def #{ a }(*args, &block)
+          handle(Brush::GenericSingleTagBrush.new('#{ a }'), *args, &block)
+        end
+      "
+    }
+  end
   def initialize(rendering_context)
     super()
     @rendering_context = rendering_context
     @document = rendering_context.document
   end
-  def method_missing(id, *args, &block)
-    handle(Brush::GenericTagBrush.new(id.to_s), *args, &block)
-  end
+  generic_tag :html, :head, :body, :title, :style, :h1, :h2, :h3, :h4, :h5, :div
+  generic_single_tag :link
-  def url_for_callback(symbol=nil, &block)
-    raise ArgumentError if symbol and block
-    block = self.current_component.method(symbol) unless block
+  def url_for_callback(callback)
     req = self.rendering_context.request
-    url = req.build_url(req.request_handler_id, req.page_id, register_callback(:action, &block))
+    url = req.build_url(req.request_handler_id, req.page_id, register_callback(:action, callback))
     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)
+  def register_callback(type, callback)
+    self.rendering_context.callbacks.register_for(self.current_component, type, callback)
   end
   def table(*args, &block)
@@ -127,16 +143,24 @@ class HtmlCanvas < Canvas
     handle(Brush::GenericTagBrush.new("b"), *args, &block)
   end
+  def javascript(*args, &block)
+    handle(Brush::JavascriptTag.new, *args, &block)
+  end
   def paragraph
-    set_brush(Brush::GenericTagBrush.new("p"))
+    set_brush(Brush::GenericSingleTagBrush.new("p"))
   end
   def break
-    set_brush(Brush::GenericTagBrush.new("br"))
+    set_brush(Brush::GenericSingleTagBrush.new("br"))
   end
   def image
-    set_brush(Brush::GenericTagBrush.new("img"))
+    handle(Brush::ImageTag.new)
+  end
+  def link_css(url)
+    link.type('text/css').rel('stylesheet').href(url)
   end
   def text(str)

data/lib/wee/renderer/html/writer.rb CHANGED Viewed

@@ -13,7 +13,6 @@ require 'cgi'
 #   w.end_tag('body')
 #   w.end_tag('html')
 #
-#   p w.valid?   # => true
 #   p doc        # => '<html><body><a href="http://...">link</a></body></html>'
 #
@@ -22,46 +21,51 @@ class Wee::HtmlWriter
   def initialize(port)
     @port = port
-    @open_start_tag = false
-    @tag_stack = []
   end
-  def start_tag(tag, attributes={})
-    @port << ">" if @open_start_tag
-    @open_start_tag = true
-    @tag_stack.push(tag)
-    @port << "<#{ tag }"
-    attributes.each {|k, v|
-      if v
-        @port << %[ #{ k }="#{ v }"]
-      else
-        @port << %[ #{ k }]
-      end
-    }
+  def start_tag(tag, attributes=nil)
+    if attributes
+      @port << "<#{ tag }"
+      attributes.each {|k, v|
+        if v
+          @port << %[ #{ k }="#{ v }"]
+        else
+          @port << %[ #{ k }]
+        end
+      }
+      @port << ">"
+    else
+      @port << "<#{ tag }>"
+    end
     self
   end
-  def end_tag(tag)
-    raise "unbalanced html" if @tag_stack.pop != tag
-    if @open_start_tag
-      @port << "/>"
-      @open_start_tag = false
+  def single_tag(tag, attributes=nil)
+    if attributes
+      @port << "<#{ tag }"
+      attributes.each {|k, v|
+        if v
+          @port << %[ #{ k }="#{ v }"]
+        else
+          @port << %[ #{ k }]
+        end
+      }
+      @port << " />"
     else
-      @port << "</#{ tag }>"
+      @port << "<#{ tag } />"
     end
     self
   end
-  def text(str)
-    if @open_start_tag
-      @port << ">"
-      @open_start_tag = false
-    end
+  def end_tag(tag)
+    @port << "</#{ tag }>"
+    self
+  end
+  def text(str)
     @port << str.to_s
     self
@@ -69,10 +73,8 @@ class Wee::HtmlWriter
   alias << text
   def encode_text(str)
-    text(CGI.escapeHTML(str.to_s))
-  end
+    @port << CGI.escapeHTML(str.to_s)
-  def valid?
-    @tag_stack.empty?
+    self
   end
 end

data/lib/wee/requesthandler.rb CHANGED Viewed

@@ -30,6 +30,9 @@ class Wee::RequestHandler
   # Terminates the handler.
+  #
+  # This will usually not immediatly terminate the handler from running, but
+  # further requests will not be answered.
   def teminate
     @running = false
@@ -39,14 +42,14 @@ class Wee::RequestHandler
   def alive?
     return false if not @running
-    return false if @max_requests and @request_count >= @max_requests
+    return @running = false if @max_requests and @request_count >= @max_requests
     now = Time.now
     inactivity = now - @last_access
     lifetime = now - @creation_time
-    return false if @expire_after and inactivity > @expire_after
-    return false if @max_lifetime and lifetime > @max_lifetime
+    return @running = false if @expire_after and inactivity > @expire_after
+    return @running = false if @max_lifetime and lifetime > @max_lifetime
     return true
   end

data/lib/wee/session.rb CHANGED Viewed

@@ -1,6 +1,5 @@
 require 'wee/page'
 require 'thread'
-require 'timeout'
 class Wee::Session < Wee::RequestHandler
   attr_accessor :root_component, :page_store
@@ -15,7 +14,9 @@ class Wee::Session < Wee::RequestHandler
     Thread.current[:wee_session] = self
     @idgen = Wee::SimpleIdGenerator.new
-    @in_queue, @out_queue = SizedQueue.new(1), SizedQueue.new(1)
+    # to serialize the requests we need a mutex
+    @mutex = Mutex.new
     block.call(self)
@@ -24,7 +25,6 @@ class Wee::Session < Wee::RequestHandler
     @initial_snapshot = snapshot()
-    start_request_response_loop
     super()
   ensure
     Thread.current[:wee_session] = nil
@@ -36,50 +36,24 @@ class Wee::Session < Wee::RequestHandler
   end
   # called by application to send the session a request
-  def handle_request(context)
-    super
-    # Send a request to the session. If the session is currently busy
-    # processing another request, this will block.
-    @in_queue.push(context)
-    # Wait for the response.
-    return @out_queue.pop
-  end
-  def start_request_response_loop
-    Thread.abort_on_exception = true
-    Thread.new {
-      Thread.current[:wee_session] = self
-      loop {
+  def handle_request(context)
+    @mutex.synchronize do
+      begin
+        Thread.current[:wee_session] = self
+        @context = context
+        super
+        awake
+        process_request
+        sleep
+      rescue Exception => exn
+        context.response = Wee::ErrorResponse.new(exn)
+      ensure
+        Thread.current[:wee_session] = nil
         @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
-          @context.response = Wee::ErrorResponse.new(exn)
-        end
-        @out_queue.push(@context)
-      }
-      p "session loop terminated" if $DEBUG
-    }
+        @page = nil
+      end
+    end
   end
   def create_page(snapshot)
@@ -87,6 +61,16 @@ class Wee::Session < Wee::RequestHandler
     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?
@@ -95,11 +79,11 @@ class Wee::Session < Wee::RequestHandler
       handle_new_page_view(@context, @initial_snapshot)
-    elsif page = @page_store.fetch(@context.request.page_id, false)
+    elsif @page = @page_store.fetch(@context.request.page_id, false)
       # A valid page_id was specified and the corresponding page exists.
-      page.snapshot.restore
+      @page.snapshot.restore
       p @context.request.fields if $DEBUG
@@ -112,9 +96,9 @@ class Wee::Session < Wee::RequestHandler
         # 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
+        @page = create_page(@page.snapshot)  # remove all action/input handlers
+        respond(@context, @page.callbacks)                    # render
+        @page_store[@context.request.page_id] = @page         # store
       else
@@ -123,16 +107,27 @@ class Wee::Session < Wee::RequestHandler
         # 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)
+        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
-        catch(:wee_back_to_session) {
-          @root_component.process_callbacks_chain(callback_stream)
+        live_update_response = catch(:wee_live_update) {
+          catch(:wee_back_to_session) {
+            @root_component.process_callbacks_chain(callback_stream)
+          }
+          nil
         }
-        handle_new_page_view(@context)
+        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
@@ -150,6 +145,30 @@ class Wee::Session < Wee::RequestHandler
     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)

data/lib/wee/utils.rb ADDED Viewed

@@ -0,0 +1,5 @@
+module Wee::Utils; end
+require 'wee/utils/autoreload'
+require 'wee/utils/cache'
+require 'wee/utils/helper'

data/lib/wee/utils/autoreload.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-module Wee
+module Wee::Utils
   module_function
   def autoreload(check_interval=10)

data/lib/wee/utils/cache.rb CHANGED Viewed

@@ -1,7 +1,5 @@
 require 'cache/cache'
-module Wee::Utils; end
 class Wee::Utils::LRUCache < Cache::StorageCache
   def initialize(capacity=20)
     super(Cache::Strategy::LRU.new(capacity))

data/lib/wee/utils/helper.rb CHANGED Viewed

@@ -1,15 +1,47 @@
-require 'wee/utils/cache'
+module Wee::Utils
-module Wee::Helper
-  def self.app_for(component, page_cache_capacity=10, id_seed=rand(1_000_000))
-    Wee::Application.new {|app|
+  # [+component+]
+  #   The component class for which to create an application object.  If a
+  #   block is given, this will be invoked to create a new component object.
+  #
+  # [+options+]
+  #   A Hash. Following keys are accepted:
+  #
+  #   [:application]
+  #     The application class to use (default: Wee::Application)
+  #
+  #   [:session]
+  #     The session class to use (default: Wee::Session)
+  #
+  #   [:page_cache_capacity]
+  #     The size of the sessions page_store (default: 10)
+  #
+  #   [:id_seed]
+  #     Initial value of the SimpleIdGenerator (default: rand(1_000_000))
+  #
+  def self.app_for(component=nil, options={}, &block)
+    raise "either component or block must be given" if component.nil? and block.nil?
+    defaults = {
+      :application => Wee::Application,
+      :session => Wee::Session,
+      :page_cache_capacity => 10,
+      :id_seed => rand(1_000_000)
+    }
+    options = defaults.update(options)
+    options[: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)
+        options[:session].new {|sess|
+          if component
+            sess.root_component = component.new
+          else
+            sess.root_component = block.call
+          end
+          sess.page_store = Wee::Utils::LRUCache.new(options[:page_cache_capacity])
         }
       }
-      app.id_generator = Wee::SimpleIdGenerator.new(id_seed)
+      app.id_generator = Wee::SimpleIdGenerator.new(options[:id_seed])
     }
   end
 end