hobo 1.3.0.RC4 → 1.3.0.pre10

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

@@ -20,8 +20,8 @@
 <def tag="empty-collection-message">
   <unless test="&this.member_class.nil?">
     <div class="empty-collection-message" style="#{'display:none' if !this.empty?}" param="default">
-      <ht key="#{this.member_class.name.underscore}.collection.empty_message">
-        No <collection-name/> to display
+      <ht key="#{this.member_class.name.tableize}.collection.empty_message">
+        No <collection-name lowercase/> to display
       </ht>
     </div>
   </unless>

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

@@ -1,19 +1,43 @@
 <!-- Rapid i18n provides tags related with the Rails-I18n project -->
 
-<!-- Wrapper around ActiveModel::Name#human
+<!-- 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
+
+-->
+<def tag="t"><%=
+  options = {}
+  attributes.each_pair{|k,v| options[k.to_sym] = h(v)}
+  k = options.delete(:key)
+  I18n.t(k, {:default=>all_parameters.default}.merge(options)).html_safe
+%></def>
+
+<!-- Wrapper around ActiveModel::Name#human with added sugar.
+It dynamically pluralizes the human name by using the implicit model.count.
 
 #### Attributes
 
  - 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.
+ - count - (optional) used to pick the inflected string for the model. It should be an integer
+   or the symbol :dynamic if you want to have the pluralization consistent with the model.count.
+   If you don't pass any count it uses the ApplicationHelper#default_count.
  -->
+
 <def tag="model-name-human" attrs="model, count"><%=
   model ||= this
   model = model.class unless model.kind_of? Class
+  # adapted from count tag
+  count = default_count if count.blank?
+  c = count.try.to_int || count==:dynamic && this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
   # prepare symbolized attributes for merging
   attrs = {}
-  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v}
-  model.model_name.human( attrs )
+  attributes.each_pair{|k,v| attrs[k.to_sym] = v}
+  model.model_name.human( {:count=>c}.merge(attrs) )
 %>
 </def>
 
@@ -27,82 +51,83 @@
  - count - (optional) should be an integer
 
  -->
+
 <def tag="human-attribute-name" attrs="attribute, model"><%=
   model ||= this
   model = model.class unless model.kind_of? Class
   # prepare symbolized attributes for merging
   attrs = {}
-  all_attributes.each_pair{|k,v| attrs[k.to_sym] = v}
+  attributes.each_pair{|k,v| attrs[k.to_sym] = v}
   model.human_attribute_name( attribute.to_sym, attrs )
 %>
 </def>
 
 <!-- Used to localize and pluralize collection names.
-A collection name is a special case of an attribute name, (indeed you should store the collection names as attribute names in the locale files), so this tag internally uses human_attribute_name to return them.
+A collection name is a special case of an attribute name, (indeed you should store the collection names as attribute names in the locale files), so this tag internally uses human_attribute_name to return them. It does also the default pluralization by calling count on the collection attribute (that you can override passing an explicit `count` attribute).
 
-With the `your` attribute and in the special case the context is a Hobo::Model::UserMixin instance it automatically embeds the `your` tag funtionality. (note: :name is added by default as an interpolable variable)
+With the `your` attribute and in the special case the context is a Hobo::Model::User instance it automatically embeds the `your` tag funtionality. (note: :name is added by default as an interpolable variable)
 
 ### Attributes
 
  - collection - the attribute/collection key to lookup in the `activerecord.attributes` namespace. (e.g. 'roles')
- - count - used to pick the inflected string for the collection. It should be an integer.
+ - count - It should be an integer or the symbol :dynamic if you want to have the pluralization
+   consistent with the collection.count. If you don't pass any count it uses the ApplicationHelper#default_count.
  - your - wraps the collection name in a `Your` tag
 
 ### Example
 
 
-    it:
-      activerecord:
-        attributes:
-          post:
-            comments:
-              one: "Commento"
-              other: "Commenti"
-          user:
-            roles:
-              one: "Ruolo"
-              other: "Ruoli"
-      tags:
-        your:
+  it:
+    activerecord:
+      attributes:
+        post:
+          comments:
+            one: "Commento"
+            other: "Commenti"
+        user:
           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 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"
+            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" your/>
+  I18n.locale = :en => "Comment" or "Comments"
+  I18n.locale = :it => "Commento" or "Commenti"
+
+  # context is an User instance
+  <human-collection-name collection="roles' 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"/>
+  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?
   belong_class = this.kind_of?(Class) ? this : this.class
   raise Hobo::Error, "The context is not an ActiveRecord::Base instance or class. (this = #{this.typed_id rescue this.inspect})" unless belong_class < ActiveRecord::Base
+  count = default_count if count.blank?
+  c = count.try.to_int || count==:dynamic && this.kind_of?(ActiveRecord::Base) && this.send(collection.to_sym).count
   # prepare symbolized attributes for merging
   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=>name(:no_wrapper => true)}.merge(attrs)" capitalize>
-      <%= belong_class.human_attribute_name(collection.to_sym, attrs) %>
+  attributes.each_pair{|k,v| attrs[k.to_sym] = v} -%>
+<% if your && belong_class < Hobo::Model::User && this.kind_of?(Hobo::Model::User) && I18n.locale == :en -%>
+    <your key="&collection" merge-attrs="&{:count=>c, :name=>this.name}.merge(attrs)" capitalize>
+      <%= belong_class.human_attribute_name(collection.to_sym, {:count=>c}.merge(attrs)) %>
     </your>
 <% else -%>
-    <%= belong_class.human_attribute_name( collection.to_sym, attrs ) %>
+    <%= belong_class.human_attribute_name( collection.to_sym, {:count=>c}.merge(attrs) ) %>
 <% end %>
 </def>
 

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

@@ -1,14 +1,14 @@
 <!-- Contains view-layer support for Hobo's lifecycles. Note that lifecycle forms are generated automatically in `app/views/taglibs/auto/rapid/forms.dryml` - this library contains only lifecycle push-buttons. -->
 
 <!-- A push-button to invoke a lifecycle transition either as a page-reload or as an ajax call.
-
+  
 ### 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.
+All of the [standard ajax attributes](/api_taglibs/rapid_forms) are also supported. 
 
 ### Warning
 
@@ -25,9 +25,7 @@ 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 = 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? 
+    label = ht("#{this.class.name.tableize}.actions.#{transition_name}", :default => (label || transition_name.to_s.titleize))
     url = object_url(this, transition_name, :method => html_attributes[:method])
 
     if (update || !ajax_attributes.empty?) && !has_params
@@ -50,7 +48,7 @@ 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>
-  -->
+  -->  
 <def tag="transition-buttons">
   <% ajax_attrs, html_attrs = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS) %>
   <div merge-attrs="&html_attrs" class="transitions">
@@ -61,4 +59,4 @@ This tag behaves similarly to repeat: an else tag may be used to handle the case
       <% end %>
     </if>
   </div>
-</def>
+</def>

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

@@ -89,7 +89,7 @@ This is a simple tag - just look at the source if you need to know more detail.
     <ul class="navigation account-nav" param>
       <li if="&Rails.env.development?" param="dev-user-changer"><dev-user-changer/></li>
       <if test="&logged_in?">
-        <li class='nav-item' param="logged-in-as"><a to="&current_user"><t key="hobo.actions.logged_in_as" name="&name">Logged in as <name/></t></a></li>
+        <li class='nav-item' param="logged-in-as"><a to="&current_user"><t key="hobo.actions.logged_in_as" name="&name.html_safe">Logged in as <name/></t></a></li>
         <li class='nav-item' param="account"><a action="account"><t key="hobo.actions.account">Account</t></a></li>
         <li class='nav-item' param="log-out"><a href="&logout_url"><t key="hobo.actions.logout">Log out</t></a></li>
       </if>
@@ -104,5 +104,5 @@ This is a simple tag - just look at the source if you need to know more detail.
 
 <!--- A simple wrapper around the `will_paginate` helper. All options to `will_paginate` are available as attributes -->
 <def tag="page-nav">
-  <%= will_paginate this, attributes.symbolize_keys.reverse_merge(:inner_window => 2, :previous_label => translate("hobo.actions.previous", :default=>"« Prev"), :next_label =>translate("hobo.actions.next", :default=>"Next »")) %>
+  <%= will_paginate this, attributes.symbolize_keys.reverse_merge(:inner_window => 2, :previous_label => translate("hobo.actions.previous", :default=>"&laquo; Prev"), :next_label =>translate("hobo.actions.next", :default=>"Next &raquo;")) %>
 </def>

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

@@ -24,7 +24,7 @@ The easiest way to see what this tag does is to look at the source.
       </do>
 
       <do param="scripts">
-        <javascript param name="prototype, effects, dragdrop, controls, rails, lowpro, hobo-rapid"/>
+        <javascript param name="prototype, effects, dragdrop, controls, lowpro, hobo-rapid"/>
         <if-ie version="lt IE 7" param="fix-ie6">
           <javascript name="IE7"/>
           <javascript name="ie7-recalc"/>
@@ -32,14 +32,13 @@ The easiest way to see what this tag does is to look at the source.
         <do param="custom-scripts"/>
         <javascript param="application-javascript" name="application"/>
       </do>
-      <%= csrf_meta_tag %>
     </head>
 
     <body param>
       <set-scoped flash-rendered="&false">
         <ajax-progress param/>
         <header class="page-header" param>
-          <account-nav if="&login_url(Hobo::Model::UserBase.default_user_model)" param/>
+          <account-nav if="&login_url(Hobo::Model::User.default_user_model)" param/>
           <h1 param="app-name"><a href="#{base_url}/"><app-name/></a></h1>
           <live-search param if="&defined_route? :site_search"/>
           <main-nav current="&title" param/>
@@ -55,10 +54,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">
-  <do param="default">
+  <script type="text/javascript" param="default">
     <hobo-rapid-javascripts/>
-    <part-contexts-javascripts/>
-  </do>
+    <part-contexts-storage/>
+  </script>
 </def>
 
 
@@ -101,11 +100,11 @@ The easiest way to see what this tag does is to look at the source.
 
 ### Attributes
 
- - `message` - The main message to display. Defaults to "The page you requested cannot be found."
+ - `message` - The main message to display. Defaults to "The page you were looking for could not be found"
 
   -->
 <def tag="not-found-page" attrs="message">
-  <% message ||= t("hobo.messages.not_found", :default=>["The page you requested cannot be found."]) %>
+  <% message ||= "The page you were looking for could not be found" %>
   <page merge>
     <body: class="not-found"/>
     <content: param>

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

@@ -13,11 +13,11 @@ 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="" with="&nil">
+        <form param="search-form" method="get" action="">
           <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]"/>
-          <submit label="&t('hobo.table_plus.submit_label', :default=>'Go')" class="search-button" param="search-submit"/>
+          <submit label="&I18n.t('hobo.table_plus.submit_label', :default=>'Go')" class="search-button" param="search-submit"/>
         </form>
       </div>
     </div>
@@ -28,12 +28,12 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
           <% col = sort_columns[scope.field_path] || scope.field_path
              sort = sort_field == col && sort_direction == 'asc' ?
                       "-#{col}" : col
-             sort_url = url_for_page_path(params.merge(:sort => sort) - [:page])
+             sort_url = url_for(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>
@@ -45,7 +45,7 @@ An [worked example](/tutorials/agility#improve_the_project_page_with_a_searchabl
     </table>
     <empty-collection-message param="empty-message"/>
 
-    <page-nav param params="&recognize_page_path.slice(:controller,:action)" if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
+    <page-nav param if="&this.respond_to?(:page_count) || this.respond_to?(:total_pages)"/>
   </div>
 </def>
 
@@ -105,16 +105,16 @@ This tag assumes the controller has a `reorder` action and the model has a `posi
      name ||= model_class.name.downcase.pluralize -%>
   <section class="#{name.dasherize} collection-preview" param="default">
     <h3 param="heading">
-      <ht key="#{model_class.to_s.underscore}.collection.heading" count="&this.size">
+      <ht key="#{name.to_s.tableize}.collection.heading" count="&this.size">
         <do param="heading-content"><%= name.pluralize.titleize %></do>
       </ht>
     </h3>
     <a with="&model_class" action="new" if="&can_create?(model_class.new)" param="new-link">
-      <ht key="#{model_class.to_s.underscore}.actions.new">New <%= model_class.model_name.human %></ht>
+      <ht key="#{model_class.to_s.tableize}.actions.new">New <%= model_class.model_name.human %></ht>
     </a>
     <collection param/>
-    <unless test="&this.empty? || this.size == model_class.count">
-      <a param="show-all"><ht key="#{model_class.to_s.underscore}.actions.show_all" count="100">Show all <%= name.pluralize.titleize %>...</ht></a>
+    <unless test="&this.empty?">
+      <a param="show-all"><ht key="#{model_class.to_s.tableize}.actions.show_all">Show all <%= name.pluralize.titleize %>...</ht></a>
     </unless>
   </section>
 </def>
@@ -171,77 +171,54 @@ See [Filtering stories by status](/tutorials/agility#filtering_stories_by_status
  - `options` - an array of options or an array of arrays (useful for localized apps) for the menu.
    It can be omitted if you provide the options as an array or array of arrays in the locale file.
  - `no-filter` - The text of the first option which indicates no filter is in effect. Defaults to 'All'
- - `first-value` - the value to be used with the first option. Typically not used,
- meaning the option has a blank value.
- - model - the model name (optional: needed if you use the "activerecord.attributes" namespace.
 
 ### 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 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 "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" ]
-
-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">
-  <% 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"]) %>
+<def tag="filter-menu" attrs="param-name, options, no-filter, id">
+  <% opt = I18n.t("tags.filter_menu.#{param_name}.options", :default=>'')
+     options = opt unless opt.blank?
+     no_filter = I18n.t("tags.filter_menu.#{param_name}.no_filter", :default=>[:"tags.filter_menu.default.no_filter", no_filter, "All"]) %>
   <form action="&request.fullpath" method="get" class="filter-menu" merge-attrs="id">
     <div>
       <% opt = options.first.kind_of?(Array) ? options.*.last : options
          selected = opt.detect {|o| o.to_s==params[param_name.gsub('-', '_')] }  %>
       <select-menu name="&param_name" options="&options" selected="&selected"
-                   first-option="&no_filter" first-value="&first_value" key="&param_name" merge-params/>
+                   first-option="&no_filter" key="&param_name" merge-params/>
     </div>
   </form>
 </def>