wee 0.9.1 → 0.10.0

data/ChangeLog

@@ -1,3 +1,39 @@
+Mon Jul 25 16:56:53 CEST 2005	Michael Neumann	<mneumann@ntecs.de>
+
+	* lib/wee/databases/og/scaffolder.rb: Now works again with Og >= 0.21.0.
+	  Enhanced for password input fields and for validation.
+
+	* lib/wee/renderer/html/brushes.rb, lib/wee/renderer/html/canvas.rb: 
+
+	  - Fixed bug in SelectListTag#selected where you could not pre-select 
+		  from [true, false] the false item. 
+	  - Added class PasswordInputTag and method HtmlCanvasRenderer#password_input   
+
+	* examples/og-test.rb: Works now with 0g 0.21.0. Enhanced.  
+
+	* lib/wee.rb: Version 0.10.0
+
+Mon Jul 25 14:59:14 CEST 2005	Michael Neumann	<mneumann@ntecs.de>
+
+	* lib/wee/renderer/html/brushes.rb:
+
+		- Refactored method html_attr (removed bool_attr) and all classes that use it.
+
+	  - removed methods GenericTagBrush#css_class_for and ImageTag#src_for.
+
+Tue Jul 19 15:57:51 CEST 2005	Michael Neumann <mneumann@ntecs.de>
+
+	* lib/wee/session.rb, lib/wee/idgen/simple.rb, lib/wee/pageless/session.rb, 
+	  lib/wee/application.rb, lib/wee/renderer/html/brushes.rb,
+	  lib/wee/adaptors/rails.rb, lib/wee/adaptors/nitro.rb, lib/wee.rb,
+	  examples/test.rb:
+	  Renamed Wee::SimpleIdGenerator to Wee::SequentialIdGenerator.
+
+	* lib/wee/page.rb: removed as it is not used anymore (we have
+	  wee/core/page.rb instead).
+
+	* Rakefile: added target 'tag'
+
 --------------------------------------------------------------------
 TAGGED 0.9.1
 --------------------------------------------------------------------

data/Rakefile

@@ -30,6 +30,17 @@ task :install do
   ruby 'install.rb'
 end
 
+task :tag do
+  if File.read('lib/wee.rb') =~ /Version\s+=\s+"(\d+\.\d+\.\d+)"/
+    version = $1
+  else
+    raise "no version"
+  end
+  baseurl = "svn+ssh://ntecs.de/data/projects/svn/public/Wee"
+
+  sh "svn cp -m 'tagged #{ version }' #{ baseurl }/trunk #{ baseurl }/tags/wee-#{ version }"
+end
+
 task :clean => [:clobber_rdoc]
 
 task :default => [:test, :rdoc, :clean]

data/examples/og-test.rb

@@ -2,12 +2,20 @@
 # The datamodel
 # -----------------------------------------
 
-require 'og'
+require 'rubygems'
+require_gem 'og', '>= 0.21.0'
 
-class Customer
-  prop_accessor :address, String, :sql => 'VARCHAR(100) NOT NULL'
-  prop_accessor :email, String, :sql => 'VARCHAR(50) NOT NULL'
-  prop_accessor :password, String, :sql => 'VARCHAR(10) NOT NULL'
+class Customer < Og::Entity
+  property :address, String, :sql => 'VARCHAR(100) NOT NULL'
+  property :email, String, :sql => 'VARCHAR(50) NOT NULL'
+  property :password, String, :sql => 'VARCHAR(10) NOT NULL', :ui => :password
+
+  property :birth_date, Date, :label => 'Date of Birth'
+  property :active, TrueClass
+
+  validate_value :address
+  validate_value :email
+  validate_value :password
 end
 
 # -----------------------------------------
@@ -38,14 +46,15 @@ if __FILE__ == $0
 
   DB_CONFIG = {
     :address => "localhost",
-    :database => "mneumann",
-    :backend => "psql",
+    :name => "mneumann",
+    :store => "psql",
     :user => "mneumann",
     :password => "",
+    #:destroy => true,
     :connection_count => 10 
   }
 
   app = Wee::Utils.app_for(CustomerList, :application => OgApplication, :session => OgSession)
-  app.db = Og::Database.new(DB_CONFIG)
+  app.db = Og.setup(DB_CONFIG)
   Wee::WEBrickAdaptor.register('/app' => app).start
 end

data/examples/test.rb

@@ -32,7 +32,7 @@ if __FILE__ == $0
   require 'wee/adaptors/webrick'
   app = Wee::Application.new {|app|
     app.default_request_handler { MySession.new }
-    app.id_generator = Wee::SimpleIdGenerator.new(rand(1_000_000))
+    app.id_generator = Wee::SequentialIdGenerator.new(rand(1_000_000))
     app.max_request_handlers = 2
   }
   Wee::WEBrickAdaptor.register('/app' => app).start

data/lib/wee.rb

@@ -1,5 +1,5 @@
 module Wee
-  Version = "0.9.1"
+  Version = "0.10.0"
   LibPath = File.dirname(__FILE__)
 end
 
@@ -24,7 +24,7 @@ require 'wee/renderer/html/brushes'
 require 'wee/renderer/html/canvas'
 Wee::DefaultRenderer = Wee::HtmlCanvasRenderer
 
-require 'wee/idgen/simple'
+require 'wee/idgen/sequential'
 require 'wee/idgen/md5'
 
 def Wee.run(component, add_page_decoration=true, mount_path='/app')

data/lib/wee/adaptors/nitro.rb

@@ -105,7 +105,7 @@ module Wee::Nitro
       if components.has_key?(name)
         raise "disallowed to overwrite component #{ name }"
       else
-        components[name] = Wee::PagelessComponentDriver.new(obj, Wee::CallbackRegistry.new(Wee::SimpleIdGenerator.new))
+        components[name] = Wee::PagelessComponentDriver.new(obj, Wee::CallbackRegistry.new(Wee::SequentialIdGenerator.new))
       end
     end
 
@@ -122,7 +122,7 @@ module Wee::Nitro
     end
 
     def _show_component(name, hash={}, out='')
-      cb = Wee::CallbackRegistry.new(Wee::SimpleIdGenerator.new)
+      cb = Wee::CallbackRegistry.new(Wee::SequentialIdGenerator.new)
       rctx = Wee::RenderingContext.new(context(), cb, Wee::HtmlWriter.new(out))
       rctx.component_name = name
       rctx.controller = self

data/lib/wee/adaptors/rails.rb

@@ -98,7 +98,7 @@ module Wee::Rails
       if components.has_key?(name)
         raise "disallowed to overwrite component #{ name }"
       else
-        components[name] = Wee::PagelessComponentDriver.new(obj, Wee::CallbackRegistry.new(Wee::SimpleIdGenerator.new))
+        components[name] = Wee::PagelessComponentDriver.new(obj, Wee::CallbackRegistry.new(Wee::SequentialIdGenerator.new))
       end
     end
 
@@ -115,7 +115,7 @@ module Wee::Rails
     end
 
     def _show_component(name, hash={}, out='')
-      cb = Wee::CallbackRegistry.new(Wee::SimpleIdGenerator.new)
+      cb = Wee::CallbackRegistry.new(Wee::SequentialIdGenerator.new)
       ctx = Wee::Context.new(@request, @response, @session)
       rctx = Wee::RenderingContext.new(ctx, cb, Wee::HtmlWriter.new(out))
       rctx.component_name = name

data/lib/wee/application.rb

@@ -27,14 +27,14 @@ class Wee::Application
   #
   #   Wee::Application.new {|app|
   #     app.default_request_handler { MySession.new } 
-  #     app.id_generator = Wee::SimpleIdGenerator.new
+  #     app.id_generator = Wee::SequentialIdGenerator.new
   #     app.max_request_handlers = 1000 
   #   }
 
   def initialize(&block)
     @request_handlers = Hash.new
     block.call(self)
-    @id_generator ||= Wee::SimpleIdGenerator.new(rand(1_000_000))
+    @id_generator ||= Wee::SequentialIdGenerator.new(rand(1_000_000))
     if @default_request_handler.nil?
       raise ArgumentError, "No default request handler specified"
     end

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

@@ -1,11 +1,10 @@
-# This is a Rails-like scaffolder for use with Og (http://navel.gr/nitro)
-# domain objects.
+# This is a Rails-like scaffolder for use with Og >= 0.21.0
+# (http://navel.gr/nitro).
 
 class OgScaffolder < Wee::Component
   def initialize(domain_class)
     super()
     @domain_class = domain_class
-    @props = @domain_class.__props.reject {|a| a.name == 'oid'}
   end
 
   def render
@@ -21,7 +20,7 @@ class OgScaffolder < Wee::Component
 
   def render_header
     r.table_row.with {
-      @props.each {|prop|
+      each_property {|prop|
         render_property_header(prop)
       }
       render_action_header
@@ -35,7 +34,7 @@ class OgScaffolder < Wee::Component
 
   def render_property_header(prop)
     r.table_header.with {
-      r.bold(prop.name.to_s.capitalize)
+      r.bold(prop.meta[:label] || prop.symbol.to_s.capitalize)
     }
   end
 
@@ -45,7 +44,7 @@ class OgScaffolder < Wee::Component
 
   def render_object(obj)
     r.table_row {
-      @props.each {|prop| render_property(obj, prop) } 
+      each_property {|prop| render_property(obj, prop) } 
       render_action(obj)
     }
   end
@@ -59,7 +58,7 @@ class OgScaffolder < Wee::Component
   end
 
   def render_property(obj, prop)
-    r.table_data(obj.send(prop.name).to_s)
+    r.table_data(obj.send(prop.symbol).to_s)
   end
 
   def edit(obj)
@@ -76,7 +75,7 @@ class OgScaffolder < Wee::Component
   end
 
   def confirm_destroy(obj, confirmed)
-    obj.delete! if confirmed
+    obj.delete if confirmed
   end
 
   def domain_objects
@@ -90,6 +89,15 @@ class OgScaffolder < Wee::Component
   def editor_for(obj)
     editor_class.new(obj).add_decoration(Wee::FormDecoration.new)
   end
+
+  protected
+
+  def each_property
+    @domain_class.properties.each {|prop|
+      yield prop if prop.symbol != :oid
+    }
+  end
+
 end
 
 class OgScaffolder::Editor < Wee::Component
@@ -97,15 +105,15 @@ class OgScaffolder::Editor < Wee::Component
   def initialize(domain_object)
     super()
     @domain_object = domain_object
+    @errors = nil
   end
 
   def render
     render_header
+    render_errors if @errors
     each_property {|prop| 
-      unless prop.name == 'oid'
-        render_label(prop)
-        render_property(prop) 
-      end
+      render_label(prop)
+      render_property(prop) 
     }
     render_buttons
   end
@@ -121,12 +129,27 @@ class OgScaffolder::Editor < Wee::Component
     r.h1 "#{ action } #{ @domain_object.class }"
   end
 
+  def render_errors
+    r.paragraph
+    r.h2 "Errors"
+    if @errors == :validation
+      r.ul {
+        @domain_object.errors.each do |sym, msg|
+          r.li("#{ sym }: #{ msg }")
+        end
+      }
+    else
+      r.text("Unexpected error occured")
+    end
+  end
+
   def render_property(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)
+    elsif prop.klass.ancestors.include?(TrueClass) or 
+          prop.klass.ancestors.include?(FalseClass)
       render_bool(prop)
     elsif prop.klass.ancestors.include?(Date)
       render_date(prop)
@@ -138,8 +161,11 @@ class OgScaffolder::Editor < Wee::Component
   end
 
   def render_string(prop)
-    if prop.meta[:ui] == :textarea
+    case prop.meta[:ui]
+    when :textarea
       r.text_area.callback(:set_value_of, prop).with(get_value_of(prop))
+    when :password
+      r.password_input.value(get_value_of(prop)).callback(:set_value_of, prop)
     else
       r.text_input.value(get_value_of(prop)).callback(:set_value_of, prop)
     end
@@ -148,7 +174,7 @@ class OgScaffolder::Editor < Wee::Component
   def render_bool(prop)
     selected = get_value_of(prop) ? true : false
     r.select_list([true, false]).labels(["Yes", "No"]).selected(selected).
-      callback {|choosen| set_value_of(prop, choosen) }
+      callback(:set_value_of, prop)
   end
 
   require 'date'
@@ -173,19 +199,31 @@ class OgScaffolder::Editor < Wee::Component
 
   def render_label(prop)
     r.paragraph
-    r.text prop.name.capitalize
+    r.text(prop.meta[:label] || prop.symbol.to_s.capitalize)
     r.break
   end
 
-  private
+  protected
 
-  def each_property(&block)
-    @domain_object.class.__props.each(&block)
+  def each_property
+    @domain_object.class.properties.each {|prop|
+      yield prop if prop.symbol != :oid
+    }
   end
 
   def save
-    @domain_object.save!
-    answer @domain_object
+    if @domain_object.valid?
+      begin
+        @domain_object.save
+        @errors = nil
+      rescue => err
+        @errors = err
+      end
+    else
+      @errors = :validation
+    end
+
+    answer @domain_object if @errors.nil?
   end
 
   def cancel

data/lib/wee/idgen/{simple.rb → sequential.rb}

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

data/lib/wee/pageless/session.rb

@@ -34,7 +34,7 @@ class Wee::PagelessSession < Wee::Session
   end
 
   def handle_render_phase
-    new_callbacks = Wee::CallbackRegistry.new(Wee::SimpleIdGenerator.new)
+    new_callbacks = Wee::CallbackRegistry.new(Wee::SequentialIdGenerator.new)
     respond(@context, new_callbacks)   # render
     self.callbacks = new_callbacks
   end

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

@@ -19,7 +19,9 @@ class Brush
   end
 end
 
-class Brush::GenericTextBrush < Brush
+class Brush
+
+class GenericTextBrush < Brush
   def initialize(text)
     super()
     @text = text
@@ -33,7 +35,7 @@ class Brush::GenericTextBrush < Brush
   end
 end
 
-class Brush::GenericEncodedTextBrush < Brush
+class GenericEncodedTextBrush < Brush
   def initialize(text)
     super()
     @text = text
@@ -47,36 +49,53 @@ class Brush::GenericEncodedTextBrush < Brush
   end
 end
 
-class Brush::GenericTagBrush < Brush
+class GenericTagBrush < Brush
 
   class << self
     private
 
-    def bool_attr(*attrs)
-      attrs.each { |a|
+		def html_attr(attr, hash={})
+      name = hash[:html_name] || attr
+
+      case hash[:type]
+      when :bool
         class_eval " 
-          def #{ a }(bool=true)
+          def #{ attr }(bool=true)
             if bool
-              @attributes['#{ a }'] = nil
+              @attributes['#{ name }'] = nil
             else
-              @attributes.delete('#{ a }')
+              @attributes.delete('#{ name }')
             end
             self
           end
         "
-      }
-    end
-
-    def html_attr(*attrs)
-      attrs.each { |a|
+      else
         class_eval " 
-          def #{ a }(value)
-            html_attr('#{ a }', value)
+          def #{ attr }(value)
+            if value == nil
+              @attributes.delete('#{ name }')
+            else
+              @attributes['#{ name }'] = value.to_s
+            end
+            self
           end
         "
-      }
-    end
+      end
 
+      if hash[:aliases]
+        hash[:aliases].each do |a|
+          class_eval "alias #{ a } #{ attr }"
+        end
+      end
+
+      if hash[:shortcuts]
+        hash[:shortcuts].each_pair do |k,v|
+          class_eval "
+            def #{ k }() #{ attr }(#{ v.inspect }) end
+          "
+        end
+      end
+		end
   end
 
   private
@@ -139,11 +158,9 @@ class Brush::GenericTagBrush < Brush
     @attributes = Hash.new
   end
 
-  html_attr :type, :id
-
-  def css_class(c)
-    html_attr("class", c)
-  end
+  html_attr 'type'
+  html_attr 'id'
+  html_attr 'css_class', :html_name => 'class'
 
   def onclick_callback(symbol=nil, *args, &block)
     raise ArgumentError if symbol and block
@@ -157,15 +174,6 @@ class Brush::GenericTagBrush < Brush
     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
-  # from the current component.
-
-  def css_class_for(prop)
-    val = @canvas.current_component.lookup_property(prop)
-    raise "no property found for: <#{ prop }>" if val.nil?
-    css_class(val)
-  end
-
   def with(text=nil, &block)
     doc = @canvas.document
     if @is_single_tag
@@ -186,26 +194,17 @@ class Brush::GenericTagBrush < Brush
   end
 end
 
-class Brush::GenericSingleTagBrush < Brush::GenericTagBrush
+class GenericSingleTagBrush < GenericTagBrush
   def initialize(tag)
     super(tag, true)
   end
 end
 
-class Brush::ImageTag < Brush::GenericSingleTagBrush
-  html_attr :src
-
-  # This method construct the src attribute by looking up the property from the
-  # current component.
-
-  def src_for(prop)
-    val = @canvas.current_component.lookup_property(prop)
-    raise "no property found for: <#{ prop }>" if val.nil?
-    src(val)
-  end
+class ImageTag < GenericSingleTagBrush
+  html_attr 'src'
 
   def initialize
-    super("img")
+    super('img')
   end
 
   def with
@@ -213,29 +212,31 @@ class Brush::ImageTag < Brush::GenericSingleTagBrush
   end
 end
 
-class Brush::JavascriptTag < Brush::GenericTagBrush
-  html_attr :src, :type
+class JavascriptTag < GenericTagBrush
+  html_attr 'src'
+  html_attr 'type'
 
   def initialize
-    super("script")
-    type("text/javascript")
+    super('script')
+    type('text/javascript')
   end
 end
 
-class Brush::TableTag < Brush::GenericTagBrush
+class TableTag < GenericTagBrush
   def initialize
     super('table')
   end
 end  
 
-class Brush::TableRowTag < Brush::GenericTagBrush
+class TableRowTag < GenericTagBrush
   def initialize
     super('tr')
   end
 
-  def align_top
-    html_attr('align', 'top')
-  end
+  html_attr 'align', :shortcuts => {
+    :align_top => 'top',
+    :align_bottom => 'bottom'
+  }
 
   def columns(*cols, &block)
     with {
@@ -278,28 +279,44 @@ class Brush::TableRowTag < Brush::GenericTagBrush
   end
 end
 
-class Brush::InputTag < Brush::GenericSingleTagBrush
+class InputTag < GenericSingleTagBrush
   def initialize
     super('input')
   end
 
-  html_attr :type, :name, :value, :size, :maxlength, :src
-  bool_attr :checked, :disabled, :readonly
+  html_attr 'type'
+  html_attr 'name'
+  html_attr 'value'
+  html_attr 'size'
+  html_attr 'maxlength'
+  html_attr 'src'
+  html_attr 'checked',  :type => :bool
+  html_attr 'disabled', :type => :bool
+  html_attr 'readonly', :type => :bool
 
   def with
     super
   end
 end
 
-class Brush::TextAreaTag < Brush::GenericTagBrush
+class TextAreaTag < GenericTagBrush
   def initialize
     super('textarea')
   end
 
   alias callback __input_callback
 
-  html_attr :name, :rows, :cols, :tabindex, :accesskey, :onfocus, :onblur, :onselect, :onchange
-  bool_attr :disabled, :readonly
+  html_attr 'name'
+  html_attr 'rows'
+  html_attr 'cols'
+  html_attr 'tabindex'
+  html_attr 'accesskey'
+  html_attr 'onfocus'
+  html_attr 'onblur'
+  html_attr 'onselect'
+  html_attr 'onchange'
+  html_attr 'disabled', :type => :bool
+  html_attr 'readonly', :type => :bool
 
   def value(val)
     @value = val
@@ -319,18 +336,19 @@ class Brush::TextAreaTag < Brush::GenericTagBrush
   end
 end
 
-class Brush::SelectOptionTag < Brush::GenericTagBrush
+class SelectOptionTag < GenericTagBrush
   def initialize
     super('option')
   end
 
-  bool_attr :selected
+  html_attr 'selected', :type => :bool
 end
 
-class Brush::SelectListTag < Brush::GenericTagBrush
+class SelectListTag < GenericTagBrush
 
-  bool_attr :disabled, :readonly, :multiple
-  alias multi multiple
+  html_attr 'disabled', :type => :bool
+  html_attr 'readonly', :type => :bool
+  html_attr 'multiple', :type => :bool, :aliases => [:multi]
 
   def initialize(items)
     super('select')
@@ -344,7 +362,7 @@ class Brush::SelectListTag < Brush::GenericTagBrush
 
   def selected(arg=nil, &block)
     raise if arg and block
-    @selected = arg || block
+    @selected = block || arg
     self
   end
 
@@ -410,7 +428,7 @@ class Brush::SelectListTag < Brush::GenericTagBrush
   end
 end
 
-class Brush::HiddenInputTag < Brush::InputTag
+class HiddenInputTag < InputTag
   def initialize
     super
     type('hidden')
@@ -419,7 +437,16 @@ class Brush::HiddenInputTag < Brush::InputTag
   alias callback __input_callback
 end
 
-class Brush::TextInputTag < Brush::InputTag
+class PasswordInputTag < InputTag
+  def initialize
+    super
+    type('password')
+  end
+
+  alias callback __input_callback
+end
+
+class TextInputTag < InputTag
   def initialize
     super
     type('text')
@@ -428,7 +455,7 @@ class Brush::TextInputTag < Brush::InputTag
   alias callback __input_callback
 end
 
-class Brush::RadioButtonTag < Brush::InputTag
+class RadioButtonTag < InputTag
   def initialize
     super
     type('radio')
@@ -438,7 +465,7 @@ class Brush::RadioButtonTag < Brush::InputTag
     def initialize(canvas)
       @name = canvas.register_callback(:input, self)
       @callbacks = {} 
-      @ids = Wee::SimpleIdGenerator.new 
+      @ids = Wee::SequentialIdGenerator.new 
     end
 
     def add_callback(callback)
@@ -478,7 +505,7 @@ class Brush::RadioButtonTag < Brush::InputTag
 
 end
 
-class Brush::CheckboxTag < Wee::Brush::InputTag
+class CheckboxTag < InputTag
   def initialize
     super
     type('checkbox')
@@ -486,7 +513,7 @@ class Brush::CheckboxTag < Wee::Brush::InputTag
   alias callback __input_callback
 end
 
-class Brush::FileUploadTag < Brush::InputTag
+class FileUploadTag < InputTag
   def initialize
     super
     type('file')
@@ -495,7 +522,7 @@ class Brush::FileUploadTag < Brush::InputTag
   alias callback __input_callback
 end
 
-class Brush::SubmitButtonTag < Brush::InputTag
+class SubmitButtonTag < InputTag
   def initialize
     super
     type('submit')
@@ -511,7 +538,7 @@ end
 # #value method. Note that it's neccessary to parse the passed form-fields and
 # generate a "name" fields in the request, to make this image-button work. 
 
-class Brush::ImageButtonTag < Brush::InputTag
+class ImageButtonTag < InputTag
   def initialize
     super
     type('image')
@@ -524,29 +551,31 @@ class Brush::ImageButtonTag < Brush::InputTag
   end
 end
 
-class Brush::TableDataTag < Brush::GenericTagBrush
+class TableDataTag < GenericTagBrush
   def initialize
     super('td')
   end
 
-  def align_top
-    html_attr('align', 'top')
-  end
+  html_attr 'align', :shortcuts => {
+    :align_top => 'top',
+    :align_bottom => 'bottom'
+  }
 end
 
-class Brush::TableHeaderTag < Brush::GenericTagBrush
+class TableHeaderTag < GenericTagBrush
   def initialize
     super('th')
   end
 end
 
-class Brush::FormTag < Brush::GenericTagBrush
+class FormTag < GenericTagBrush
   def initialize
     super('form')
     @attributes['method'] = 'POST'
   end
 
-  html_attr :action, :enctype
+  html_attr 'action'
+  html_attr 'enctype'
 
   alias __set_url action
   alias callback __actionurl_callback
@@ -567,14 +596,13 @@ class Brush::FormTag < Brush::GenericTagBrush
   end
 end
 
-class Brush::AnchorTag < Brush::GenericTagBrush
+class AnchorTag < GenericTagBrush
   def initialize
     super('a')
   end
 
-  html_attr :href, :title
-  alias url href
-  alias tooltip title
+  html_attr 'href', :aliases => [:url]
+  html_attr 'title', :aliases => [:tooltip]
 
   alias __set_url url
 
@@ -601,7 +629,7 @@ class Brush::AnchorTag < Brush::GenericTagBrush
 
 end
 
-class Brush::Page < Brush
+class Page < Brush
   def title(t)
     @title = t
     self
@@ -634,4 +662,6 @@ class Brush::Page < Brush
   end
 end
 
+end # class Brush
+
 end # module Wee

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

@@ -124,6 +124,10 @@ class HtmlCanvasRenderer < Renderer
     handle(Brush::HiddenInputTag.new, *args, &block)
   end
 
+  def password_input(*args, &block)
+    handle(Brush::PasswordInputTag.new, *args, &block)
+  end
+
   def text_input(*args, &block)
     handle(Brush::TextInputTag.new, *args, &block)
   end

data/lib/wee/session.rb

@@ -21,7 +21,7 @@ class Wee::Session < Wee::AbstractSession
   protected
 
   def setup(&block)
-    @idgen = Wee::SimpleIdGenerator.new
+    @idgen = Wee::SequentialIdGenerator.new
 
     with_session do
       block.call(self) if block
@@ -143,7 +143,7 @@ class Wee::Session < Wee::AbstractSession
   # Return a new Wee::Page object with the given snapshot assigned.
 
   def create_page(snapshot)
-    idgen = Wee::SimpleIdGenerator.new
+    idgen = Wee::SequentialIdGenerator.new
     page = Wee::Page.new(snapshot, Wee::CallbackRegistry.new(idgen))
   end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.4
 specification_version: 1
 name: wee
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2005-07-18 00:00:00 +02:00
+  version: 0.10.0
+date: 2005-07-25
 summary: Wee is a framework for building highly dynamic web applications.
 require_paths: 
   - lib
@@ -24,8 +24,6 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
   - Michael Neumann
 files: 
@@ -88,7 +86,6 @@ files:
   - doc/rdoc/files/lib/wee/idgen
   - doc/rdoc/files/lib/wee/databases
   - doc/rdoc/files/lib/wee/utils
-  - doc/rdoc/files/lib/wee/examples
   - doc/rdoc/files/lib/wee/snapshot_ext_rb.html
   - doc/rdoc/files/lib/wee/callback_rb.html
   - doc/rdoc/files/lib/wee/snapshot_rb.html
@@ -96,6 +93,7 @@ files:
   - doc/rdoc/files/lib/wee/component_rb.html
   - doc/rdoc/files/lib/wee/template_rb.html
   - doc/rdoc/files/lib/wee/page_rb.html
+  - doc/rdoc/files/lib/wee/examples
   - doc/rdoc/files/lib/wee/component_ext_rb.html
   - doc/rdoc/files/lib/wee/components_rb.html
   - doc/rdoc/files/lib/wee/core_rb.html
@@ -105,8 +103,6 @@ files:
   - 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/abstractsession_rb.html
-  - doc/rdoc/files/lib/wee/core_ext_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
@@ -118,24 +114,26 @@ files:
   - 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/login_decoration_rb.html
+  - doc/rdoc/files/lib/wee/core_ext_rb.html
+  - doc/rdoc/files/lib/wee/abstractsession_rb.html
+  - doc/rdoc/files/lib/wee/components/wrapper_decoration_rb.html
   - doc/rdoc/files/lib/wee/components/form_decoration_rb.html
   - doc/rdoc/files/lib/wee/components/messagebox_rb.html
-  - doc/rdoc/files/lib/wee/components/pager_rb.html
-  - doc/rdoc/files/lib/wee/components/wrapper_decoration_rb.html
   - doc/rdoc/files/lib/wee/components/page_decoration_rb.html
   - doc/rdoc/files/lib/wee/components/component_dispatcher_rb.html
+  - doc/rdoc/files/lib/wee/components/login_decoration_rb.html
+  - doc/rdoc/files/lib/wee/components/pager_rb.html
   - doc/rdoc/files/lib/wee/core/componentrunner_rb.html
   - doc/rdoc/files/lib/wee/core/valueholder_rb.html
   - doc/rdoc/files/lib/wee/core/callback_rb.html
   - doc/rdoc/files/lib/wee/core/snapshot_rb.html
-  - doc/rdoc/files/lib/wee/core/page_rb.html
   - doc/rdoc/files/lib/wee/core/component_rb.html
+  - doc/rdoc/files/lib/wee/core/decoration_rb.html
+  - doc/rdoc/files/lib/wee/core/presenter_rb.html
   - doc/rdoc/files/lib/wee/core/context_rb.html
   - doc/rdoc/files/lib/wee/core/idgen_rb.html
   - doc/rdoc/files/lib/wee/core/renderer_rb.html
-  - doc/rdoc/files/lib/wee/core/decoration_rb.html
-  - doc/rdoc/files/lib/wee/core/presenter_rb.html
+  - doc/rdoc/files/lib/wee/core/page_rb.html
   - doc/rdoc/files/lib/wee/pageless/application_rb.html
   - doc/rdoc/files/lib/wee/pageless/session_rb.html
   - doc/rdoc/files/lib/wee/pageless/request_rb.html
@@ -150,10 +148,10 @@ files:
   - doc/rdoc/files/lib/wee/rendering/html/brushes_rb.html
   - doc/rdoc/files/lib/wee/rendering/html/canvas_rb.html
   - doc/rdoc/files/lib/wee/rendering/html/writer_rb.html
+  - doc/rdoc/files/lib/wee/adaptors/webrick_rb.html
+  - doc/rdoc/files/lib/wee/adaptors/fastcgi_rb.html
   - doc/rdoc/files/lib/wee/adaptors/rails_rb.html
   - doc/rdoc/files/lib/wee/adaptors/nitro_rb.html
-  - doc/rdoc/files/lib/wee/adaptors/fastcgi_rb.html
-  - doc/rdoc/files/lib/wee/adaptors/webrick_rb.html
   - doc/rdoc/files/lib/wee/skeleton/og
   - doc/rdoc/files/lib/wee/skeleton/simple
   - doc/rdoc/files/lib/wee/skeleton/og/models
@@ -185,14 +183,12 @@ files:
   - doc/rdoc/classes/Wee
   - doc/rdoc/classes/OgScaffolder
   - doc/rdoc/classes/Cache
-  - doc/rdoc/classes/ActionView
   - doc/rdoc/classes/Enumerable.html
   - doc/rdoc/classes/Array.html
-  - doc/rdoc/classes/ActionView.html
+  - doc/rdoc/classes/OgSession.html
   - doc/rdoc/classes/Wee.html
-  - doc/rdoc/classes/Hash.html
-  - doc/rdoc/classes/Main.html
   - doc/rdoc/classes/Struct.html
+  - doc/rdoc/classes/Main.html
   - doc/rdoc/classes/Cache.html
   - doc/rdoc/classes/OgApplication.html
   - doc/rdoc/classes/LiteralMethod.html
@@ -200,123 +196,125 @@ files:
   - doc/rdoc/classes/String.html
   - doc/rdoc/classes/Object.html
   - doc/rdoc/classes/Recipe.html
-  - doc/rdoc/classes/OgSession.html
-  - doc/rdoc/classes/Wee/Rails
-  - doc/rdoc/classes/Wee/Nitro
+  - doc/rdoc/classes/ActionView.html
+  - doc/rdoc/classes/Hash.html
+  - doc/rdoc/classes/ActionView
   - doc/rdoc/classes/Wee/Utils
   - doc/rdoc/classes/Wee/Component
   - doc/rdoc/classes/Wee/StateRegistry
-  - doc/rdoc/classes/Wee/Examples
   - doc/rdoc/classes/Wee/Brush
-  - doc/rdoc/classes/Wee/LiteralMethodCallback.html
-  - doc/rdoc/classes/Wee/SimpleIdGenerator.html
-  - doc/rdoc/classes/Wee/Helper.html
   - doc/rdoc/classes/Wee/Session.html
-  - doc/rdoc/classes/Wee/HtmlCanvasRenderer.html
+  - doc/rdoc/classes/Wee/Page.html
+  - doc/rdoc/classes/Wee/Helper.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/MessageBox.html
   - doc/rdoc/classes/Wee/Response.html
-  - doc/rdoc/classes/Wee/Pager.html
   - doc/rdoc/classes/Wee/Snapshot.html
-  - doc/rdoc/classes/Wee/WEBrickAdaptor.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/StateRegistry.html
-  - doc/rdoc/classes/Wee/ValueHolder.html
-  - doc/rdoc/classes/Wee/DupReplaceSnapshotMixin.html
   - doc/rdoc/classes/Wee/Delegate.html
+  - doc/rdoc/classes/Wee/ValueHolder.html
   - doc/rdoc/classes/Wee/Canvas.html
   - doc/rdoc/classes/Wee/FormDecoration.html
-  - doc/rdoc/classes/Wee/PagelessRequest.html
-  - doc/rdoc/classes/Wee/LoginDecoration.html
+  - doc/rdoc/classes/Wee/RedirectResponse.html
+  - doc/rdoc/classes/Wee/StateHolder.html
+  - doc/rdoc/classes/Wee/PagelessApplication.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/Nitro.html
-  - doc/rdoc/classes/Wee/HtmlCanvas.html
-  - doc/rdoc/classes/Wee/Component.html
-  - doc/rdoc/classes/Wee/RefreshResponse.html
-  - doc/rdoc/classes/Wee/Page.html
-  - doc/rdoc/classes/Wee/ComponentDispatcher.html
-  - doc/rdoc/classes/Wee/Examples.html
-  - doc/rdoc/classes/Wee/CanvasMixin.html
-  - doc/rdoc/classes/Wee/PageDecoration.html
-  - doc/rdoc/classes/Wee/RequestHandler.html
-  - doc/rdoc/classes/Wee/Decoration.html
-  - doc/rdoc/classes/Wee/GenericResponse.html
-  - doc/rdoc/classes/Wee/ComponentRunner.html
-  - doc/rdoc/classes/Wee/IdGenerator.html
-  - doc/rdoc/classes/Wee/PagelessComponentDriver.html
-  - doc/rdoc/classes/Wee/Renderer.html
-  - doc/rdoc/classes/Wee/AnswerDecoration.html
-  - doc/rdoc/classes/Wee/AbstractSession.html
-  - doc/rdoc/classes/Wee/RedirectResponse.html
-  - doc/rdoc/classes/Wee/StateHolder.html
-  - doc/rdoc/classes/Wee/Context.html
-  - doc/rdoc/classes/Wee/Brush.html
-  - doc/rdoc/classes/Wee/PagelessApplication.html
-  - doc/rdoc/classes/Wee/FastCGIAdaptor.html
   - doc/rdoc/classes/Wee/Callback.html
   - doc/rdoc/classes/Wee/MethodCallback.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/ErrorResponse.html
   - doc/rdoc/classes/Wee/Md5IdGenerator.html
+  - doc/rdoc/classes/Wee/Nitro
+  - doc/rdoc/classes/Wee/Nitro.html
+  - doc/rdoc/classes/Wee/Rails
+  - doc/rdoc/classes/Wee/CanvasMixin.html
   - doc/rdoc/classes/Wee/Rails.html
-  - doc/rdoc/classes/Wee/Rails/ControllerClassMixin.html
-  - doc/rdoc/classes/Wee/Rails/FormTag.html
-  - doc/rdoc/classes/Wee/Rails/HtmlCanvasRenderer.html
-  - doc/rdoc/classes/Wee/Rails/ControllerMixin.html
-  - doc/rdoc/classes/Wee/Nitro/ControllerClassMixin.html
-  - doc/rdoc/classes/Wee/Nitro/FormTag.html
-  - doc/rdoc/classes/Wee/Nitro/HtmlCanvasRenderer.html
-  - doc/rdoc/classes/Wee/Nitro/ControllerMixin.html
+  - doc/rdoc/classes/Wee/Examples
+  - doc/rdoc/classes/Wee/ComponentDispatcher.html
+  - doc/rdoc/classes/Wee/DupReplaceSnapshotMixin.html
+  - doc/rdoc/classes/Wee/Examples.html
+  - doc/rdoc/classes/Wee/ComponentRunner.html
+  - doc/rdoc/classes/Wee/IdGenerator.html
+  - doc/rdoc/classes/Wee/Renderer.html
+  - doc/rdoc/classes/Wee/Pager.html
+  - doc/rdoc/classes/Wee/FastCGIAdaptor.html
+  - doc/rdoc/classes/Wee/LoginDecoration.html
+  - doc/rdoc/classes/Wee/PagelessComponentDriver.html
+  - doc/rdoc/classes/Wee/AbstractSession.html
+  - doc/rdoc/classes/Wee/HtmlCanvasRenderer.html
   - doc/rdoc/classes/Wee/Utils/LRUCache.html
   - doc/rdoc/classes/Wee/Component/OnAnswer.html
   - doc/rdoc/classes/Wee/StateRegistry/Snapshot.html
   - doc/rdoc/classes/Wee/StateRegistry/WithObject.html
-  - doc/rdoc/classes/Wee/Examples/Counter.html
-  - doc/rdoc/classes/Wee/Examples/Window.html
-  - doc/rdoc/classes/Wee/Examples/Calculator.html
-  - doc/rdoc/classes/Wee/Examples/EditableCounter.html
   - doc/rdoc/classes/Wee/Brush/SelectListTag
-  - doc/rdoc/classes/Wee/Brush/RadioButtonTag
-  - doc/rdoc/classes/Wee/Brush/TableTag.html
+  - doc/rdoc/classes/Wee/Brush/GenericSingleTagBrush.html
+  - doc/rdoc/classes/Wee/Brush/GenericTagBrush.html
   - doc/rdoc/classes/Wee/Brush/Page.html
-  - doc/rdoc/classes/Wee/Brush/SubmitButtonTag.html
   - doc/rdoc/classes/Wee/Brush/TableDataTag.html
-  - doc/rdoc/classes/Wee/Brush/ActionMixin.html
-  - doc/rdoc/classes/Wee/Brush/RadioButtonTag.html
-  - doc/rdoc/classes/Wee/Brush/ActionURLCallbackMixin.html
-  - doc/rdoc/classes/Wee/Brush/SelectOptionTag.html
-  - doc/rdoc/classes/Wee/Brush/TableHeaderTag.html
-  - doc/rdoc/classes/Wee/Brush/FormTag.html
-  - doc/rdoc/classes/Wee/Brush/SelectListTag.html
-  - doc/rdoc/classes/Wee/Brush/ActionCallbackMixin.html
-  - doc/rdoc/classes/Wee/Brush/ToCallback.html
-  - doc/rdoc/classes/Wee/Brush/FileUploadTag.html
   - doc/rdoc/classes/Wee/Brush/ImageTag.html
-  - doc/rdoc/classes/Wee/Brush/HiddenInputTag.html
-  - doc/rdoc/classes/Wee/Brush/TextAreaTag.html
-  - doc/rdoc/classes/Wee/Brush/TableRowTag.html
-  - doc/rdoc/classes/Wee/Brush/GenericTagBrush.html
-  - doc/rdoc/classes/Wee/Brush/GenericSingleTagBrush.html
   - doc/rdoc/classes/Wee/Brush/InputCallbackMixin.html
-  - doc/rdoc/classes/Wee/Brush/CheckboxTag.html
+  - doc/rdoc/classes/Wee/Brush/FileUploadTag.html
+  - doc/rdoc/classes/Wee/Brush/GenericEncodedTextBrush.html
+  - doc/rdoc/classes/Wee/Brush/ActionURLCallbackMixin.html
+  - doc/rdoc/classes/Wee/Brush/ActionMixin.html
+  - doc/rdoc/classes/Wee/Brush/TableTag.html
   - doc/rdoc/classes/Wee/Brush/GenericTextBrush.html
   - doc/rdoc/classes/Wee/Brush/AssignMixin.html
   - doc/rdoc/classes/Wee/Brush/InputTag.html
+  - doc/rdoc/classes/Wee/Brush/SubmitButtonTag.html
+  - doc/rdoc/classes/Wee/Brush/TableHeaderTag.html
+  - doc/rdoc/classes/Wee/Brush/FormTag.html
+  - doc/rdoc/classes/Wee/Brush/ActionCallbackMixin.html
+  - doc/rdoc/classes/Wee/Brush/ToCallback.html
   - doc/rdoc/classes/Wee/Brush/TextInputTag.html
   - doc/rdoc/classes/Wee/Brush/CallbackMixin.html
   - doc/rdoc/classes/Wee/Brush/JavascriptTag.html
+  - doc/rdoc/classes/Wee/Brush/SelectOptionTag.html
   - doc/rdoc/classes/Wee/Brush/AnchorTag.html
-  - doc/rdoc/classes/Wee/Brush/GenericEncodedTextBrush.html
+  - doc/rdoc/classes/Wee/Brush/RadioButtonTag
+  - doc/rdoc/classes/Wee/Brush/SelectListTag.html
+  - doc/rdoc/classes/Wee/Brush/TextAreaTag.html
   - doc/rdoc/classes/Wee/Brush/ImageButtonTag.html
+  - doc/rdoc/classes/Wee/Brush/TableRowTag.html
+  - doc/rdoc/classes/Wee/Brush/HiddenInputTag.html
+  - doc/rdoc/classes/Wee/Brush/CheckboxTag.html
+  - doc/rdoc/classes/Wee/Brush/RadioButtonTag.html
   - doc/rdoc/classes/Wee/Brush/SelectListTag/SelectListCallback.html
   - doc/rdoc/classes/Wee/Brush/RadioButtonTag/RadioGroup.html
+  - doc/rdoc/classes/Wee/Nitro/ControllerClassMixin.html
+  - doc/rdoc/classes/Wee/Nitro/ControllerMixin.html
+  - doc/rdoc/classes/Wee/Nitro/FormTag.html
+  - doc/rdoc/classes/Wee/Nitro/HtmlCanvasRenderer.html
+  - doc/rdoc/classes/Wee/Rails/ControllerClassMixin.html
+  - doc/rdoc/classes/Wee/Rails/ControllerMixin.html
+  - doc/rdoc/classes/Wee/Rails/FormTag.html
+  - doc/rdoc/classes/Wee/Rails/HtmlCanvasRenderer.html
+  - doc/rdoc/classes/Wee/Examples/EditableCounter.html
+  - doc/rdoc/classes/Wee/Examples/Calculator.html
+  - doc/rdoc/classes/Wee/Examples/Window.html
+  - doc/rdoc/classes/Wee/Examples/Counter.html
   - doc/rdoc/classes/OgScaffolder/Editor.html
   - doc/rdoc/classes/Cache/Strategy
   - doc/rdoc/classes/Cache/StorageCache.html
@@ -360,7 +358,6 @@ files:
   - lib/wee/core_ext.rb
   - lib/wee/abstractsession.rb
   - lib/wee/template.rb
-  - lib/wee/page.rb
   - lib/wee/skeleton/og
   - lib/wee/skeleton/simple
   - lib/wee/skeleton/og/models
@@ -382,8 +379,8 @@ files:
   - lib/wee/components/page_decoration.rb
   - lib/wee/components/component_dispatcher.rb
   - lib/wee/components/form_decoration.rb
-  - lib/wee/idgen/simple.rb
   - lib/wee/idgen/md5.rb
+  - lib/wee/idgen/sequential.rb
   - lib/wee/databases/og
   - lib/wee/databases/og.rb
   - lib/wee/databases/og/old_scaffolder.rb

data/lib/wee/page.rb

@@ -1 +0,0 @@
-class Wee::Page < Struct.new(:snapshot, :callbacks); end