hobo 1.3.0.RC2 → 1.3.0.RC3

data/VERSION

@@ -1 +1 @@
-1.3.0.RC2
+1.3.0.RC3

data/lib/generators/hobo/rapid/templates/hobo-rapid.js

@@ -34,6 +34,7 @@ var Hobo = {
         var params = Hobo.fieldSetParam(el, val)
         var p = el.getAttribute("hobo-ajax-params")
         if (p) params = params + "&" + p
+        params = params + '&_method=PUT'
 
         var opts = Object.merge(options || {}, { params: params, message: el.getAttribute("hobo-ajax-message")})
         Hobo.ajaxRequest(Hobo.putUrl(el), updates, opts)
@@ -257,8 +258,9 @@ var Hobo = {
 
 
     putUrl: function(el) {
+        /* we used to append _method=put here, but it doesn't work in Rails 3 */
         var spec = Hobo.modelSpecForElement(el)
-        return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id + "?_method=PUT"
+        return urlBase + "/" + Hobo.pluralise(spec.name) + "/" + spec.id
     },
 
 

data/lib/generators/hobo/rapid/templates/themes/clean/public/stylesheets/clean.css

@@ -14,6 +14,7 @@ body {color: #193440; background: url(../images/300-ACD3E6-fff.png) repeat-x #ff
 .section.content {background: #FCFFF5;}
 .button {color: white; background: #5B8BA0;}
 .button:hover {background-color: #193440;}
+.button[disabled] { background-color: #CCCCCC; }
 .add-to-collection {background: #E6E7DE;}
 .aside { background: #E5E5E5;}
 

data/lib/generators/hobo/routes/router.rb

@@ -92,7 +92,7 @@ module Generators
         end
 
         def user_routes
-          return [] unless controller < ::Hobo::Controller::User
+          return [] unless controller < ::Hobo::Controller::UserBase
           prefix = records == "users" ? "" : "#{record}_"
           [
           link("match '#{prefix}login(.:format)' => '#{records}#login', :as => '#{record}_login'",  'login'),

data/lib/hobo.rb

@@ -6,7 +6,7 @@ require 'hobo/extensions/enumerable'
 require 'hobo/extensions/array'
 
 ActiveSupport::Dependencies.autoload_paths |= [File.dirname(__FILE__)]
-
+ActiveSupport::Dependencies.autoload_once_paths |= [File.dirname(__FILE__)]
 
 module Hobo
 

data/lib/hobo/controller/model.rb

@@ -129,13 +129,15 @@ module Hobo
       def auto_actions(*args)
         options = args.extract_options!
 
-        @auto_actions = case args.first
+        @auto_actions = args.map do |arg|
+                          case arg
                           when :all        then available_auto_actions
-                          when :write_only then available_auto_write_actions     + args.rest
-                          when :read_only  then available_auto_read_actions      + args.rest
-                          when :lifecycle  then available_auto_lifecycle_actions + args.rest
-                          else args
-                        end
+                          when :write_only then available_auto_write_actions
+                          when :read_only  then available_auto_read_actions
+                          when :lifecycle  then available_auto_lifecycle_actions
+                          else arg
+                          end
+                        end.flatten.uniq
 
         except = Array(options[:except])
         except_actions = except.map do |arg|
@@ -143,9 +145,9 @@ module Hobo
             when :lifecycle   then available_auto_lifecycle_actions
             else arg
           end
-        end
+        end.flatten.uniq
 
-        @auto_actions -= except_actions.flatten
+        @auto_actions -= except_actions
 
         def_auto_actions
       end

data/lib/hobo/controller/{user.rb → user_base.rb}

@@ -1,6 +1,6 @@
 module Hobo
   module Controller
- 	 module User
+  module UserBase
 
     class << self
       def included(base)
@@ -12,7 +12,7 @@ module Hobo
             alias_method_chain :def_auto_actions, :user_actions
           end
 
-          skip_before_filter :login_required, :only => [:login, :signup, :forgot_password, :reset_password, :do_reset_password,
+          skip_before_filter :login_required, :only => [:login, :signup, :do_signup, :forgot_password, :reset_password, :do_reset_password,
                                                         :accept_invitation, :do_accept_invitation]
 
           include_taglib "rapid_user_pages", :plugin => "hobo"

data/lib/hobo/extensions/action_controller/hobo_methods.rb

@@ -2,7 +2,7 @@ ActionController::Base.class_eval do
 
   def self.hobo_user_controller
     include Hobo::Controller::Model
-    include Hobo::Controller::User
+    include Hobo::Controller::UserBase
   end
 
   def self.hobo_model_controller

data/lib/hobo/extensions/active_record/associations/collection.rb

@@ -28,12 +28,17 @@ module ActiveRecord
       # DO NOT call super here - AssociationProxy's version loads the collection, and that's bad.
       # TODO: this really belongs in Rails; migrate it there ASAP
       def respond_to?(*args)
-        proxy_respond_to?(*args) || Array.new.respond_to?(*args)
+        return super if has_one_collection?
+        proxy_respond_to?(*args) || [].respond_to?(*args)
       end
 
-      # TODO: send this patch into Rails. There's no reason to load the collection just to find out it acts like an array.
       def is_a?(klass)
-        [].is_a?(klass)
+        if has_one_collection?
+          load_target
+          @target.is_a?(klass)
+        else
+          [].is_a?(klass)
+        end
       end
 
       def member_class
@@ -52,6 +57,10 @@ module ActiveRecord
           end
         end
 
+        def has_one_collection?
+          proxy_reflection.macro == :has_one
+        end
+
     end
   end
 end

data/lib/hobo/extensions/active_record/associations/reflection.rb

@@ -9,7 +9,7 @@ module ActiveRecord
           begin
             klass_without_create_polymorphic_class
           rescue NameError => e
-            Object.class_eval "class #{e.missing_name} < ActiveRecord::Base; set_table_name '#{active_record.name.tableize}'; end"
+            Object.class_eval "class #{e.missing_name} < ActiveRecord::Base; set_table_name '#{active_record.name.tableize}'; def self.hobo_shim?; true; end; end"
             e.missing_name.constantize
           end
         else

data/lib/hobo/helper.rb

@@ -179,6 +179,10 @@ module Hobo
       object.respond_to?(:typed_id) ? "model::#{typed_id(object, attribute).to_s.dasherize}" : ""
     end
 
+    def update_elements_class(updates)
+      'update::'+comma_split(updates).join(':') unless updates.blank?
+    end
+
     def can_create?(object=this)
       if object.is_a?(Class) and object < ActiveRecord::Base
         object = object.new
@@ -248,7 +252,8 @@ module Hobo
       # TODO: Man does this need a big cleanup!
 
       if args.empty?
-        if this_parent && this_field
+        # if we're repeating over an array, this_field ends up with the current index. Is this useful to anybody?
+        if this_parent && this_field && !this_field.is_a?(Integer)
           object = this_parent
           field = this_field
         else

data/lib/hobo/helper/translations.rb

@@ -42,7 +42,7 @@ en:
           raise Hobo::I18nError, %(wrong model name: "#{model_name}" (extracted from translation key: "#{key}"). You might want to use the translate/t tag/method instead.)
         end
         options[:default].unshift("hobo.#{keys.join(".")}".to_sym)
-        options[:model] = model_class.model_name.human(:count=>options[:count]||1)
+        options[:model] = model_class.model_name.human(:count=>(options[:count] || 1).to_i)
         translate key.to_sym, options
       end
       alias_method :ht, :hobo_translate

data/lib/hobo/model.rb

@@ -33,17 +33,6 @@ module Hobo
         alias_method_chain :attr_accessor, :creator_metadata
 
         alias_method_chain :has_one, :new_method
-
-        # eval avoids the ruby 1.9.2 "super from singleton method ..." error
-        eval %(
-        def inherited(klass)
-          super
-          fields(false) do
-            Hobo.register_model(klass)
-            field(klass.inheritance_column, :string)
-          end
-        end
-        )
       end
 
       base.fields(false) # force hobo_fields to load
@@ -172,6 +161,18 @@ module Hobo
         send(:login_attribute=, name.to_sym, validate) if options.delete(:login) && respond_to?(:login_attribute=)
       end
 
+      # eval avoids the ruby 1.9.2 "super from singleton method ..." error
+      eval %(
+        def inherited(klass)
+          super
+          Hobo::Model.register_model(klass)
+          # TODO: figure out when this is needed, as Hobofields already does this
+          fields(false) do
+            field(klass.inheritance_column, :string)
+          end
+        end
+      )
+
       private
 
       def attrib_names
@@ -188,22 +189,27 @@ module Hobo
       def belongs_to_with_test_methods(name, options={}, &block)
         belongs_to_without_test_methods(name, options, &block)
         refl = reflections[name]
+        id_method = refl.options[:primary_key] || refl.klass.primary_key
         if options[:polymorphic]
           # TODO: the class lookup in _is? below is incomplete; a polymorphic association to an STI base class
           #       will fail to match an object of a derived type
           #       (ie X belongs_to Y (polymorphic), Z is a subclass of Y; @x.y_is?(some_z) will never pass)
           class_eval %{
             def #{name}_is?(target)
-              target.class.name == self.#{refl.options[:foreign_type]} && target.id == self.#{refl.primary_key_name}
+              target.class.name == self.#{refl.options[:foreign_type]} && target.#{id_method} == self.#{refl.primary_key_name}
             end
             def #{name}_changed?
               #{refl.primary_key_name}_changed? || #{refl.options[:foreign_type]}_changed?
             end
           }
         else
+          id_method = refl.options[:primary_key] || refl.klass.primary_key
           class_eval %{
             def #{name}_is?(target)
-              target.class <= ::#{refl.klass.name} && target.id == self.#{refl.primary_key_name}
+              our_id = self.#{refl.primary_key_name}
+              # if our_id is nil, only return true if target is nil
+              return target.nil? unless our_id
+              target.class <= ::#{refl.klass.name} && target.#{id_method} == our_id
             end
             def #{name}_changed?
               #{refl.primary_key_name}_changed?
@@ -464,7 +470,11 @@ module Hobo
           if parts.include?(0)
             nil
           else
-            Date.new(*parts)
+            begin
+              Date.new(*parts)
+            rescue ArgumentError => ex
+              Time.time_with_datetime_fallback(ActiveRecord::Base.default_timezone, *parts).to_date
+            end
           end
         else
           value

data/lib/hobo/rapid/generators/rapid/forms.dryml.erb

@@ -1,5 +1,6 @@
 <% each_controller do -%>
 <%
+next unless @controller < Hobo::Controller::Model
 form_fields = standard_fields :belongs_to, :has_many
 
 cancel_to_show_page  = linkable?(:show)

data/lib/hobo/rapid/generators/rapid/pages.dryml.erb

@@ -12,7 +12,7 @@
 
 
 <% each_controller do -%>
-
+<% next unless @controller < Hobo::Controller::Model %>
 <!-- ====== <%= model.name %> Pages ====== -->
 <%
 new_link = linkable?(:new)
@@ -124,11 +124,10 @@ end
 
 unless model.view_hints.secondary_children.empty?
   aside_collections = model.view_hints.secondary_children.map { |c| [model.reflections[c], model.reverse_reflection(c)] }
-  aside_collections.reject! { |refl, reverse| reverse.nil? }
 end
 -%>
 <def tag="show-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=sq_escape model_name %>'] }">
+  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=sq_escape model_name %>'], :name => name(:no_wrapper => true) }">
 
     <body: class="show-page <%= model_class %>" param/>
 
@@ -142,8 +141,8 @@ end
             <a:<%= back_link %> param="parent-link">&laquo; <ht key="<%= model_key %>.actions.back_to_parent" parent="<%= back_link_human_name %>" name="&this">Back to <name/></ht></a:<%= back_link %>>
 <% end -%>
             <h2 param="heading">
-              <ht key="<%= model_key %>.show.heading" name="&this.respond_to?(:name) ? this.name : ''">
-                <name/>
+              <ht key="<%= model_key %>.show.heading" name="#{name(:no_wrapper => true)}">
+                <%= model_name %> <name/>
               </ht>
             </h2>
 <% if boolean_fields -%>
@@ -160,7 +159,7 @@ end
 <% if edit_link -%>
 
             <a action="edit" if="&can_edit?" param="edit-link">
-              <ht key="<%= model_key %>.actions.edit" name="&this.respond_to?(:name) ? this.name : ''">
+              <ht key="<%= model_key %>.actions.edit" name="#{name(:no_wrapper => true)}">
                 Edit <%= model_name %>
               </ht>
             </a>
@@ -169,7 +168,7 @@ end
 
           <section param="content-body">
 <% if main_content -%>
-            <view:<%= main_content %> param="description"/>
+            <view:<%= main_content %> param="description" />
 <% end -%>
 <% if show_fields.any? -%>
             <field-list fields="<%= show_fields * ', ' %>" param/>
@@ -216,7 +215,7 @@ end
 
         <aside param>
 <%   for refl, reverse_refl in aside_collections -%>
-<%     if linkable?(refl.klass, :"index_for_#{reverse_refl.name}") -%>
+<%     if reverse_refl && linkable?(refl.klass, :"index_for_#{reverse_refl.name}") -%>
          <collection-preview:<%= refl.name %>.recent param="<%= refl.name %>-preview">
            <heading-content:><human-collection-name with="&this.origin" collection="<%= refl.name %>" your/></heading-content:>
          </collection-preview:<%= refl.name %>.recent>
@@ -244,14 +243,14 @@ end
 name_attribute = model.name_attribute
 -%>
 <def tag="edit-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%= model_key %>.edit.title', :default=>['Edit <%= sq_escape model_name %>'] }">
+  <page merge title="#{ht '<%= model_key %>.edit.title', :default=>['Edit <%= sq_escape model_name %>'], :name => name(:no_wrapper => true) }">
 
     <body: class="edit-page <%= model_class %>" param/>
 
     <content:>
       <section param="content-header">
         <h2 param="heading">
-          <ht key="<%= model_key %>.edit.heading" name="&this.respond_to?(:name) ? this.name : ''">
+          <ht key="<%= model_key %>.edit.heading" name="#{name(:no_wrapper => true)}">
             Edit <%= model_name %>
           </ht>
         </h2>

data/lib/hobo/rapid/helper.rb

@@ -120,15 +120,16 @@ module Hobo
         edit_text = this._?.to_s
         attributes.update(:hobo_edit_text => edit_text) unless edit_text.nil?
 
-        update = attributes.delete(:update)
-        attributes[:hobo_update] = update if update
+        if update = attributes.delete(:update)
+          attributes = add_classes(attributes, update_elements_class(update))
+        end
 
         view(attributes)
       end
 
 
 
-      AJAX_CALLBACKS = [ :before, :success, :failure, :complete ]
+      AJAX_CALLBACKS = [ :success, :failure, :complete ]
 
       AJAX_ATTRS = AJAX_CALLBACKS + [ :update, :type, :method,
                                       :script, :form, :params, :confirm, :message,

data/lib/hobo/rapid/taglibs/rapid_core.dryml

@@ -93,7 +93,15 @@ This will use `<input/>` as the tag in each table cell instead of `<view/>`
         <table fields="name, created_at, description">
           <controls:/>
         </table>
-    The controls can be further customised using the "edit-link" and "delete-button" parameters or by providing completely new content for the control column, e.g.
+
+    The controls can be further customised using the "edit-link" and "delete-button" parameters:
+
+        <table fields="name, created_at, description">
+          <controls:/>
+          <delete-button: label="Nuke Me"/>
+        </table>
+
+    or by providing completely new content for the control column:
 
         <table fields="name, created_at, description">
           <controls:>my controls!</controls:>
@@ -681,8 +689,8 @@ The "titleize" attribute is deprecated: use "capitalize" instead.
   </if>
   <else>
     <do param="default">
-      <%= s = t("tags.you.other_user.#{k || attributes.keys.first || 'default'}", :name=>this.name,
-          :default=>"#{this.name} #{'has' if attributes[:have]}#{'is' if attributes[:are]}#{'does' if attributes[:do]}")
+      <%= s = t("tags.you.other_user.#{k || attributes.keys.first || 'default'}", :name=>name(:no_wrapper => true),
+          :default=>"#{name(:no_wrapper => true)} #{'has' if attributes[:have]}#{'is' if attributes[:are]}#{'does' if attributes[:do]}")
           (titleize||capitalize) ? s.sub(/^./){|c| c.upcase} : s %>
     </do>
   </else>
@@ -750,7 +758,7 @@ Notes
    attrs = {}
    attributes.each_pair{|k,v| attrs[k.to_sym] = v}
    d = "#{your_default} #{all_parameters.default}"
-   options = {:default=>[d], :count=>(attrs[:count]||1), :name=>this.name}
+   options = {:default=>[d], :count=>(attrs[:count]||1), :name=>name(:no_wrapper => true)}
    your_key = key.split('.').last
    unless key.eql?(your_key) || attrs.has_key?(your_key.to_sym)
      options[your_key.to_sym] = t(key, :count=>options[:count], :default=>your_key.titleize)

data/lib/hobo/rapid/taglibs/rapid_editing.dryml

@@ -81,25 +81,45 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
 
 ### Attributes
 
- - include-none: Should the menu include a "none" option (true/false). Defaults: false, or true if the association is nil at render-time.
-
- - blank-message: The text for the "none" option. Default: "(No Product)" (or whatever the model name is)
-
- - sort: Sort the options (true/false)? Default: false
-
- - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call.
+  - `include-none` - whether to include a 'none' option (i.e. set the foreign key to null).   If this value is not supplied, the default is "true" if the current value is nil; otherwise the default is "false".  One implication of this is that the default may change when the form is re-rendered due to a validation failure.  Setting this value explicitly is recommended.
+  - `blank-message` - the message for the 'none' option. Defaults to "(No `<model-name>`)", e.g. "(No Product)"
+  - `options` - an array of records to include in the menu. Defaults to the all the records in the target table that match any `:conditions` declared on the `belongs_to` (subject to `limit`)
+  - `sort` - whether to sort the array of options. Defaults to no sorting.
+  - `limit` - if `options` is not specified, this limits the number of records.  Default: 100
+  - `text_method` - The method to call on each record to get the text for the option.  Multiple methods are supported ie "institution.name"
+  - `update` - one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call.
 
    NOTE: yes that's *DOM ID's* not part-names. A common source of confusion because by default the part name and DOM ID are the same.
 
   -->
-<def tag="select-one-editor" attrs="include-none, blank-message, sort, update, options"><%
+<def tag="select-one-editor" attrs="include-none, blank-message, options, sort, limit, text-method, update"><%
   raise Hobo::Error.new("Not allowed to edit") unless can_edit?
   blank_message ||= ht("#{this_type.name.to_s.underscore}.select_one_editor.blank_message", :count => 0, :default => "(No #{this_type.name.to_s.titleize})")
-  options ||= this_field_reflection.klass.all.select {|x| can_view?(x)}.map {|x|
-            [ name(:with => x, :no_wrapper => true), x.id ]
-          }
-   options = options.sort if sort
-   options.insert(0, [blank_message, ""]) if this.nil? || include_none
+  limit ||= 100
+
+  if options.blank? || !options.first.respond_to?(:first)
+    options ||= begin
+      conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).send(:conditions)
+      order = this_field_reflection.klass.default_order
+      this_field_reflection.klass.all(:conditions => conditions, :limit => limit, :order => order).select {|x| can_view?(x)}
+    end
+
+    id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
+    if text_method.nil?
+      select_options = options.map { |x| [name(:with => x, :no_wrapper => true), x.send(id_method)] }
+    else
+      select_options = options.map do |x|
+        [ text_method.split(".").inject(x) { |v, method| v.send(method) },
+             x.send(id_method) ]
+      end
+    end
+  else
+    # handle the old style, where options could be passed an options_for_select style array
+    select_options = options
+  end
+  select_options = select_options.sort if sort
+  select_options.insert(0, [blank_message, ""]) if include_none || (this.nil? && include_none != false)
+
    f = ajax_updater(object_url(this_parent, :method => :put),
                     update,
                     :method => "put",
@@ -108,7 +128,7 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
                       } })
     %>
   <select onchange="#{f}" merge-attrs>
-     <%= options_for_select(options, this ? this.id : "") %>
+     <%= options_for_select(select_options, this ? this.send(id_method) : "") %>
   </select>
 </def>
 
@@ -216,7 +236,7 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
   -->
 <def tag="integer-select-editor" attrs="options, min, max, update, nil-option, message">
  <% options ||= (min.to_i..max.to_i).to_a %>
- <select class="integer editor #{'update:' + comma_split(update).join(':') unless update.blank?} #{model_id_class(this_parent, this_field)}"
+ <select class="integer editor #{update_elements_class(update)} #{model_id_class(this_parent, this_field)}"
           merge-attrs="&message ? attributes.merge(:hobo_message => message) : attributes">
    <if test="&this.nil?"><option value=""><%= nil_option || "Choose a value" %></option></if>
    <%= options_for_select(options.*.to_s, this.to_s) %>

data/lib/hobo/rapid/taglibs/rapid_forms.dryml

@@ -32,8 +32,6 @@ Several of the tags in this taglib support the following set of ajax attributes:
 The following attributes are also supported by all the ajax tags. Set them to fragments of javascript to have that script
 executed at various points in the ajax request cycle:
 
- - before: script to run before the request
-
  - success: script to run on successful completion of the request
 
  - failure: script to run on a request failure
@@ -635,7 +633,8 @@ All of the standard ajax attributes are supported (see the main taglib documenti
   class_or_assoc = if model
                      model.is_a?(String) ? model.constantize : model
                    elsif Hobo.simple_has_many_association?(this)
-                     fields[this_field_reflection.primary_key_name] = this.proxy_owner.id
+                     id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
+                     fields[this_field_reflection.primary_key_name] = this.proxy_owner.send(id_method)
                      this
                    else
                      raise Hobo::Error.new("invalid context for <create-button>")
@@ -644,11 +643,17 @@ All of the standard ajax attributes are supported (see the main taglib documenti
   new.set_creator(current_user)
   if can_create?(new)
     label ||= ht("#{new.class.to_s.underscore}.actions.new", :default=>"New #{new.class.model_name.human}")
-    ajax_attributes = { :message => message }
     class_name = new.class.name.underscore
-    ajax_attributes[:params] = { class_name => fields } unless fields.empty?
+    params ||= params || {}
+    params = params.merge(class_name => fields) unless fields.blank?
+
+    ajax_attributes, html_attributes = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
+
+    ajax_attributes.reverse_merge!(:message => message, :params => params)
     func = ajax_updater(object_url(new.class, :method => :post), update, ajax_attributes)
-    element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
+    html_attributes.reverse_merge!(:type =>'button', :onclick => func, :value => label)
+
+    element :input, add_classes(html_attributes,
                                 "button create-button create-#{class_name}-button"), nil, true, true
   end
 %></def>
@@ -663,6 +668,7 @@ This is the default input that Rapid uses for `belongs_to` associations. The men
  - `include-none` - whether to include a 'none' option (i.e. set the foreign key to null).   If this value is not supplied, the default is "true" if the current value is nil; otherwise the default is "false".  One implication of this is that the default may change when the form is re-rendered due to a validation failure.  Setting this value explicitly is recommended.
  - `blank-message` - the message for the 'none' option. Defaults to "(No `<model-name>`)", e.g. "(No Product)"
  - `options` - an array of records to include in the menu. Defaults to the all the records in the target table that match any `:conditions` declared on the `belongs_to` (subject to `limit`)
+ - `sort` - whether to sort the array of options. Defaults to no sorting.
  - `limit` - if `options` is not specified, this limits the number of records.  Default: 100
  - `text_method` - The method to call on each record to get the text for the option.  Multiple methods are supported ie "institution.name"
 
@@ -682,12 +688,13 @@ For situations where there are too many target records to practically include in
     this_field_reflection.klass.all(:conditions => conditions, :limit => limit, :order => order).select {|x| can_view?(x)}
   end
 
+  id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
   if text_method.nil?
-    select_options = options.map { |x| [x.to_s, x.id] }
+    select_options = options.map { |x| [name(:with => x, :no_wrapper => true), x.send(id_method)] }
   else
     select_options = options.map do |x|
       [ text_method.split(".").inject(x) { |v, method| v.send(method) },
-           x.id ]
+           x.send(id_method) ]
     end
   end
   select_options = select_options.sort if sort
@@ -695,7 +702,7 @@ For situations where there are too many target records to practically include in
   attributes = add_classes(attributes, "input", "belongs_to", type_and_field)
   -%>
   <select name="#{param_name_for_this(true)}" merge-attrs="&attributes.except :name">
-    <%= options_for_select(select_options, this ? this.id : "") %>
+    <%= options_for_select(select_options, this ? this.send(id_method) : "") %>
   </select>
 </def>
 
@@ -766,11 +773,13 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
   min_chars ||= 1
   value = name(:no_wrapper => true, :if_present => true)
   -%>
-  <input type="text" name="#{param_name_for_this}"
-         class="autocompleter #{type_and_field._?.dasherize} #{css_data :complete_on, typed_id(complete_target), completer} #{css_data :min_chars, min_chars} #{'nil-value' if value==''}"
-         value="#{value=='' ? nil_value : value}"
-         merge-attrs/>
-  <div class="completions-popup" style="display:none"></div>
+  <wrap tag="span" class="field-with-errors" when="&!this_parent.errors[this_field].empty?">
+    <input type="text" name="#{param_name_for_this}"
+           class="autocompleter #{type_and_field._?.dasherize} #{css_data :complete_on, typed_id(complete_target), completer} #{css_data :min_chars, min_chars} #{'nil-value' if value==''}"
+           value="#{value=='' ? nil_value : value}"
+           merge-attrs/>
+    <div class="completions-popup" style="display:none"></div>
+  </wrap>
 </def>
 
 
@@ -877,7 +886,7 @@ Use the `stay-here` attribute to remain on the current page:
       ...
     </form>
 
-Use the `go-back` option to return to the previous page:
+Use the `go-back` option to return to the page in `session[:previous_uri]`:
 
     <form>
       <after-submit go-back/>
@@ -919,7 +928,7 @@ Use the `uri` option to specify a redirect location:
   <select merge-attrs param="default">
     <% selected=this if selected.nil? %>
     <option value="#{first_value}" unless="&first_option.nil?"><first-option/></option>
-    <do param="options"><% options_for_select(options, selected) %></do>
+    <do param="options"><%= options_for_select(options, selected) %></do>
   </select>
 </def>
 
@@ -944,8 +953,8 @@ Use the `uri` option to specify a redirect location:
     <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked
     %>
     <li repeat="&options" param>
-      <input type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
-      <name param/>
+      <input id="#{dom_id(this, :check_many)}" type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
+      <label for="#{dom_id(this, :check_many)}"><name param/></label>
     </li>
   </ul>
 </def>

data/lib/hobo/rapid/taglibs/rapid_i18n.dryml

@@ -98,7 +98,7 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
   attrs = {}
   all_attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
 <% if your && belong_class < Hobo::Model::UserBase && this.kind_of?(Hobo::Model::UserBase) && I18n.locale == :en -%>
-    <your key="&collection" merge-attrs="&{:name=>this.name}.merge(attrs)" capitalize>
+    <your key="&collection" merge-attrs="&{:name=>name(:no_wrapper => true)}.merge(attrs)" capitalize>
       <%= belong_class.human_attribute_name(collection.to_sym, attrs) %>
     </your>
 <% else -%>

data/lib/hobo/rapid/taglibs/rapid_plus.dryml

@@ -13,7 +13,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
   <div class="table-plus" merge-attrs="&attributes - attrs_for(:with_fields) - attrs_for(:table)">
     <div class="header" param="header">
       <div class="search">
-        <form param="search-form" method="get" action="">
+        <form param="search-form" method="get" action="" with="&nil">
           <hidden-fields for-query-string skip="page, search"/>
           <span><t key="hobo.table_plus.search">Search</t></span>
           <input class="search" type="search" name="search" value="&params[:search]"/>

metadata

@@ -2,7 +2,7 @@
 name: hobo
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.3.0.RC2
+  version: 1.3.0.RC3
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -04:00
+date: 2011-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC2
+        version: 1.3.0.RC3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC2
+        version: 1.3.0.RC3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.RC2
+        version: 1.3.0.RC3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -228,7 +228,7 @@ files:
 - lib/hobo/controller.rb
 - lib/hobo/controller/authentication_support.rb
 - lib/hobo/controller/model.rb
-- lib/hobo/controller/user.rb
+- lib/hobo/controller/user_base.rb
 - lib/hobo/engine.rb
 - lib/hobo/extensions/action_controller/hobo_methods.rb
 - lib/hobo/extensions/action_mailer/helper.rb
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: The web app builder for Rails