wee 0.8.0 → 0.9.0

data/examples/ajax/ajax.rb

@@ -20,7 +20,7 @@ class AjaxTest < Wee::Component
 
   def update
     send_render_response {
-      r.text "Live-updates works! This is no. #{ @live_updates += 1}" 
+      r.text "Live-updates works! This is no. #{ @live_updates = (@live_updates || 0) + 1 }"
     }
   end
 end

data/examples/demo.rb

@@ -0,0 +1,47 @@
+require 'wee'
+require 'wee/adaptors/webrick'
+require 'wee/utils'
+
+class Demo < Wee::Component
+  def render
+    r.h1 'Wee Demos' 
+    r.ul {
+      APPS.each do |name, descr, _| 
+        r.li {
+          r.anchor.href("/#{ name }").with("/#{ name }: #{ descr }")
+        }
+      end
+    }
+  end
+end
+
+APPS = []
+def APPS.add(name, description=nil, &block)
+  self << [name, description||name, block]
+end
+
+APPS.add 'demo', 'This demo application' do 
+  Demo.new.add_decoration Wee::PageDecoration.new('Demo')
+end
+
+APPS.add 'calc', 'RPN Calculator' do
+  require 'wee/examples/calculator'
+  Wee::Examples::Calculator.new.
+  add_decoration(Wee::FormDecoration.new).
+  add_decoration(Wee::PageDecoration.new('RPN Calculator'))
+end
+
+APPS.add 'calendar', 'Calendar' do
+  require File.join(File.dirname(__FILE__), 'demo', 'calendar')
+  CustomCalendarDemo.new
+end
+
+APPS.add 'example', 'Misc Components' do
+  require File.join(File.dirname(__FILE__), 'demo', 'example')
+  MainPage.new
+end
+
+APPS.each do |name, descr, block|
+  Wee::WEBrickAdaptor.register("/#{ name }" => Wee::Utils.app_for(&block))
+end
+Wee::WEBrickAdaptor.start

data/examples/{calendar.rb → demo/calendar.rb}

@@ -1,9 +1,5 @@
 # Copyright by Kevin Howe (kh@newclear.ca)
 
-$LOAD_PATH.unshift << "../lib"
-require 'wee'
-require 'wee/adaptors/webrick'
-require 'wee/utils'
 require 'date'
 
 class Date
@@ -247,108 +243,104 @@ class MiniCalendar < Wee::Component
   end
 end
 
-if __FILE__ == $0
+# Custom CSS styles
+#
+module StyleMixin
+  def render_styles
+    r.style("
+      a {
+        text-decoration: none;
+      }
+      body {
+        font-size : 11px;
+        font-family : Arial, Helvetica, sans-serif;
+        text-align: center;
+      }
+      td {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 11px;
+        border: 1px solid;
+        background-color: #FFFFFF;
+        vertical-align: top;
+        text-align: center;
+      }
+      th {
+        font-family: Arial, Helvetica, sans-serif;
+        font-size: 11px;
+        font-style: normal;
+        font-weight: bold;
+        background-color: #BBCCFF;
+        border: 1px solid;
+        vertical-align: top;
+        text-align: center;
+      }
+    ")
+  end
+end
+
+# Calendar with custom CSS styles
+#
+class CustomCalendar < MiniCalendar
+  include StyleMixin
+end
+
+# Calendar demo
+#
+class CustomCalendarDemo < Wee::Component
+  include StyleMixin
+
+  # Holds the current chosen date
+  attr_accessor :date
+
+  # Initialize with a Date object (defaults to today)
+  #
+  def initialize(date=Date.today)
+    super()
+    @date = date
+  end
   
-  # Custom CSS styles
+  # Backtrack state
   #
-  module StyleMixin
-    def render_styles
-      r.style("
-        a {
-          text-decoration: none;
-        }
-        body {
-          font-size : 11px;
-          font-family : Arial, Helvetica, sans-serif;
-          text-align: center;
-        }
-        td {
-          font-family: Arial, Helvetica, sans-serif;
-          font-size: 11px;
-          border: 1px solid;
-          background-color: #FFFFFF;
-          vertical-align: top;
-          text-align: center;
-        }
-        th {
-          font-family: Arial, Helvetica, sans-serif;
-          font-size: 11px;
-          font-style: normal;
-          font-weight: bold;
-          background-color: #BBCCFF;
-          border: 1px solid;
-          vertical-align: top;
-          text-align: center;
-        }
-      ")
-    end
+  def backtrack_state(snap)
+    super
+    snap.add(self)
   end
 
-  # Calendar with custom CSS styles
+  # Render calendar icon
   #
-  class CustomCalendar < MiniCalendar
-    include StyleMixin
+  def render_icon
+    icon = 'http://www.softcomplex.com/products/tigra_calendar/img/cal.gif'
+    r.image.src(icon).width(16).height(16).border(0).alt('Calendar')
   end
-
-  # Calendar demo
+  
+  # Render Calendar demo
   #
-  class CustomCalendarDemo < Wee::Component
-    include StyleMixin
-
-    # Holds the current chosen date
-    attr_accessor :date
-
-    # Initialize with a Date object (defaults to today)
-    #
-    def initialize(date=Date.today)
-      super()
-      @date = date
-    end
-    
-    # Backtrack state
-    #
-    def backtrack_state(snap)
-      super
-      snap.add(self)
-    end
-
-    # Render calendar icon
-    #
-    def render_icon
-      icon = 'http://www.softcomplex.com/products/tigra_calendar/img/cal.gif'
-      r.image.src(icon).width(16).height(16).border(0).alt('Calendar')
-    end
-    
-    # Render Calendar demo
-    #
-    def render
-      r.html do
-        r.head { r.title('Calendar Demo'); render_styles }
-        r.body do
-          r.break
-          r.table { r.table_row { r.table_header {
-            r.table do
-              r.table_row { r.table_header('Calendar Demo') }
-              r.table_row { r.table_data {
-                r.text_input.value(@date).attr(:date)
-                r.space
-                r.anchor.callback { calendar }.with { render_icon }
-              }}
-            end
-          }}}
-        end
-      end
-    end
-    
-    # Call the calendar component
-    #
-    def calendar()
-      if date = call( CustomCalendar.new(@date) )
-        @date = date
+  def render
+    r.html do
+      r.head { r.title('Calendar Demo'); render_styles }
+      r.body do
+        r.break
+        r.table { r.table_row { r.table_header {
+          r.table do
+            r.table_row { r.table_header('Calendar Demo') }
+            r.table_row { r.table_data {
+              r.text_input.value(@date).attr(:date)
+              r.space
+              r.anchor.callback { calendar }.with { render_icon }
+            }}
+          end
+        }}}
       end
     end
   end
+  
+  # Call the calendar component
+  #
+  def calendar()
+    call( CustomCalendar.new(@date), :set_date)
+  end
 
-  app = Wee::Utils.app_for(CustomCalendarDemo)
-  Wee::WEBrickAdaptor.register('/app' => app).start
+  def set_date(date)
+    @date = date if date
+  end
 end

data/examples/{example.rb → demo/example.rb}

@@ -1,50 +1,5 @@
-$LOAD_PATH.unshift << "../lib"
-require 'wee'
-require 'window'
-
-class Counter < Wee::Component
-  def initialize(cnt)
-    super()
-    @cnt = cnt 
-  end
-
-  def backtrack_state(snap)
-    super
-    snap.add(self)
-  end
-
-  def dec
-    @cnt -= 1
-  end
-
-  def inc
-    @cnt += 1
-  end
-
-  def render
-    r.anchor.callback { dec }.with("--")
-    r.space; r.text(@cnt.to_s); r.space 
-    r.anchor.callback { inc }.with("++")
-  end
-end
-
-class MessageBox < Wee::Component
-  def initialize(text)
-    super()
-    @text = text 
-  end
-
-  def render
-    r.break
-    r.text(@text)
-    r.form do 
-      r.submit_button.value('OK').callback { answer true }
-      r.space
-      r.submit_button.value('Cancel').callback { answer false }
-    end
-    r.break
-  end
-end
+require 'wee/examples/window'
+require 'wee/examples/editable_counter'
 
 class RegexpValidatedInput < Wee::Component
 
@@ -93,50 +48,17 @@ class RegexpValidatedInput < Wee::Component
 
 end
 
-class EditableCounter < Counter 
-
-  def initialize(cnt)
-    super
-    @show_edit_field = false
-  end
-
-  def render
-    #r.form.callback{submit}.with do
-      r.anchor.callback { dec }.with("--")
-      r.space
-
-      if @show_edit_field
-        r.text_input.callback{|@cnt|}.value(@cnt).size(6)
-        r.submit_button.callback{submit}.value('S')
-      else
-        r.anchor.callback{submit}.with(@cnt) 
-      end
-
-      r.space
-      r.anchor.callback{inc}.with("++")
-    #end
-  end
-
-  def submit
-    if @cnt.to_s !~ /^\d+$/
-      call MessageBox.new("You entered an invalid counter! Please try again!")
-      @cnt = 0
-    else
-      @show_edit_field = !@show_edit_field
-    end
-    @cnt = @cnt.to_i
-  end
-
-  def cnt=(val)
-    @cnt = val
-  end
-
-end
-
 class MainPage < Wee::Component
   def initialize
     super()
-    @counters = (1..10).map {|i| Wee::Window.new("Cnt #{ i }", "#{i*10}px", EditableCounter.new(i))}
+    @counters = (1..10).map {|i|
+      Wee::Examples::Window.new {|w| 
+        w.title = "Cnt #{ i }"
+        w.pos_x = "200px"
+        w.pos_y = "#{i*50}px"
+        w.child = Wee::Examples::EditableCounter.new(i)
+      }
+    }
     children.push(*@counters)
     children << (@val_inp = RegexpValidatedInput.new('Michael Neumann', /^\w+\s+\w+$/))
 
@@ -196,14 +118,12 @@ class MainPage < Wee::Component
   end
 
   def add
-    if call(MessageBox.new("Do you really want to add '" + @text + "'?"))
-      @arr << @text if call(MessageBox.new("Do you really really really want to add '" + @text + "'?"))
-    end
+    call Wee::MessageBox.new("Do you really want to add '" + @text + "'?"), proc {|res|
+      if res
+        call Wee::MessageBox.new("Do you really really really want to add '" + @text + "'?"), proc {|res2| 
+          @arr << @text if res2
+        }
+      end
+    }
   end
 end
-
-if __FILE__ == $0
-  require 'wee/adaptors/webrick' 
-  require 'wee/utils'
-  Wee::WEBrickAdaptor.register('/app' => Wee::Utils.app_for(MainPage)).start 
-end

data/examples/dispatcher.rb

@@ -0,0 +1,37 @@
+require 'wee'
+require 'wee/examples/calculator'
+require 'wee/examples/counter'
+
+class Wee::Pager
+  def render_arrow(sym, text, tooltip=text)
+    index = 
+    case sym
+    when :first
+      0
+    when :prev
+      @current_page - 1
+    when :next
+      @current_page + 1
+    when :last
+      last_page_index
+    end
+    r.anchor.info("pager/#{ index }").callback(sym).tooltip(tooltip).with { r.encode_text(text) }
+  end
+
+  def render_page_num(num, current)
+    if current
+      r.bold(num+1)
+    else
+      r.anchor.info("pager/#{ num }").callback(:goto, num).with(num+1)
+    end
+  end
+end
+
+comp = Wee::ComponentDispatcher.new
+comp.add_rule /calc/, Wee::Examples::Calculator.new
+comp.add_rule /pager\/(\d+)/, Wee::Pager.new(50) do |comp, match|
+  comp.goto(Integer(match[1]))
+end
+comp.add_rule /(counter|)/, Wee::Examples::Counter.new
+
+Wee.run(comp)

data/examples/draw.rb

@@ -1,14 +1,17 @@
 $LOAD_PATH.unshift << "../lib"
 require 'wee'
-require 'wee/webrick'
-require 'wee/utils/cache'
+require 'wee/adaptors/webrick' 
+require 'wee/utils'
 require 'GD'
 
 class MainPage < Wee::Component
 
   def initialize
     @points = []
-    session.register_object_for_backtracking(@points)
+  end
+
+  def backtrack_state(snap)
+    snap.add(@points)
   end
 
   def create_image(points)
@@ -33,17 +36,17 @@ class MainPage < Wee::Component
     @points.clear
   end
 
-  def process_request(context)
-    query = context.request.unparsed_uri.split('?').last
-    @x, @y = query.split(",").map {|i| i.to_i} if query
-    super
-  end
+  #def process_request(context)
+  #  query = context.request.unparsed_uri.split('?').last
+  #  @x, @y = query.split(",").map {|i| i.to_i} if query
+  #  super
+  #end
 
   # TODO: move the above into method point (we need the current context,
   # Session.current_context)
-  def draw_point
-    @points << [@x, @y]
-  end
+  #def draw_point
+  #  @points << [@x, @y]
+  #end
 
   def render
     r.page.title("Draw Test").with do