wee 0.10.0 → 2.0.0

data/examples/demo/counter.rb

@@ -0,0 +1,38 @@
+class Counter < Wee::Component
+  attr_accessor :count
+
+  def initialize(initial_count=0)
+    super()
+    @count = initial_count 
+  end
+
+  def backtrack(state)
+    super
+    state.add_ivar(self, :@count, @count)
+  end
+
+  def dec
+    @count -= 1
+  end
+
+  def inc
+    @count += 1
+  end
+
+  def render(r)
+    r.once(self.class) {
+      r.css ".wee-Counter a { border: 1px dotted blue; margin: 2px; }"
+    }
+    r.div.id("wee-#{object_id.to_s(36)}").css_class('wee-Counter').with {
+      r.anchor.callback_method(:dec).with("--")
+      r.space
+      render_count(r)
+      r.space
+      r.anchor.callback_method(:inc).with("++")
+    }
+  end
+
+  def render_count(r)
+    r.text @count.to_s
+  end
+end

data/{lib/wee/examples → examples/demo}/editable_counter.rb

@@ -1,20 +1,25 @@
 # NEEDS: FormDecoration
 
-require 'wee/examples/counter'
+require 'demo/counter'
 
-class Wee::Examples::EditableCounter < Wee::Examples::Counter 
+class EditableCounter < Counter 
 
   def initialize(initial_count=0)
     super
     @show_edit_field = false
   end
 
-  def render_count
+  def backtrack(state)
+    super
+    state.add_ivar(self, :@show_edit_field, @show_edit_field)
+  end
+
+  def render_count(r)
     if @show_edit_field
-      r.text_input.callback(:count=).value(@count).size(6)
-      r.submit_button.callback(:submit).value('S')
+      r.text_input.value(@count).size(6).callback {|val| self.count = val}
+      r.submit_button.value('S').callback { submit }
     else
-      r.anchor.callback(:submit).with(@count) 
+      r.anchor.callback { submit }.with(@count)
     end
   end
 

data/examples/demo/example.rb

@@ -1,5 +1,6 @@
-require 'wee/examples/window'
-require 'wee/examples/editable_counter'
+require 'demo/window'
+require 'demo/editable_counter'
+require 'demo/messagebox'
 
 class RegexpValidatedInput < Wee::Component
 
@@ -10,9 +11,9 @@ class RegexpValidatedInput < Wee::Component
     @error = false
   end
 
-  def backtrack_state(snap)
+  def backtrack(state)
     super
-    snap.add(self)
+    state.add(self)
   end
 
   def value
@@ -24,9 +25,9 @@ class RegexpValidatedInput < Wee::Component
     @input = @value = new_value
   end
 
-  def render
+  def render(r)
     r.form do
-      r.text_input.value(@input).callback(:input=)
+      r.text_input.value(@input).callback {|val| self.input = val }
       r.text %(<div style="color: red">Invalid input</div>) if @error
     end
   end
@@ -52,15 +53,16 @@ class MainPage < Wee::Component
   def initialize
     super()
     @counters = (1..10).map {|i|
-      Wee::Examples::Window.new {|w| 
+      add_child Window.new {|w| 
         w.title = "Cnt #{ i }"
         w.pos_x = "200px"
         w.pos_y = "#{i*50}px"
-        w.child = Wee::Examples::EditableCounter.new(i)
+	w.add_child EditableCounter.new(i)
       }
     }
-    children.push(*@counters)
-    children << (@val_inp = RegexpValidatedInput.new('Michael Neumann', /^\w+\s+\w+$/))
+
+
+    add_child(@val_inp = RegexpValidatedInput.new('Michael Neumann', /^\w+\s+\w+$/))
 
     @arr = []
     @text = ""
@@ -71,20 +73,22 @@ class MainPage < Wee::Component
     @selected2 = []
   end
 
-  def backtrack_state(snap)
+  def backtrack(state)
     super
-    snap.add(@arr)
-    snap.add(@text)
-
-    snap.add(@list1)
-    snap.add(@selected1)
-    snap.add(@list2)
-    snap.add(@selected2)
+    backtrack_children(state)
+    backtrack_decoration(state)
+    state.add(@arr)
+    state.add(@text)
+
+    state.add(@list1)
+    state.add(@selected1)
+    state.add(@list2)
+    state.add(@selected2)
   end
 
   attr_accessor :text
 
-  def render
+  def render(r)
     r.page.title("Counter Test").with do 
 
       r.form do
@@ -110,7 +114,7 @@ class MainPage < Wee::Component
       end
 
       r.form do
-        r.text_input.value(@text).callback{|@text|}
+        r.text_input.value(@text).callback{|val| @text = val}
         r.submit_button.callback{add}.value('add')
       end
 
@@ -118,12 +122,12 @@ class MainPage < Wee::Component
   end
 
   def add
-    call Wee::MessageBox.new("Do you really want to add '" + @text + "'?"), proc {|res|
+    call Wee::MessageBox.new("Do you really want to add '" + @text + "'?") do |res|
       if res
-        call Wee::MessageBox.new("Do you really really really want to add '" + @text + "'?"), proc {|res2| 
+        call Wee::MessageBox.new("Do you really really really want to add '" + @text + "'?") do |res2| 
           @arr << @text if res2
-        }
+        end
       end
-    }
+    end 
   end
 end

data/examples/demo/file_upload.rb

@@ -0,0 +1,19 @@
+class FileUploadTest < Wee::Component
+  def render(r)
+    r.file_upload.callback {|f| call Uploaded.new(f[:tempfile]) }
+    r.break
+    r.submit_button.name('Upload')
+  end
+
+  class Uploaded < Wee::Component
+    def initialize(file)
+      super()
+      @file = file
+    end
+
+    def render(r)
+      r.pre { r.encode_text @file.read }
+      r.anchor.callback_method(:answer).with('back')
+    end
+  end
+end

data/{lib/wee/components → examples/demo}/messagebox.rb

@@ -4,12 +4,12 @@ class Wee::MessageBox < Wee::Component
     @text = text 
   end
 
-  def render
+  def render(r)
     r.bold(@text)
     r.form do 
-      r.submit_button.value('OK').callback(:answer, true)
+      r.submit_button.value('OK').callback { answer true }
       r.space
-      r.submit_button.value('Cancel').callback(:answer, false)
+      r.submit_button.value('Cancel').callback { answer false }
     end
   end
 end

data/examples/demo/radio.rb

@@ -0,0 +1,33 @@
+class RadioTest < Wee::Component
+  def render(r)
+    grp1 = r.new_radio_group
+    grp2 = r.new_radio_group
+
+    r.paragraph
+    r.text "Group1"
+    r.text " (your choice: #{@g1})" if @g1
+    r.break
+
+    r.text "R1: "
+    r.radio_button.group(grp1).checked(@g1.nil? || @g1 == 'R1').callback { @g1 = 'R1' }
+    r.break
+
+    r.text "R2: "
+    r.radio_button.group(grp1).checked(@g1 == 'R2').callback { @g1 = 'R2' }
+
+    r.paragraph
+    r.text "Group2"
+    r.text " (your choice: #{@g2})" if @g2
+    r.break
+
+    r.text "R1: "
+    r.radio_button.group(grp2).checked(@g2.nil? || @g2 == 'R1').callback { @g2 = 'R1' }
+    r.break
+
+    r.text "R2: "
+    r.radio_button.group(grp2).checked(@g2 == 'R2').callback { @g2 = 'R2' }
+
+    r.paragraph
+    r.submit_button.value('Submit')
+  end
+end

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

@@ -1,6 +1,6 @@
-class Wee::Examples::Window < Wee::Component
+class Window < Wee::Component
 
-  attr_accessor :title, :pos_x, :pos_y, :child
+  attr_accessor :title, :pos_x, :pos_y
 
   def initialize(&block)
     super()
@@ -9,16 +9,17 @@ class Wee::Examples::Window < Wee::Component
     block.call(self) if block
   end
 
-  def children
-    [@child].uniq
+  def backtrack(state)
+    super
+    state.add_ivar(self, :@status, @status)
   end
 
-  def process_callbacks(&block)
+  def process_callbacks(callbacks)
     return if @status == :closed
     super
   end
 
-  def render
+  def render(r)
     return if @status == :closed
 
     r.table.cellspacing(0).style("border:solid 1px grey; position: absolute; left: #{@pos_x}; top: #{@pos_y};").with do
@@ -26,17 +27,21 @@ class Wee::Examples::Window < Wee::Component
         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 @child and @status == :normal
+          if @status == :normal
+            each_child do |child|
+              r.render(child)
+            end
+          end
         end
       end
     end

data/examples/hw.rb

@@ -1,7 +1,6 @@
+$LOAD_PATH.unshift "../lib"
 require 'rubygems'
 require 'wee'
-require 'wee/adaptors/webrick' 
-require 'wee/utils'
 
 class HelloWorld < Wee::Component
   def initialize
@@ -9,9 +8,9 @@ class HelloWorld < Wee::Component
     add_decoration(Wee::PageDecoration.new("Hello World"))
   end
 
-  def render
+  def render(r)
     r.h1 "Hello World from Wee!"
   end
 end
 
-Wee::WEBrickAdaptor.register('/app' => Wee::Utils.app_for(HelloWorld)).start 
+Wee.run(HelloWorld) if __FILE__ == $0

data/{lib/wee/components → examples}/pager.rb

@@ -1,4 +1,4 @@
-class Wee::Pager < Wee::Component
+class Pager < Wee::Component
   attr_accessor :num_entries, :entries_per_page
   attr_reader :current_page
 
@@ -61,38 +61,38 @@ class Wee::Pager < Wee::Component
     validate
   end
 
-  def render
+  def render(r)
     return if num_pages() <= 0
-    render_arrow(:first, "<<", "Go to first page"); r.space(2)
-    render_arrow(:prev, "<", "Go to previous page"); r.space(2)
-    render_index; r.space(2)
-    render_arrow(:next, ">", "Go to next page"); r.space(2)
-    render_arrow(:last, ">>", "Go to last page")
+    render_arrow(r, :first, "<<", "Go to first page"); r.space(2)
+    render_arrow(r, :prev, "<", "Go to previous page"); r.space(2)
+    render_index(r); r.space(2)
+    render_arrow(r, :next, ">", "Go to next page"); r.space(2)
+    render_arrow(r, :last, ">>", "Go to last page")
   end
 
   private
 
-  def render_arrow(sym, text, tooltip=text)
-    r.anchor.callback(sym).tooltip(tooltip).with { r.encode_text(text) }
+  def render_arrow(r, sym, text, tooltip=text)
+    r.anchor.callback_method(sym).tooltip(tooltip).with { r.encode_text(text) }
   end
 
-  def render_index
+  def render_index(r)
     last = last_page_index()
     (0 .. last).each do |i|
       if i == @current_page
-        render_page_num(i, true)
+        render_page_num(r, i, true)
       else
-        render_page_num(i, false)
+        render_page_num(r, i, false)
       end
       r.space if i < last
     end
   end
 
-  def render_page_num(num, current)
+  def render_page_num(r, num, current)
     if current
       r.bold(num+1)
     else
-      r.anchor.callback(:goto, num).with(num+1)
+      r.anchor.callback{ goto(num) }.with(num+1)
     end
   end
 

data/lib/wee.rb

@@ -1,38 +1,61 @@
 module Wee
-  Version = "0.10.0"
-  LibPath = File.dirname(__FILE__)
+  Version = "2.0.0"
 end
 
-module Wee::Examples; end
+require 'rack'
 
-require 'wee/core'
-require 'wee/core_ext'
+require 'wee/state'
+require 'wee/callback'
+
+require 'wee/presenter'
+require 'wee/decoration'
+require 'wee/component'
 
 require 'wee/application'
-require 'wee/requesthandler'
 require 'wee/request'
 require 'wee/response'
 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::HtmlCanvasRenderer
-
-require 'wee/idgen/sequential'
-require 'wee/idgen/md5'
+require 'wee/html_document'
+require 'wee/html_brushes'
+require 'wee/html_canvas'
+
+if RUBY_VERSION >= "1.9"
+  begin
+    require 'continuation'
+  rescue LoadError
+  end
+  unless String.instance_methods.include?(:each)
+    # required by Rack
+    class String
+      def each() yield self end
+    end
+  end
+end
 
-def Wee.run(component, add_page_decoration=true, mount_path='/app')
-  require 'wee/utils'
-  require 'wee/adaptors/webrick'
+Wee::DefaultRenderer = Wee::HtmlCanvas
+
+def Wee.run(component_class=nil, mount_path='/', port=2000, &block)
+  raise ArgumentError if component_class and block
+
+  require 'rack/handler/webrick'
+  app = Rack::Builder.app do
+    map mount_path do
+      if block
+        run Wee::Application.new(&block)
+      else
+        run Wee::Application.new { Wee::Session.new(component_class.new) }
+      end
+    end
+  end
+  Rack::Handler::WEBrick.run(app, :Port => port)
+end
 
-  component = component.new if component.kind_of?(Class)
-  component.add_decoration(Wee::PageDecoration.new('Welcome to Wee!')) if add_page_decoration
-  component.add_decoration(Wee::FormDecoration.new)
-  Wee::WEBrickAdaptor.register(mount_path => Wee::Utils.app_for { component }).start
+#
+# Like Wee.run, but for use with continuations.
+#
+def Wee.runcc(component_class, *args)
+  Wee.run(nil, *args) {
+    Wee::Session.new(component_class.new, Wee::Session::ThreadSerializer.new)
+  }
 end