hobo 1.3.0.pre31 → 1.3.0

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

@@ -32,8 +32,6 @@ Several of the tags in this taglib support the following set of ajax attributes:
 The following attributes are also supported by all the ajax tags. Set them to fragments of javascript to have that script
 executed at various points in the ajax request cycle:
 
- - before: script to run before the request
-
  - success: script to run on successful completion of the request
 
  - failure: script to run on a request failure
@@ -373,15 +371,29 @@ edit collections a `Category` model in your application:
 
 ### Attributes
 
- - order: The order of the year, month and day menus. A comma separated string or an array. Default: "year, month, day"
- - date-separator, discard-type, prompt and prefix are passed to the select_date helper as options
+ - all the options of select_date and date_select are passed to the select_date Rails
+ helper
 
 All the other attributes are passed to the `select_date` helper as the html-options hash.
 
 The menus default to the current date if the current value is nil.
 
+Examples:
+
+   - override the input for date tag in a form
+
+     <my-special-date-view:>
+        <input start-year="&1940" order="day,month,year" />
+     </my-special-date-view:>
+
+   - override the tag application-wide
+
+     <extend tag='input' for='date'>
+       <old-input merge order="day,month,year" start-year="&1940" />
+     </extend>
+
   -->
-<def tag="input" for="date" attrs="order, date-separator, discard-type, prompt, prefix">
+<def tag="input" for="date" attrs="use-month-numbers, use-short-month, add-month-numbers, use-month-names, date-separator, start-year, end-year, discard-day, discard-month, discard-year, order, include-blank, default, disabled, prompt, prefix">
   <% order = order.nil? ? [:year, :month, :day] : comma_split(order).*.to_sym -%>
   <%= select_date(this || current_time,
                   (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this).merge(:order => order),
@@ -621,7 +633,8 @@ All of the standard ajax attributes are supported (see the main taglib documenti
   class_or_assoc = if model
                      model.is_a?(String) ? model.constantize : model
                    elsif Hobo.simple_has_many_association?(this)
-                     fields[this_field_reflection.primary_key_name] = this.proxy_owner.id
+                     id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
+                     fields[this_field_reflection.primary_key_name] = this.proxy_owner.send(id_method)
                      this
                    else
                      raise Hobo::Error.new("invalid context for <create-button>")
@@ -630,11 +643,17 @@ All of the standard ajax attributes are supported (see the main taglib documenti
   new.set_creator(current_user)
   if can_create?(new)
     label ||= ht("#{new.class.to_s.underscore}.actions.new", :default=>"New #{new.class.model_name.human}")
-    ajax_attributes = { :message => message }
     class_name = new.class.name.underscore
-    ajax_attributes[:params] = { class_name => fields } unless fields.empty?
+    params ||= params || {}
+    params = params.merge(class_name => fields) unless fields.blank?
+
+    ajax_attributes, html_attributes = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
+
+    ajax_attributes.reverse_merge!(:message => message, :params => params)
     func = ajax_updater(object_url(new.class, :method => :post), update, ajax_attributes)
-    element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
+    html_attributes.reverse_merge!(:type =>'button', :onclick => func, :value => label)
+
+    element :input, add_classes(html_attributes,
                                 "button create-button create-#{class_name}-button"), nil, true, true
   end
 %></def>
@@ -649,6 +668,7 @@ This is the default input that Rapid uses for `belongs_to` associations. The men
  - `include-none` - whether to include a 'none' option (i.e. set the foreign key to null).   If this value is not supplied, the default is "true" if the current value is nil; otherwise the default is "false".  One implication of this is that the default may change when the form is re-rendered due to a validation failure.  Setting this value explicitly is recommended.
  - `blank-message` - the message for the 'none' option. Defaults to "(No `<model-name>`)", e.g. "(No Product)"
  - `options` - an array of records to include in the menu. Defaults to the all the records in the target table that match any `:conditions` declared on the `belongs_to` (subject to `limit`)
+ - `sort` - whether to sort the array of options. Defaults to no sorting.
  - `limit` - if `options` is not specified, this limits the number of records.  Default: 100
  - `text_method` - The method to call on each record to get the text for the option.  Multiple methods are supported ie "institution.name"
 
@@ -664,15 +684,17 @@ For situations where there are too many target records to practically include in
 
   options ||= begin
     conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).send(:conditions)
-    this_field_reflection.klass.all(:conditions => conditions, :limit => limit).select {|x| can_view?(x)}
+    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| [x.to_s, x.id] }
+    select_options = options.map { |x| [name(:with => x, :no_wrapper => true), x.send(id_method)] }
   else
     select_options = options.map do |x|
       [ text_method.split(".").inject(x) { |v, method| v.send(method) },
-           x.id ]
+           x.send(id_method) ]
     end
   end
   select_options = select_options.sort if sort
@@ -680,7 +702,7 @@ For situations where there are too many target records to practically include in
   attributes = add_classes(attributes, "input", "belongs_to", type_and_field)
   -%>
   <select name="#{param_name_for_this(true)}" merge-attrs="&attributes.except :name">
-    <%= options_for_select(select_options, this ? this.id : "") %>
+    <%= options_for_select(select_options, this ? this.send(id_method) : "") %>
   </select>
 </def>
 
@@ -751,11 +773,13 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
   min_chars ||= 1
   value = name(:no_wrapper => true, :if_present => true)
   -%>
-  <input type="text" name="#{param_name_for_this}"
-         class="autocompleter #{type_and_field._?.dasherize} #{css_data :complete_on, typed_id(complete_target), completer} #{css_data :min_chars, min_chars} #{'nil-value' if value==''}"
-         value="#{value=='' ? nil_value : value}"
-         merge-attrs/>
-  <div class="completions-popup" style="display:none"></div>
+  <wrap tag="span" class="field-with-errors" when="&!this_parent.errors[this_field].empty?">
+    <input type="text" name="#{param_name_for_this}"
+           class="autocompleter #{type_and_field._?.dasherize} #{css_data :complete_on, typed_id(complete_target), completer} #{css_data :min_chars, min_chars} #{'nil-value' if value==''}"
+           value="#{value=='' ? nil_value : value}"
+           merge-attrs/>
+    <div class="completions-popup" style="display:none"></div>
+  </wrap>
 </def>
 
 
@@ -862,7 +886,7 @@ Use the `stay-here` attribute to remain on the current page:
       ...
     </form>
 
-Use the `go-back` option to return to the previous page:
+Use the `go-back` option to return to the page in `session[:previous_uri]`:
 
     <form>
       <after-submit go-back/>
@@ -904,7 +928,7 @@ Use the `uri` option to specify a redirect location:
   <select merge-attrs param="default">
     <% selected=this if selected.nil? %>
     <option value="#{first_value}" unless="&first_option.nil?"><first-option/></option>
-    <do param="options"><% options_for_select(options, selected) %></do>
+    <do param="options"><%= options_for_select(options, selected) %></do>
   </select>
 </def>
 
@@ -929,8 +953,8 @@ Use the `uri` option to specify a redirect location:
     <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked
     %>
     <li repeat="&options" param>
-      <input type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
-      <name param/>
+      <input id="#{dom_id(this, :check_many)}" type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
+      <label for="#{dom_id(this, :check_many)}"><name param/></label>
     </li>
   </ul>
 </def>

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

@@ -7,7 +7,6 @@
  - model - (optional) should be a model class or a record object (default to this)
  - count - (optional) used to pick the inflected string for the model. It should be an integer.
  -->
-
 <def tag="model-name-human" attrs="model, count"><%=
   model ||= this
   model = model.class unless model.kind_of? Class
@@ -28,7 +27,6 @@
  - count - (optional) should be an integer
 
  -->
-
 <def tag="human-attribute-name" attrs="attribute, model"><%=
   model ||= this
   model = model.class unless model.kind_of? Class
@@ -53,41 +51,44 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
 ### Example
 
 
-  it:
-    activerecord:
-      attributes:
-        post:
-          comments:
-            one: "Commento"
-            other: "Commenti"
-        user:
+    it:
+      activerecord:
+        attributes:
+          post:
+            comments:
+              one: "Commento"
+              other: "Commenti"
+          user:
+            roles:
+              one: "Ruolo"
+              other: "Ruoli"
+      tags:
+        your:
           roles:
-            one: "Ruolo"
-            other: "Ruoli"
-    tags:
-      your:
-        roles:
-          current_user:
-            one: "Il tuo Ruolo"
-            other: "I tuoi Ruoli"
-          other_user:
-            one: "Ruolo di {{name}}"
-            other: Ruoli di {{name}}"
-
-  # context is a Post instance ('your' is ignored)
-  <human-collection-name collection="comments" count="&user.comments.count" your/>
-  I18n.locale = :en => "Comment" or "Comments"
-  I18n.locale = :it => "Commento" or "Commenti"
-
-  # context is an User instance
-  <human-collection-name collection="roles' count="&user.roles.count" your/>
-  I18n.locale = :en => "Your Role" or "Jim's Role" or "Your Roles" or "Jim's Roles"
-  I18n.locale = :it => "Il tuo Ruolo" or "Il Ruolo di Jim" or "I tuoi Ruoli" or "I Ruoli di Jim"
-  (output is the same as <Your key="roles" count=>"&user.roles.count"/> )
-
-  <human-collection-name collection="roles" count="&user.roles.count"/>
-  I18n.locale = :en => "Role" or "Roles"
-  I18n.locale = :it => "Ruolo" or "Ruoli"
+            current_user:
+              one: "Il tuo Ruolo"
+              other: "I tuoi Ruoli"
+            other_user:
+              one: "Ruolo di {{name}}"
+              other: Ruoli di {{name}}"
+
+  context is a Post instance ('your' is ignored)
+
+    <human-collection-name collection="comments" count="&user.comments.count" your/>
+    I18n.locale = :en => "Comment" or "Comments"
+    I18n.locale = :it => "Commento" or "Commenti"
+
+  context is a User instance
+
+    <human-collection-name collection="roles' count="&user.roles.count" your/>
+    I18n.locale = :en => "Your Role" or "Jim's Role" or "Your Roles" or "Jim's Roles"
+    I18n.locale = :it => "Il tuo Ruolo" or "Il Ruolo di Jim" or "I tuoi Ruoli" or "I Ruoli di Jim"
+
+  (output is the same as `<Your key="roles" count=>"&user.roles.count"/>`)
+
+    <human-collection-name collection="roles" count="&user.roles.count"/>
+    I18n.locale = :en => "Role" or "Roles"
+    I18n.locale = :it => "Ruolo" or "Ruoli"
 -->
 <def tag="human-collection-name" attrs="collection, count, your"><%
   raise Hobo::Error, "The 'collection' attribute must be defined" if collection.blank?
@@ -97,7 +98,7 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
   attrs = {}
   all_attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
 <% if your && belong_class < Hobo::Model::UserBase && this.kind_of?(Hobo::Model::UserBase) && I18n.locale == :en -%>
-    <your key="&collection" merge-attrs="&{:name=>this.name}.merge(attrs)" capitalize>
+    <your key="&collection" merge-attrs="&{:name=>name(:no_wrapper => true)}.merge(attrs)" capitalize>
       <%= belong_class.human_attribute_name(collection.to_sym, attrs) %>
     </your>
 <% else -%>
@@ -105,3 +106,68 @@ With the `your` attribute and in the special case the context is a Hobo::Model::
 <% end %>
 </def>
 
+<!-- nodoc -->
+<def tag="fakedef">
+</def>
+
+<!-- Simple wrapper around I18n.t.
+
+The tag content is used as the :default option. It is overridden by an explicit 'default' attribute.
+There is a default :count => 1.
+
+### Attributes
+
+ - key: the key to lookup
+ - all the attributes accepted by the wrapped method -->
+<fakedef tag="t" attrs="key">
+<!-- actually defined in i18n.rb -->
+</fakedef>
+
+<!--
+Wrapper around the Rails :translate helper with hobo added features.
+
+It can be used as a regular helper or as a dryml tag.
+
+### Hobo Added Features
+
+`ht` adds some conventions for easier hobo translation.
+
+1. Assumes the first part of the key to be a model name (e.g.: users.index.title -> user)
+2. Tries to translate the model by lookup for: (e.g.: user-> activerecord.models.user)
+3. Adds a default fallback to the beginning of the fallback chain by replacing the first part of the key with "hobo" and using the translated model name as additional attribute. This allows us to have default translations (e.g.: hobo.index.title: "{{model}} Index")
+
+You can also pass any other :translate option like for example :count.
+
+Is also used as a tag in the dryml-view files. The syntax is:
+
+      <ht key="my.app">My Application</ht>
+
+Will lookup the "my.app"-key for your locale and replaces the "My Application" content if found.
+
+      <ht key="my" app="Program">My Application</ht>
+
+Will look up both the "my"- and "app"-key for your locale, and replaces the "My Application" with the "my"-key contents (interpolated using the "app"-key.
+
+sample.no.yml-file:
+
+      "no":
+        my: "Mitt {{app}}"
+
+The output should be: Mitt Program
+
+Another example:
+
+    <%= ht :key=>'user.index.title', :default=>'Index'  %>
+    <ht key="user.index.title">Index</ht>
+    #=> "Index" # if "user.index.title" or "hobo.index.title" is not found
+    #=> "User Index" # with the below en.yml file
+
+    === en.yml ===
+    en:
+      hobo:
+        index:
+          title: %{model} Index
+-->
+<fakedef tag="ht">
+<!-- actually defined in translations.rb -->
+</fakedef>

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

@@ -25,7 +25,9 @@ Transitions with parameters are implemented using a form.  HTML does not allow f
 
     html_attributes[:method] ||= has_params ? :get : :put
     add_classes!(html_attributes, "transition-button #{transition_name}-button")
-    label = ht("#{this.class.to_s.underscore}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
+    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

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

@@ -55,10 +55,10 @@ The easiest way to see what this tag does is to look at the source.
 
 <!-- Renderes dynamically generated JavaScript required by `hobo-rapid.js`, including the information required to perform automatic part updates -->
 <def tag="page-scripts">
-  <script type="text/javascript" param="default">
+  <do param="default">
     <hobo-rapid-javascripts/>
-    <part-contexts-storage/>
-  </script>
+    <part-contexts-javascripts/>
+  </do>
 </def>
 
 

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

@@ -13,7 +13,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
   <div class="table-plus" merge-attrs="&attributes - attrs_for(:with_fields) - attrs_for(:table)">
     <div class="header" param="header">
       <div class="search">
-        <form param="search-form" method="get" action="">
+        <form param="search-form" method="get" action="" with="&nil">
           <hidden-fields for-query-string skip="page, search"/>
           <span><t key="hobo.table_plus.search">Search</t></span>
           <input class="search" type="search" name="search" value="&params[:search]"/>
@@ -31,9 +31,9 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
              sort_url = url_for_page_path(params.merge(:sort => sort) - [:page])
              col_heading_name = this.member_class.try.human_attribute_name(scope.field_name, :default=> scope.field_name.titleize) %>
 
-          <th param="#{scope.field-name}-heading">
+          <th param="#{scope.field_name}-heading">
             <a href="&sort_url" class="column-sort"
-               param="#{scope.field-name}-heading-link"><%= col_heading_name %></a>
+               param="#{scope.field_name}-heading-link"><%= col_heading_name %></a>
             <if test="&col == sort_field">
               <do param="up-arrow" if="&sort_direction == 'desc'">&uarr;</do>
               <do param="down-arrow" if="&sort_direction == 'asc'">&darr;</do>
@@ -177,60 +177,64 @@ See [Filtering stories by status](/tutorials/agility#filtering_stories_by_status
 
 ### I18n
 
-It lookups the options attributes in "activerecord.attributes.#{model}.filter_menu.#{param\_name}.options"
-with fallback to "filter_menu.#{param_name}.options".
+It lookups the options attributes in `activerecord.attributes.#{model}.filter_menu.#{param\_name}.options`
+with fallback to `filter_menu.#{param_name}.options`.
 The passed options are used as a default in case the lookup fails.
-Besides the "activerecord.attributes.#{model}.filter_menu.#{param_name}.no_filter" or
-"tags.filter_menu.default.no_filter" key is used as default of the attribute "no-filter"
+Besides the `activerecord.attributes.#{model}.filter_menu.#{param_name}.no_filter` or
+`tags.filter_menu.default.no_filter` key is used as default of the attribute "no-filter"
 (or "All" if no default is found)
 
 ### I18n Example
 
 
-  es:
-    activerecord:
-      attributes:
-        <model_name>:
-          filter_menu:
-            period:
-              no_filter: Todos Períodos
-              options:
-              - [ "Hoy", "today" ]
-              - [ "Ayer", "yesterday" ]
+    es:
+      activerecord:
+        attributes:
+          <model_name>:
+            filter_menu:
+              period:
+                no_filter: Todos Períodos
+                options:
+                - [ "Hoy", "today" ]
+                - [ "Ayer", "yesterday" ]
 
 or
 
-  es:
-    tags:
-      filter_menu:
-        period:
-          no_filter: Todos Períodos
-          options:
-          - [ "Hoy", "today" ]
-          - [ "Ayer", "yesterday" ]
-
-   TIME_PERIODS = %w[today yesterday]
-
-   <t-filter-menu param-name="period" options="&TIME_PERIODS" no-filter="All Periods"/>
-
-   with I18n.locale == :es
-   <select name="period">
-     <option value="">Todos Períodos</option>
-     <option value="today">Hoy</option>
-     <option value="yesterday">Ayer</option>
-   </select>
-
-   with I18n.locale == :en (i.e no locale file)
-   <select name="period">
-     <option value="">All Periods</option>
-     <option value="today">today</option>
-     <option value="yesterday">yesterday</option>
-   </select>
+    es:
+      tags:
+        filter_menu:
+          period:
+            no_filter: Todos Períodos
+            options:
+            - [ "Hoy", "today" ]
+            - [ "Ayer", "yesterday" ]
+
+
+     TIME_PERIODS = %w[today yesterday]
+
+     <t-filter-menu param-name="period" options="&TIME_PERIODS" no-filter="All Periods"/>
+
+  with I18n.locale == :es
+
+     <select name="period">
+       <option value="">Todos Períodos</option>
+       <option value="today">Hoy</option>
+       <option value="yesterday">Ayer</option>
+     </select>
+
+  with I18n.locale == :en (i.e no locale file)
+
+     <select name="period">
+       <option value="">All Periods</option>
+       <option value="today">today</option>
+       <option value="yesterday">yesterday</option>
+     </select>
 
   -->
 <def tag="filter-menu" attrs="model, param-name, options, no-filter, id, first-value">
-  <% opt = t("activerecord.attributes.#{model}.filter_menu.#{param_name}.options", :default=>[:"tags.filter_menu.#{param_name}.options"])
-     options = opt unless opt.blank?
+  <% options = t("activerecord.attributes.#{model}.filter_menu.#{param_name}.options", :default=>[:"tags.filter_menu.#{param_name}.options", options])
+     raise ArgumentError, %(You must provide an "options" attribute, or set "activerecord.attributes.#{model}.filter_menu.#{param_name}.options" or "tags.filter_menu.#{param_name}.options" to an Array or to an Array of Arrays
+     in your locale file(s)) unless options.is_a?(Array)
      no_filter = t("activerecord.attributes.#{model}.filter_menu.#{param_name}.no_filter", :default=>[:"tags.filter_menu.#{param_name}.no_filter", :"tags.filter_menu.default.no_filter", no_filter, "All"]) %>
   <form action="&request.fullpath" method="get" class="filter-menu" merge-attrs="id">
     <div>