hobo 1.3.0.pre31 → 1.3.0

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>
@@ -314,7 +313,7 @@ new_link = :new.in?(actions)
 
       <section param="content-body">
 <% if new_link -%>
-        <a action="new" to="&model" param="new-link">
+        <a action="new" to="&@<%= owner %>.<%= collection_name %>" param="new-link">
           <ht key="<%= model_key %>.actions.new" >New <%=model_name %></ht>
         </a>
 

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:>
@@ -124,7 +132,9 @@ This will use `<input/>` as the tag in each table cell instead of `<view/>`
                 <td param="#{scope.field_name.to_s.sub('?', '').gsub('.', '-')}-view"><call-tag tag="&field_tag"/></td>
               </with-fields>
               <td class="controls" param="controls" if="&all_parameters[:controls]">
-                <a param="edit-link" action="edit" if="&can_edit?"><t key="hobo.action.edit">Edit</t></a>
+                <a param="edit-link" action="edit" if="&can_edit?">
+                  <t key="hobo.actions.edit_control">Edit</t>
+                </a>
                 <delete-button param/>
               </td>
             </if>
@@ -157,24 +167,35 @@ Provides a short hand way of displaying images in public/images
 
 
 <!-- Renders some standard JavaScript code that various features of the Rapid library rely on. This tag would typicallu be called from your `<page>` tag. The default Rapid pages include this already. -->
-<def tag="hobo-rapid-javascripts"><%=
-   res = 'var hoboParts = {};'
-   # FIXME: This should interrogate the model-router - not the models
-   unless Hobo::Model.all_models.empty?
-     # Tell JS code how to pluralize names, unless they follow the simple rule
-     names = Hobo::Model.all_models.map do |m|
-                                          m = m.name.underscore
-                                          "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
-                                        end.compact
-     res << "var pluralisations = {#{names * ', '}}; "
-   end
-   base = [base_url, subsite].compact.join("/")
-   res << "urlBase = '#{base}'; hoboPagePath = '#{request.fullpath}'"
-   if protect_against_forgery?
-     res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
-   end
-   res
-%></def>
+<def tag="hobo-rapid-javascripts">
+  <script type="text/javascript" param="default"><%=
+     res = 'var hoboParts = {};'
+     # FIXME: This should interrogate the model-router - not the models
+     unless Hobo::Model.all_models.empty?
+       # Tell JS code how to pluralize names, unless they follow the simple rule
+       names = Hobo::Model.all_models.map do |m|
+                 m = m.name.underscore
+                 "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
+               end.compact
+       res << "var pluralisations = {#{names * ', '}}; "
+     end
+     base = [base_url, subsite].compact.join("/")
+     res << "urlBase = '#{base}'; hoboPagePath = '#{request.fullpath}'"
+     if protect_against_forgery?
+       res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
+     end
+     res
+  %></script>
+</def>
+
+
+<def tag="part-contexts-javascripts">
+  <% unless (storage = part_contexts_storage).blank? %>
+    <script type="text/javascript"><%=
+      storage
+    %></script>
+  <% end %>
+</def>
 
 <!-- Renders the name of the current context using a variety of methods.
 
@@ -445,7 +466,7 @@ Assuming the context is a blog post...
 
             truncate = 30 if truncate == true
             the_view = self.truncate(the_view, :length => truncate.to_i) if truncate
-            the_view = the_view.strip
+            the_view = the_view.html_safe? ? the_view.strip.html_safe : the_view.strip
 
             if no_wrapper
               the_view
@@ -483,12 +504,14 @@ Assuming the context is a blog post...
 <!-- Renders localized `number_with_delimiter this`, or `format % this` if the `format` attribute is given -->
 <def tag="view" for="Numeric" attrs="format"><%= format ? format % this : number_with_delimiter(this) %></def>
 
-<!-- Renders `this` with HTML escaping and newlines replaced with `<br>` tags -->
+<!-- If `this.html_safe?`, returns this unchanged.  Otherwise renders `this` with HTML escaping and newlines replaced with `<br>` tags -->
 <def tag="view" for="string"><%=
-  if !(this.class == String) && this.respond_to?(:to_html) # workaround for Maruku which adds String#to_html : (
+  if this.html_safe?
+    this
+  elsif !(this.class == String) && this.respond_to?(:to_html) # workaround for Maruku which adds String#to_html : (
     this.to_html(scope.xmldoctype)
   else
-    h(this).gsub("\n", "<br#{scope.xmldoctype ? ' /' : ''}>")
+    h(this).gsub("\n", "<br#{scope.xmldoctype ? ' /' : ''}>").html_safe
   end
 %></def>
 
@@ -513,10 +536,9 @@ The label can be customised using the `label` attribute, e.g.
     <count:comments label="blog post comment"/> -> <span class="count">12 blog post comments</span>
 
 You can pass a summary attribute, which will generate a complete localized sentence. It allows 2 options:
-  - boolean (e.g. `<count summary/>`): it will lookup the 'tags.count.default' key in the locale file.
-    If the lookup fails, it will fallback to the english default sentences consistent with the count.
-  - String (e.g. `<count summary="offer"/>`): it will lookup the 'tags.count.offer' key in the locale file.
-    If the lookup fails, it will fallback to the english default sentences consistent with the count.
+
+- boolean (e.g. `<count summary/>`): it will lookup the 'tags.count.default' key in the locale file. If the lookup fails, it will fallback to the english default sentences consistent with the count.
+- String (e.g. `<count summary="offer"/>`): it will lookup the 'tags.count.offer' key in the locale file.  If the lookup fails, it will fallback to the english default sentences consistent with the count.
 
 ### Examples
 
@@ -532,18 +554,22 @@ You can pass a summary attribute, which will generate a complete localized sente
             one: "Puoi scegliere solo una {{label}}"
             other: "Puoi scegliere tra {{count}} {{label}}"
 
-    with :en locale and boolean summary (internal defaults)
+with :en locale and boolean summary (internal defaults)
+
     <count:comments summary/> -> <span class="count">There is 1 Comment</span>
     <count:viewings summary/> -> <span class="count">There are 3 Viewings</span>
-    (note: just add the locale english strings to use like the following examples)
 
-    with :it locale and boolean summary (key "tags.count.default")
+(note: just add the locale english strings to use like the following examples)
+
+with :it locale and boolean summary (key "tags.count.default")
+
     <count:comments summary/>
     -> count => 0 -> <span class="count">Non ci sono Commenti</span>
     -> count => 1 -> <span class="count">C'è solo 1 Commento</span>
     -> count => 5 -> <span class="count">Ci sono 5 Commenti</span>
 
-    with :it locale and summary="choice" (key "tags.count.choice")
+with :it locale and summary="choice" (key "tags.count.choice")
+
     <count:comments summary="choice"/>
     -> count => 0 -> <span class="count">Non ci sono Commenti da scegliere</span>
     -> count => 1 -> <span class="count">Puoi scegliere solo 1 Commento</span>
@@ -596,6 +622,8 @@ You can pass a summary attribute, which will generate a complete localized sente
   end
 %></span></def>
 
+<!-- Equivalent to `<you capitalize/>`-->
+<def tag="You"><you merge capitalize/></def>
 
 <!-- Renders a `<link rel="Stylesheet" type="text/css">` to include the default stylesheet for the selected theme (select with `<set-theme>`). Included in the default pages.
 -->
@@ -611,9 +639,9 @@ You can pass a summary attribute, which will generate a complete localized sente
 
 The context should be a user object. If `this == current_user` the "you" form is rendered, otherwise the form with the user's name:
 
- - `<you have/> new mail` -> "you have new mail" or "Jim has new mail"
- - `<you are/> now an admin` -> "you are now an admin" or "Jim is now an admin"
- - `<you do/>n't want to go there` -> "you don't want to go there" or "Jim doesn't want to go there"
+- `<you have/> new mail` -> "you have new mail" or "Jim has new mail"
+- `<you are/> now an admin` -> "you are now an admin" or "Jim is now an admin"
+- `<you do/>n't want to go there` -> "you don't want to go there" or "Jim doesn't want to go there"
 
 The tag is also localized in the namespaces "tags.you.current_user" and "tags.you.other_user".
 Each namespace can contain the legacy keys "have", "are", "do" used for the respective attributes,
@@ -636,15 +664,15 @@ that you add the keys in the correct namespaces.
             are: "{{name}} è"
             can: "{{name}} può"
 
- - `<you have/> un nuovo messaggio.` -> "Hai un nuovo messaggio." or "Jim ha un nuovo messaggio."
- - `Adesso <you are/> amministratore.` -> "Adesso sei amministratore." or "Adesso Jim è amministratore."
- - `<you can/> scrivere.` -> "Puoi scrivere." or "Jim può scrivere."
+- `<you have/> un nuovo messaggio.` -> "Hai un nuovo messaggio." or "Jim ha un nuovo messaggio."
+- `Adesso <you are/> amministratore.` -> "Adesso sei amministratore." or "Adesso Jim è amministratore."
+- `<you can/> scrivere.` -> "Puoi scrivere." or "Jim può scrivere."
 
 (note: :name is added by default as an interpolable variable)
 
 ### Attributes
 
- - capitalize: the first letter of the resulting sentence will be capitalized
+- capitalize: the first letter of the resulting sentence will be capitalized
 
 
 ### Additional Notes
@@ -666,36 +694,36 @@ 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>
 </def>
 
-<!-- Equivalent to `<you capitalize/>`-->
-<def tag="You"><you merge capitalize/></def>
+<!-- Equivalent to `<your ... capitalize/>`-->
+<def tag="Your"><your merge capitalize/></def>
 
 <!-- Similar to `<you>`, but renders "Your" or "Fred's" or equivalent localized strings
 
 ### Attributes
 
- - capitalize: the first letter of the resulting sentence will be capitalized
- - count: used in pluralization. If omitted it will be set to 1.
- - key: used to lookup the translation in the locale file. It allows 3 different options:
+- capitalize: the first letter of the resulting sentence will be capitalized
+- count: used in pluralization. If omitted it will be set to 1.
+- key: used to lookup the translation in the locale file. It allows 3 different options:
    - single key like 'message': simple translation in 'tags.your.message.current_user'
      or 'tags.your.message.other_user'
    - composite key like 'any.namespace.message': translation as for the previous case, but it will
-     translate also the 'any.namespace.message' and will interpolate the variable <key> (in this case :message)
+     translate also the 'any.namespace.message' and will interpolate the variable `<key>` (in this case :message)
      in the translation
    - when key is omitted it will be set to "default" and will do the translation with that key.
      Pass other meaningful attributes to achieve a dynamic usage
- - any other attribute passed to the tag will be used as a variable for interpolation
+- any other attribute passed to the tag will be used as a variable for interpolation
 
 Notes
 
- - The :name variable is added by default as an interpolable variable
- - If no translation is found an automatic (only english) default is generated:
+- The :name variable is added by default as an interpolable variable
+- If no translation is found an automatic (only english) default is generated:
    the Your/Jim's string, joined to the tag content.
    If you pass an explicit 'default' attribute you will override the automatic default.
 
@@ -718,24 +746,25 @@ Notes
               other: "Tue {{entry}}"
             other_user: "{{entry}} di {{name}}"
 
- - `<your key="message" count=>"&messages.count"/>`
-   -> count => 1 -> "Tuo Messaggio" or "Messaggio di Jim"
-   -> count => 5 -> "Tuoi Messaggi" or "Messaggi di Jim"
+- `<your key="message" count=>"&messages.count"/>`:
 
- - `<your key="activerecord.models.entry" count=>"&this.entries.count"/>`
-   -> count => 1 -> "Tua Entrata" or "Entrata di Jim"
-   -> count => 5 -> "Tue Entrate" or "Entrate di Jim"
+ - count => 1: "Tuo Messaggio" or "Messaggio di Jim"
+ - count => 5: "Tuoi Messaggi" or "Messaggi di Jim"
 
- - `<your>Posts</your>` -> "your Posts" or "Jim's Posts"
- -->
+- `<your key="activerecord.models.entry" count=>"&this.entries.count"/>`:
+
+ - count => 1: "Tua Entrata" or "Entrata di Jim"
+ - count => 5: "Tue Entrate" or "Entrate di Jim"
 
+- `<your>Posts</your>`: "your Posts" or "Jim's Posts"
+ -->
 <def tag="your" attrs="key, capitalize"><%=
    key ||= 'default'
    # prepare symbolized attributes for merging
    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)
@@ -750,8 +779,10 @@ Notes
    capitalize ? s.sub(/^./){|c| c.upcase} : s
 %></def>
 
-<!-- Equivalent to `<your ... capitalize/>`-->
-<def tag="Your"><your merge capitalize/></def>
+<!-- Capitalised version of `<a-or-an>` -->
+<def tag="A-or-An" attrs="word"><%=
+  (word =~ /^[aeiou]/i ? "An " : "A ") + word
+%></def>
 
 <!-- Deprecated. It's harder than you think to do this (e.g. an umbrealla, an user)
 -->
@@ -760,12 +791,6 @@ Notes
 %></def>
 
 
-<!-- Capitalised version of `<a-or-an>` -->
-<def tag="A-or-An" attrs="word"><%=
-  (word =~ /^[aeiou]/i ? "An " : "A ") + word
-%></def>
-
-
 <!-- Renders a collection of string joined with ", ", or some other string passed in the `join` attribute -->
 <def tag="comma-list" attrs="join"><%= this.join(join || ", ") %></def>
 

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) %>