wee 0.8.0 → 0.9.0

data/lib/wee/examples/counter.rb

@@ -0,0 +1,33 @@
+class Wee::Examples::Counter < Wee::Component
+  attr_accessor :count
+
+  def initialize(initial_count=0)
+    super()
+    @count = initial_count 
+  end
+
+  def backtrack_state(snap)
+    super
+    snap.add(self)
+  end
+
+  def dec
+    @count -= 1
+  end
+
+  def inc
+    @count += 1
+  end
+
+  def render
+    r.anchor.callback(:dec).with("--")
+    r.space
+    render_count
+    r.space 
+    r.anchor.callback(:inc).with("++")
+  end
+
+  def render_count
+    r.text @count.to_s
+  end
+end

data/lib/wee/examples/editable_counter.rb

@@ -0,0 +1,31 @@
+# NEEDS: FormDecoration
+
+require 'wee/examples/counter'
+
+class Wee::Examples::EditableCounter < Wee::Examples::Counter 
+
+  def initialize(initial_count=0)
+    super
+    @show_edit_field = false
+  end
+
+  def render_count
+    if @show_edit_field
+      r.text_input.callback(:count=).value(@count).size(6)
+      r.submit_button.callback(:submit).value('S')
+    else
+      r.anchor.callback(:submit).with(@count) 
+    end
+  end
+
+  def submit
+    if @count.to_s !~ /^\d+$/
+      call Wee::MessageBox.new("You entered an invalid counter! Please try again!")
+      @count = 0
+    else
+      @show_edit_field = !@show_edit_field
+    end
+    @count = @count.to_i
+  end
+
+end

data/{examples → lib/wee/examples}/window.rb

@@ -1,12 +1,16 @@
-class Wee::Window < Wee::Component
+class Wee::Examples::Window < Wee::Component
 
-  def initialize(title, pos, child)
+  attr_accessor :title, :pos_x, :pos_y, :child
+
+  def initialize(&block)
     super()
-    @title = title
-    @child = child
     @status = :normal  
-    self.children << @child
-    @pos = pos
+    @pos_x, @pos_y = "0px", "0px"
+    block.call(self) if block
+  end
+
+  def children
+    [@child].uniq
   end
 
   def process_callbacks(&block)
@@ -14,40 +18,42 @@ class Wee::Window < Wee::Component
     super
   end
 
-  def minimize
-    @status = :minimized
-  end
-
-  def maximize
-    @status = :normal
-  end
-
-  def close
-    @status = :closed
-  end
-
   def render
     return if @status == :closed
 
-    r.table.cellspacing(0).style("border:solid 1px grey; position: relative; top: #{@pos}; left: #{200+@pos.to_i}").with do
+    r.table.cellspacing(0).style("border:solid 1px grey; position: absolute; left: #{@pos_x}; top: #{@pos_y};").with do
       r.table_row.style("background-color: lightblue; width: 100%").with do
         r.table_data.style("text-align: left; width: 66%").with(@title)
         r.table_data.style("text-align: right").with do
           if @status == :minimized
-            r.anchor.callback{maximize}.with("#")
+            r.anchor.callback(:maximize).with("^")
           else
-            r.anchor.callback{minimize}.with("_")
+            r.anchor.callback(:minimize).with("_")
           end
           r.space
-          r.anchor.callback{close}.with("X")
+          r.anchor.callback(:close).with("x")
         end
       end
       r.table_row do
         r.table_data.colspan(2).with do
-          r.render(@child) if @status == :normal
+          r.render(@child) if @child and @status == :normal
         end
       end
     end
   end
 
+  public 
+
+  def minimize
+    @status = :minimized
+  end
+
+  def maximize
+    @status = :normal
+  end
+
+  def close
+    @status = :closed
+  end
+
 end

data/lib/wee/idgen/md5.rb

@@ -3,7 +3,7 @@
 
 require 'digest/md5'
 
-class Wee::Md5IdGenerator
+class Wee::Md5IdGenerator < Wee::IdGenerator
   def initialize(salt='wee')
     @salt = salt
   end

data/lib/wee/idgen/simple.rb

@@ -1,6 +1,6 @@
 # Returned ids are guaranteed to be unique, but they are easily guessable.
 
-class Wee::SimpleIdGenerator
+class Wee::SimpleIdGenerator < Wee::IdGenerator
   def initialize(initial_value=0)
     @value = initial_value
   end

data/lib/wee/pageless/session.rb

@@ -5,7 +5,6 @@ require 'cgi'
 # backtrack.
 
 class Wee::PagelessSession < Wee::Session
-  attr_accessor :root_component
   undef page_store
 
   attr_accessor :callbacks
@@ -14,7 +13,7 @@ class Wee::PagelessSession < Wee::Session
   def setup(&block)
     with_session do
       block.call(self) if block
-      raise ArgumentError, "No root component specified" if @root_component.nil?
+      raise ArgumentError, "No component runner specified" if @component_runner.nil?
     end
   end
 
@@ -47,7 +46,7 @@ class Wee::PagelessSession < Wee::Session
     # new page view. 
 
     callback_stream = Wee::CallbackStream.new(self.callbacks, @context.request.fields) 
-    send_response = invoke_callbacks(callback_stream)
+    send_response = @component_runner.process_callbacks(callback_stream)
 
     post_callbacks_hook()
 

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

@@ -154,7 +154,7 @@ class Brush::GenericTagBrush < Brush
   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'});")
+    onclick("javascript: new Ajax.Updater('#{ update_id }', '#{ url }', {method:'get'}); return false;")
   end
 
   # This method construct the css-class attribute by looking up the property
@@ -301,8 +301,21 @@ class Brush::TextAreaTag < Brush::GenericTagBrush
   html_attr :name, :rows, :cols, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange
   bool_attr :disabled, :readonly
 
+  def value(val)
+    @value = val
+    self
+  end
+
   def with(*args, &block)
-    super
+    if @value
+      if block or !args.empty?
+        raise "please use either method 'value' or 'with'"
+      else
+        super(@value)
+      end
+    else
+      super
+    end
   end
 end
 
@@ -315,21 +328,36 @@ class Brush::SelectOptionTag < Brush::GenericTagBrush
 end
 
 class Brush::SelectListTag < Brush::GenericTagBrush
+
+  bool_attr :disabled, :readonly, :multiple
+  alias multi multiple
+
   def initialize(items)
     super('select')
     @items = items
   end
 
-  %w(selected items labels).each do |meth|
-    eval %[
-    def #{ meth }(arg)
-      @#{ meth } = arg
-      self
-    end
-    ]
+  def items(arg)
+    @items = arg
+    self
   end
 
-  bool_attr :multiple
+  def selected(arg=nil, &block)
+    raise if arg and block
+    @selected = arg || block
+    self
+  end
+
+  def labels(arg=nil, &block)
+    raise if arg and block
+
+    if block
+      @labels = proc{|i| block.call(@items[i])}
+    else
+      @labels = arg
+    end
+    self
+  end
 
   def callback(symbol=nil, *args, &block)
     @callback = to_callback(symbol, args, block)
@@ -367,20 +395,30 @@ class Brush::SelectListTag < Brush::GenericTagBrush
     end
 
     super do
-      if is_multiple
+      meth = 
+      if is_multiple 
         @selected ||= Array.new
-        @items.each_index {|i|
-          @canvas.option.value(i).selected(@selected.include?(@items[i])).with(@labels[i])
-        }
+        @selected.kind_of?(Proc) ? (:call) : (:include?)
       else
-        @items.each_index {|i|
-          @canvas.option.value(i).selected(@selected == @items[i]).with(@labels[i])
-        }
+        @selected.kind_of?(Proc) ? (:call) : (:==)
       end
+
+      @items.each_index {|i|
+        @canvas.option.value(i).selected(@selected.send(meth, @items[i])).with(@labels[i])
+      }
     end
   end
 end
 
+class Brush::HiddenInputTag < Brush::InputTag
+  def initialize
+    super
+    type('hidden')
+  end
+
+  alias callback __input_callback
+end
+
 class Brush::TextInputTag < Brush::InputTag
   def initialize
     super
@@ -390,6 +428,64 @@ class Brush::TextInputTag < Brush::InputTag
   alias callback __input_callback
 end
 
+class Brush::RadioButtonTag < Brush::InputTag
+  def initialize
+    super
+    type('radio')
+  end
+
+  class RadioGroup
+    def initialize(canvas)
+      @name = canvas.register_callback(:input, self)
+      @callbacks = {} 
+      @ids = Wee::SimpleIdGenerator.new 
+    end
+
+    def add_callback(callback)
+      value = @ids.next.to_s
+      @callbacks[value] = callback
+      return [@name, value]
+    end
+
+    def call(value)
+      if @callbacks.has_key?(value)
+        cb = @callbacks[value]
+        cb.call(value) if cb
+      else
+        raise "invalid radio button/group value"
+      end
+    end
+  end
+
+  def group(radio_group)
+    @group = radio_group
+    self
+  end
+
+  def callback(symbol=nil, *args, &block)
+    @callback = to_callback(symbol, args, block)
+    self
+  end
+
+  def with
+    if @group
+      n, v = @group.add_callback(@callback)
+      name(n)
+      value(v)
+    end
+    super
+  end
+
+end
+
+class Brush::CheckboxTag < Wee::Brush::InputTag
+  def initialize
+    super
+    type('checkbox')
+  end
+  alias callback __input_callback
+end
+
 class Brush::FileUploadTag < Brush::InputTag
   def initialize
     super
@@ -456,12 +552,16 @@ class Brush::FormTag < Brush::GenericTagBrush
   alias callback __actionurl_callback
   alias named_callback __actionurl_named_callback
 
+  def onsubmit_update(update_id, symbol=nil, *args, &block)
+    raise ArgumentError if symbol and block
+    url = @canvas.url_for_callback(to_callback(symbol, args, block), :live_update)
+    onsubmit("javascript: new Ajax.Updater('#{ update_id }', '#{ url }', {method:'get', parameters: Form.serialize(this)}); return false;")
+  end
+
   def with(*args, &block)
     # If no action was specified, use a dummy one.
     unless @attributes.has_key?('action')
-      req = @canvas.rendering_context.request
-      # TODO?
-      @attributes['action'] = req.build_url
+      @attributes['action'] = @canvas.build_url
     end
     super
   end
@@ -477,8 +577,28 @@ class Brush::AnchorTag < Brush::GenericTagBrush
   alias tooltip title
 
   alias __set_url url
-  alias callback __actionurl_callback
-  alias named_callback __actionurl_named_callback
+
+  def info(info=nil)
+    @info = info
+    self
+  end
+
+  def callback(symbol=nil, *args, &block)
+    if @info
+      __set_url(@canvas.url_for_callback(to_callback(symbol, args, block), :action, :info => @info))
+    else
+      __set_url(@canvas.url_for_callback(to_callback(symbol, args, block)))
+    end
+  end
+
+  def named_callback(name, symbol=nil, *args, &block)
+    if @info
+      __set_url(@canvas.url_for_named_callback(name, to_callback(symbol, args, block), :info => @info))
+    else
+      __set_url(@canvas.url_for_named_callback(name, to_callback(symbol, args, block)))
+    end
+  end
+
 end
 
 class Brush::Page < Brush

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

@@ -1,7 +1,7 @@
 module Wee
 
-class Canvas
-  def initialize
+module CanvasMixin
+  def initialize_canvas
     @parent_brush = nil
     @current_brush = nil
   end
@@ -31,10 +31,10 @@ class Canvas
   end
 end
 
-class HtmlCanvas < Canvas
-  attr_reader :rendering_context  # the current Wee::RenderingContext
+class HtmlCanvasRenderer < Renderer
+  include CanvasMixin
+
   attr_reader :document
-  attr_accessor :current_component
 
   def self.generic_tag(*attrs)
     attrs.each { |a|
@@ -56,28 +56,36 @@ class HtmlCanvas < Canvas
     }
   end
 
-  def initialize(rendering_context)
-    super()
-    @rendering_context = rendering_context
-    @document = rendering_context.document
+  def initialize(rendering_context, current_component=nil, &block)
+    # cache the document, to reduce method calls
+    @document = rendering_context.document 
+
+    initialize_canvas
+    super
   end
 
   generic_tag :html, :head, :body, :title, :style, :h1, :h2, :h3, :h4, :h5, :div
   generic_tag :div, :span, :ul, :ol, :li
   generic_single_tag :link, :hr
 
-  def url_for_callback(callback)
-    url_for_callback_id(register_callback(:action, callback))
+  def url_for_callback(callback, type=:action, hash=nil)
+    url_for_callback_id(register_callback(type, callback), hash)
   end
 
-  def url_for_named_callback(name, callback)
-    url_for_callback_id(register_named_callback(name, :action, callback))
+  def url_for_named_callback(name, callback, hash=nil)
+    url_for_callback_id(register_named_callback(name, :action, callback), hash)
+  end
+
+  def url_for_callback_id(callback_id, hash=nil)
+    if hash
+      build_url(hash.update(:callback_id => callback_id))
+    else
+      build_url(:callback_id => callback_id)
+    end
   end
 
-  def url_for_callback_id(callback_id)
-    req = self.rendering_context.request
-    url = req.build_url(:callback_id => callback_id)
-    return url
+  def build_url(*args)
+    rendering_context.request.build_url(*args)
   end
 
   def register_callback(type, callback)
@@ -112,10 +120,28 @@ class HtmlCanvas < Canvas
     handle(Brush::InputTag.new, *args, &block)
   end
 
+  def hidden_input(*args, &block)
+    handle(Brush::HiddenInputTag.new, *args, &block)
+  end
+
   def text_input(*args, &block)
     handle(Brush::TextInputTag.new, *args, &block)
   end
 
+  def new_radio_group
+    Wee::Brush::RadioButtonTag::RadioGroup.new(self)
+  end
+
+  def radio_button(*args, &block)
+    handle(Brush::RadioButtonTag.new, *args, &block)
+  end
+
+  def check_box(*args, &block)
+    handle(Wee::Brush::CheckboxTag.new, *args, &block)
+  end
+
+  alias checkbox check_box
+
   def text_area(*args, &block)
     handle(Brush::TextAreaTag.new, *args, &block)
   end
@@ -160,8 +186,12 @@ class HtmlCanvas < Canvas
     handle(Brush::JavascriptTag.new, *args, &block)
   end
 
-  def paragraph
-    set_brush(Brush::GenericSingleTagBrush.new("p"))
+  def paragraph(*args, &block)
+    handle(Brush::GenericTagBrush.new("p"), *args, &block)
+  end
+
+  def label(*args, &block)
+    handle(Brush::GenericTagBrush.new("label"), *args, &block)
   end
 
   def break
@@ -185,6 +215,14 @@ class HtmlCanvas < Canvas
     set_brush(Brush::GenericEncodedTextBrush.new(str))
   end
 
+  # converts \n into <br/>
+  def multiline_text(text, encode=true)
+    meth = encode ? :encode_text : :text
+    lines = text.split("\n")
+    send(meth, lines.first)
+    lines[1..-1].each { |l| self.break; send(meth, l) }
+  end
+
   def render(obj)
     self.close
     obj.do_render_chain(@rendering_context)