Bring examples up-to-date with latest commits

mneumann · Jan 6, 2010 · 8ca9aba · 8ca9aba
1 parent 2cb116e
commit 8ca9aba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/examples/arc_challenge2.rb b/examples/arc_challenge2.rb
@@ -9,27 +9,28 @@
 $LOAD_PATH.unshift "../lib"
 require 'rubygems'
 require 'wee'
-require "wee/conversation"
 
 class Wee::IO
   def initialize(component)
     @component = component
   end
 
   def ask
-    @component.display do |r|
+    @component.call_inline do |r|
-      text = nil
+      r.form do
-      r.text_input.callback {|t| text = t}
+        text = nil
-      r.submit_button.callback { answer(text) }.value("Enter")
+        r.text_input.callback {|t| text = t}
+        r.submit_button.callback { answer(text) }.value("Enter")
+      end
     end 
   end
 
   def pause(text)
-    @component.display {|r| r.anchor.callback { answer }.with(text) }
+    @component.call_inline {|r| r.anchor.callback { answer }.with(text) }
   end
 
   def tell(text)
-    @component.display {|r| r.text text.to_s }
+    @component.call_inline {|r| r.text text.to_s }
   end
 end
 

diff --git a/examples/cheese_task.rb b/examples/cheese_task.rb
@@ -1,10 +1,8 @@
 $LOAD_PATH.unshift "../lib"
 require 'rubygems'
 require 'wee'
-require 'wee/conversation'
 
 class CheeseTask < Wee::Task
-
   def go
     begin choose_cheese end until confirm_cheese
     inform_cheese
@@ -24,7 +22,6 @@ def confirm_cheese
   def inform_cheese
     inform "Your favorite is #{@cheese}."
   end
-
 end
 
 Wee.runcc(CheeseTask) if __FILE__ == $0
diff --git a/examples/demo/counter.rb b/examples/demo/counter.rb
@@ -2,13 +2,12 @@ class Counter < Wee::Component
   attr_accessor :count
 
   def initialize(initial_count=0)
-    super()
+    @count = initial_count
-    @count = initial_count 
+    add_decoration Wee::StyleDecoration.new(self)
   end
 
-  def state(s)
+  def state(s) super
-    super
+    s.add_ivar(self, :@count)
-    s.add_ivar(self, :@count, @count)
   end
 
   def dec
@@ -19,11 +18,12 @@ def inc
     @count += 1
   end
 
+  def style
+    ".wee-Counter a { border: 1px dotted blue; margin: 2px; }"
+  end
+
   def render(r)
-    r.once(self.class) {
+    r.div.oid.css_class('wee-Counter').with {
-      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)