wee 0.6.0 → 0.7.0

data/lib/wee.rb

@@ -1,5 +1,5 @@
 module Wee
-  Version = "0.6.0"
+  Version = "0.7.0"
   LibPath = File.dirname(__FILE__)
 end
 

data/lib/wee/databases/og/scaffolder.rb

@@ -64,12 +64,11 @@ class OgScaffolder < Wee::Component
   end
 
   def edit(obj)
-    call Editor.new(obj).add_decoration(Wee::FormDecoration.new)
+    call editor_for(obj)
   end
 
   def add
-    call Editor.new(@domain_class.new, "Create").
-      add_decoration(Wee::FormDecoration.new)
+    call editor_for(@domain_class.new)
   end
 
   def destroy(obj)
@@ -84,37 +83,54 @@ class OgScaffolder < Wee::Component
   def domain_objects
     @domain_class.all || []
   end
+
+  def editor_class
+    Editor
+  end
+
+  def editor_for(obj)
+    editor_class.new(obj).add_decoration(Wee::FormDecoration.new)
+  end
 end
 
 class OgScaffolder::Editor < Wee::Component
 
-  def initialize(domain_object, action="Edit")
+  def initialize(domain_object)
     super()
     @domain_object = domain_object
-    @action = action
   end
 
   def render
     render_header
     each_property {|prop| 
-      render_property(prop) unless prop.name == 'oid'
+      unless prop.name == 'oid'
+        render_label(prop)
+        render_property(prop) 
+      end
     }
     render_buttons
   end
 
   def render_header
-    r.h1 "#{ @action } #{ @domain_object.class }"
+    action =
+      if @domain_object.oid.nil?
+        "Create"
+      else
+        "Edit"
+      end
+
+    r.h1 "#{ action } #{ @domain_object.class }"
   end
 
   def render_property(prop)
-    render_label(prop)
-
     if prop.klass.ancestors.include?(Numeric)
       render_numeric(prop)
     elsif prop.klass.ancestors.include?(String)
       render_string(prop)
     elsif prop.klass.ancestors.include?(TrueClass)
       render_bool(prop)
+    elsif prop.klass.ancestors.include?(Date)
+      render_date(prop)
     end
   end
 
@@ -131,11 +147,25 @@ class OgScaffolder::Editor < Wee::Component
   end
 
   def render_bool(prop)
-    selected = [ get_value_of(prop) ? true : false ]
+    selected = get_value_of(prop) ? true : false
     r.select_list([true, false]).labels(["Yes", "No"]).selected(selected).
-      callback {|choosen| set_value_of(prop, choosen.first) }
+      callback {|choosen| set_value_of(prop, choosen) }
   end
 
+  require 'date'
+  def render_date(prop)
+    t = get_value_of(prop) || Time.now
+    
+    m = Date::MONTHS.invert
+    months = (1..12).map {|i| m[i].capitalize}
+    r.select_list((t.year-10 .. t.year+10).to_a).selected(t.year).callback {|year| set_date_of(prop, year, :year) }
+    r.space
+    r.select_list((1..12).to_a).labels(months).selected(t.month).callback {|month| set_date_of(prop, month, :month) }
+    r.space
+    r.select_list((1..31).to_a).selected(t.day).callback {|day| set_date_of(prop, day, :day) }
+  end
+
+
   def render_buttons
     r.paragraph
     r.submit_button.value('Save').callback(:save)
@@ -155,6 +185,15 @@ class OgScaffolder::Editor < Wee::Component
     @domain_object.class.__props.each(&block)
   end
 
+  def save
+    @domain_object.save!
+    answer @domain_object
+  end
+
+  def cancel
+    answer nil
+  end
+
   def get_value_of(prop)
     @domain_object.send(prop.symbol)
   end
@@ -163,12 +202,18 @@ class OgScaffolder::Editor < Wee::Component
     @domain_object.send(prop.symbol.to_s + "=", value)
   end
 
-  def save
-    @domain_object.save!
-    answer @domain_object
+  def set_date_of(prop, val, pos)
+    v = get_value_of(prop) || Date.new
+    new_date = [v.year, v.month, v.day]
+    pos = 
+      case pos
+      when :year then 0
+      when :month then 1
+      when :day then 2
+      else raise
+      end
+    new_date[pos] = val
+    set_value_of(prop, Date.new(*new_date))
   end
 
-  def cancel
-    answer nil
-  end
 end

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

@@ -340,24 +340,36 @@ class Brush::SelectListTag < Brush::GenericTagBrush
       if choosen.size > 1 and not is_multiple
         raise "choosen more than one element from a non-multiple select list" 
       end
-      callback.call(choosen)
+      if is_multiple
+        callback.call(choosen)
+      else
+        callback.call(choosen.first)
+      end
     end
   end
 
   def with
     @labels ||= @items.collect { |i| i.to_s }
-    @selected ||= Array.new
+
+    is_multiple = @attributes.has_key?('multiple')
 
     if @callback
       # A callback was specified. We have to wrap it inside a
       # SelectListCallback object as we want to perform some 
       # additional actions.
-      __input_callback(SelectListCallback.new(@callback, @items, @attributes.has_key?('multiple')))
+      __input_callback(SelectListCallback.new(@callback, @items, is_multiple))
     end
 
     super do
-      @items.each_index do |i|
-        @canvas.option.value(i).selected(@selected.include?(@items[i])).with(@labels[i])
+      if is_multiple
+        @selected ||= Array.new
+        @items.each_index {|i|
+          @canvas.option.value(i).selected(@selected.include?(@items[i])).with(@labels[i])
+        }
+      else
+        @items.each_index {|i|
+          @canvas.option.value(i).selected(@selected == @items[i]).with(@labels[i])
+        }
       end
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: wee
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2005-01-31
+  version: 0.7.0
+date: 2005-02-01
 summary: Wee is a framework for building highly dynamic web applications.
 require_paths: 
   - lib
@@ -33,8 +33,8 @@ files:
   - bin
   - benchmark
   - examples
-  - Rakefile
   - wee.gemspec
+  - Rakefile
   - TODO
   - INSTALL
   - ChangeLog
@@ -99,19 +99,19 @@ files:
   - doc/rdoc/files/lib/wee/response_rb.html
   - doc/rdoc/files/lib/wee/html_canvas_rb.html
   - doc/rdoc/files/lib/wee/html_writer_rb.html
-  - doc/rdoc/files/lib/wee/application_rb.html
   - doc/rdoc/files/lib/wee/pageless_rb.html
+  - doc/rdoc/files/lib/wee/application_rb.html
   - doc/rdoc/files/lib/wee/presenter_rb.html
   - doc/rdoc/files/lib/wee/state_registry_rb.html
   - doc/rdoc/files/lib/wee/continuation_rb.html
   - doc/rdoc/files/lib/wee/holder_rb.html
   - doc/rdoc/files/lib/wee/session_rb.html
   - doc/rdoc/files/lib/wee/context_rb.html
-  - doc/rdoc/files/lib/wee/webrick_rb.html
-  - doc/rdoc/files/lib/wee/idgen_rb.html
   - doc/rdoc/files/lib/wee/requesthandler_rb.html
-  - doc/rdoc/files/lib/wee/stuff_rb.html
+  - doc/rdoc/files/lib/wee/idgen_rb.html
+  - doc/rdoc/files/lib/wee/webrick_rb.html
   - doc/rdoc/files/lib/wee/decoration_rb.html
+  - doc/rdoc/files/lib/wee/stuff_rb.html
   - doc/rdoc/files/lib/wee/request_rb.html
   - doc/rdoc/files/lib/wee/components/wrapper_decoration_rb.html
   - doc/rdoc/files/lib/wee/components/form_decoration_rb.html
@@ -127,8 +127,8 @@ files:
   - doc/rdoc/files/lib/wee/pageless/session_rb.html
   - doc/rdoc/files/lib/wee/pageless/request_rb.html
   - doc/rdoc/files/lib/wee/renderer/html
-  - doc/rdoc/files/lib/wee/renderer/html/brushes_rb.html
   - doc/rdoc/files/lib/wee/renderer/html/canvas_rb.html
+  - doc/rdoc/files/lib/wee/renderer/html/brushes_rb.html
   - doc/rdoc/files/lib/wee/renderer/html/writer_rb.html
   - doc/rdoc/files/lib/wee/continuation/core
   - doc/rdoc/files/lib/wee/continuation/session_rb.html
@@ -154,9 +154,9 @@ files:
   - doc/rdoc/files/lib/wee/idgen/md5_rb.html
   - doc/rdoc/files/lib/wee/databases/og
   - doc/rdoc/files/lib/wee/databases/og_rb.html
+  - doc/rdoc/files/lib/wee/databases/og/old_scaffolder_rb.html
   - doc/rdoc/files/lib/wee/databases/og/application_rb.html
   - doc/rdoc/files/lib/wee/databases/og/session_rb.html
-  - doc/rdoc/files/lib/wee/databases/og/old_scaffolder_rb.html
   - doc/rdoc/files/lib/wee/databases/og/scaffolder_rb.html
   - doc/rdoc/files/lib/wee/utils/autoreload_rb.html
   - doc/rdoc/files/lib/wee/utils/helper_rb.html
@@ -185,44 +185,44 @@ files:
   - doc/rdoc/classes/Wee/Session.html
   - doc/rdoc/classes/Wee/Page.html
   - doc/rdoc/classes/Wee/Helper.html
-  - doc/rdoc/classes/Wee/SimpleIdGenerator.html
   - doc/rdoc/classes/Wee/RefreshResponse.html
+  - doc/rdoc/classes/Wee/SimpleIdGenerator.html
   - doc/rdoc/classes/Wee/GenericResponse.html
   - doc/rdoc/classes/Wee/PageDecoration.html
   - doc/rdoc/classes/Wee/RequestHandler.html
   - doc/rdoc/classes/Wee/Decoration.html
-  - doc/rdoc/classes/Wee/AnswerDecoration.html
+  - doc/rdoc/classes/Wee/WEBrickAdaptor.html
   - doc/rdoc/classes/Wee/MessageBox.html
   - doc/rdoc/classes/Wee/Response.html
   - doc/rdoc/classes/Wee/Snapshot.html
-  - doc/rdoc/classes/Wee/HtmlWriter.html
-  - doc/rdoc/classes/Wee/WEBrickAdaptor.html
-  - doc/rdoc/classes/Wee/PagelessRequest.html
   - doc/rdoc/classes/Wee/CallbackStream.html
+  - doc/rdoc/classes/Wee/HtmlWriter.html
+  - doc/rdoc/classes/Wee/PagelessApplication.html
+  - doc/rdoc/classes/Wee/AnswerDecoration.html
   - doc/rdoc/classes/Wee/StateRegistry.html
   - doc/rdoc/classes/Wee/Delegate.html
   - doc/rdoc/classes/Wee/ValueHolder.html
   - doc/rdoc/classes/Wee/FormDecoration.html
   - doc/rdoc/classes/Wee/Canvas.html
-  - doc/rdoc/classes/Wee/RedirectResponse.html
+  - doc/rdoc/classes/Wee/PagelessRequest.html
   - doc/rdoc/classes/Wee/StateHolder.html
-  - doc/rdoc/classes/Wee/PagelessApplication.html
+  - doc/rdoc/classes/Wee/RedirectResponse.html
   - doc/rdoc/classes/Wee/RenderingContext.html
   - doc/rdoc/classes/Wee/Brush.html
   - doc/rdoc/classes/Wee/Context.html
   - doc/rdoc/classes/Wee/CallbackRegistry.html
   - doc/rdoc/classes/Wee/ErrorPage.html
+  - doc/rdoc/classes/Wee/Request.html
   - doc/rdoc/classes/Wee/LiteralMethodCallback.html
   - doc/rdoc/classes/Wee/WrapperDecoration.html
-  - doc/rdoc/classes/Wee/Request.html
   - doc/rdoc/classes/Wee/Callback.html
   - doc/rdoc/classes/Wee/MethodCallback.html
-  - doc/rdoc/classes/Wee/Utils.html
   - doc/rdoc/classes/Wee/HtmlCanvas.html
+  - doc/rdoc/classes/Wee/Utils.html
   - doc/rdoc/classes/Wee/Component.html
   - doc/rdoc/classes/Wee/Application.html
-  - doc/rdoc/classes/Wee/Presenter.html
   - doc/rdoc/classes/Wee/PagelessSession.html
+  - doc/rdoc/classes/Wee/Presenter.html
   - doc/rdoc/classes/Wee/ErrorResponse.html
   - doc/rdoc/classes/Wee/Md5IdGenerator.html
   - doc/rdoc/classes/Wee/Utils/LRUCache.html
@@ -322,9 +322,9 @@ files:
   - lib/wee/idgen/md5.rb
   - lib/wee/databases/og
   - lib/wee/databases/og.rb
-  - lib/wee/databases/og/old_scaffolder.rb
   - lib/wee/databases/og/application.rb
   - lib/wee/databases/og/session.rb
+  - lib/wee/databases/og/old_scaffolder.rb
   - lib/wee/databases/og/scaffolder.rb
   - lib/wee/core/component.rb
   - lib/wee/core/snapshot.rb
@@ -339,8 +339,8 @@ files:
   - lib/wee/pageless/session.rb
   - lib/wee/pageless/request.rb
   - lib/wee/renderer/html
-  - lib/wee/renderer/html/brushes.rb
   - lib/wee/renderer/html/canvas.rb
+  - lib/wee/renderer/html/brushes.rb
   - lib/wee/renderer/html/writer.rb
   - lib/wee/continuation/core
   - lib/wee/continuation/session.rb