hobo 0.6.4 → 0.7.0

data/hobo_files/plugin/tags/rapid_document_tags.dryml

@@ -1,53 +1,55 @@
-<def tag="field_list"><table class="field_list" merge_attrs><tagbody/></table></def>
+<def tag="labelled-item-list"><table class="field-list" merge-attrs><do param="default"/></table></def>
 
-<def tag="field_list_item"><tr merge_attrs><tagbody/></tr></def>
+<def tag="labelled-item"><tr merge-attrs><do param="default"/></tr></def>
 
-<def tag="item_label"><th merge_attrs><tagbody/></th></def>
+<def tag="item-label"><th merge-attrs><do param="default"/></th></def>
 
-<def tag="item_value"><td merge_attrs><tagbody/></td></def>
+<def tag="item-value"><td merge-attrs><do param="default"/></td></def>
 
 
 <def tag="heading">
-  <%= content_tag "h#{scope.heading_level || '1'}", tagbody.call, attributes %>
+   <%= element("h#{scope.heading_level || '1'}", attributes, parameters.default) %>
 </def>
 
-<def tag="sub_heading">
-  <%= content_tag "h#{scope.heading_level.to_i + 1|| '2'}", tagbody.call, attributes.merge(:class => "subheading") %>
-</def>
+<def tag="sub-heading"><%= 
+  element("h#{scope.heading_level ? scope.heading_level.to_i + 1 : '2'}",
+          attributes.merge(:class => "subheading"),
+          parameters.default)
+%></def>
 
 <def tag="nav">
-  <div class="nav" merge_attrs><tagbody/></div>
+  <div class="nav" merge-attrs><do param="default"/></div>
 </def>  
 
 <!-- section represents a generic document or application section. -->
 <def tag="section" attrs="empty">
-  <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="section" merge_attrs if="&!body.blank? || empty"><%= body %></div>
+  <set body="&parameters.default"/>
+  <div class="section" merge-attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
 <def tag="aside" attrs="empty">
-  <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="aside" merge_attrs if="&!body.blank? || empty"><%= body %></div>
+  <set body="&parameters.default"/>
+  <div class="aside" merge-attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
 <def tag="header" attrs="empty">
-  <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="header" merge_attrs if="&!body.blank? || empty"><%= body %></div>
+  <set body="&parameters.default"/>
+  <div class="header" merge-attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
 <def tag="footer" attrs="empty">
-  <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="footer" merge_attrs if="&!body.blank? || empty"><%= body %></div>
+  <set body="&parameters.default"/>
+  <div class="footer" merge-attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
 <!-- article represents an independent piece of content of a --> 
 <!-- document, such as a blog entry or newspaper article.    -->
 <def tag="article" attrs="empty">
-  <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="article" merge_attrs if="&!body.blank? || empty"><%= body %></div>
+  <set body="&parameters.default"/>
+  <div class="article" merge-attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
 <!-- temporary tag -->
 <def tag="panel">
-  <div class="panel" merge_attrs><tagbody/></div>
+  <div class="panel" merge-attrs><do param="default"/></div>
 </def>

data/hobo_files/plugin/tags/rapid_editing.dryml

@@ -16,12 +16,12 @@
 %></def>
 
 
-<def tag="has_many_editor">
+<def tag="has-many-editor">
   <% #TODO: Implement %>
-  <a merge_attrs/>
+  <a merge-attrs/>
 </def>
   
-<def tag="belongs_to_editor"><%= belongs_to_menu_editor(attributes) %></def>
+<def tag="belongs-to-editor"><%= belongs_to_menu_editor(attributes) %></def>
 
 <def tag="editor" for="string"><%= in_place_editor "in_place_textfield_bhv", attributes %></def>
 
@@ -39,12 +39,16 @@
 
 <def tag="editor" for="password"><% raise HoboError, "passwords cannot be edited in place" %></def>
 
-<def tag="editor" for="boolean"><boolean_checkbox_editor merge_attrs/></def>
+<def tag="editor" for="boolean"><boolean-checkbox-editor merge-attrs/></def>
 
 <def tag="editor" for="big_integer"><%= in_place_editor "in_place_textfield_bhv", attributes %></def>
 
+<def tag="editor" for="Hobo::EnumString">
+ <string-select-editor values="&this_type.values"/>
+</def>
+
 
-<def tag="autocompleter" attrs="completer_model, completer_attr, id, filter, name, value">
+<def tag="autocompleter" attrs="completer-model, completer-attr, id, filter, name, value">
   <% refl = this_type
      if refl.respond_to?(:macro) && refl.macro == :belongs_to
        completer_model ||= refl.klass
@@ -56,17 +60,17 @@
      url = object_url(completer_model, "completions",
                       { :for => completer_attr }.update(attributes.select_hash {|k,v| k.to_s.starts_with? "where_"}))
   %>
-  <input type="text" name="#{name}" id="#{id}" class="autocomplete_bhv"
-         autocomplete_url="#{url}" value="#{value}"
-         merge_attrs/>
-  <div id="<%= id %>_completions" class="completions_popup" style="display:none"></div>
+  <input type="text" name="#{name}" id="#{id}" class="autocomplete-bhv"
+         autocomplete-url="#{url}" value="#{value}"
+         merge-attrs/>
+  <div id="<%= id %>-completions" class="completions-popup" style="display:none"></div>
 </def>
 
 
-<def tag="belongs_to_menu_editor"><%
+<def tag="belongs-to-menu-editor"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
   link_id = "#{this_field_dom_id}_editor" %>
-  <span id="#{link_id}" part="rapid_belongs_to_edit">
+  <span id="#{link_id}" part="rapid-belongs-to-edit">
     <% select_options = this_type.klass.find(:all).select {|x| can_view?(x)}.map {|x|
             [ name(:with => x, :no_wrapper => true), x.id ]
           }
@@ -86,8 +90,8 @@
 </def>
 
 
-<def tag="belongs_to_autocompleting_editor" attrs="update">
-  <if_can_edit><%
+<def tag="belongs-to-autocompleting-editor" attrs="update">
+  <if-can-edit><%
   return object_link unless can_edit?
 
   id ||= this_field_dom_id + "_completer"
@@ -105,18 +109,18 @@
                    attributes.select_hash {|k,v| k.to_s.starts_with? "where_"})
   %>
     <form onsubmit="#{f}; $('#{id}').blur(); return false">
-      <input type="text" class="autocomplete_bhv autosubmit" id="#{id}" autocomplete_url="#{url}"
-             value="#{this && this.id_name}" merge_attrs />
-      <div id="#{id}_completions" class="completions_popup" style="display:none"></div>
+      <input type="text" class="autocomplete-bhv autosubmit" id="#{id}" autocomplete-url="#{url}"
+             value="#{this && this.id_name}" merge-attrs />
+      <div id="#{id}-completions" class="completions-popup" style="display:none"></div>
     </form>
-  </if_can_edit>
+  </if-can-edit>
   <else>
-    <object_link/>
+    <object-link/>
   </else>
 </def>
 
 
-<def tag="string_select_editor" attrs="update, values"><%
+<def tag="string-select-editor" attrs="update, values"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
 
   values = comma_split(values)
@@ -128,13 +132,13 @@
                     } })
   html_attributes = add_classes(attributes, editor_class)
 %>
-  <select onchange="#{f}" merge_attrs="&html_attributes">
+  <select onchange="#{f}" merge-attrs="&html_attributes">
     <%= options_for_select(values, this) %>
   </select>  
 </def>
 
 
-<def tag="boolean_checkbox_editor" attrs="update"><%
+<def tag="boolean-checkbox-editor" attrs="update"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
   f = ajax_updater(object_url(this_parent),
                    "Change #{this_field.to_s.titleize}", update,
@@ -145,11 +149,11 @@
   attributes = add_classes(attributes, editor_class)
 %>
   <input type="checkbox" value="1" onclick="#{f}"
-         merge_attrs="& this ? attributes.merge(:checked => 'checked') : attributes" />
+         merge-attrs="& this ? attributes.merge(:checked => 'checked') : attributes" />
 </def>
 
 
-<def tag="sti_type_editor" attrs="update">
+<def tag="sti-type-editor" attrs="update">
   <% base_class = this.class
      base_class = base_class.superclass while base_class.superclass != ActiveRecord::Base
    f = ajax_updater("#{base_url}/#{controller_for base_class}/#{this.id}",
@@ -161,27 +165,23 @@
   %>
 
   <select onchange="#{f}">
-    <if test="&tagbody">
-      <tagbody/>
-    </if>
-    <else>
-      <%= options_for_select(base_class.send(:subclasses).map{|x| [x.name.titleize, x.name]}, this.class.name) %>
-    </else>
+    <%= parameters.default || options_for_select(base_class.send(:subclasses).map{|x| [x.name.titleize, x.name]},
+                                                 this.class.name) %>
   </select>
 </def>
 
       
-<def tag="integer_select_editor" attrs="min, max, update, nil_option, message">
- <select class="number_editor_bhv" hobo_update="#{update}"
-          hobo_model_id="#{this_field_dom_id}"
-          merge_attrs="&message ? attributes.merge(:hobo_message => message) : attributes">
+<def tag="integer-select-editor" attrs="min, max, update, nil-option, message">
+ <select class="number-editor-bhv" hobo-update="#{update}"
+          hobo-model-id="#{this_field_dom_id}"
+          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((min.to_i..max.to_i).to_a, this) %>
  </select>
 </def>
 
 
-<def tag="has_many_checkbox_editor" attrs="model, update, message"><%=
+<def tag="has-many-checkbox-editor" attrs="model, update, message"><%=
   raise HoboError.new("no update specified") unless update
 
   fields = attributes.delete_if{|k,v|!k.ends_with? "_id"}
@@ -208,15 +208,15 @@
       checkbox_attrs[:onclick] = ajax_updater(object_url(obj, "destroy"), message, update, {:method => 'delete'})                          
     end
   end
-  tag :input, add_classes(attributes.merge(checkbox_attrs),
-                          "checkbox_input has_many_checkbox has_many_#{class_name}_checkbox") if permission
+  element(:input, add_classes(attributes.merge(checkbox_attrs),
+                              "checkbox_input has_many_checkbox has_many_#{class_name}_checkbox")) if permission
 %></def>
 
-<def tag="HasManyCheckboxEditors">
-  <Table>
-    <tr>
-      <td><has_many_checkbox_editor param="editor" merge_attrs/></td>
+<def tag="has-many-checkbox-editors">
+  <table>
+    <tr:>
+      <td><has-many-checkbox-editor param="editor" merge-attrs/></td>
       <td><name param/></td>
     </tr>
-  </Table>
+  </table>
 </def>

data/hobo_files/plugin/tags/rapid_forms.dryml

@@ -1,4 +1,4 @@
-<def tag="hidden_fields" attrs="fields, skip, for_query_string"><%= 
+<def tag="hidden-fields" attrs="fields, skip, for-query-string"><%= 
   pairs = if for_query_string
             query_params.to_a
           else
@@ -20,7 +20,7 @@
 %></def>
 
 
-<def tag="form" attrs="message, update, hidden_fields, action, method, web_method"><%= 
+<def tag="form" attrs="message, update, hidden-fields, action, method, web-method"><%= 
   ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
    
   html_attrs[:action] = action || object_url(this, web_method)
@@ -48,7 +48,7 @@
 
   body, field_names = scope.new_scope do
     scope[:in_form] = true
-    with_form_context { tagbody.call }
+    with_form_context { parameters.default }
   end
 
   hiddens = hidden_fields(:fields => hidden_fields, :skip => field_names) if new_record
@@ -56,9 +56,9 @@
   auth_token = if request_forgery_protection_token.nil?
                  ''
                else
-                 tag(:input, :type => "hidden", 
-                     :name => request_forgery_protection_token.to_s,
-                     :value => form_authenticity_token)
+                 element(:input, :type => "hidden", 
+                         :name => request_forgery_protection_token.to_s,
+                         :value => form_authenticity_token)
                end
 
   page_path_hidden = hidden_field_tag("page_path", view_name) 
@@ -71,21 +71,21 @@
     add_classes!(html_attrs, "#{'new_' if new_record}#{type_id}")
   end
    
-  content_tag("form", body, html_attrs)
+  element("form", html_attrs, body)
 %></def>
 
 
 <def tag="submit" attrs="label, image">
-  <input if="&image" type="image" src="&image" merge_attrs class="image_button submit_button"/>
+  <input if="&image" type="image" src="&image" merge-attrs class="image-button submit-button"/>
   <else>
-    <input type="submit" value="#{label}" merge_attrs class="button submit_button"/>
+    <input type="submit" value="#{label}" merge-attrs class="button submit-button"/>
   </else>
 </def>
 
 
 <def tag="input"><%=     
   if attributes[:type]
-    tag :input, attributes
+    element :input, attributes
   elsif !can_edit?
     view
   else
@@ -107,7 +107,7 @@
                     raise HoboError, ("No input tag for #{this_field}:#{this_type} (this=#{this.inspect})")
                 end
     if this_parent.errors[this_field]
-      "<div class='field_with_errors'>#{the_input}</div>"
+      "<div class='field-with-errors'>#{the_input}</div>"
     else
       the_input
     end
@@ -163,7 +163,7 @@
 <def tag="input" for="Hobo::EnumString" attrs="labels,titleize">
   <% labels ||= {} %>
   <% titleize = true if titleize.nil? %>
-  <select name="#{param_name_for_this}" merge_attrs>
+  <select name="#{param_name_for_this}" merge-attrs>
     <%= options_for_select(this_type.values.map {|v| [labels.fetch(v.to_sym, titleize ? v.titleize : v), v] }, this) %>
   </select>
 </def>
@@ -173,42 +173,42 @@
 </def>
 
 
-<def tag="belongs_to_input">
+<def tag="belongs-to-input">
   <%= belongs_to_menu_input(attributes) %>
 </def>
 
 <!--- Buttons --->
 
-<def tag="remote_method_button" attrs="method, update, result_update, params, label, message"><%= 
+<def tag="remote-method-button" attrs="method, update, result-update, params, label, message"><%= 
   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
 
   url = object_url(this, method)
-  add_classes!(html_attributes, "button remote_method_button #{method}_button")
+  add_classes!(html_attributes, "button remote-method-button #{method}-button")
   if update || result_update
     message ||= method.titleize
     func = ajax_updater(url, message, update,
                         ajax_attributes.merge(:params => params, :result_update => result_update))
     html_attributes.update(:onclick => "var e = this; " + func, :type =>'button', :value => label)
-    tag(:input, html_attributes)
+    element(:input, html_attributes)
   else
     button_to(label, url, html_attributes)
   end
 %></def>
   
 
-<def tag="update_button" attrs="label, message, update, fields, params"><%=
+<def tag="update-button" attrs="label, message, update, fields, params"><%=
   raise HoboError.new("no update specified") unless update
   message ||= label
   func = ajax_updater(object_url(this), message, update,
                       :params => { this.class.name.underscore => fields }.merge(params || {}),
                       :method => :put)
-  tag :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
-                          "button update_button update_#{this.class.name.underscore}_button") %>
+  element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
+                          "button update-button update-#{this.class.name.underscore}-button") %>
 </def>
 
 
-<def tag="delete_button" attrs="label, message, update, in_place, image, confirm, fade"><%=
-  if can_delete?
+<def tag="delete-button" attrs="label, message, update, in-place, image, confirm, fade, subsite"><%=
+  if (Hobo::Dryml.last_if = can_delete?)
     attributes = attributes.merge(if image
                                     { :type => "image", :src => "#{base_url}/images/#{image}" }
                                   else
@@ -218,9 +218,9 @@
     confirm = "Are you sure?" if confirm.nil?
     
     add_classes!(attributes,
-                 image ? "image_button" : "button",
-                 "delete_button delete_#{this.class.name.underscore}_button")
-    url = object_url(this, "destroy")
+                 image ? "image-button" : "button",
+                 "delete-button delete-#{this.class.name.underscore.dasherize}-button")
+    url = object_url(this, "destroy", :subsite => subsite)
     if in_place == false
       attributes[:confirm] = confirm if confirm
       button_to(label, url, attributes)
@@ -228,13 +228,15 @@
       fade = true if fade.nil?
       attributes[:value] = label
       attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
-      tag(:input, attributes)
+      element(:input, attributes)
     end
+  else
+    ""
   end
 %></def>
 
 
-<def tag="create_button" attrs="model, update, label, message, fields"><%=
+<def tag="create-button" attrs="model, update, label, message, fields"><%=
   raise HoboError.new("no update specified") unless update
 
   fields ||= {}
@@ -244,7 +246,7 @@
                      fields[this.proxy_reflection.primary_key_name] = this.proxy_owner.id
                      this
                    else
-                     raise HoboError.new("invalid context for <create_button>")
+                     raise HoboError.new("invalid context for <create-button>")
                    end
   new = class_or_assoc.new(fields)
   new.set_creator(current_user)
@@ -254,13 +256,13 @@
     class_name = new.class.name.underscore
     func = ajax_updater(object_url(new.class), message, update,
                         ({:params => { class_name => fields }} unless fields.empty?))
-    tag :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
-                            "button create_button create_#{class_name}_button")
+    element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
+                            "button create-button create-#{class_name}-button")
   end
 %></def>
 
 
-<def tag="belongs_to_menu_input" attrs="include_none, blank_message, options"><%
+<def tag="belongs-to-menu-input" attrs="include-none, blank-message, options"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
    
   blank_message ||= "(No #{this_type.name.to_s.titleize})"
@@ -272,13 +274,13 @@
   select_options.insert(0, [blank_message, ""]) if include_none || (this.nil? && include_none != false)
   attributes = add_classes(attributes, "input", "belongs_to", type_and_field)
   %>
-  <select name="#{param_name_for_this(true)}" merge_attrs>
+  <select name="#{param_name_for_this(true)}" merge-attrs>
     <%= options_for_select(select_options, this ? this.id : "") %>
   </select>
 </def>
 
 
-<def tag="belongs_to_autocompleting_input">
+<def tag="belongs-to-autocompleting-input">
 <% refl = this_type
    completer_model ||= refl.klass
    completer_attr ||= refl.klass.id_name_column
@@ -287,65 +289,65 @@
    url = object_url(completer_model, :completions, { :for => completer_attr }.update(where_attributes))
   %>
 
-  <input type="text" id="#{id}" class="autocomplete_bhv" autocomplete_url="#{url}"
-         name="#{param_name_for_this}" merge_attrs/>
-  <div id="#{id}_completions" class="completions_popup" style="display:none"></div>
+  <input type="text" id="#{id}" class="autocomplete-bhv" autocomplete-url="#{url}"
+         name="#{param_name_for_this}" merge-attrs/>
+  <div id="#{id}-completions" class="completions-popup" style="display:none"></div>
 </def>
 
 
-<def tag="sti_type_input">
+<def tag="sti-type-input">
   <select name="#{param_name_for(form_this, form_field_path + ['type'])}">
     <%= options_for_select(this.class.send(:subclasses).map{|x| [x.name.titleize, x.name]}, this.class.name) %>
   </select>
 </def>
 
       
-<def tag="select_input">
+<def tag="select-input">
   <select name="#{param_name_for_this}">
-    <tagbody/>
+    <do param="default"/>
   </select>
 </def>
 
       
-<def tag="ErrorMessages">
-  <section class="error_messages" merge_attrs if="&this.errors.length > 0">
+<def tag="error-messages">
+  <section class="error-messages" merge-attrs if="&this.errors.length > 0">
     <h2 param="heading">In order to proceed please correct the following:</h2>
-    <UL:errors.full_messages param>
+    <ul:errors.full_messages param>
       <li param><%= this %></li>
-    </UL>
+    </ul>
   </section>
 </def>
 
 
-<def tag="name_array_input" attrs="targets, remove_label">
+<def tag="name-array-input" attrs="targets, remove-label">
   <%
   all ||= this.member_class.find(:all)
   values = this
   %>
-  <div class="input has_many_through" merge_attrs>
-    <div style="display:none" class="item_proto">
+  <div class="input has-many-through" merge-attrs>
+    <div style="display:none" class="item-proto">
       <div class="item">
         <span></span>
         <input type="hidden" name="#{param_name_for_this}[]" />
-        <input type="button" class="remove_item" value="#{remove_label || 'Remove'}"/>
+        <input type="button" class="remove-item" value="#{remove_label || 'Remove'}"/>
       </div>
     </div>
     <div class="items">
       <div class="item" repeat>
         <span><%= this %></span>
         <input type="hidden" name="#{param_name_for_this}[]" value="#{this}"/>
-        <input type="button" class="remove_item" value="#{remove_label || 'Remove'}"/>
+        <input type="button" class="remove-item" value="#{remove_label || 'Remove'}"/>
       </div>
     </div>
     <select>
       <option value="">Add a <%= this_field.titleize.singularize %></option>
       <option repeat="&all.sort_by {|x| name(:no_wrapper => true, :with => x).downcase}" 
-              merge_attrs="&{:style => 'display:none'} if this.in?(values)"><name/></option>
+              merge-attrs="&{:style => 'display:none'} if this.in?(values)"><name/></option>
     </select>
   </div>
 </def>
 
 
-<def tag="after_submit" attrs="uri">
+<def tag="after-submit" attrs="uri">
   <input type="hidden" value="&params[:after_submit] || uri" name="after_submit"/>
 </def>