hobo 0.8.2 → 0.8.3

data/rails_generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid-ui.css

@@ -16,8 +16,6 @@ table.new-record textarea, table.new-record input {
 .inplaceeditor-form, .inplaceeditor-form input {
 	display: inline;	
 }
-.inplaceeditor-form .nicEdit-panel .editor_ok_button {display: block; float: right; width: 50px; margin-top: 2px; height:21px; padding-top: 1px;}
-.inplaceeditor-form .nicEdit-panel .editor_cancel_link {display: block; float: right; margin: 3px 10px; background: transparent; }
 
 /**** Admin ****/
 

data/taglibs/core.dryml

@@ -15,8 +15,7 @@
 %></def>
 
 
-<def tag="repeat" attrs="even-odd, join">
-  <if><%= 
+<def tag="repeat" attrs="even-odd, join"><if><%= 
     if even_odd
       context_map do
         klass = [attributes[:class], model_id_class, cycle("even", "odd")].compact.join(' ')
@@ -30,9 +29,7 @@
           res
         end.join(join)
       end
-    end %>
-  </if>
-</def>
+    end %></if></def>
 
 
 <def tag="do"><%= parameters.default %></def>
@@ -57,3 +54,9 @@
   res
 %></def>
 
+
+
+<def tag="fake-field-context" attrs="fake-field, context"><%=
+  res = ""
+  new_field_context(fake_field, context) { res << parameters.default }
+  res %></def>

data/taglibs/rapid.dryml

@@ -102,19 +102,23 @@
 %></def>
 
 
-<def tag="name"><%= 
+<def tag="name" attrs="if-present, raw"><%= 
   if this.nil?
-    nil_view
+    nil_view unless if_present
   else
     name_tag = find_polymorphic_tag("name")
     if name_tag != "name"
-      send(name_tag)
+      send(name_tag, attributes)
     elsif this.is_a?(Array) && this.respond_to?(:proxy_reflection)
       count
     elsif this.is_a? Class and this < ActiveRecord::Base
       this.name.pluralize.titleize
     elsif (name_attr = this.class.try.name_attribute) && can_view?(this, name_attr)
-      view(merge_attrs(attributes, {:field => name_attr}))
+      if raw
+        this.send(name_attr)
+      else
+        view(merge_attrs(attributes, {:field => name_attr}))
+      end
     elsif can_view?(this)
       this.to_s
     end
@@ -377,7 +381,7 @@ in the future - use at your own risk. -->
     <spinner id="search-spinner"/>
   </div>
   <section class="hidden" id="search-results-panel">
-    <h2>Search Results</h2>
+    <h2>Search Results</h2><div param="close-button">close</div>
     <section id="search-results">&nbsp;</section>
   </section>
 </def>

data/taglibs/rapid_document_tags.dryml

@@ -6,7 +6,7 @@
 
 <def tag="item-value"><td merge-attrs><do param="default"/></td></def>
 
-<def tag="section-group"><div class="section-group"><div class="section-group-inner" param="default"></div></div></def>
+<def tag="section-group"><div class="section-group"><div class="section-group-inner" merge-attrs param="default"></div></div></def>
 
 <!-- section represents a generic document or application section. -->
 <def tag="section" attrs="empty, with-flash-messages">

data/taglibs/rapid_editing.dryml

@@ -180,7 +180,7 @@
  <select class="number-editor-bhv #{model_id_class} #{'update:' + comma_split(update).join(':') unless update.blank?}"
           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, this) %>
+   <%= options_for_select(options.*.to_s, this) %>
  </select>
 </def>
 

data/taglibs/rapid_forms.dryml

@@ -1,28 +1,29 @@
-<def tag="hidden-fields" attrs="fields, skip, for-query-string"><%= 
-  skip = comma_split(skip)
+<def tag="hidden-fields" attrs="fields, for-query-string, skip"><%= 
   pairs = if for_query_string
             query_params.to_a
           else
             hiddens = case fields
                       when '*', nil
-                        this.class.column_names - ['type', 'created_at', 'updated_at']
+                        # TODO: Need a better (i.e. extensible) way to eleminate certain fields
+                        this.class.column_names - ['type', 'created_at', 'updated_at'] - comma_split(skip)
                       else
                         comma_split(fields)
                       end
-            pname = this.class.name.underscore
             hiddens.map do |field| 
               val = this.send(field)
-              ["#{pname}[#{field}]", val] unless val.nil? || 
-                                                   field.to_sym.in?(this.class.attr_protected) || 
-                                                   (this.new_record? && val == this.class.column(field).default)
+              param_name = param_name_for(form_this, form_field_path + [field])
+              [param_name, val] unless val.nil? || 
+                                       field.to_sym.in?(this.class.attr_protected) || 
+                                       (this.new_record? && val == this.class.column(field).default)
             end.compact
           end
-  pairs.map { |n, v| hidden_field_tag(n, v.to_s) if v && n.not_in?(skip) }.compact.join("\n")
+  pairs.map { |n, v| hidden_field_tag(n, v.to_s) if v && n.not_in?(scope.form_field_names) }.compact.join("\n")
 %></def>
 
 
-<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner"><%= 
+<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner, multipart"><%= 
   ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
+  html_attrs[:enctype] ||= "multipart/form-data" if multipart
    
   new_record = this.try.new_record?
 
@@ -63,12 +64,14 @@
       html_attrs[:onsubmit] = [html_attrs[:onsubmit], "#{function}; return false;"].compact.join("; ")
     end
      
-    body, field_names = scope.new_scope :in_form => true do
-      with_form_context { parameters.default }
+    hiddens = nil
+    body = with_form_context do
+      # It is important to evaluate parameters.default first, in order to populate scope.form_field_names
+      b = parameters.default
+      hiddens = self.hidden_fields(:fields => hidden_fields) if new_record
+      b
     end
      
-    hiddens = hidden_fields(:fields => hidden_fields, :skip => field_names) if new_record
-     
     auth_token = if method.nil? || method == 'get' || request_forgery_protection_token.nil?
                    ''
                  else
@@ -77,22 +80,24 @@
                            :value => form_authenticity_token}, nil, true, true)
                  end
      
-    page_path = if request.post? || request.put? && params[:page_path]
-                  params[:page_path]
-                else
-                  view_name.sub(Hobo::Dryml::EMPTY_PAGE, params[:action])
-                end
-    page_path_hidden = hidden_field_tag("page_path", page_path) unless method == "get"
-
+    unless method == "get"
+      page_path = if (request.post? || request.put?) && params[:page_path]
+                    params[:page_path]
+                  else
+                    view_name.sub(Hobo::Dryml::EMPTY_PAGE, params[:action])
+                  end
+      page_path_hidden = hidden_field_tag("page_path", page_path) 
+    end
+    
     hiddens_div = element(:div, {:class => "hidden-fields"}, [http_method_hidden, page_path_hidden, auth_token, hiddens].join)
      
     body = [hiddens_div, body].join
     
     if action.nil? # don't add automatic css classes if the action was specified
       if web_method
-        add_classes!(html_attrs, "#{type_id}-#{web_method}-form")
+        add_classes!(html_attrs, "#{type_id.dasherize}-#{web_method}-form")
       else
-        add_classes!(html_attrs, "#{'new-' if new_record}#{type_id}")
+        add_classes!(html_attrs, "#{'new-' if new_record}#{type_id.dasherize}")
       end
     end
 
@@ -125,7 +130,7 @@
                     if refl.options[:through]
                       select_many(attrs)
                     else
-                      raise NotImlementedError, "An input for has-many associations has not been implemented yet"
+                      raise NotImplementedError, "An input for has-many associations has not been implemented yet"
                     end
                   end
                 else
@@ -198,7 +203,7 @@
 
 <!-- Buttons -->
 
-<def tag="remote-method-button" attrs="method, update, label"><%= 
+<def tag="remote-method-button" attrs="method, update, label, confirm"><%= 
   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
 
   url = object_url(this, method, :method => :post)
@@ -206,11 +211,11 @@
   label ||= method.titleize
   if update || !ajax_attributes.empty?
     ajax_attributes[:message] ||= label
-    func = ajax_updater(url, update, ajax_attributes)
+    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)
   else
-    button_to(label, url, html_attributes)
+    button_to(label, url, html_attributes.merge(:confirm => confirm))
   end
 %></def>
   
@@ -295,7 +300,7 @@
   options ||= this_field_reflection.klass.all(:conditions => conditions).select {|x| can_view?(x)}
     #Todo: switch to autocompleter for id_name when too many records, and id_name supported
   select_options = options.map { |x|
-            [ name(:with => x, :no_wrapper => true), x.id ]
+            [ name(:with => x, :raw => true), x.id ]
           }
   select_options = select_options.sort if sort
   select_options.insert(0, [blank_message, ""]) if include_none || (this.nil? && include_none != false)
@@ -307,9 +312,13 @@
 </def>
 
 
-<def tag="name-one" attrs="complete-target, completer">
+<def tag="name-one" attrs="complete-target, completer"><%
+  complete_target ||= this_field_reflection.klass
+  completer ||= (complete_target.is_a?(Class) ? complete_target : complete_target.class).name_attribute
+%>
   <input type="text" name="#{param_name_for_this}" 
          class="autocompleter #{type_and_field} complete-on:#{dom_id complete_target}:#{completer}"
+         value="&name :no_wrapper => true, :if_present => true"
          merge-attrs/>
   <div class="completions-popup" style="display:none"></div>
 </def>
@@ -331,7 +340,9 @@
   <section class="error-messages" merge-attrs if="&this.errors.length > 0">
     <h2 param="heading">To proceed please correct the following:</h2>
     <ul param>
-      <li repeat="errors.full_messages" param><%= this %></li>
+      <% this.errors.each do |attr, message|; next if message == "..." %>
+        <li param><%= attr.titleize %> <%= message %></li>
+      <% end %>
     </ul>
   </section>
 </def>
@@ -339,8 +350,12 @@
 
 <def tag="select-many" attrs="options, targets, remove-label, prompt">
   <%
-  prompt ||= "Add a #{this_field.titleize.singularize}"
-  options ||= this.member_class.all
+  prompt ||= "Add #{a_or_an(:word => this_field.titleize.singularize)}"
+  options ||= begin
+                conditions = ActiveRecord::Associations::HasManyThroughAssociation.new(this_parent, this_field_reflection).sql_conditions
+                this_field_reflection.klass.all(:conditions => conditions).select {|x| can_view?(x)}
+              end
+                
   values = this
   %>
   <div class="input select-many" merge-attrs>
@@ -380,6 +395,67 @@
 <def tag="select-menu" attrs="options, selected, first-option, first-value">
   <select merge-attrs param="default">
     <option value="#{first_value}" unless="&first_option.nil?"><first-option/></option>
-    <do param="options"><% options_for_select(options.*.to_s, selected.to_s) %></do>
+    <do param="options"><% options_for_select(options, selected.to_s) %></do>
   </select>
 </def>
+
+
+<def tag="hidden-id-field">
+  <if:id><input type="hidden" name="#{param_name_for_this}" value="#{this}" /></if>
+</def>
+
+
+<def tag="input-many">
+  <set empty="&this.empty?"/>
+  <ul class="input-many #{this_field.dasherize} input-many-prefix:#{param_name_for_this}">
+    <li repeat class="#{'record-with-errors' unless this.errors.empty?}">
+      <error-messages without-heading class="sub-record"/>
+      <hidden-id-field/>
+      <div class="input-many-item" param="default"/>
+      <div class="buttons">
+        <button class="remove-item" unless="&this_parent.length == 1">-</button>
+        <button class="add-item" if="&last_item?">+</button>
+      </div>
+    </li>
+    <li if="&empty">
+      <fake-field-context fake-field="0" context="&this.member_class.new">
+        <div class="input-many-item" param="default"/>
+      </fake-field-context>
+      <div class="buttons">
+        <button class="add-item">+</button>
+      </div>
+    </li>
+  </ul>
+</def>
+
+
+<def tag="input-all">
+  <% association_fkey = this_field_reflection.primary_key_name %>
+  <ul class="input-all #{this_field.dasherize}">
+    <li repeat class="#{'record-with-errors' unless this.errors.empty?}">
+      <set-scoped form-field-names="&[]">
+        <hidden-id-field/>
+        <do param="default"/>
+        <hidden-fields skip="&association_fkey"/>
+      </set-scoped>
+    </li>
+  </ul>
+</def>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/taglibs/rapid_generics.dryml

@@ -12,9 +12,9 @@
 
 
 <def tag="empty-collection-message">
-  <p class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
+  <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
     No <collection-name lowercase/> to display
-  </p>
+  </div>
 </def>
 
 

data/taglibs/rapid_lifecycles.dryml

@@ -1,21 +1,3 @@
-<def tag="start-lifecycle" attrs="model, name, parameters">
-  <% 
-  model   = model.constantize if model.is_a?(String) 
-  creator = model::Lifecycle.creators[name]
-  candidate = creator.candidate(current_user, parameters)
-  %>
-  <if with="&candidate">
-    <div class="lifecycle #{name}" merge-attrs>
-      <h2 param="heading"><name.titleize/></h2>
-
-      <form lifecycle="#{name}" method="post" param>
-        <field-list fields="&creator.parameters - parameters.keys" param/>
-        <submit label="#{name.titleize}" param/>
-      </form>
-    </div>
-  </if>
-</def>
-
 <def tag="transition-button" attrs="transition, update, label"><%= 
     transition = transition.name unless transition.is_a?(String)
     ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)

data/taglibs/rapid_user_pages.dryml

@@ -4,6 +4,7 @@
 
 
 <def tag="login-page" attrs="remember-me">
+  <% remember_me = true if remember_me.nil? %>
   <simple-page title="Log in" merge>
    
     <body: class="login-page" param/>
@@ -33,18 +34,19 @@
               <item-value><input type="checkbox" name="remember_me" id="remember-me" param="remember-me-input"/></item-value>
             </labelled-item>
           </labelled-item-list>
-          <div class="actions" param="actions">
-            <submit label='Log in' param/><if test="&signup_url" class='nav-item'> or <a href="&signup_url">Sign up</a></if>
+          <div param="actions">
+            <submit label='Log in' param/><if test="&signup_url" class='nav-item'>
+            or <a href="&signup_url">Sign up</a></if>
           </div>
         </form>
-        <a class="forgot-password" href="&forgot_password_url">Forgot your password?</a>
+        <a href="&forgot_password_url" param="forgot-password" if="&forgot_password_url">Forgot your password?</a>
       </section>
     </content:>
   </simple-page>
 </def>
 
 
-<def tag="forgot-password-page" attrs="remember-me">
+<def tag="forgot-password-page">
   <simple-page title="Forgotten Password" merge>
    
     <body: class="forgot-password-page" param/>
@@ -53,7 +55,7 @@
       <header param="content-header">
         <h2 param="heading">Forgotten Password</h2>
         <p>Enter the email address you signed up with. If we have it in
-        our records we'll send you an email allowing you to chose a new
+        our records we'll send you an email allowing you to choose a new
         password.</p>
       </header>
 
@@ -67,7 +69,7 @@
               </item-value>
             </labelled-item>
           </labelled-item-list>
-          <div class="actions" param="actions">
+          <div param="actions">
             <submit label="Send" param/>
           </div>
         </form>
@@ -78,41 +80,6 @@
 </def>
 
 
-<def tag="forgot-password-page" attrs="remember-me">
-  <simple-page title="Forgotten Password" merge>
-   
-    <body: class="forgot-password-page" param/>
-    
-    <content: param>
-      <header param="content-header">
-        <h2 param>Forgotten Password</h2>
-        <p>Enter the email address you signed up with. If we have it in
-        our records we'll send you an email allowing you to chose a new
-        password.</p>
-      </header>
-
-      <section param="content-body">
-        <form action="" class="forgot-password" param>
-          <labelled-item-list param>
-            <labelled-item>
-              <item-label param="email-address-label">Email Address</item-label>
-              <item-value>
-                <input type="text" name="email_address" id="email-address" class="email-address" param="email-address-input" />
-              </item-value>
-            </labelled-item>
-          </labelled-item-list>
-          <div class="actions" param="actions">
-            <submit label="Send" param/>
-          </div>
-        </form>
-      </section>
-      
-    </content:>
-      
-  </simple-page>
-</def>
-
-
 <def tag="forgot-password-email-sent-page">
   <simple-page>
     <body: class="forgot-password-page" param/>