hobo_rapid 1.4.0.pre8 → 2.0.0.pre1

data/VERSION

@@ -1 +1 @@
-1.4.0.pre8
+2.0.0.pre1

data/app/helpers/hobo_rapid_helper.rb

@@ -9,9 +9,9 @@ module HoboRapidHelper
 
     AJAX_PUSHSTATE_ATTRS = [:push_state, :new_title]
 
-    AJAX_ATTRS = AJAX_CALLBACKS + AJAX_UPDATE_ATTRS + AJAX_EFFECT_ATTRS + AJAX_SPINNER_ATTRS + AJAX_PUSHSTATE_ATTRS
-    [:params, :errors_ok,
-     :reset_form, :refocus_form ]
+    AJAX_ATTRS = AJAX_CALLBACKS + AJAX_UPDATE_ATTRS + AJAX_EFFECT_ATTRS + AJAX_SPINNER_ATTRS + AJAX_PUSHSTATE_ATTRS +
+      [:params, :errors_ok,
+       :reset_form, :refocus_form ]
 
     def app_name(add_subsite=true)
       an = Rails.application.config.hobo.app_name
@@ -194,4 +194,31 @@ module HoboRapidHelper
       end
     end
 
+    # the meat of with-fields, with-field-names, with-fields-grouped.
+    # returns the list of field names
+    def with_fields_helper(attrs)
+      attrs[:fields].nil? || attrs[:associations].nil? or raise ArgumentError, "with-fields -- specify either fields or associations but not both"
+
+      field_names = if attrs[:associations] == "has_many"
+                      this.class.reflections.values.select { |refl| refl.macro == :has_many }.map { |refl| refl.name.to_s }
+
+                    elsif attrs[:fields].nil? || attrs[:fields] == "*" || attrs[:fields].is_a?(Class)
+                      klass = attrs[:fields].is_a?(Class) ? attrs[:fields] : this.class
+                      columns = standard_fields(klass, attrs[:include_timestamps])
+
+                      if attrs[:skip_associations] == "has_many"
+                        assocs = this.class.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
+                        columns + assocs
+                      elsif attrs[:skip_associations]
+                        columns
+                      else
+                        assocs = klass.reflections.values.map &its.name.to_s
+                        columns + assocs
+                      end
+                    else
+                      comma_split(attrs[:fields].gsub('-', '_'))
+                    end
+      field_names -= comma_split(attrs[:skip]) if attrs[:skip]
+      field_names
+    end
 end

data/taglibs/buttons/create_button.dryml

@@ -1,40 +1,45 @@
-<!-- Provides an ajax create button that will send a RESTful "POST" to the server to create a new resource.
-
-All of the standard ajax attributes are supported (see the main taglib documention for Rapid Forms).
+<!-- Provides a button that will create a new resource.  This is normally used with ajax attributes.
 
 ### Attributes
 
- - model: The class to instantiate, pass either the class name or the class object.
+All standard ajax attributes are supported, plus:
 
- -->
-<def tag="create-button" attrs="model, update, label, fields, message"><%=
-  raise Hobo::Error.new("no update specified") unless update
+ - model: The class to instantiate, pass either the class name or the class object.  If model is not supplied, the current context (aka this) must be a has-many association.
+
+ - label: the button label.  Rather than using this attribute, the best way to customize this label is to set the i18n key `<class_name>.actions.new`
+
+ - fields: a hash containing fields and their values to set on the new object
+
+### Example
 
+    <create-button update="foo" label="New" fields="&{name: 'Hello'}"/>
+
+is equivalent to:
+
+    <form with="&this.new" update="foo">
+      <field-list: replace>
+        <hidden-field:name value="Hello"/>
+      </field-list:>
+      <submit: label="New"/>
+    </form>
+ -->
+<def tag="create-button" attrs="model, label, fields"><%
   fields ||= {}
   class_or_assoc = if model
                      model.is_a?(String) ? model.constantize : model
-                   elsif Hobo.simple_has_many_association?(this)
-                     id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
-                     fields[this_field_reflection.foreign_key] = this.proxy_owner.send(id_method)
-                     this
                    else
-                     raise Hobo::Error.new("invalid context for <create-button>")
+                     this
                    end
   new = class_or_assoc.new(fields)
   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}")
-    class_name = new.class.name.underscore
-    params ||= params || {}
-    params = params.merge(class_name => fields) unless fields.blank?
-
-    ajax_attributes, html_attributes = attributes.partition_hash(HoboRapidHelper::AJAX_ATTRS)
-
-    ajax_attributes.reverse_merge!(:message => message, :params => params)
-    func = ajax_updater(object_url(new.class, :method => :post), update, ajax_attributes)
-    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>
+  label ||= ht("#{new.class.to_s.underscore}.actions.new", :default=>"New #{new.class.model_name.human}")
+%>
+  <form with="&new" without-cancel param class="button_to" merge>
+    <submit: label="&label"/>
+    <field-list: replace>
+      <% fields.each do |field, val| %>
+        <hidden-field field="&field" value="&val"/>
+      <% end %>
+    </field-list:>
+  </form>
+</def>

data/taglibs/buttons/delete-button.dryml

@@ -28,7 +28,7 @@ then `delete-button` performs an Ajax delete and then attempts to fix up the pag
 
 ### Attributes
 
-All the standard ajax attributes *except the callbacks* are supported (see the main taglib documention for Rapid Forms).
+All the standard ajax attributes *except the callbacks* are supported (see the main taglib documentation for Rapid Forms).
 
  - label: The label for the button. Default: "Remove".  (Alternately, use the hobo.actions.remove translation to customize)
 

data/taglibs/buttons/remote_method_button.dryml

@@ -1,21 +1,21 @@
-<!-- Provides either an ajax or non-ajax button to invoke a "remote method" or "web method" declared in the controller.
-Web Methods provide support for the RPC model of client-server interaction, in contrast to the REST model. The
-preference in Rails is to use REST as much as possible, but we are pragmatists, and sometimes you just to need a remote
-procedure call.
+<!-- DEPRECATED.  remote-method-button is provided for backwards compatibility.  Ajax functionality is no longer supported.   This would be easy to fix, but testing is harder, so if you want to volunteer to test it, we can fix it for you.
 
-The URL that the call is POSTed to is the `object_url` of `this`, plus the method name
+You can replace remote-method-button with something like:
 
-`<remote-method-button>` supports all of the standard ajax attributes (see the main taglib documention for Rapid
-Forms). If any ajax attributes are given, the button becomes an ajax button, if not, Rails' `button_to` is used, which behaves similarly to a standard link.
+    <form action="method" method="POST"><submit/></form>
 
 ### Attributes
 
+Either method or url must be specified.
+
  - method: the name of the web-method to call
 
  - label: the label on the button
 
+ - url: use this url instead of looking it up
+
  -->
-<def tag="remote-method-button" attrs="method, update, label, confirm, url"><%=
+<def tag="remote-method-button" attrs="method, label, url"><%=
   ajax_attributes, html_attributes = attributes.partition_hash(HoboRapidHelper::AJAX_ATTRS)
 
   url ||= object_url(this, method.to_s.gsub('-', '_'), :method => :post)
@@ -23,11 +23,9 @@ Forms). If any ajax attributes are given, the button becomes an ajax button, if
 
   add_classes!(html_attributes, "button remote-method-button #{method}-button")
   label ||= method.titleize
-  if update || !ajax_attributes.empty?
+  if !ajax_attributes.empty?
     ajax_attributes[:message] ||= label
-    func = ajax_updater(url, update, ajax_attributes.merge(:confirm => confirm))
-    html_attributes.update(:onclick => "var e = this; " + func, :type =>'button', :value => label)
-    element(:input, html_attributes, nil, true, true)
+    fail "UNSUPPORTED"
   else
     button_to(label, url, html_attributes.merge(:confirm => confirm))
   end

data/taglibs/buttons/transition_button.dryml

@@ -1,16 +1,27 @@
-<!-- A push-button to invoke a lifecycle transition either as a page-reload or as an ajax call.
+<!-- A push button to invoke a lifecycle transition.
+
+If the transition has parameters or no ajax attributes are supplied, the push-button simply moves to the transition page.  This is bad form, you probably should use `<transition-link>` instead.
+
+If the transition has no parameters and ajax attributes are supplied, ajax is used to perform the transaction.
+
+If your transition has parameters and/or you don't want to use ajax, use and parametrize the automatically generated transition form.
+
+    <transition-button transition="mogrify" ajax/>
+
+is equivalent to
+
+    <mogrify-form without-cancel without-field-list ajax />
 
 ### Attributes
 
  - `transition` - the name of the transition to invoke. Required
- - `update` - one or more DOM IDs of ajax parts to update after the transition
  - `label` - the label on the button. Defaults to the name of the transition
 
 All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also supported.
 
 ### Warning
 
-Transitions with parameters are implemented using a form.  HTML does not allow forms to be nested, so a transitions with parameters should not be placed inside of a form.
+Buttons are implemented using a form.  HTML does not allow forms to be nested, so a transition-button should not be placed inside of a form.
 
 ### Invalid transitions
 
@@ -19,7 +30,7 @@ If the transition could not be found, the user does not have permissions for the
      <transition-button transition="mogrify"/><else>Cannot mogrify</else>
 
   -->
-<def tag="transition-button" attrs="transition, update, label"><%=
+<def tag="transition-button" attrs="transition, label"><%
     if transition.is_a?(String)
       transition = this.lifecycle.find_transition(transition, current_user)
     end
@@ -36,16 +47,17 @@ If the transition could not be found, the user does not have permissions for the
     label = t("activerecord.attributes.#{this.class.to_s.underscore}.lifecycle.transitions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
     title = t("activerecord.attribute_help.#{this.class.to_s.underscore}.lifecycle.transitions.#{transition_name}")
     html_attributes.update(:title => title) unless title.empty? 
-    url = object_url(this, transition_name, :method => html_attributes[:method])
 
-    if (update || !ajax_attributes.empty?) && !has_params
+    if (!ajax_attributes.empty?) && !has_params
       ajax_attributes[:message] ||= label
       ajax_attributes[:method] = html_attributes[:method]
-      func = ajax_updater(url, update, ajax_attributes)
-      html_attributes.update(:onclick => "var e = this; " + func, :type =>'button', :value => label)
-      element(:input, html_attributes, nil, true, true)
-    else
-      button_to(label, url, html_attributes)
+    %><form lifecycle="&transition_name" merge-attrs="&ajax_attributes" class="button_to" param>
+        <input type="hidden" name="key" value="&this.lifecycle.provided_key" if="&this.lifecycle.provided_key"/>
+        <submit label="&label" merge-attributes="&html_attributes" param="button"/>
+      </form><%
+    else %><%=
+      url = object_url(this, transition_name, :method => html_attributes[:method])
+      button_to(label, url, html_attributes) %><%
     end
   %>
 </def>
@@ -57,6 +69,10 @@ For example, you could use this on a `Friendship` card: the person invited to ha
 This tag behaves similarly to repeat: an else tag may be used to handle the case of no buttons:
 
     <transition-buttons/><else>Sorry, no buttons to press.</else>
+
+### Attributes
+
+Ajax attributes are passed through to the individual transition buttons.   All other attributes are added to the surrounding div.
   -->
 <def tag="transition-buttons">
   <% ajax_attrs, html_attrs = attributes.partition_hash(HoboRapidHelper::AJAX_ATTRS) %>

data/taglibs/buttons/update_button.dryml

@@ -1,29 +1,16 @@
-<!-- Provides an ajax button to send a RESTful update or "PUT" to the server. i.e. to udate one or more fields of a
-record.
+<!-- This tag is no longer supported in Hobo 1.4.
 
-Note that unlike simliar tags, `<update-button>` does not support both ajax and non-ajax modes at this time. It only
-does ajax.
+You can replace it with something like:
 
-`<update-button>` supports all of the standard ajax attributes (see the main taglib documention for Rapid Forms).
-
-### Attributes
-
- - label: The label on the button.
-
- - fields: A hash with new field values pairs to update the resource with. The items in the hash will be converted to
-   HTTP parameters.
-
- - params: Another hash with additional HTTP parameters to include in the ajax request
+    <form without-cancel update="...">
+      <field-list: replace>
+        <hidden-input:foo value="17"/>
+        <hidden-input:bar value="92"/>
+      </field-list:>
+    </form>
 
   -->
-<def tag="update-button" attrs="label, update, fields, params"><%=
-   raise Hobo::Error.new("no update specified") unless update
-
-   ajax_attributes, html_attributes = attributes.partition_hash(HoboRapidHelper::AJAX_ATTRS)
-   params = (params || {}).merge(this.class.name.underscore => fields)
-   ajax_attributes.reverse_merge!(:message => label, :params => params, :method => :put)
-   func = ajax_updater(object_url(this), update, ajax_attributes)
-   html_attributes.reverse_merge!(:type =>'button', :onclick => func, :value => label)
-
-   element :input, add_classes(html_attributes, "button update-button update-#{this.class.name.underscore}-button"), nil, true, true %>
+<def tag="update-button" attrs="label, update, fields, params"><%
+   raise Hobo::Error.new("unsupported")
+%>
 </def>

data/taglibs/forms/form.dryml

@@ -75,6 +75,8 @@ or on a standard generated page using a default form:
 
  - refocus-form: Refocus the first form-field after submission (only makes sense for ajax forms)
 
+ - before-unload: If set to a message, the message is displayed if the user attempts to leave the page without submitting the form.  Note that some browsers ignore the user's message and display their own in an attempt to stop mouse-trappers.
+
 ### Parameters
 
 The standard form tag does not have any parameters, nor does it have any default content.   However, Hobo does autogenerate polymorphic form tags for each of your models into `app/views/taglibs/auto/rapid/forms.dryml`.  These forms have the following parameters:
@@ -90,11 +92,12 @@ The standard form tag does not have any parameters, nor does it have any default
  - cancel
 
 -->
-<def tag="form" polymorphic >
+<def tag="form" polymorphic attrs="before-unload">
 <%
   body, html_attrs, ajax_attrs, form_attrs = form_helper(attributes, parameters)
   unless body.nil?
     add_data_rapid!(html_attrs, :form, :ajax_attrs => ajax_attrs) unless ajax_attrs.empty?
+    add_data_rapid!(html_attrs, :before_unload, :message => before_unload) if before_unload
 %>
     <%= element("form", html_attrs.merge(form_attrs), body) if body %>
 <% end %>

data/taglibs/html/a.dryml

@@ -83,6 +83,8 @@ The standard AJAX attributes are supported.
 
 * method: "get", "put", "post" or "delete".  "get" is the default
 
+* only-path, protocol, host, subdomain, domain, tld-length, port, anchor, trailing-slash: In smart mode, passed through to Rails' polymorphic_url.   For more information, see the Rails documentation for url_for.
+
 -->
 <def tag="a" attrs="action, to, params, query-params, href, format, subsite, force"><%=
   content = parameters.default
@@ -107,6 +109,10 @@ The standard AJAX attributes are supported.
     href += "?" + params.map { |n, v| "#{n}=#{v}" }.join('&') if !params.blank?
     element(:a, attributes.update(:href => href), content)
   else
+    url_options, attributes = attributes.partition_hash(%w(only_path protocol host subdomain domain tld_length port anchor trailing_slash))
+    url_options[:subsite] = subsite
+    params = url_options.merge(params || {})
+
     target = to || this
 
     if target.nil?
@@ -116,7 +122,7 @@ The standard AJAX attributes are supported.
       # Link to a new object form
       new_record = target.respond_to?(:build) ? target.build : target.new
       new_record.set_creator(current_user)
-      href = object_url(target, "new", params._?.merge(:subsite => subsite))
+      href = object_url(target, "new", params)
 
       if href && (force || can_create?(new_record))
         new_class_name = if target.respond_to?(:proxy_association)
@@ -138,7 +144,7 @@ The standard AJAX attributes are supported.
 
       content = name if content.blank?
 
-      href = object_url(target, action, (params || {}).merge(:subsite => subsite)) unless (action.nil? && target.try.new_record?)
+      href = object_url(target, action, params) unless (action.nil? && target.try.new_record?)
       if href.nil?
         # This target is registered with Hobo::Routes as not linkable
         content

data/taglibs/inputs/input_many.dryml

@@ -78,7 +78,7 @@ end
   <% skip += ",#{more_skip}" if more_skip -%>
   <% js_attrs = all_attributes.slice(:minimum, :add_hook, :remove_hook, :hide, :show) %>
   <% js_attrs[:prefix] = param_name_for_this %>
-  <ul class="input-many #{this_field.dasherize}" data-rapid="#{data_rapid('input-many', js_attrs)}" merge-attrs>
+  <ul class="input-many #{this_field.dasherize}" data-rapid="#{data_rapid('input-many', js_attrs, attributes)}" merge-attrs>
     <fake-field-context fake-field="-1" context="&template">
       <li class="input-many-li input-many-template" id="#{underize param_name_for_this}">
         <div class="input-many-item" param="default">

data/taglibs/inputs/select_many.dryml

@@ -36,14 +36,14 @@ To use this tag, the model of the items the user is chosing *must* have unique n
     </div>
     <div class="items">
       <div class="item" param="item" repeat>
-        <span><%= h this.to_s %></span>
+        <span param='item-label'><%= h this.to_s %></span>
         <input type="hidden" name="#{name}[]" value="@#{h this.id}" disabled="&disabled"
                param="hidden"/>
         <input type="button" class="remove-item" value="#{remove_label}" disabled="&disabled"
                param="remove-button"/>
       </div>
     </div>
-    <select merge-attrs="&{:disabled => disabled}">
+    <select merge-attrs="&{:disabled => disabled}" param>
       <option value=""><prompt/></option>
       <repeat with="&options">
         <if test="&this.in?(values)">

data/taglibs/inputs/sortable_input_many.dryml

@@ -8,18 +8,22 @@ The specified sort order may be maintained even without `acts_as_list`.  The ite
 
 ### Attributes
 
- - `id`:  Due to a limitation in script.aculo.us, an id is required.  If you do not supply one, one will be generated.
  - `position-column`:  The position column may be specified via `acts_as_list`, via a `position_column` method on your model or via this attribute.
- - others:  all other attributes are passed through to `<input-many>`
+ - others:  all other attributes are passed through to [jQuery UI's Sortable](http://jqueryui.com/demos/sortable/) or to `<input-many>`, as appropriate.
 
+The jQuery UI option `update` is used internally to update the order.   If you modify this option, your function may call `$(this).hjq_sortable_input_many('update')` to retain this functionality.
 -->
 
-<def tag="sortable-input-many" attrs="id, position-column, template">
-  <% this_id = this_parent.id || rand(100000) -%>
-  <% id ||= "sortable-input-many-#{this_parent.class.name.underscore.dasherize}-#{this_id}-#{this_field_reflection.name}" -%>
+<def tag="sortable-input-many" attrs="position-column, template">
+<%
+  options, attributes = attributes.partition_hash(['disabled', 'appendTo', 'axis', 'cancel', 'connectWith', 'containment', 'cursor', 'cursorAt', 'delay', 'distance', 'dropOnEmpty', 'forceHelperSize', 'forcePlaceholderSize', 'grid', 'handle', 'helper', 'items', 'opacity', 'placeholder', 'revert', 'scroll', 'scrollSensitivity', 'scrollSpeed', 'tolerance', 'zIndex'])
+  events, attributes = attributes.partition_hash(['create', 'start', 'sort', 'change', 'beforeStop', 'stop', 'update', 'receive', 'remove', 'over', 'out', 'activate', 'deactivate'])
+
+  data_rapid_options = { :options => options, :events => events }
+%>
   <% template ||= this.try.new_candidate || this.member_class.new %>
   <% position_column ||= template.try.position_column -%>
-  <input-many merge id="&id" class="sortable-input-many" template="&template" more-skip="&position_column">
+  <input-many merge class="sortable-input-many" template="&template" more-skip="&position_column" data-rapid="&data_rapid('sortable-input-many', data_rapid_options)">
     <default: replace>
         <div class="ordering-handle" param="handle" if="&can_edit?">&uarr;<br/>&darr;</div>
         <if test="&position_column">

data/taglibs/lists/with_fields.dryml

@@ -1,7 +1,5 @@
 <!-- Call with the context set to a record. Repeats the content of the tag with `this` and `this_field` set to the value and name of each of the record's fields in turn. E.g. this is useful for generating a form containing each of the fields. Tags like `<field-list>` and `<table>` forward their attributes to this tag and also have the features described here. For example, the `fields` attribute to `<field-list>` supports the same options as described here.
 
-This tag is in need of a review - it's a bit funky.
-
 ### Attributes
 
  - `fields` - set to one of:
@@ -17,82 +15,32 @@ This tag is in need of a review - it's a bit funky.
 
   -->
 <def tag="with-fields" attrs="fields, associations, skip, skip-associations, include-timestamps, force-all"><%
-  fields.nil? || associations.nil? or raise ArgumentError, "with-fields -- specify either fields or associations but not both"
-
-  field_names = if associations == "has_many"
-                  this.class.reflections.values.select { |refl| refl.macro == :has_many }.map { |refl| refl.name.to_s }
-
-                elsif fields.nil? || fields == "*" || fields.is_a?(Class)
-                  klass = fields.is_a?(Class) ? fields : this.class
-                  columns = standard_fields(klass, include_timestamps)
-
-                  if skip_associations == "has_many"
-                    assocs = this.class.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
-                    columns + assocs
-                  elsif skip_associations
-                    columns
-                  else
-                    assocs = klass.reflections.values.map &its.name.to_s
-                    columns + assocs
-                  end
-                else
-                  comma_split(fields.gsub('-', '_'))
-                end
-  field_names -= comma_split(skip) if skip
-  field_names = field_names.select {|f| can_view?(this, f)} unless force_all
-  field_names.each do |field|
-    %><set-scoped field-name="&field"><%
-    if field == "this"
-      %><do param="default"/><%
-    else
-      %><with field="&field"><do param="default"/></with><%
-    end
-    %></set-scoped><%
-  end
-%></def>
+   field_names = with_fields_helper(all_attributes)
+   field_names = field_names.select {|f| can_view?(this, f)} unless force_all
+   field_names.each do |field|
+     %><set-scoped field-name="&field"><%
+     if field == "this"
+       %><do param="default"/><%
+     else
+       %><with field="&field"><do param="default"/></with><%
+     end
+     %></set-scoped><%
+   end
+-%></def>
 
 <!-- Call with the context set to a model class. Repeats the content of the tag with `this` set name of each of the model's fields in turn. E.g. this tag is used when generating the heading row in a `<table fields='...'/>`.
 
-This tag is in need of a review - it's a bit funky.
-
 ### Attributes
 
- - `fields` - set to one of:
-    - A model class - equivalent to listing all of the regular 'content columns' of that model
-    - '`*`' - equivalent to listing all of the regular 'content columns' of the current record
-    - A comma separated list of field names.
-  Defaults to '`*`'
- - `skip` - comma separated list of field names to omit.
- - `skip-associations` - set to `has-many` to omit all `has_many` associations.
- - `include-timestamps` - whether or not to include the standard ActiveRecord timestamp fields such as `created_at` and `updated_at`. Defaults to false.
-
+Supports the same attributes as `<with-fields>`
   -->
-<def tag="with-field-names" attrs="fields, skip, skip-associations, include-timestamps"><%=
-  field_names = if fields.nil? || fields == "*" || fields.is_a?(Class)
-                  klass = fields.is_a?(Class) ? fields : this.member_class
-                  columns = klass.content_columns.*.name
-                  columns -= %w{created_at updated_at created_on updated_on deleted_at} unless include_timestamps
-
-                  if skip_associations == "has_many"
-                    assocs = this.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
-                    columns + assocs
-                  elsif skip_associations
-                    columns
-                  else
-                    assocs = klass.reflections.values.map &its.name.to_s
-                    columns + assocs
-                  end
-                else
-                  comma_split(fields)
-                end
-
-  field_names -= comma_split(skip) if skip
-  scope.new_scope :field_name => nil, :field_path => nil do
-    field_names.map do |n|
-      scope.field_name = n == "this" ? (this.member_class.try.name || 'this') : n.to_s.gsub("." , "_")
-      scope.field_path = n
-      parameters.default
-    end.safe_join
-  end
-%>
-</def>
+<def tag="with-field-names"><%=
+   field_names = with_fields_helper(all_attributes)
+   scope.new_scope :field_name => nil, :field_path => nil do
+     field_names.map do |n|
+       scope.field_name = n == "this" ? (this.member_class.try.name || 'this') : n.to_s.gsub("." , "_")
+       scope.field_path = n
+       parameters.default
+     end.safe_join
+   end
+%></def>

data/taglibs/plus/filter_menu.dryml

@@ -97,7 +97,7 @@ or
      end
      attributes['message'] ||= t("FIXME", :default => "Loading...") if HoboRapidHelper::AJAX_ATTRS.any?{|a| attributes.has_key?(a)}
      %>
-  <form action="&request.path" method="get" class="filter-menu" merge-attrs="&attributes"  data-rapid="&data_rapid('filter-menu')">
+  <form action="&request.path" method="get" class="filter-menu" merge-attrs="&attributes"  data-rapid="&data_rapid('filter-menu')" with="&nil">
     <div>
       <% opt = options.first.kind_of?(Array) ? options.*.last : options
          selected = opt.detect {|o| o.to_s==params[param_name.gsub('-', '_')] }  %>

data/taglibs/plus/live_search.dryml

@@ -1,8 +1,10 @@
 <!-- Provides an ajax-powered *find-as-you-type* live search field which is hooked up to Hobo's site-side search feature.
 
-Customizing the display of results can be done through customizing the "box" param and the `search-results` tag.  The current definition of `<search-results>` expects results to be returned in `@search_results`.
+You can provide a completely custom set of results by changing the action parameter to your own controller action.
+
+On the other hand, if you wish to slightly tweak the list of results you can adjust the search columns on each model through [set_search_columns](http://cookbook.hobocentral.net/manual/model#set_search_columns),  To stop querying a model, simply set it's search_columns to an empty list.
 
-TODO: currently you have to press 'return' to initiate the search.  This should be easy to fix in hjq-live-search.js - the hard part will probably be in doing it in a way that works in all possible browsers.
+Customizing the display of results can be done through customizing the "box" param and the `search-results` tag.  The current definition of `<search-results>` expects results to be returned in `@search_results`.
 
 ### attributes
 
@@ -23,7 +25,7 @@ All other attributes are merged into the form, so standard form attributes are s
     </form>
     <% panel_tag ||= 'dialog-box' %>
     <% title = t("hobo.live_search.results_label", :default => "Search Results") %>
-    <call-tag tag="&panel_tag" position="&{:my => 'right top'}" width="&600" height="&800" id="search-results-box" with="&nil" title="&title" param="box">
+    <call-tag tag="&panel_tag" position="center" width="&600" height="&800" id="search-results-box" with="&nil" title="&title" param="box">
       <do part="search-results-part">
         <search-results/>
       </do>
@@ -34,7 +36,9 @@ All other attributes are merged into the form, so standard form attributes are s
 <!-- redefining or extending this tag will allow you to customize the display of search results -->
 <def tag="search-results">
   <section with="&@search_results || []" data-rapid='{"search-results": {}}'>
-    <collection/>
+    <collection param>
+      <search-card/>
+    </collection>
     <else><t key="hobo.live_search.no_results">Your search returned no matches.</t></else>
   </section>
 </def>

data/taglibs/views/links_for_collection.dryml

@@ -1,2 +1,2 @@
-<!-- Renders a comma separated list of links (`<a>`), or "(none)" if the list is empty -->
-<def tag="links-for-collection"><%= this.empty? ? "(none)" : context_map { a }.safe_join(", ") %></def>
+<!-- Renders a comma separated list of links (`<view>`), or "(none)" if the list is empty -->
+<def tag="links-for-collection"><%= this.empty? ? "(none)" : context_map { view }.safe_join(", ") %></def>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo_rapid
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre8
+  version: 2.0.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.pre8
+        version: 2.0.0.pre1
 description: The RAPID tag library for Hobo
 email: tom@tomlocke.com
 executables: []
@@ -96,7 +96,6 @@ files:
 - taglibs/inputs/input_for_enum_string.dryml
 - taglibs/inputs/input_many.dryml
 - taglibs/inputs/inputs.dryml
-- taglibs/inputs/name_one.dryml
 - taglibs/inputs/or_cancel.dryml
 - taglibs/inputs/select_input.dryml
 - taglibs/inputs/select_many.dryml

data/taglibs/inputs/name_one.dryml

@@ -1,74 +0,0 @@
-<!-- An `<input type="text">` with auto-completion. Allows the user to chose the target of a `belongs_to` association by name.
-
-This tag relies on an autocompleter being defined in a controller.  A simple example:
-
-    <form with="&ProjectMembership.new">
-      <name-one:user>
-    </form>
-
-    class ProjectMembership < ActiveRecord::Base
-      hobo_model
-      belongs_to :user
-    end
-
-    class User < ActiveRecord::Base
-      hobo_user_model
-      has_many :project_memberships, :accessible => true, :dependent => :destroy
-    end
-
-    class UsersController < ApplicationController
-      autocomplete
-    end
-
-The route used by the autocompleter looks something like `/users/complete_name`.  The first part of this route is specified by the `complete-target` attribute, and the second part is specified by the `completer` attribute.
-
-`complete-target` specifies the controller for the route.  It can be specified by either supplying a model class or a model.  If a model is supplied, the id of the model is passed as a parameter to the controller.  (`?id=7`, for example)  The default for this attribute is the class of the context.   In other words, the class that contains the `has_many / has_one`, not the class with the `belongs_to`.
-
-`completer` specifies the action for the route.   `name-one` prepends `complete_` to the value given here.  This should be exactly the same as the first parameter to `autocomplete` in your controller.   As an example:  `autocomplete :email_address` would correspond to `completer="email_address"`.  The default for this attribute is the name field for the model being searched, which is usually `name`, but not always.
-
-The query string is passed to the controller in the `query` parameter.  (`?query=hello` for example).
-
-For more information on how to customize the controller, see the [controller manual](http://cookbook.hobocentral.net/manual/controllers#autocompleters)
-
-Here's a more complex example.  This used to be a part of [agility](http://cookbook.hobocentral.net/tutorials/agility) until it was simplified.
-
-    class ProjectsController < ApplicationController
-      autocomplete :new_member_name do
-        project = find_instance
-        hobo_completions :name, User.without_project(project).is_not(project.owner)
-      end
-    end
-
-Note that this was added to the projects controller, rather than the users controller as in the first example.  You can read this as: create an auto-complete action called `new_member_name` that finds users that are not already members of the project, and not the owner of the project, and completes the :name field.
-
-    <name-one:user complete-target="&@project" completer="new_member_name"/>
-
-We're using an object as the complete-target rather than a class.   This allows the `find_instance` in our controller action to function.
-
-There's another example of `<name-one>` use in the [recipes](http://cookbook.hobocentral.net/recipes/36-using-a-name-one-one-a).
-
-### Attributes:
-
-- `complete-target`, `completer`: see above
-- `min-chars`: The minimum number of characters that must be entered in the input field before an Ajax request is made.
-- `nil-value`: If there is no current value, this text will appear greyed out inside the control, and will disappear on focus.
-
-### Note:
-
-If you wish to set `min-chars` to 0, you will require this [patch to controls.js](http://github.com/bryanlarsen/scriptaculous/commit/3915b7b).   'controls.js' was added to your project via the rails generator, not via Hobo.
-
-  -->
-<def tag="name-one" attrs="complete-target, completer, min-chars, nil-value"><%
-  complete_target ||= this_field_reflection.klass
-  completer ||= (complete_target.is_a?(Class) ? complete_target : complete_target.class).name_attribute
-  min_chars ||= 1
-  value = name(:no_wrapper => true, :if_present => true)
-  -%>
-  <wrap tag="span" class="field-with-errors" when="&!this_parent.nil? && !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>